advent 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c0c39c2988dbc38f5b3131ddf89f6bd401a40a43b1d9bfc6abdf1c95209f337
-  data.tar.gz: 7e118fad809b0b052fc7bf3bb52f3076e610a083efba687f1474a5fe8904ee9f
+  metadata.gz: 44488f23b0a385b7060d3a2d64d6538dc1e738bbd8600bcc405e1735ace44ff2
+  data.tar.gz: aa26c72769ec2cc0eeb05bf4ed67e3619470e7e1e7e77465c0b19c69b65abe2b
 SHA512:
-  metadata.gz: 23e3da22b885aab74015af7120f1645e4c069f960f68f5bf30d72c2559b815cd8ee03fdcbb6de4784ccb99c7e4e0d992a156e83dedd38905013e0f028e174de4
-  data.tar.gz: d554cded9c2cf182aec0ef74d40638471c4f34994ca9e97e5d1d7c860d69b1f1ebad74d17be99d6764a5bc2dc5d437aff23420faa52807955ffe4a5b97bb3260
+  metadata.gz: 8be6f552d4fd5930143da51281cf204b7e93f680358578927094f97dde8443d1d5c4307641286edf14fa2454fde7058abd2a2422afe107d4a857b1bdfdd5129b
+  data.tar.gz: 51575d6fd1d772627c00e199c69f07c4069429787345fa239312effbeac090604c35bf9ab3c1dada8a13de0e75c8a41c83afccfe91723507eb06c36ee6692f8d

data/lib/advent/cli/solver.rb

@@ -3,31 +3,31 @@
 class Advent::CLI::Solver
   PARTS = [1, 2]
 
-  def initialize(command, root_path:, year:, day:)
+  def initialize(command, year:, day:)
     @command = command
-    @root_path = root_path
     @year = year
     @day = day
   end
 
   def solve
-    if in_year_directory?
-      require @root_path.join(solution_file_name).to_s
+    if @command.in_year_directory?
+      require @command.root_path.join(solution_file_name).to_s
     else
-      require @root_path.join(@year.to_s, solution_file_name)
+      require @command.root_path.join(@year.to_s, solution_file_name)
     end
 
     solution = Object.const_get(solution_class_name).new
 
     PARTS.each do |n|
       method_name = "part#{n}".to_sym
-      result = if solution.respond_to?(method_name)
-        solution.public_send(method_name)
-      else
-        "Missing"
+
+      result, colour = if solution.respond_to?(method_name)
+        [solution.public_send(method_name), :green]
       end
 
-      @command.say "Part #{n}: #{result}"
+      result, colour = ["Missing", :red] if result.nil?
+
+      @command.say "Part #{n}: #{result}", colour, true
     end
   end
 
@@ -40,9 +40,4 @@ class Advent::CLI::Solver
   def solution_class_name
     "Day#{@day}"
   end
-
-  def in_year_directory?
-    dir = @root_path.basename.to_s
-    dir =~ /^20[0-9]{2}/
-  end
 end

data/lib/advent/cli.rb

@@ -6,31 +6,56 @@ require "thor"
 
 module Advent
   class CLI < Thor
+    include Thor::Actions
+
     class_option :root_path, default: Dir.pwd, hide: true, check_default_type: false
 
+    def initialize(*args)
+      super
+
+      self.destination_root = root_path
+      source_paths << File.expand_path("templates", __dir__)
+    end
+
     def self.exit_on_failure?
       true
     end
 
+    no_commands do
+      def in_year_directory?
+        dir = root_path.basename.to_s
+        dir =~ /^20[0-9]{2}/
+      end
+
+      def root_path
+        @_root_path ||= if options.root_path.is_a?(Pathname)
+          options.root_path
+        else
+          Pathname.new(options.root_path)
+        end
+      end
+    end
+
+    desc "generate YEAR DAY or generate DAY in a year directory", "Generate a new solution for YEAR and DAY"
+    def generate(year_or_day, day = nil)
+      destination = if in_year_directory?
+        "day#{year_or_day}.rb"
+      else
+        "#{year_or_day}/day#{day}.rb"
+      end
+
+      template "solution.rb.tt", destination, context: binding
+    end
+
     desc "solve YEAR DAY", "Solve your solution for YEAR and DAY"
     def solve(year, day)
       require "advent/cli/solver"
-      Solver.new(self, root_path: root_path, year: year, day: day).solve
+      Solver.new(self, year: year, day: day).solve
     end
 
     desc "version", "Prints the current version of Advent"
     def version
       say Advent::VERSION
     end
-
-    private
-
-    def root_path
-      @_root_path ||= if options.root_path.is_a?(Pathname)
-        options.root_path
-      else
-        Pathname.new(options.root_path)
-      end
-    end
   end
 end

data/lib/advent/templates/solution.rb.tt

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "advent"
+
+class Day<%= day %> < Advent::Solution
+  def part1(input: load_input)
+  end
+
+  def part2(input: load_input)
+  end
+end

data/lib/advent/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Advent
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: advent
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Grieve
@@ -40,6 +40,7 @@ files:
 - lib/advent/cli.rb
 - lib/advent/cli/solver.rb
 - lib/advent/solution.rb
+- lib/advent/templates/solution.rb.tt
 - lib/advent/version.rb
 homepage: https://github.com/dnlgrv/advent-rb
 licenses: