goldman 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b2b295e5ec720d4b21567f3dab4a266f24a65e765e93941122d2291f86aeb11
-  data.tar.gz: 522073bb4ad24a862c3554d8232ac7de700fc3f187d07a76439f8566bc9e9908
+  metadata.gz: 6f1879b6e3dde08040bc60cbd042d30fd6d8033b69d0324c18572001af199bc6
+  data.tar.gz: 2cb786913beaf9da72d3e3c9d8ea98d13930e8957bae83f47f6f159235eedccb
 SHA512:
-  metadata.gz: 7619fed6a8146dd32bb1a4993c806addca42c948c0877291d78ad215abadee958b2da15b701a8dce477637aeba1dce58e8a0731b9fdd8e5bbe3a003ffb6f2af2
-  data.tar.gz: 1eec49aba2251e932cbe5a57863e7e693903779290ed3db6a22fdfb026ac962521d4a63a128ca189412bab3685e6ce06712110d276d20d4afb98a0e6affebf3e
+  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,62 +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)
-  list = Goldman::ScheduleList.new(
-    data: config.data,
-    dates: dates
-  ).generate
-
-  @options.each do |k, v|
-    case k
-    when :generate
-      Goldman::Presenter.print_schedule_list(
-        list: list,
-        formatter: formatter
-      )
-    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)

data/lib/goldman/version.rb

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

data/lib/goldman.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "goldman/cli"
 require_relative "goldman/config"
 require_relative "goldman/date_range"
 require_relative "goldman/formatter"
@@ -9,20 +10,6 @@ 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.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Wei Chen (willsmile)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies: []
 description: goldman for generating option list of schedule
 email:
@@ -26,6 +26,7 @@ files:
 - Rakefile
 - exe/goldman
 - lib/goldman.rb
+- lib/goldman/cli.rb
 - lib/goldman/config.rb
 - lib/goldman/date_range.rb
 - lib/goldman/formatter.rb
@@ -33,6 +34,7 @@ files:
 - lib/goldman/schedule_list.rb
 - lib/goldman/version.rb
 - lib/goldman/wday.rb
+- pkg/.keep
 homepage: https://github.com/willsmile/goldman-rb
 licenses:
 - MIT