aoc_cli 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 523ec81af92a97e0d60f5e7490d29feb336e2c1577eecb00c7510c47171dfb87
-  data.tar.gz: 6c6f424ee15d996c12d9552d6a7681fd946b0f0724c5803f3344bfdb41eaad72
+  metadata.gz: ddf7e8e1d35efd516bae0a1a9b4d773a0ff59120f3ae287491668fa81740ffba
+  data.tar.gz: 7fc18fbfcf0391b6d9b6ed43b6e6f35b372f368c9ffd8f5f23c2f3a305c470d2
 SHA512:
-  metadata.gz: cd1fd05753d8fc593f37b6f28db96bb58cb9eae931a8b28852513ed25bf6cdcc300c44f4963a1581207dd8001b4d9fc0115ac582b6d79d49e1766c54dc17fbe7
-  data.tar.gz: 1a5a042be37b1e4b661c05417a94312701c26eb794895cfc58455099ef9cd16f3c6df57ac74d096d20f5298019415b6beea15acc875f465728ef7314ad5dd031
+  metadata.gz: 41cb419b34d2d7a385e3c227e11b4f548f834d1f6d14566d11baff340367ff95ed7e87cdf512ae45aa3dc4339b65e9549ff2182960e33d0b26af06a6e36e1f24
+  data.tar.gz: e32591f10e88ff7aa402ebe0523328af2bc61a8458028ff3c559477ec81aa3ee34944b8cf63156ae8625e9000e4a9716d910c02a59a4010679c524dcf387652b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aoc_cli (1.0.0)
+    aoc_cli (1.0.1)
       http
       kangaru
       nokogiri

data/aoc_cli.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.bindir = "exe"
   spec.executables = ["aoc"]
-  spec.require_paths = ["lib"]
+  spec.require_paths = %w[lib db]
 
   spec.add_dependency "http"
   spec.add_dependency "kangaru"

data/db/migrate/7_create_progresses.rb

@@ -0,0 +1,17 @@
+Sequel.migration do
+  change do
+    create_table :progresses do
+      primary_key :id
+
+      foreign_key :puzzle_id, :puzzles, null: false
+
+      integer :level, null: false
+
+      datetime :started_at, null: false
+      datetime :completed_at
+
+      datetime :created_at
+      datetime :updated_at
+    end
+  end
+end

data/db/migrate/8_remove_legacy_timestamps.rb

@@ -0,0 +1,8 @@
+Sequel.migration do
+  change do
+    alter_table :puzzles do
+      drop_column :part_one_completed_at
+      drop_column :part_two_completed_at
+    end
+  end
+end

data/lib/aoc_cli/models/progress.rb

@@ -0,0 +1,33 @@
+module AocCli
+  class Progress < Kangaru::Model
+    many_to_one :puzzle
+
+    validates :puzzle, required: true
+    validates :level, integer: { between: 1..2 }
+    validates :started_at, required: true
+
+    def complete?
+      !incomplete?
+    end
+
+    def incomplete?
+      completed_at.nil?
+    end
+
+    def complete!
+      update(completed_at: Time.now)
+    end
+
+    def reset!
+      update(started_at: Time.now)
+    end
+
+    def time_taken
+      if complete?
+        completed_at - started_at
+      else
+        Time.now - started_at
+      end
+    end
+  end
+end

data/lib/aoc_cli/models/puzzle.rb

@@ -6,6 +6,14 @@ module AocCli
     one_to_one :location, as: :resource
     one_to_many :attempts
 
+    one_to_one :part_one_progress,
+               class: "AocCli::Progress",
+               conditions: { level: 1 }
+
+    one_to_one :part_two_progress,
+               class: "AocCli::Progress",
+               conditions: { level: 2 }
+
     validates :event, required: true
     validates :day, integer: { between: 1..25 }
     validates :content, required: true
@@ -16,13 +24,5 @@ module AocCli
     def presenter
       @presenter ||= Presenters::PuzzlePresenter.new(self)
     end
-
-    def mark_complete!(level)
-      case level
-      when 1 then update(part_one_completed_at: Time.now)
-      when 2 then update(part_two_completed_at: Time.now)
-      else raise "invalid level"
-      end
-    end
   end
 end

data/lib/aoc_cli/processors/progress_syncer.rb

