advent 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a49571ac28572d7a91bcc6a26ecb7253b4f10690dfe2c529a86eca8d310b059b
-  data.tar.gz: 470af342600d4fac184e63837dd0f0cdfbd27d34268d34d4a191ef65ce59b960
+  metadata.gz: 93d44877a5468b5affbd9592d7c945f6871377d60f1b46fb1c13f5d908ba28be
+  data.tar.gz: 85a323f0c9b3d18d065e116def995e2d033fe3fb74ae20b27e1a636cf09e6bb6
 SHA512:
-  metadata.gz: e94342f2d83c40b0bd360478d7535583da1076517b218c045b44ead0d455e389c174e58c92321da978f63cecbd41abfff0904927552b1acaeb08853b74874a34
-  data.tar.gz: 5d2af6a890fc835148f7e1bc054ef49a3e69e641d7a93528ae184b8b39d48a8c69ce4cdf166c29750525750167278c8c84350d8c2d766df77c8d2a2b30f4e502
+  metadata.gz: d5d15673033b99a3c3438aa0500b8b37ea80a7658505ef74b30cbc6118a794d3c4abb05b54a5398df726a016cd11bc10a03ddc587c721e8bf632cf01d63c8815
+  data.tar.gz: 41f2be3af2c0afc93a9d4cccb7297653df61e1e1da15dd32c9d6dbcb9356b123e36fa6baa6ddbff64f180bf18f1451c9d014460dd68ba685b0b6f5f19a3df6fd

data/{exe → bin}/advent

@@ -2,6 +2,6 @@
 
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
-require "advent/cli"
+require "advent"
 
-Advent::CLI.start
+Advent::Cli.start ARGV

data/lib/advent/cli.rb

@@ -1,101 +1,62 @@
-# frozen_string_literal: true
-
-require "advent"
-require "date"
-require "pathname"
 require "thor"
 
-module Advent
-  class CLI < Thor
-    include Thor::Actions
-    EXCLUDED_ROOT_COMMANDS = %w[help init version]
-
-    class_option :http_module, default: Net::HTTP, check_default_type: false
-
-    def initialize(*args)
-      super
-
-      source_paths << File.expand_path("templates", __dir__)
-
-      # Don't try to load Advent.root if we're a command that doesn't need it
-      unless EXCLUDED_ROOT_COMMANDS.include? args.last[:current_command]&.name
-        self.destination_root = Advent.root
-      end
-    end
-
-    # @return [Boolean] defines whether an exit status is set if a command fails
-    def self.exit_on_failure?
-      true
-    end
+class Advent::Cli < Thor
+  include Thor::Actions
 
-    desc "download YEAR DAY", "Download the input for YEAR and DAY"
-    def download(year, day)
-      require "advent/cli/downloader"
+  def self.exit_on_failure?
+    true
+  end
 
-      Dir.chdir Advent.root do
-        Downloader.new(self, year, day).download
-      end
-    end
+  desc "auth", "remember your session for downloading inputs"
+  option :session, aliases: "-s", type: :string, default: nil, desc: "Provide the value directly without being prompted"
+  def auth
+    session = options[:session] || ask("What is your Advent of Code session value?", echo: false)
+    say ""
 
-    desc "generate YEAR DAY", "Generate a new solution for YEAR and DAY"
-    # Generates a new solution file. If within a year directory, only the day
-    # is used, otherwise both the year and day will be required to generate the
-    # output.
-    def generate(year, day)
-      year = parse_number year
-      day = parse_number day
+    create_file ".advent_session", session
+    append_to_file ".gitignore", ".advent_session" if File.exist? ".git"
+  end
 
-      if (message = validate(year, day))
-        say_error message, :red
-        return
-      end
+  desc "download YEAR DAY", "download input"
+  def download(year, day)
+    get "https://adventofcode.com/#{year}/day/#{day}/input", "#{year}/.day#{day}_input.txt", http_headers: http_headers
+  end
 
