data correctly persisted now

Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>

Author: davidkirwan

.env.example

@@ -12,5 +12,6 @@ APP_VERSION=dev
 # METRICS_SCHEDULER_DISABLED=0
 
 # Optional SQLite persistence for price history (survives restarts)
+# Local dev via podman:run uses ./data bind-mounted to /data in the container.
 # PRICE_HISTORY_DB_PATH=/data/asset_history.db
-# PRICE_HISTORY_RETENTION_DAYS=7
+# PRICE_HISTORY_RETENTION_DAYS=365

.gitignore

@@ -40,4 +40,8 @@ Thumbs.db
 /vendor/bundle/
 
 # Podman
-.containerignore
+.containerignore
+
+# Local SQLite price history (see data/.gitkeep)
+/data/*
+!/data/.gitkeep

Containerfile

@@ -10,13 +10,16 @@ RUN apk add --no-cache \
 
 WORKDIR /app
 
+ENV BUNDLE_DEPLOYMENT=1 \
+    BUNDLE_WITHOUT="development:test" \
+    BUNDLE_PATH=/usr/local/bundle \
+    GEM_HOME=/usr/local/bundle
+
 # Copy dependency files
 COPY Gemfile Gemfile.lock ./
 
-# Install gems
-RUN bundle config set --local deployment 'true' \
-    && bundle config set --local without 'development test' \
-    && bundle install --jobs=4 --retry=3
+# Install gems (clean binstubs; no host vendor/bundle)
+RUN bundle install --jobs=4 --retry=3
 
 # Production stage
 FROM ruby:3.4.8-alpine AS production
@@ -26,34 +29,33 @@ RUN apk add --no-cache \
     tzdata \
     ca-certificates \
     sqlite \
+    wget \
     && addgroup -g 1001 -S appgroup \
     && adduser -u 1001 -S appuser -G appgroup
 
-# Set timezone
-ENV TZ=UTC
+ENV TZ=UTC \
+    RACK_ENV=production \
+    PORT=8080 \
+    BUNDLE_DEPLOYMENT=1 \
+    BUNDLE_WITHOUT="development:test" \
+    BUNDLE_PATH=/usr/local/bundle \
+    GEM_HOME=/usr/local/bundle
 
-# Create app directory
 WORKDIR /app
 
 # Copy gems from builder stage
 COPY --from=builder /usr/local/bundle /usr/local/bundle
 
-# Copy application code
-COPY --chown=appuser:appgroup . .
+# Copy application code (vendor/bundle excluded via .containerignore)
+COPY --chown=appuser:appgroup Gemfile Gemfile.lock config.ru ./
+COPY --chown=appuser:appgroup lib/ lib/
+COPY --chown=appuser:appgroup views/ views/
 
-# Create non-root user and set permissions
 USER appuser
 
-# Health check
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://localhost:8080/health || exit 1
 
-# Expose port
 EXPOSE 8080
 
-# Set environment variables
-ENV RACK_ENV=production
-ENV PORT=8080
-
-# Start the application
-CMD ["bundle", "exec", "rackup", "--host", "0.0.0.0", "-p", "8080"]
+CMD ["bundle", "exec", "rackup", "config.ru", "--host", "0.0.0.0", "-p", "8080"]

Makefile

@@ -9,10 +9,17 @@ APP_HOST ?= 0.0.0.0
 APP_PORT ?= 8080
 CONTAINERFILE ?= Containerfile
 IMAGE ?= asset-monitoring:latest
+DATA_DIR ?= $(CURDIR)/data
+CONTAINER_DATA_DIR ?= /data
+PRICE_HISTORY_DB_PATH ?= $(CONTAINER_DATA_DIR)/asset_history.db
+PRICE_HISTORY_RETENTION_DAYS ?= 365
 BUNDLE ?= bundle
 BUNDLE_EXEC ?= $(BUNDLE) exec
 RACKUP := $(BUNDLE_EXEC) rackup config.ru --host $(APP_HOST) -p $(APP_PORT)
 
+# RVM binstubs call ruby_executable_hooks; keep GEM_HOME/bin on PATH for make recipes.
+export PATH := $(shell ruby -e 'paths=[]; paths << File.join(ENV["GEM_HOME"], "bin") if ENV["GEM_HOME"]; print paths.join(":") + (paths.empty? ? "" : ":")'):$(PATH)
+
 .PHONY: help install server dev console \
         spec test rubocop lint check coverage \
         security audit brakeman \
@@ -61,8 +68,13 @@ security: audit brakeman ## Run security checks (bundle-audit + brakeman)
 podman-build: ## Build the container image tagged asset-monitoring:latest
 	podman build -t $(IMAGE) -f $(CONTAINERFILE) .
 
-podman-run: ## Run the container (port $(APP_PORT))
-	podman run -p $(APP_PORT):$(APP_PORT) $(IMAGE)
+podman-run: ## Run the container (SQLite in ./data bind-mounted to /data)
+	@mkdir -p $(DATA_DIR)
+	podman run --rm -p $(APP_PORT):$(APP_PORT) \
+	  -e PRICE_HISTORY_RETENTION_DAYS=$(PRICE_HISTORY_RETENTION_DAYS) \
+	  -e PRICE_HISTORY_DB_PATH=$(PRICE_HISTORY_DB_PATH) \
+	  -v $(DATA_DIR):$(CONTAINER_DATA_DIR):Z,U \
+	  $(IMAGE)
 
 podman_build: podman-build ## Alias for podman-build
 

Rakefile

@@ -1,15 +1,33 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
+require 'fileutils'
 
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
+# RVM (and similar) gem binstubs use `ruby_executable_hooks`; ensure it is on PATH
+# when Rake spawns subshells via `sh`.
+def ensure_gem_exec_path!
+  paths = ENV.fetch('PATH', '').split(File::PATH_SEPARATOR)
+  [ENV['GEM_HOME'], Gem.dir].compact.filter_map do |base|
+    File.join(base, 'bin') if base && !base.empty?
+  end.each do |bin|
+    paths.unshift(bin) unless paths.include?(bin)
+  end
+  ENV['PATH'] = paths.join(File::PATH_SEPARATOR)
+end
+
+ensure_gem_exec_path!
+
 APP_HOST = ENV.fetch('HOST', '0.0.0.0')
 APP_PORT = ENV.fetch('PORT', '8080')
 CONTAINERFILE = 'Containerfile'
 IMAGE = 'asset-monitoring:latest'
-RACKUP_CMD = "bundle exec rackup config.ru --host #{APP_HOST} -p #{APP_PORT}"
+DATA_DIR = File.expand_path(ENV.fetch('DATA_DIR', 'data'), __dir__)
+CONTAINER_DATA_DIR = '/data'
+PRICE_HISTORY_DB_PATH = File.join(CONTAINER_DATA_DIR, 'asset_history.db')
+RACKUP_CMD = ['bundle', 'exec', 'rackup', 'config.ru', '--host', APP_HOST, '-p', APP_PORT]
 
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new(:rubocop)
@@ -33,12 +51,12 @@ end
 namespace :security do
   desc 'Run Bundler audit'
   task :audit do
-    sh 'bundle exec bundle-audit check --update'
+    sh 'bundle', 'exec', 'bundle-audit', 'check', '--update'
   end
 
   desc 'Run Brakeman'
   task :brakeman do
-    sh 'bundle exec brakeman --no-pager'
+    sh 'bundle', 'exec', 'brakeman', '--no-pager'
   end
 end
 
@@ -53,34 +71,45 @@ task brakeman: 'security:brakeman'
 
 desc 'Install dependencies'
 task :install do
-  sh 'bundle install'
+  sh 'bundle', 'install'
 end
 
 desc 'Start the application server'
 task :server do
-  sh RACKUP_CMD
+  sh(*RACKUP_CMD)
 end
 
 desc 'Start the application server with auto-reload (development)'
 task :dev do
-  sh "bundle exec rerun -- #{RACKUP_CMD}"
+  sh 'bundle', 'exec', 'rerun', '--', *RACKUP_CMD
 end
 
 desc 'Start an interactive console'
 task :console do
   ENV['METRICS_SCHEDULER_DISABLED'] = '1'
-  sh 'bundle exec pry -Ilib -r asset_monitoring'
+  sh 'bundle', 'exec', 'pry', '-Ilib', '-r', 'asset_monitoring'
 end
 
 namespace :podman do
   desc 'Build the container image'
   task :build do
-    sh "podman build -t #{IMAGE} -f #{CONTAINERFILE} ."
+    sh 'podman', 'build', '-t', IMAGE, '-f', CONTAINERFILE, '.'
   end
 
-  desc 'Run the container'
+  desc 'Run the container (1-year price history, SQLite in ./data bind-mounted to /data)'
   task :run do
-    sh "podman run -p #{APP_PORT}:#{APP_PORT} #{IMAGE}"
+    retention_days = ENV.fetch('PRICE_HISTORY_RETENTION_DAYS', '365')
+    db_path = ENV.fetch('PRICE_HISTORY_DB_PATH', PRICE_HISTORY_DB_PATH)
+    container_data_dir = File.dirname(db_path)
+
+    FileUtils.mkdir_p(DATA_DIR)
+
+    sh 'podman', 'run', '--rm',
+       '-p', "#{APP_PORT}:#{APP_PORT}",
+       '-e', "PRICE_HISTORY_RETENTION_DAYS=#{retention_days}",
+       '-e', "PRICE_HISTORY_DB_PATH=#{db_path}",
+       '-v', "#{DATA_DIR}:#{container_data_dir}:Z,U",
+       IMAGE
   end
 end
 

data/.gitkeep

@@ -27,22 +27,16 @@ def configure_from_env!
         end
 
         log = resolve_logger
-        @store = PriceHistoryStore.new(db_path, retention_days: @retention_days, log: log)
-        hydrate_from_store! if @store&.enabled?
-      end
-
-      private_class_method def resolve_retention_days
-        val = ENV.fetch('PRICE_HISTORY_RETENTION_DAYS', DEFAULT_RETENTION_DAYS.to_s).to_i
-        val.positive? ? val : DEFAULT_RETENTION_DAYS
-      end
-
-      private_class_method def resolve_logger
-        return nil unless defined?(Asset::Monitoring)
-
-        settings = Asset::Monitoring.settings
-        return nil unless settings.respond_to?(:log)
+        store = PriceHistoryStore.new(db_path, retention_days: @retention_days, log: log)
+        unless store.enabled?
+          log_warn("SQLite price history disabled; could not open #{db_path} (check directory permissions)")
+          @store = nil
+          return
+        end
 
-        settings.log
+        @store = store
+        log_info("SQLite price history enabled at #{db_path} (retention: #{@retention_days} days)")
+        hydrate_from_store!
       end
 
       attr_reader :retention_days
@@ -95,6 +89,38 @@ def to_api_hash
 
       private
 
+      def resolve_retention_days
+        val = ENV.fetch('PRICE_HISTORY_RETENTION_DAYS', DEFAULT_RETENTION_DAYS.to_s).to_i
+        val.positive? ? val : DEFAULT_RETENTION_DAYS
+      end
+
+      def resolve_logger
+        return nil unless defined?(Asset::Monitoring)
+
+        settings = Asset::Monitoring.settings
+        return nil unless settings.respond_to?(:log)
+
+        settings.log
+      end
+
+      def log_info(message)
+        logger = resolve_logger
+        if logger.respond_to?(:info)
+          logger.info(message)
+        else
+          warn "[PriceHistory] #{message}"
+        end
+      end
+
+      def log_warn(message)
+        logger = resolve_logger
+        if logger.respond_to?(:warn)
+          logger.warn(message)
+        else
+          warn "[PriceHistory] #{message}"
+        end
+      end
+
       def retention_seconds
         @retention_days * 24 * 60 * 60
       end

lib/price_history.rb

@@ -21,8 +21,9 @@ def initialize(db_path, retention_days:, log: nil)
       ensure_directory
       open_database
       ensure_schema
+      log_info("Opened SQLite store at #{@db_path}")
     rescue StandardError => e
-      log_error("Failed to initialize SQLite store at #{@db_path}: #{e.message}")
+      log_error("Failed to initialize SQLite store at #{@db_path}: #{e.class}: #{e.message}")
       close_database
       @db = nil
     end
@@ -125,6 +126,11 @@ def open_database
       @db.busy_timeout = 5_000
       @db.execute('PRAGMA foreign_keys = ON')
       @db.execute('PRAGMA journal_mode = DELETE') # simple and safe default
+
+      return if @db_path == ':memory:'
+      return if File.file?(@db_path)
+
+      raise Errno::ENOENT, "SQLite database file was not created at #{@db_path}"
     end
 
     def ensure_schema
@@ -172,6 +178,14 @@ def log_error(message)
         warn "[PriceHistoryStore] #{message}"
       end
     end
+
+    def log_info(message)
+      if @log.respond_to?(:info)
+        @log.info(message)
+      else
+        warn "[PriceHistoryStore] #{message}"
+      end
+    end
   end
   # rubocop:enable Metrics/ClassLength
 end

lib/price_history_store.rb

@@ -82,6 +82,20 @@
       File.unlink(temp_db) if File.exist?(temp_db)
     end
 
+    it 'creates the database file on disk during initialization' do
+      dir = Dir.mktmpdir
+      db_path = File.join(dir, 'asset_history.db')
+      expect(File.exist?(db_path)).to be false
+
+      store = described_class.new(db_path, retention_days: 30, log: log)
+
+      expect(store.enabled?).to be true
+      expect(File.exist?(db_path)).to be true
+      expect(File.size(db_path)).to be > 0
+    ensure
+      FileUtils.remove_entry(dir) if defined?(dir) && dir && Dir.exist?(dir)
+    end
+
     it 'persists across separate store instances (simulating restart)' do
       now = Time.now.to_i
       store1 = described_class.new(temp_db, retention_days: 30, log: log)

spec/price_history_store_spec.rb

@@ -24,7 +24,15 @@ Security:
 
 Podman:
   rake podman:build / make podman-build   - Build the container image
-  rake podman:run / make podman-run       - Run the container
+  rake podman:run / make podman-run       - Run the container (365-day retention, SQLite in ./data)
+
+  podman:run defaults (override via env):
+    PRICE_HISTORY_RETENTION_DAYS=365      - Retain price history for one year
+    PRICE_HISTORY_DB_PATH=/data/asset_history.db  - Path inside the container
+    DATA_DIR=./data                       - Host directory bind-mounted to /data
+
+  The SQLite file appears in ./data/asset_history.db after a successful start.
+  Check container logs for "SQLite price history enabled" or permission errors.
 
 Environment overrides (server/dev):
   HOST=0.0.0.0 PORT=8080            - Bind address and port (defaults shown)