@@ -0,0 +1,48 @@
+module AocCli
+  module Processors
+    class ProgressSyncer < Core::Processor
+      attr_accessor :puzzle, :stats
+
+      validates :puzzle, required: true
+      validates :stats, required: true
+
+      def run
+        case current_progress
+        when 0 then handle_not_complete!
+        when 1 then handle_partially_complete!
+        when 2 then handle_fully_complete!
+        else raise
+        end
+      end
+
+      private
+
+      def_delegators :puzzle, :part_one_progress, :part_two_progress
+
+      def current_progress
+        stats.progress(puzzle.day)
+      end
+
+      def create_part_one_progress!
+        Progress.create(puzzle:, level: 1, started_at: Time.now)
+      end
+
+      def create_part_two_progress!
+        Progress.create(puzzle:, level: 2, started_at: Time.now)
+      end
+
+      def handle_not_complete!
+        create_part_one_progress! if part_one_progress.nil?
+      end
+
+      def handle_partially_complete!
+        part_one_progress&.complete! if part_one_progress&.incomplete?
+        create_part_two_progress! if part_two_progress.nil?
+      end
+
+      def handle_fully_complete!
+        part_two_progress&.complete! if part_two_progress&.incomplete?
+      end
+    end
+  end
+end

data/lib/aoc_cli/processors/puzzle_initialiser.rb

@@ -8,6 +8,7 @@ module AocCli
 
       def validate
         super
+        validate_event_stats_set! if errors.empty?
         validate_event_location_set! if errors.empty?
         validate_event_dir_exists! if errors.empty?
         validate_puzzle_dir_does_not_exist! if errors.empty?
@@ -15,6 +16,8 @@ module AocCli
 
       def run
         create_or_update_puzzle!(fetch_content!, fetch_input!).tap do |puzzle|
+          sync_puzzle_progress!(puzzle)
+
           attach_puzzle_dir!(puzzle).tap do |location|
             write_puzzle_files!(puzzle, location)
           end
@@ -53,6 +56,10 @@ module AocCli
         end
       end
 
+      def sync_puzzle_progress!(puzzle)
+        ProgressSyncer.run!(puzzle:, stats: event.stats)
+      end
+
       def attach_puzzle_dir!(puzzle)
         puzzle_dir.mkdir
 
@@ -63,6 +70,14 @@ module AocCli
         PuzzleDirSynchroniser.run!(puzzle:, location:)
       end
 
+      def validate_event_stats_set!
+        return unless event.stats.nil?
+
+        errors << Kangaru::Validation::Error.new(
+          attribute: :event_stats, message: "can't be blank"
+        )
+      end
+
       def validate_event_location_set!
         return unless event.location.nil?
 

data/lib/aoc_cli/processors/solution_poster.rb

@@ -39,8 +39,8 @@ module AocCli
 
       def advance_puzzle!
         event.stats.advance_progress!(day)
-        puzzle.mark_complete!(level)
 
+        ProgressSyncer.run!(puzzle:, stats: event.stats.reload)
         PuzzleDirSynchroniser.run!(puzzle:, location:, skip_cache: true)
       end
 

data/lib/aoc_cli/version.rb

@@ -1,3 +1,3 @@
 module AocCli
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

data/lib/aoc_cli.rb

@@ -14,9 +14,13 @@ module AocCli
   config_path "spec/aoc.yml", env: :test
 
   configure do |config|
+    migration_path = File.join(
+      File.expand_path(__dir__ || raise), "../db/migrate"
+    )
+
     config.database.adaptor = :sqlite
     config.database.path = File.expand_path("~/.local/share/aoc/aoc.sqlite3")
-    config.database.migration_path = "db/migrate"
+    config.database.migration_path = migration_path
   end
 
   configure env: :test do |config|

data/rbs_collection.lock.yaml

@@ -6,7 +6,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: ec140aff951e3af39846eed4525ba5d040d294fa
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: addressable
@@ -14,7 +14,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: ec140aff951e3af39846eed4525ba5d040d294fa
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: base64
@@ -42,7 +42,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: ec140aff951e3af39846eed4525ba5d040d294fa
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: connection_pool
@@ -50,7 +50,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: ec140aff951e3af39846eed4525ba5d040d294fa
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: date
@@ -74,7 +74,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: ec140aff951e3af39846eed4525ba5d040d294fa
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: i18n
@@ -82,7 +82,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: ec140aff951e3af39846eed4525ba5d040d294fa
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: kangaru
@@ -114,7 +114,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: ec140aff951e3af39846eed4525ba5d040d294fa
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: pathname

data/sig/aoc_cli/models/progress.rbs

@@ -0,0 +1,21 @@
+module AocCli
+  class Progress < Kangaru::Model
+    attr_accessor id: Integer
+    attr_accessor puzzle: Puzzle
+    attr_accessor level: Integer
+    attr_accessor started_at: Time
+    attr_accessor completed_at: Time
+    attr_accessor created_at: Time
+    attr_accessor updated_at: Time
+
+    def complete?: -> bool
+
+    def incomplete?: -> bool
+
+    def complete!: -> void
+
+    def reset!: -> void
+
+    def time_taken: -> Float
+  end
+end