-      template "solution.rb.tt", "#{year}/day#{day}.rb", context: binding
-      template "solution_test.rb.tt", "#{year}/test/day#{day}_test.rb", context: binding
+  desc "new YEAR DAY", "start a new solution"
+  def new(year, day)
+    self.class.source_root __dir__
 
-      download year, day if Advent.config.download_when_generating
-    end
+    template "templates/solution.rb.tt", "#{year}/day#{day}.rb", context: binding
+    template "templates/solution_test.rb.tt", "test/#{year}/day#{day}_test.rb", context: binding
+  end
 
-    desc "init DIR", "Initialise a new advent project in DIR"
-    def init(dir = ".")
-      create_file Pathname.getwd.join(dir).join(Advent::Configuration::FILE_NAME) do
-        ""
-      end
-    end
+  desc "solve FILE", "solve your solution"
+  def solve(path)
+    load path
 
-    desc "solve FILE", "Solve your solution"
-    # Runs a solution file, outputting both :part1 and :part2 method return values.
-    def solve(path)
-      require "advent/cli/solver"
-      file_path = Pathname.getwd.join(path)
+    require "active_support/core_ext/object/blank"
+    require "active_support/core_ext/string/inflections"
+    require "pathname"
+    klass = Pathname.new(path).basename(".rb").to_s.classify.constantize
 
-      Dir.chdir Advent.root do
-        Solver.new(self, file_path.relative_path_from(Advent.root)).solve
-      end
-    end
+    part_1 = klass.new.part_1
+    part_2 = klass.new.part_2
 
-    desc "version", "Prints the current version of the gem"
-    # Prints the current version of the gem
-    def version
-      say Advent::VERSION
-    end
+    say_status "Part 1", part_1.presence || "No answer", part_1.present? ? :green : :red
+    say_status "Part 2", part_2.presence || "No answer", part_2.present? ? :green : :red
+  end
 
-    private
+  desc "version", "current gem version"
+  def version
+    say Advent::VERSION
+  end
 
-    def parse_number(str)
-      if (m = str.match(/[0-9]+/))
-        m[0]
-      end
+  private
+    def http_headers
+      {"Cookie" => CGI::Cookie.new("session", session).to_s}
     end
 
-    def validate(year, day)
-      if year.to_i < 2014
-        "Advent of Code only started in 2014!"
-      elsif year.to_i > Date.today.year
-        "Future years are not supported."
-      elsif !(1..25).cover? day.to_i
-        "Day must be between 1 and 25 (inclusive)."
-      end
+    def session
+      File.read(".advent_session").chomp
     end
-  end
 end

data/lib/advent/solution.rb

@@ -1,45 +1,10 @@
-# frozen_string_literal: true
+class Advent::Solution
+  def input_text
+    require "pathname"
 
-require "pathname"
+    location, _ = Object.const_source_location(self.class.to_s)
+    path = Pathname.new(location)
 
-module Advent
-  # Baes class for an Advent of Code solution attempt. If subclass is in a
-  # directory matching a year (eg. 2015) and the filename is for a particular
-  # day (eg. day1.rb) then the @year and @day instance variables are
-  # automatically inferred.
-  class Solution
-    attr_reader :year # @return [Numeric] the year this solution is from
-    attr_reader :day # @return [Numeric] the day this solution is for
-
-    def initialize
-      year, day = infer_year_and_day_from_file_system
-
-      @year = year
-      @day = day
-
-      @input = Input.new(source_location.dirname, day: day)
-    end
-
-    def load_input
-      File.read(@input.file_path)
-    end
-
-    private
-
-    def infer_year_and_day_from_file_system
-      path, day = source_location.split
-
-      day = /day([0-9]+)/.match(day.to_s)[1]
-      year = path.basename.to_s
-
-      [year, day].map(&:to_i)
-    rescue
-      raise Error, "Failed to infer year/day of solution."
-    end
-
-    def source_location
-      class_path, _ = Object.const_source_location(self.class.to_s)
-      Pathname.new(class_path)
-    end
+    path.dirname.join(".#{path.basename(".rb")}_input.txt").read
   end
 end

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

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

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

