goldman 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52be477a4632324c453bacd8f3e748bb0c02873642e4ee7498c819e6282f3f06
-  data.tar.gz: 619eabb3703eef463ed164e27cccff677fa521b46b12527d6dc374bbb25ad3b9
+  metadata.gz: c43ad648ae8b70aa4fc9c685d49c4e4a51dfc5fcf8502568591a232f6456f58b
+  data.tar.gz: ed94b8ab0a2d8275e4dccba56a85f54e987afad71973086052727c545a92037f
 SHA512:
-  metadata.gz: 51db44f5a47de166c4959b54ad46b4fa7946dc1c6cb686ca48b30270a8d91655ccbe416c17c2cca801ff059767a77a234c3058e3753cacd0645793212e9dbb8e
-  data.tar.gz: 6bdc1deedc08e4d281499f1dbd3af308c2cb040a212004a5ec06a03dac32a47bb279a036040bb5fed98dc77aa73fe33089f6bbc8aabda3e1800b5a10c2c458c8
+  metadata.gz: a67132dae664ff6501afddcdf2a04098b2e74bb7aabde76422e01b7df80e40d8f02685a7ecb862705f7b848df1e4a8d80f7c050ff87a0cd20623b3f54c2abb7f
+  data.tar.gz: b0cbf1313bef97ab2907743aed72b9e7113accf6c009ca21e46d3823cf67fee04a5ef7bad5a42bc16cf5d6b362cc316fee2e10f0815aac4d8f2d44845048966c

data/README.md

@@ -3,6 +3,9 @@
 Goldman is a tool for [g]enerating [o]ption [l]ist of sche[d]ule. And goldman-rb is its ruby
 implementation.
 
+## Requirements
+- Ruby: MRI 3.0+
+
 ## Installation
 
 Goldman's installation is standard for a Ruby gem:

data/Rakefile

@@ -14,3 +14,21 @@ 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

@@ -33,11 +33,14 @@ def error(message)
 end
 
 begin
-  date_form = Goldman::DateForm.new(@options)
+  date_list = Goldman::DateRange.new(start_date_str: @options[:start_date],
+                                     end_date_str: @options[:end_date],
+                                     day_str: @options[:day],
+                                     week_str: @options[:week]).date_list
   config = Goldman::Config.new(@options[:config])
   formatter = Goldman::Formatter.new(config)
   data = Goldman::DataLoader.new(config).data
-  generator = Goldman::Generator.new(data, formatter, date_form)
+  generator = Goldman::Generator.new(data, formatter, date_list)
 
   @options.each do |k, v|
     case k

data/goldman.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   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 = ">= 2.7.0"
+  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.

data/lib/goldman/date_range.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "date"
+
+module Goldman
+  class DateRange
+    attr_reader :start_date, :end_date
+
+    def initialize(start_date_str:, end_date_str:, day_str:, week_str:)
+      @week = to_integer!(week_str, "week") || default_week
+      @day = to_integer!(day_str, "day") || default_day
+      @start_date = to_date!(start_date_str, "start_date") || default_start_date
+      @end_date = to_date!(end_date_str, "end_date") || calculate_end_date
+      validate!
+    end
+
+    def date_list
+      (@start_date..@end_date).to_a
+    end
+
+    private
+
+    def calculate_end_date
+      if @week > 0
+        @start_date + @week * 7 - 1
+      elsif @day > 0
+        @start_date + @day - 1
+      else
+        nil
+      end
+    end
+
+    def validate!
+      end_date_err_msg = "The parameter of week (#{@week}) or day (#{@day}) is invalid."
+      raise Goldman::ParameterError.new(end_date_err_msg) if @end_date.nil?
+
+      date_range_err_msg = "The start_date (#{@start_date}) should be before end_date (#{@end_date})."
+      raise Goldman::ParameterError.new(date_range_err_msg) if @start_date > @end_date
+    end
+
+    def to_date!(str, source)
+      return if str.nil?
+
+      begin
+        Date.parse(str)
+      rescue Date::Error, TypeError
+        raise Goldman::ParameterError.new("The parameter of #{source} (#{str}) is invalid.")
+      end
+    end
+
+    def to_integer!(str, source)
+      return if str.nil?
+
+      begin
+        Integer(str)
+      rescue ArgumentError, TypeError
+        raise Goldman::ParameterError.new("The parameter of #{source} (#{str}) is invalid.")
+      end
+    end
+
+    def default_start_date
+      Date.today
+    end
+
+    def default_week
+      0
+    end
+
+    def default_day
+      7
+    end
+  end
+end

data/lib/goldman/generator.rb

@@ -4,16 +4,16 @@ require "date"
 
 module Goldman
   class Generator
-    def initialize(data, formatter, date_form)
+    def initialize(data, formatter, date_list)
       @data = data
       @formatter = formatter
-      @date_form = date_form
+      @date_list = date_list
     end
 
     def exec
       raise Goldman::OperationError.new("No data for schedule. Please define them in the config file.") if @data.empty?
 
-      @date_form.range.each do |date|
+      @date_list.each do |date|
         @data[date.cwday]&.each do |time|
           @formatter.schedule(date, time)
         end

data/lib/goldman/version.rb

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

data/lib/goldman.rb

@@ -2,7 +2,7 @@
 
 require_relative "goldman/config"
 require_relative "goldman/data_loader"
-require_relative "goldman/date_form"
+require_relative "goldman/date_range"
 require_relative "goldman/formatter"
 require_relative "goldman/generator"
 require_relative "goldman/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Wei Chen (willsmile)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-07 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies: []
 description: goldman for generating option list of schedule
 email:
@@ -29,7 +29,7 @@ files:
 - lib/goldman.rb
 - lib/goldman/config.rb
 - lib/goldman/data_loader.rb
-- lib/goldman/date_form.rb
+- lib/goldman/date_range.rb
 - lib/goldman/formatter.rb
 - lib/goldman/generator.rb
 - lib/goldman/version.rb
@@ -46,7 +46,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/goldman/date_form.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require "date"
-
-module Goldman
-  class DateForm
-    def initialize(options)
-      @week_num = parse_num!(options[:week], "week")
-      @day_num = parse_num!(options[:day], "day") || default_day_num
-      @start_date = parse_date!(options[:start_date], "start_date") || today
-      @end_date = parse_date!(options[:end_date], "end_date")
-      validate_end_date!
-    end
-
-    def range
-      return @start_date..@end_date if @end_date
-
-      @start_date..(@start_date + interval_day)
-    end
-
-    def interval_day
-      return @week_num * 7 - 1 if @week_num
-
-      @day_num - 1
-    end
-
-    private
-
-    def validate_end_date!
-      return if @end_date.nil?
-
-      err_msg = "The date in start_date (#{@start_date}) should be before the date in end_date (#{@end_date})."
-      raise Goldman::ParameterError.new(err_msg) if @start_date > @end_date
-    end
-
-    def parse_date!(str, source)
-      return if str.nil?
-
-      begin
-        Date.parse(str)
-      rescue Date::Error, TypeError
-        raise Goldman::ParameterError.new("The parameter of #{source} (#{str}) is invalid.")
-      end
-    end
-
-    def parse_num!(str, source)
-      return if str.nil?
-
-      begin
-        Integer(str)
-      rescue ArgumentError, TypeError
-        raise Goldman::ParameterError.new("The parameter of #{source} (#{str}) is invalid.")
-      end
-    end
-
-    def today
-      Date.today
-    end
-
-    def default_day_num
-      7
-    end
-  end
-end