goldman 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f773ac07453545627e3f47a174af08c8260d8e0146861adeea9808bc7d174ea
-  data.tar.gz: 788b04e2dba00c069d331ae648841b4ffd156b70639d4773a2cca000014625df
+  metadata.gz: 6f1879b6e3dde08040bc60cbd042d30fd6d8033b69d0324c18572001af199bc6
+  data.tar.gz: 2cb786913beaf9da72d3e3c9d8ea98d13930e8957bae83f47f6f159235eedccb
 SHA512:
-  metadata.gz: 7c6bf7496046d91315c3344809ea010655d2078d9aa12932db6bb1f364b4c8d17e8b63ccccddf150f220fadc883e156160ad06f0f64b6e32f33310b97380d1b8
-  data.tar.gz: 3dae0f42687a4777fff508003d1f6d30055e1e22b71831787d19a110f45e198e1053a21aa0c2a790ac298ae279ac751752f4c5259f206eca5dc481be1715a46f
+  metadata.gz: 9d43fbbf48bd7f062ed6a0fbe02f2d74d1c7da1c7aa5f8c9d186ac80bf0dbc94c660663e15144065ef3f976e576d4151f0438b466d652aafe2f866e3c6cc5fec
+  data.tar.gz: bbaeca4190f77c282715f486fb0a256ad5218888451d6aad5469119883ca942b4f0fbb3f4e5acd56876ab704b0fc044e25b0dfbf8a7f72b8d73bb4feee80b403

data/Rakefile

@@ -14,21 +14,3 @@ require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 task default: %i[test rubocop]
-
-namespace "gem" do
-  desc "Build a gem package"
-  task :build do
-    sh "gem build goldman.gemspec"
-  end
-
-  desc "Push a gem package"
-  task :push do
-    Rake::Task["gem:build"].execute
-    sh "gem push goldman-#{Goldman::VERSION}.gem"
-  end
-
-  desc "Clean built gem packages"
-  task :clean do
-    sh "rm goldman-*.gem"
-  end
-end

data/exe/goldman

@@ -5,61 +5,10 @@
 # MIT license
 
 require "goldman"
-require "optparse"
-
-DEFAULT_CONFIG_FILEPATH = ENV["GOLDMAN_RB_PATH"] || File.expand_path("~/.goldman/config.yml")
-NON_OPERATIONAL_OPTS = [:config]
-
-# default value
-@options = {
-  config: DEFAULT_CONFIG_FILEPATH
-}
-
-opts = OptionParser.new do |opts|
-  opts.on("-c", "--config FILE", "Use a config file") { |v| @options[:config] = v }
-  opts.on("-g", "--generate", "Generate list of schedule options") { |v| @options[:generate] = v }
-  opts.on("-s", "--start [DATE]", "Set start date") { |v| @options[:start_date] = v }
-  opts.on("-e", "--end [DATE]", "Set end date") { |v| @options[:end_date] = v }
-  opts.on("-d", "--day [INTEGER]", "Set day interval from start date") { |v| @options[:day] = v }
-  opts.on("-w", "--week [INTEGER]", "Set week interval  from start date") { |v| @options[:week] = v }
-  opts.on("-v", "--version", "Show tool version") { |v| @options[:version] = v }
-
-  opts.parse!(ARGV)
-end
-
-def error(message)
-  warn "ERROR: #{message}"
-  exit 1
-end
 
 begin
-  dates = Goldman::DateRange.new(
-    start_date_str: @options[:start_date],
-    end_date_str: @options[:end_date],
-    day_str: @options[:day],
-    week_str: @options[:week]
-  ).to_a
-  config = Goldman::Config.new(path: @options[:config])
-  formatter = Goldman::Formatter.new(customized: config.format)
-  schedules = Goldman::Schedule.new(data: config.data).generate
-  presenter = Goldman::Presenter.new(
-    schedules: schedules,
-    formatter: formatter,
-    dates: dates
-  )
-
-  @options.each do |k, v|
-    case k
-    when :generate
-      presenter.exec
-    when *NON_OPERATIONAL_OPTS
-      # Do nothing here
-    when :version
-      Goldman.version
-    end
-  end
+  Goldman::Cli.new(ARGV).run
 rescue Goldman::Error => ex
-  error ex.message
-rescue Errno::ENOENT
-  error "Config file (#{@options[:config]}) dose not exist."
+  warn "ERROR: #{ex}"
+  exit 1
 end