@@ -1,20 +1,18 @@
-# frozen_string_literal: true
-
 require "advent"
 require "minitest/autorun"
 
-require_relative "../day<%= day %>"
+require_relative "../../<%= year %>/day<%= day %>"
 
 class Day<%= day %>Test < Advent::TestCase
   def setup
     @solution = Day<%= day %>.new
   end
 
-  # def test_part1
-  #   assert_equal 123, @solution.part1
+  # def test_part_1
+  #   assert_equal 123, @solution.part_1
   # end
 
-  # def test_part2
-  #   assert_equal 123, @solution.part2
+  # def test_part_2
+  #   assert_equal 123, @solution.part_2
   # end
 end

data/lib/advent/test_case.rb

@@ -1,6 +1,4 @@
 require "minitest"
 
-module Advent
-  class TestCase < Minitest::Test
-  end
+class Advent::TestCase < Minitest::Test
 end

data/lib/advent/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Advent
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/advent.rb

@@ -1,39 +1,10 @@
-# frozen_string_literal: true
-
-require_relative "advent/configuration"
-require_relative "advent/input"
-require_relative "advent/session"
-require_relative "advent/solution"
-require_relative "advent/test_case"
-require_relative "advent/version"
+require "active_support"
+require "zeitwerk"
+loader = Zeitwerk::Loader.for_gem
+loader.setup
 
 module Advent
   class Error < StandardError; end
-
-  class << self
-    def config
-      @_config ||= Configuration.from_file(root.join(Configuration::FILE_NAME))
-    end
-
-    def root
-      if (location = find_config_location)
-        location
-      else
-        raise Error, "Cannot find advent.yml config file in current or parent directories."
-      end
-    end
-
-    def session
-      @_session ||= Session.new
-    end
-
-    private
-
-    def find_config_location
-      Pathname.new(Dir.pwd).ascend do |path|
-        return path if File.exist? path.join(Configuration::FILE_NAME)
-        return nil if path.to_s == "/"
-      end
-    end
-  end
 end
+
+loader.eager_load

metadata

@@ -1,29 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: advent
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Daniel Grieve
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2023-12-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - dnlgrv@hey.com
@@ -34,14 +118,9 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- exe/advent
+- bin/advent
 - lib/advent.rb
 - lib/advent/cli.rb
-- lib/advent/cli/downloader.rb
-- lib/advent/cli/solver.rb
-- lib/advent/configuration.rb
-- lib/advent/input.rb
-- lib/advent/session.rb
 - lib/advent/solution.rb
 - lib/advent/templates/solution.rb.tt
 - lib/advent/templates/solution_test.rb.tt
@@ -51,13 +130,7 @@ homepage: https://github.com/dnlgrv/advent-rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-
-  advent v0.1.5 requires a config file in your working directory.
-
-  See https://github.com/dnlgrv/advent-rb/blob/main/README.md#usage or if you're
-  brave run `advent init` in your current directory.
-
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,16 +138,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Have fun with the Advent of Code using Ruby.
 test_files: []
-...

data/lib/advent/cli/downloader.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-class Advent::CLI::Downloader
-  def initialize(command, year, day)
-    @command = command
-    @year = year
-    @day = day
-  end
-
-  def download
-    ask_for_session_cookie_if_needed
-    input = Advent::Input.new(Advent.root.join(@year), day: @day.to_i)
-
-    if input.download(Advent.session.value, @command.options.http_module)
-      @command.say "Input downloaded to #{input.file_path}.", :green
-      @command.say "\nUsing #load_input in your daily solution will load the input file for you."
-    else
-      @command.say_error "Something went wrong, maybe an old session cookie?", :red
-    end
-  end
-
-  private
-
-  def ask_for_session_cookie_if_needed
-    return if Advent.session.exist?
-
-    session = @command.ask "What is your Advent of Code session cookie value?", echo: false
-    Advent.session.value = session
-
-    @command.say "\n\nThanks. Psst, we're going to save this for next time. It's in .advent_session if you need to update or delete it.\n\n"
-  end
-end