data/sig/aoc_cli/models/puzzle.rbs

@@ -9,8 +9,6 @@ module AocCli
     attr_accessor input: String
     attr_accessor created_at: Time
     attr_accessor updated_at: Time
-    attr_accessor part_one_completed_at: Time
-    attr_accessor part_two_completed_at: Time
 
     attr_accessor location: Location
     attr_accessor location_dataset: Sequel::Dataset
@@ -18,11 +16,12 @@ module AocCli
     attr_accessor attempts: Array[Attempt]
     attr_accessor attempts_dataset: Sequel::Dataset
 
+    attr_accessor part_one_progress: Progress?
+    attr_accessor part_two_progress: Progress?
+
     # Delegated to event
     def year: -> Integer
 
     attr_reader presenter: Presenters::PuzzlePresenter
-
-    def mark_complete!: (Integer) -> void
   end
 end

data/sig/aoc_cli/processors/progress_syncer.rbs

@@ -0,0 +1,29 @@
+module AocCli
+  module Processors
+    class ProgressSyncer < Core::Processor
+      attr_accessor puzzle: Puzzle
+      attr_accessor stats: Stats
+
+      def run: -> void
+
+      def self.run!: (puzzle: untyped, stats: untyped) -> void
+
+      private
+
+      def part_one_progress: -> Progress?
+      def part_two_progress: -> Progress?
+
+      def current_progress: -> Integer
+
+      def create_part_one_progress!: -> void
+
+      def create_part_two_progress!: -> void
+
+      def handle_not_complete!: -> void
+
+      def handle_partially_complete!: -> void
+
+      def handle_fully_complete!: -> void
+    end
+  end
+end

data/sig/aoc_cli/processors/puzzle_initialiser.rbs

@@ -23,10 +23,14 @@ module AocCli
 
       def create_or_update_puzzle!: (String, String) -> Puzzle
 
+      def sync_puzzle_progress!: (Puzzle) -> void
+
       def attach_puzzle_dir!: (Puzzle) -> Location
 
       def write_puzzle_files!: (Puzzle, Location) -> PuzzleDirSyncLog
 
+      def validate_event_stats_set!: -> void
+
       def validate_event_location_set!: -> void
 
       def validate_event_dir_exists!: -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aoc_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Christian Welham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-20 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -123,6 +123,8 @@ files:
 - db/migrate/4_create_attempts.rb
 - db/migrate/5_create_locations.rb
 - db/migrate/6_create_puzzle_dir_sync_logs.rb
+- db/migrate/7_create_progresses.rb
+- db/migrate/8_remove_legacy_timestamps.rb
 - exe/aoc
 - lib/aoc_cli.rb
 - lib/aoc_cli/components/attempts_table.erb
@@ -155,6 +157,7 @@ files:
 - lib/aoc_cli/models/attempt.rb
 - lib/aoc_cli/models/event.rb
 - lib/aoc_cli/models/location.rb
+- lib/aoc_cli/models/progress.rb
 - lib/aoc_cli/models/puzzle.rb
 - lib/aoc_cli/models/puzzle_dir_sync_log.rb
 - lib/aoc_cli/models/stats.rb
@@ -162,6 +165,7 @@ files:
 - lib/aoc_cli/presenters/puzzle_presenter.rb
 - lib/aoc_cli/presenters/stats_presenter.rb
 - lib/aoc_cli/processors/event_initialiser.rb
+- lib/aoc_cli/processors/progress_syncer.rb
 - lib/aoc_cli/processors/puzzle_dir_synchroniser.rb
 - lib/aoc_cli/processors/puzzle_initialiser.rb
 - lib/aoc_cli/processors/puzzle_refresher.rb
@@ -215,6 +219,7 @@ files:
 - sig/aoc_cli/models/attempt.rbs
 - sig/aoc_cli/models/event.rbs
 - sig/aoc_cli/models/location.rbs
+- sig/aoc_cli/models/progress.rbs
 - sig/aoc_cli/models/puzzle.rbs
 - sig/aoc_cli/models/puzzle_dir_sync_log.rbs
 - sig/aoc_cli/models/stats.rbs
@@ -222,6 +227,7 @@ files:
 - sig/aoc_cli/presenters/puzzle_presenter.rbs
 - sig/aoc_cli/presenters/stats_presenter.rbs
 - sig/aoc_cli/processors/event_initialiser.rbs
+- sig/aoc_cli/processors/progress_syncer.rbs
 - sig/aoc_cli/processors/puzzle_dir_synchroniser.rbs
 - sig/aoc_cli/processors/puzzle_initialiser.rbs
 - sig/aoc_cli/processors/puzzle_refresher.rbs
@@ -249,6 +255,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- db
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="