data/lib/goldman/cli.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require "optparse"
+
+module Goldman
+  class Cli
+    NON_OPERATIONAL_OPTS = [:config]
+
+    def initialize(argv)
+      @options = parse_argv(argv)
+    end
+
+    def run
+      @options.each do |k, v|
+        case k
+        when :generate
+          cmd_generate
+        when *NON_OPERATIONAL_OPTS
+          # Do nothing here
+        when :version
+          cmd_version
+        end
+      end
+    end
+
+    def cmd_generate
+      dates = Goldman::DateRange.new(
+        start_date_str: @options[:start_date],
+        end_date_str: @options[:end_date],
+        day_str: @options[:day],
+        week_str: @options[:week]
+      ).to_a
+      config = Goldman::Config.new(path: @options[:config])
+      formatter = Goldman::Formatter.new(customized: config.format)
+      list = Goldman::ScheduleList.new(
+        data: config.data,
+        dates: dates
+      ).generate
+
+      Goldman::Presenter.print_schedule_list(
+        list: list,
+        formatter: formatter
+      )
+    end
+
+    def cmd_version
+      Goldman.version
+    end
+
+    private
+
+    def parse_argv(argv)
+      # default value
+      options = {
+        config: ENV["GOLDMAN_RB_PATH"] || File.expand_path("~/.goldman/config.yml")
+      }
+
+      OptionParser.new do |opts|
+        opts.on("-c", "--config FILE", "Use a config file") { |v| options[:config] = v }
+        opts.on("-g", "--generate", "Generate list of schedule options") { |v| options[:generate] = v }
+        opts.on("-s", "--start [DATE]", "Set start date") { |v| options[:start_date] = v }
+        opts.on("-e", "--end [DATE]", "Set end date") { |v| options[:end_date] = v }
+        opts.on("-d", "--day [INTEGER]", "Set day interval from start date") { |v| options[:day] = v }
+        opts.on("-w", "--week [INTEGER]", "Set week interval  from start date") { |v| options[:week] = v }
+        opts.on("-v", "--version", "Show tool version") { |v| options[:version] = v }
+        opts.parse!(argv)
+      end
+
+      return options
+    end
+  end
+end

data/lib/goldman/config.rb

@@ -16,7 +16,11 @@ module Goldman
     private
 
     def load_file
-      Psych.safe_load_file(@path, symbolize_names: true)
+      begin
+        Psych.safe_load_file(@path, symbolize_names: true)
+      rescue Errno::ENOENT
+        raise Goldman::ConfigurationError.new("Config file (#{@path}) dose not exist.")
+      end
     end
 
     def load_data

data/lib/goldman/formatter.rb

@@ -2,6 +2,20 @@
 
 module Goldman
   class Formatter
+    DEFAULT_FORMAT = {
+      schedule: "%{date}(%{wday}) %{time}",
+      date: "%Y/%m/%d",
+      wday: {
+        Monday: "Mon",
+        Tuesday: "Tue",
+        Wednesday: "Wed",
+        Thursday: "Thu",
+        Friday: "Fri",
+        Saturday: "Sat",
+        Sunday: "Sun"
+      }
+    }
+
     attr_reader :customized_format, :default_format
 
     def initialize(customized:, default: DEFAULT_FORMAT)
@@ -9,8 +23,16 @@ module Goldman
       @default_format = default
     end
 
-    def schedule(date, time_str)
-      puts format(:schedule) % { date: formatted_date(date), wday: formatted_wday(date.cwday), time: time_str }
+    def schedule(date, option)
+      {
+        date: formatted_date(date),
+        wday: formatted_wday(date.cwday),
+        time: option
+      }
+    end
+
+    def schedule_format
+      format(:schedule)
     end
 
     def format(target)

data/lib/goldman/presenter.rb

@@ -4,21 +4,20 @@ require "date"
 
 module Goldman
   class Presenter
-    def initialize(schedules:, formatter:, dates:)
-      @schedules = schedules
-      @formatter = formatter
-      @dates = dates
-    end
-
-    def exec
-      raise Goldman::OperationError.new("No data for schedule. Please define them in the config file.") \
-        if @schedules.empty?
+    class << self
+      def print_schedule_list(list:, formatter:)
+        print_no_schedule and return if list.empty?
 
-      @dates.each do |date|
-        @schedules[date.cwday]&.each do |time|
-          @formatter.schedule(date, time)
+        list.each do |s|
+          puts formatter.schedule_format % formatter.schedule(s.date, s.option)
         end
       end
+
+      private
+
+      def print_no_schedule
+        puts "There is no schedule in the period."
+      end
     end
   end
 end

