aoc_rb 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 076dd89dac44c23506bbb8246e31461f1c368b80641e5ffcb6fd1bdf61ddfb88
-  data.tar.gz: 976bd57bcd1cc83e82374daf596f4c8225915c55aea4550dc443194e0fe16c92
+  metadata.gz: 38ac165e5227f5d9b076d64d93dea19911b340dc9d5548d09f5ae5cb212bc6db
+  data.tar.gz: ca88a6b53beea0f7494a48ec17ba26314b9d87c37f22ddeb32d8b4fb782ebfef
 SHA512:
-  metadata.gz: 4cf7d655b9f0abf9fbcb510401398c2a579d7695b7bac06d89285a94549e94f7a382801b6cc765f1765c8d7c48f60c5330119a2bf89d35224bab536a76aa9262
-  data.tar.gz: faa35ceb5476c8df89d3cd84c5d423e62d652e216f17bd79b666d96f2f58d4400f3da682f1009b0b4687c2b026226e6bcf196303ebca04f4db5065e048216c91
+  metadata.gz: '03981012538cc9f76c88e32b1ba4d7cf3c0f51101da979065e84ea22ce8f7a12fcd45eb9d7f2451d8a044b0352150b73a94efa6bba99700e3c4f797c211aac6d'
+  data.tar.gz: 6ff40d3a21324bcad2f840583ad9e9bb1388e84c852ae268580c343c04254775fbfcf50280767fb3841f586f874f07a2d21bf18fd5d7faf4ee6951e6a624c560

data/lib/aoc_rb/app.rb

@@ -9,8 +9,16 @@ require 'aoc_rb/puzzle_input'
 require 'aoc_rb/puzzle_solution'
 require 'aoc_rb/puzzle_source'
 
-src_files = File.join(Dir.getwd, "challenges", "**", "*.rb")
+shared_files = File.join(Dir.getwd, "challenges", "shared", "**", "*.rb")
+Dir[shared_files].each do |file|
+  if File.exist? file
+    require file
+  else
+    puts "missing file #{file}"
+  end
+end
 
+src_files = File.join(Dir.getwd, "challenges", "20**", "**", "*.rb")
 Dir[src_files].each do |file|
   if File.exist? file
     require file
@@ -72,12 +80,12 @@ module AocRb
     method_option :day, aliases: "-d", type: :numeric, default: Time.now.day
 
     def exec(year = options[:year], day = options[:day])
-      puzzle = AocRb::PuzzleSource.create_puzzle(year, day)
       input = AocRb::PuzzleInput.load(year, day)
+      puzzle = AocRb::PuzzleSource.create_puzzle(year, day, input)
 
       level = Puzzle.instructions_exist?(year, day, :part_2) ? 2 : 1
       puts "#{year} Day #{day}"
-      solution = PuzzleSource.run_part("part #{level}") { puzzle.send("part_#{level}", input) }
+      solution = PuzzleSource.run_part("part #{level}") { puzzle.send("part_#{level}") }
 
       puts "Submit solution? #{solution} (y/N)"
       submit = STDIN.gets.chomp.downcase

data/lib/aoc_rb/cli.rb

@@ -22,6 +22,12 @@ module AocRb
       FileUtils.mkdir_p bin_dir
       File.open(bin_path, "w") { |f| f.write(File.read(bin_template)) }
 
+      shared_dir = File.join(project_dir, "challenges", "shared")
+      solution_path = File.join(shared_dir, "solution.rb")
+      solution_template = File.join(File.dirname(__FILE__), "../../templates/solution_base.rb")
+      FileUtils.mkdir_p shared_dir
+      File.open(solution_path, "w") { |f| f.write(File.read(solution_template)) }
+
       spec_dir = File.join(project_dir, "spec")
       spec_helper_path = File.join(spec_dir, "spec_helper.rb")
       spec_helper_template = File.join(File.dirname(__FILE__), "../../templates/spec/spec_helper.rb")

data/lib/aoc_rb/puzzle_solution.rb

@@ -6,9 +6,9 @@ module AocRb
 
     def submit(level, year, day, answer = nil, allow_waiting = true)
       if answer.nil?
-        puzzle   = PuzzleSource.create_puzzle(year, day)
         input    = PuzzleInput.load(year, day)