data/lib/advent/cli/solver.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-class Advent::CLI::Solver
-  PARTS = [1, 2]
-
-  if RUBY_VERSION >= "3.1"
-    module Solutions
-    end
-  end
-
-  def initialize(command, path)
-    @command = command
-    @path = path
-  end
-
-  def solve
-    if RUBY_VERSION >= "3.1"
-      load @path, Solutions
-      solution = Solutions.const_get(solution_class_name).new
-    else
-      require @path.expand_path
-      solution = Object.const_get(solution_class_name).new
-    end
-
-    PARTS.each do |n|
-      method_name = "part#{n}".to_sym
-
-      result, colour = if solution.respond_to?(method_name)
-        [solution.public_send(method_name), :green]
-      end
-
-      result, colour = ["Missing", :red] if result.nil?
-
-      @command.say "Part #{n}: #{result}", colour, true
-    end
-  end
-
-  private
-
-  def solution_class_name
-    "Day#{day}"
-  end
-
-  def day
-    @_day ||= @path.basename.to_s.match(/day([0-9]+)\.rb/)[1]
-  end
-end

data/lib/advent/configuration.rb

@@ -1,30 +0,0 @@
-require "psych"
-
-module Advent
-  class Configuration
-    DEFAULTS = {
-      "download_when_generating" => true,
-      "remember_session" => true
-    }
-    FILE_NAME = "advent.yml"
-
-    attr_reader :download_when_generating, :remember_session
-
-    class << self
-      def from_file(file = FILE_NAME)
-        if RUBY_VERSION >= "3.1"
-          new Psych.safe_load_file(file)
-        else
-          new Psych.safe_load(File.read(file))
-        end
-      end
-    end
-
-    def initialize(conf)
-      config = DEFAULTS.merge(conf || {})
-
-      @download_when_generating = config.dig("download_when_generating")
-      @remember_session = config.dig("remember_session")
-    end
-  end
-end

data/lib/advent/input.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require "cgi/cookie"
-require "fileutils"
-require "net/http"
-require "uri"
-
-module Advent
-  class Input
-    def initialize(dir, day:)
-      @dir = dir
-      @day = day
-    end
-
-    def file_path
-      @dir.join(".day#{@day}.input.txt")
-    end
-
-    def exist?
-      File.exist? file_path
-    end
-
-    def download(session, http = Net::HTTP)
-      session_cookie = CGI::Cookie.new("session", session)
-      response = http.get_response(input_url, {"Cookie" => session_cookie.to_s})
-
-      if success?(response)
-        FileUtils.mkdir_p file_path.dirname
-        File.write file_path, response.body
-        true
-      else
-        false
-      end
-    end
-
-    private
-
-    def input_url
-      URI("https://adventofcode.com/#{year}/day/#{@day}/input")
-    end
-
-    def year
-      @_year ||= @dir.basename
-    end
-
-    def success?(response)
-      response.code >= "200" && response.code < "300"
-    end
-  end
-end

data/lib/advent/session.rb

@@ -1,39 +0,0 @@
-module Advent
-  # Simple class for handling the session cookie file
-  class Session
-    FILE_NAME = ".advent_session"
-
-    attr_reader :file_name
-
-    def initialize(file_name = FILE_NAME)
-      @file_name = file_name
-    end
-
-    def clear
-      File.delete file_name if exist?
-    end
-
-    def exist?
-      File.exist? file_name
-    end
-
-    def value=(val)
-      if save_to_disk?
-        File.write file_name, val
-      else
-        @_value = val
-      end
-    end
-
-    def value
-      return @_value unless save_to_disk?
-      return File.read(file_name) if exist?
-    end
-
-    private
-
-    def save_to_disk?
-      Advent.config.remember_session
-    end
-  end
-end