data/lib/goldman/schedule_list.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Goldman
+  class ScheduleList
+    Schedule = Struct.new(:date, :option)
+
+    def initialize(data:, dates:)
+      @data = data
+      @dates = dates
+    end
+
+    def generate
+      return [] if @data.nil? || @data.empty?
+
+      list = []
+      @dates.each do |date|
+        options = select_options_by_date(date)
+        next if options.empty?
+        sorted_options = sort(options)
+        sorted_options.each do |option|
+          list << Schedule.new(date, option)
+        end
+      end
+
+      list
+    end
+
+    private
+
+    def select_options_by_date(date)
+      options = []
+      wday_name = Goldman::Wday.to_name(date.cwday)
+      options += wday(wday_name) unless wday(wday_name).nil?
+      options += everyday unless everyday.nil?
+      options += weekday if Goldman::Wday.weekday?(wday_name) && !weekday.nil?
+      options += weekend if Goldman::Wday.weekend?(wday_name) && !weekend.nil?
+
+      return options
+    end
+
+    def sort(options)
+      options.sort_by { _1.split(":").first.to_i }
+    end
+
+    def wday(name)
+      @data[name]
+    end
+
+    def weekday
+      @data[:Weekday]
+    end
+
+    def weekend
+      @data[:Weekend]
+    end
+
+    def everyday
+      @data[:Everyday]
+    end
+  end
+end

data/lib/goldman/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Goldman
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 
   def self.version
     puts "Goldman version #{VERSION}"

data/lib/goldman.rb

@@ -1,28 +1,15 @@
 # frozen_string_literal: true
 
+require_relative "goldman/cli"
 require_relative "goldman/config"
 require_relative "goldman/date_range"
 require_relative "goldman/formatter"
 require_relative "goldman/presenter"
-require_relative "goldman/schedule"
+require_relative "goldman/schedule_list"
 require_relative "goldman/version"
 require_relative "goldman/wday"
 
 module Goldman
-  DEFAULT_FORMAT = {
-    schedule: "%{date}(%{wday}) %{time}",
-    date: "%Y/%m/%d",
-    wday: {
-      Monday: "Mon",
-      Tuesday: "Tue",
-      Wednesday: "Wed",
-      Thursday: "Thu",
-      Friday: "Fri",
-      Saturday: "Sat",
-      Sunday: "Sun"
-    }
-  }
-
   class Error < StandardError; end
   class ParameterError < Error; end
   class ConfigurationError < Error; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldman
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Wei Chen (willsmile)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-13 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies: []
 description: goldman for generating option list of schedule
 email:
@@ -25,15 +25,16 @@ files:
 - README.md
 - Rakefile
 - exe/goldman
-- goldman.gemspec
 - lib/goldman.rb
+- lib/goldman/cli.rb
 - lib/goldman/config.rb
 - lib/goldman/date_range.rb
 - lib/goldman/formatter.rb
 - lib/goldman/presenter.rb
-- lib/goldman/schedule.rb
+- lib/goldman/schedule_list.rb
 - lib/goldman/version.rb
 - lib/goldman/wday.rb
+- pkg/.keep
 homepage: https://github.com/willsmile/goldman-rb
 licenses:
 - MIT

data/goldman.gemspec

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/goldman/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "goldman"
-  spec.version = Goldman::VERSION
-  spec.authors = ["Wei Chen (willsmile)"]
-  spec.email = ["willsmile.me@gmail.com"]
-
-  spec.summary = %q{goldman}
-  spec.description = %q{goldman for generating option list of schedule}
-  spec.homepage = "https://github.com/willsmile/goldman-rb"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.0.0"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end

data/lib/goldman/schedule.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Goldman
-  class Schedule
-
-    def initialize(data:)
-      @data = data
-    end
-
-    def generate
-      result = {}
-      Goldman::Wday.members.each do |w|
-        periods = []
-        periods += wday(w) unless wday(w).nil?
-        periods += everyday unless everyday.nil?
-        periods += weekday if Goldman::Wday.weekday?(w) && !weekday.nil?
-        periods += weekend if Goldman::Wday.weekend?(w) && !weekend.nil?
-        result[Goldman::Wday.to_num(w)] = sort(periods) unless periods.empty?
-      end
-
-      result
-    end
-
-    def sort(periods)
-      periods.sort_by { _1.split(":").first.to_i }
-    end
-
-    def wday(name)
-      @data[name]
-    end
-
-    def weekday
-      @data[:Weekday]
-    end
-
-    def weekend
-      @data[:Weekend]
-    end
-
-    def everyday
-      @data[:Everyday]
-    end
-  end
-end