-        answer = level == 1 ? puzzle.part_1(input) : puzzle.part_2(input)
+        puzzle   = PuzzleSource.create_puzzle(year, day, input)
+        answer = level == 1 ? puzzle.part_1 : puzzle.part_2
       end
 
       aoc_api  = AocApi.new(ENV['AOC_COOKIE'])

data/lib/aoc_rb/puzzle_source.rb

@@ -5,10 +5,10 @@ module AocRb
   module PuzzleSource
     extend self
 
-    def create_puzzle(year, day)
+    def create_puzzle(year, day, input)
       padded_day = Puzzle.padded(day)
       begin
-        Module.const_get("Year#{year}").const_get("Day#{padded_day}").new
+        Module.const_get("Year#{year}").const_get("Day#{padded_day}").new(input)
       rescue NameError
         puts "There is no solution for this puzzle"
       end

data/lib/aoc_rb/version.rb

@@ -1,3 +1,3 @@
 module AocRb
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/templates/solution.rb.erb

@@ -1,12 +1,26 @@
 # frozen_string_literal: true
 module Year<%= @year %>
-  class Day<%= @day %>
-    def part_1(input)
+  class Day<%= @day %> < Solution
+    # @input is available if you need the raw data input
+    # Call `data` to access either an array of the parsed data, or a single record for a 1-line input file
+
+    def part_1
       nil
     end
 
-    def part_2(input)
+    def part_2
       nil
     end
+
+    private
+      # Processes each line of the input file and stores the result in the dataset
+      # def process_input(line)
+      #   line.map(&:to_i)
+      # end
+
+      # Processes the dataset as a whole
+      # def process_dataset(set)
+      #   set
+      # end
   end
 end

data/templates/solution_base.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true %>
+
+class Solution
+  def self.part_1(input)
+    new(input).part_1
+  end
+
+  def self.part_2(input)
+    new(input).part_2
+  end
+
+  def initialize(input)
+    @input = input
+  end
+
+  def data
+    @data ||= begin
+                processed = @input.lines(chomp: true).map do |line|
+                  process_input line
+                end
+
+                processed.length == 1 ? processed.first : process_dataset(processed)
+              end
+  end
+
+  private
+    def process_input(line)
+      line
+    end
+
+    def process_dataset(set)
+      set
+    end
+end

data/templates/solution_spec.rb.erb

@@ -2,7 +2,6 @@
 require 'spec_helper'
 
 RSpec.describe Year<%= @year %>::Day<%= @day %> do
-  let(:puzzle) { Year<%= @year %>::Day<%= @day %>.new }
   let(:input) { File.read(File.join(File.dirname(__FILE__), "../../../challenges/<%= @year %>/<%= @day.to_s.rjust(2, "0") %>/input.txt")) }
   let(:example_input) {
     <<~EOF
@@ -13,21 +12,21 @@ RSpec.describe Year<%= @year %>::Day<%= @day %> do
 
   describe "part 1" do
     it "returns nil for the example input" do
-      expect(puzzle.part_1(example_input)).to eq(nil)
+      expect(described_class.part_1(example_input)).to eq(nil)
     end
 
     it "returns nil for my input" do
-      expect(puzzle.part_1(input)).to eq(nil)
+      expect(described_class.part_1(input)).to eq(nil)
     end
   end
 
   describe "part 2" do
     it "returns nil for the example input" do
-      expect(puzzle.part_2(example_input)).to eq(nil)
+      expect(described_class.part_2(example_input)).to eq(nil)
     end
 
     it "returns nil for my input" do
-      expect(puzzle.part_2(input)).to eq(nil)
+      expect(described_class.part_2(input)).to eq(nil)
     end
   end
 end

data/templates/spec/spec_helper.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
-Dir[File.join(File.dirname(__FILE__), "..", "challenges", "**", "*.rb")].each do |file|
+Dir[File.join(File.dirname(__FILE__), "..", "challenges", "shared", "**", "*.rb")].each do |file|
+  require file
+end
+
+Dir[File.join(File.dirname(__FILE__), "..", "challenges", "20*", "**", "*.rb")].each do |file|
   require file
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aoc_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jon Pascoe
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -130,6 +130,7 @@ files:
 - templates/Gemfile
 - templates/bin/aoc
 - templates/solution.rb.erb
+- templates/solution_base.rb
 - templates/solution_spec.rb.erb
 - templates/spec/spec_helper.rb
 homepage: https://github.com/pacso/aoc_rb