taskloop 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6395f4580c66f3deef3ec7a0a6103083b7d1b3a608c68cc0b878ad0a496c0116
-  data.tar.gz: 8775908ba3ac44c34dd23435e5159e52fab16d7901ff970d0a3d2af7ccc3e8d4
+  metadata.gz: fe54ad9d9bfec60de30dcda7607bae029880697f8e3300f3d8f5ca720d1e3b61
+  data.tar.gz: 1963fb584f8fbb3fdde0d72008a19a3c8568c0b4fe3dc5939a3df22360370cee
 SHA512:
-  metadata.gz: d2e8aa350458c9d9538cc339fbfd93f820fc3abdfcc4d905178d757805d9cafda6042c5049b12033ca84814fcd1f8d2111bc890c23de5b8785fb180553980dd2
-  data.tar.gz: fc4513b7568acc4789af5b39d73b31b28039bae7885b9ff70c838fc00f810fc9d501eba9041c540026da02224c8ba3763988d9fa7f39d8dc9157eb0ec0dc771e
+  metadata.gz: 534de276e8ced9600bbecc3f7a07a4de578d3addee053ddcacacad7b284e9e59b40f9bde0cd309a2075e0f5ff3692f8c2fc38a9ff08ccedabfae933c792d5e52
+  data.tar.gz: 529cdbe0ea94872d8960fba3a1b7eba0520d5bd2b0d09ae5f1319c698b20fc63c9d6acb957c0f239e0958e58f0f908531c26caed504956b6c4ae73eaf70f51e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    taskloop (0.1.0)
+    taskloop (0.2.0)
       claide (~> 1.0.3)
 
 GEM

data/lib/taskloop/command/deploy.rb

@@ -13,6 +13,9 @@ module TaskLoop
     require_relative '../rules/loop_rule'
     require_relative '../rules/date_list_rule'
     require_relative '../rules/time_list_rule'
+    require_relative '../rules//boundary_rule'
+    require_relative '../rules/start_point_boundary_rule'
+    require_relative '../rules/end_point_boundary_rule'
     require_relative '../extension/string_extension'
     require_relative '../extension/integer_extension'
     require_relative '../dsl/dsl'
@@ -62,10 +65,6 @@ module TaskLoop
       json_string = File.read(taskloop_proj_list_path)
       parsed_json = JSON.parse(json_string)
       # check if all the registered path
-      push_taskfile_dir_if_needed(parsed_json)
-    end
-
-    private def push_taskfile_dir_if_needed(parsed_json)
       proj_dir = Dir.pwd
       duplicate = parsed_json.select { |path| path == proj_dir }
       if duplicate.empty?

data/lib/taskloop/command/init.rb

@@ -25,14 +25,16 @@ module TaskLoop
 # env "ENV_NAME", "ENV_VALUE" 
 
 TaskLoop::Task.new do |t|
-  t.name = 'TODO: task name. <Required>'
-  t.path = 'TODO: task job path. For exmaple, t.path = "./Job.sh". <Required>'
-  t.year = "TODO: year rule. <Optional>"
-  t.month = "TODO: month rule. <Optional>"
-  t.day = "TODO: day rule. <Optional>"
-  t.hour = "TODO: hour rule. <Optional>"
-  t.minute = "TODO: minute rule. <Optional>"
-  t.loop = "TODO: loop count. <Optional>"
+  t.name        = 'TODO: task name. <Required>'
+  t.path        = 'TODO: task job path. For exmaple, t.path = "./Job.sh". <Required>'
+  t.year        = "TODO: year rule. <Optional>"
+  t.month       = "TODO: month rule. <Optional>"
+  t.day         = "TODO: day rule. <Optional>"
+  t.hour        = "TODO: hour rule. <Optional>"
+  t.minute      = "TODO: minute rule. <Optional>"
+  t.loop        = "TODO: loop count. <Optional>"
+  t.start_point = "TODO: start point boundary rule. <Optional"
+  t.end_point   = "TODO: start point boundary rule. <Optional"
 end
       DESC
       file.puts content

data/lib/taskloop/command/list.rb

@@ -44,14 +44,16 @@ module TaskLoop
         puts "Tasks above are defined in Taskfile of <#{proj}>".ansi.blue
         list.each do |task|
           puts "  #{task.desc}".ansi.blue
-          puts "    t.name   = #{task.name}".ansi.blue
-          puts "    t.path   = #{task.path}".ansi.blue
-          puts "    t.year   = #{task.year.desc}".ansi.blue
-          puts "    t.month  = #{task.month.desc}".ansi.blue
-          puts "    t.day    = #{task.day.desc}".ansi.blue
-          puts "    t.hour   = #{task.hour.desc}".ansi.blue
-          puts "    t.minute = #{task.minute.desc}".ansi.blue
-          puts "    t.loop   = #{task.loop.desc}".ansi.blue
+          puts "    t.name        = #{task.name}".ansi.blue
+          puts "    t.path        = #{task.path}".ansi.blue
+          puts "    t.year        = #{task.year.desc}".ansi.blue
+          puts "    t.month       = #{task.month.desc}".ansi.blue
+          puts "    t.day         = #{task.day.desc}".ansi.blue
+          puts "    t.hour        = #{task.hour.desc}".ansi.blue
+          puts "    t.minute      = #{task.minute.desc}".ansi.blue
+          puts "    t.loop        = #{task.loop.desc}".ansi.blue
+          puts "    t.start_point = #{task.start_point.desc}".ansi.blue
+          puts "    t.end_point   = #{task.end_point.desc}".ansi.blue
         end
       end
     end

data/lib/taskloop/dsl/dsl.rb

@@ -11,23 +11,23 @@ module TaskLoop
     #################################
     # Specific Syntax
     #################################
-    def at(value)
-      SpecificRule.new(:unknown, value)
+    def at(*values)
+      SpecificRule.new(:unknown, values)
     end
 
     #################################
     # Scope Syntax
     #################################
     def before(right)
-      BeforeScopeRule.new(:unknown, :before, right)
+      BeforeScopeRule.new(:unknown, right)
     end
 
     def between(left, right)
-      BetweenScopeRule.new(:unknown, :between, left, right)
+      BetweenScopeRule.new(:unknown, left, right)
     end
 
     def after(left)
-      AfterScopeRule.new(:unknown, :after, left)
+      AfterScopeRule.new(:unknown, left)
     end
 
     #################################
@@ -51,6 +51,17 @@ module TaskLoop
       DateListRule.new(:unknown, args)
     end
 
+    #################################
+    # Boundary Syntax
+    #################################
+    def from(value)
+      StartPointBoundaryRule.new(:unknown, value)
+    end
+
+    def to(value)
+      EndPointBoundaryRule.new(:unknown, value)
+    end
+
     #################################
     # Env
     #################################

data/lib/taskloop/extension/integer_extension.rb

@@ -18,8 +18,4 @@ class Integer
   def year
     self
   end
-
-  def times
-    self
-  end
 end

data/lib/taskloop/rules/after_scope_rule.rb

@@ -3,39 +3,39 @@ module TaskLoop
 
     attr_accessor :left
 
-    def initialize(unit, scope, left)
-      super unit, scope
+    def initialize(unit, left)
+      super unit, :after
       @left = left
     end
 
-    def invalidate!
-      super
-      if @unit == :day
-        unless Task::WEEK.has_key?(@left) || Task::DAY.has_key?(@left)
-          raise ArgumentError, "#{left} must be a Symbol defined in Task::WEEK or Task::DAY"
-        end
-        return
-      end
-
-      if @unit == :month
-        unless Task::MONTH.has_key?(@left)
-          raise ArgumentError, "#{left} must be a Symbol defined in Task::MONTH"
-        end
-        return
-      end
-
-      unless @left.is_a?(Integer)
-        raise TypeError, "'left' need to be Symbol or Integer"
-      end
-
-      if @unit == :minute && (@left < 0 || @left > 59)
-        raise ArgumentError, "'right' for 'minute' must >= 0 and <= 59"
-      end
-
-      if @unit == :hour && (@left < 0 || @left > 23)
-        raise ArgumentError, "'right' for 'hour' must >= 0 and <= 23"
-      end
-    end
+    # def invalidate!
+    #   super
+    #   if @unit == :day
+    #     unless Task::WEEK.has_key?(@left) || Task::DAY.has_key?(@left)
+    #       raise ArgumentError, "#{left} must be a Symbol defined in Task::WEEK or Task::DAY"
+    #     end
+    #     return
+    #   end
+    #
+    #   if @unit == :month
+    #     unless Task::MONTH.has_key?(@left)
+    #       raise ArgumentError, "#{left} must be a Symbol defined in Task::MONTH"
+    #     end
+    #     return
+    #   end
+    #
+    #   unless @left.is_a?(Integer)
+    #     raise TypeError, "'left' need to be Symbol or Integer"
+    #   end
+    #
+    #   if @unit == :minute && (@left < 0 || @left > 59)
+    #     raise ArgumentError, "'right' for 'minute' must >= 0 and <= 59"
+    #   end
+    #
+    #   if @unit == :hour && (@left < 0 || @left > 23)
+    #     raise ArgumentError, "'right' for 'hour' must >= 0 and <= 23"
+    #   end
+    # end
 
 
     def left_value
@@ -56,30 +56,21 @@ module TaskLoop
       return @left
     end
 
-    def is_week_value?
-      if @unit == :day && Task::WEEK.has_key?(@left)
-        return true
-      end
-      return false
-    end
-
     def is_conform_rule?(last_exec_time)
       current = Time.now
       value = left_value
       result = false
       case @unit
       when :year then
-        result = current.year > value
+        result = current.year >= value
       when :month then
-        result = current.month > value
+        result = current.month >= value
+      when :week then
+        result = current.wday >= (value % TaskLoop::WEEK_BASE)
       when :day then
-        if is_week_value?
-          result = current.wday > (value % TaskLoop::WEEK_BASE)
-        else
-          result = current.day > value
-        end
+        result = current.day >= value
       when :hour then
-        result = current.hour > value
+        result = current.hour >= value
       end
       return result
     end

data/lib/taskloop/rules/before_scope_rule.rb

@@ -3,39 +3,39 @@ module TaskLoop
 
     attr_accessor :right
 
-    def initialize(unit, scope, right)
-      super unit, scope
+    def initialize(unit, right)
+      super unit, :before
       @right = right
     end
 
-    def invalidate!
-      super
-      if @unit == :day
-        unless Task::WEEK.has_key?(@right) || Task::DAY.has_key?(@right)
-          raise ArgumentError, "#{@right} must be a Symbol defined in Task::WEEK or Task::DAY"
-        end
-        return
-      end
-
-      if @unit == :month
-        unless Task::MONTH.has_key?(@right)
-          raise ArgumentError, "#{@right} must be a Symbol defined in Task::MONTH"
-        end
-        return
-      end
-
-      unless @right.is_a?(Integer)
-        raise TypeError, "'right' need to be Symbol or Integer"
-      end
-
-      if @unit == :minute && (@right < 0 || @right > 59)
-        raise ArgumentError, "'right' for 'minute' must >= 0 and <= 59"
-      end
-
-      if @unit == :hour && (@right < 0 || @right > 23)
-        raise ArgumentError, "'right' for 'hour' must >= 0 and <= 23"
-      end
-    end
+    # def invalidate!
+    #   super
+    #   if @unit == :day
+    #     unless Task::WEEK.has_key?(@right) || Task::DAY.has_key?(@right)
+    #       raise ArgumentError, "#{@right} must be a Symbol defined in Task::WEEK or Task::DAY"
+    #     end
+    #     return
+    #   end
+    #
+    #   if @unit == :month
+    #     unless Task::MONTH.has_key?(@right)
+    #       raise ArgumentError, "#{@right} must be a Symbol defined in Task::MONTH"
+    #     end
+    #     return
+    #   end
+    #
+    #   unless @right.is_a?(Integer)
+    #     raise TypeError, "'right' need to be Symbol or Integer"
+    #   end
+    #
+    #   if @unit == :minute && (@right < 0 || @right > 59)
+    #     raise ArgumentError, "'right' for 'minute' must >= 0 and <= 59"
+    #   end
+    #
+    #   if @unit == :hour && (@right < 0 || @right > 23)
+    #     raise ArgumentError, "'right' for 'hour' must >= 0 and <= 23"
+    #   end
+    # end
 
     def right_value
       if (Task::DAY.has_key?(@right))
@@ -55,30 +55,21 @@ module TaskLoop
       return @right
     end
 
-    def is_week_value?
-      if @unit == :day && Task::WEEK.has_key?(@right)
-        return true
-      end
-      return false
-    end
-
     def is_conform_rule?(last_exec_time)
       current = Time.now
       value = right_value
       result = false
       case @unit
       when :year then
-        result = current.year < value
+        result = current.year <= value
       when :month then
-        result = current.month < value
+        result = current.month <= value
+      when :week then
+        result = current.wday <= (value % TaskLoop::WEEK_BASE)
       when :day then
-        if is_week_value?
-          result = current.wday < (value % TaskLoop::WEEK_BASE)
-        else
-          result = current.day < value
-        end
+        result = current.day <= value
       when :hour then
-        result = current.hour < value
+        result = current.hour <= value
       end
       return result
     end

data/lib/taskloop/rules/between_scope_rule.rb

@@ -5,58 +5,58 @@ module TaskLoop
 
     attr_accessor :right
 
-    def initialize(unit, scope, left, right)
-      super unit, scope
+    def initialize(unit, left, right)
+      super unit, :between
       @left = left
       @right = right
     end
 
-    def invalidate!
-      super
-      if @unit == :day
-        if Task::WEEK.has_key?(@left) && Task::WEEK.has_key?(@right)
-          unless Task::WEEK[@left] < Task::WEEK[@right]
-            raise ArgumentError, "'left' must less than 'right'"
-          end
-          return
-        end
-        if Task::DAY.has_key?(@left) && Task::DAY.has_key?(@right)
-          unless Task::WEEK[@left] < Task::WEEK[@right]
-            raise ArgumentError, "'left' must less than 'right'"
-          end
-          return
-        end
-
-        raise ArgumentError, "'left' and 'right' must be the same type."
-      end
-
-      if @unit == :month
-        unless Task::MONTH.has_key?(@left)
-          raise ArgumentError, "#{left} must be a Symbol defined in Task::MONTH"
-        end
-        return
-      end
-
-      unless @left.is_a?(Integer) && @right.is_a?(Integer)
-        raise TypeError, "both 'left' and 'right' need to be Symbol or Integer"
-      end
-
-      unless @left < @right
-        raise ArgumentError, "'left' must less than 'right'"
-      end
-
-      if @unit == :minute && (@left < 0 || @right > 59)
-        raise ArgumentError, "'left' and 'right' for 'minute' must >= 0 and <= 59"
-      end
-
-      if @unit == :hour && (@left < 0 || @right > 23)
-        raise ArgumentError, "'left', 'right' for 'hour' must >= 0 and <= 23"
-      end
-
-      if @unit == :year && @left < 0
-        raise ArgumentError, "'left' must greater than 0"
-      end
-    end
+    # def invalidate!
+    #   super
+    #   if @unit == :day
+    #     if Task::WEEK.has_key?(@left) && Task::WEEK.has_key?(@right)
+    #       unless Task::WEEK[@left] < Task::WEEK[@right]
+    #         raise ArgumentError, "'left' must less than 'right'"
+    #       end
+    #       return
+    #     end
+    #     if Task::DAY.has_key?(@left) && Task::DAY.has_key?(@right)
+    #       unless Task::WEEK[@left] < Task::WEEK[@right]
+    #         raise ArgumentError, "'left' must less than 'right'"
+    #       end
+    #       return
+    #     end
+    #
+    #     raise ArgumentError, "'left' and 'right' must be the same type."
+    #   end
+    #
+    #   if @unit == :month
+    #     unless Task::MONTH.has_key?(@left)
+    #       raise ArgumentError, "#{left} must be a Symbol defined in Task::MONTH"
+    #     end
+    #     return
+    #   end
+    #
+    #   unless @left.is_a?(Integer) && @right.is_a?(Integer)
+    #     raise TypeError, "both 'left' and 'right' need to be Symbol or Integer"
+    #   end
+    #
+    #   unless @left < @right
+    #     raise ArgumentError, "'left' must less than 'right'"
+    #   end
+    #
+    #   if @unit == :minute && (@left < 0 || @right > 59)
+    #     raise ArgumentError, "'left' and 'right' for 'minute' must >= 0 and <= 59"
+    #   end
+    #
+    #   if @unit == :hour && (@left < 0 || @right > 23)
+    #     raise ArgumentError, "'left', 'right' for 'hour' must >= 0 and <= 23"
+    #   end
+    #
+    #   if @unit == :year && @left < 0
+    #     raise ArgumentError, "'left' must greater than 0"
+    #   end
+    # end
 
     def left_value
       if (Task::DAY.has_key?(@left))
@@ -94,13 +94,6 @@ module TaskLoop
       return @right
     end
 
-    def is_week_value?
-      if @unit == :day && Task::WEEK.has_key?(@left) && Task::WEEK.has_key?(@right)
-        return true
-      end
-      return false
-    end
-
     def is_conform_rule?(last_exec_time)
       current = Time.now
       left = left_value
@@ -111,12 +104,10 @@ module TaskLoop
         result = left <= current.year >= left && current.year <= right
       when :month then
         result = left <= current.month && current.month <= right
+      when :week then
+        result = (left % TaskLoop::WEEK_BASE) <= current.wday && current.wday <= (right % TaskLoop::WEEK_BASE)
       when :day then
-        if is_week_value?
-          result = (left % TaskLoop::WEEK_BASE) <= current.wday && current.wday <= (right % TaskLoop::WEEK_BASE)
-        else
-          result = left <= current.day && current.day <= right
-        end
+        result = left <= current.day && current.day <= right
       when :hour then
         result = left <= current.hour && current.hour <= right
       end

data/lib/taskloop/rules/boundary_rule.rb

@@ -0,0 +1,21 @@
+module TaskLoop
+
+  class BoundaryRule < Rule
+
+    BOUNDARY = {
+      :start    => 0,
+      :end      => 1,
+    }
+
+    attr_accessor :boundary
+
+    def initialize(unit, boundary)
+      super unit
+      @boundary = boundary
+    end
+
+    def desc
+      super + "; boundary: #{boundary.to_s}"
+    end
+  end
+end

data/lib/taskloop/rules/date_list_rule.rb

@@ -26,10 +26,6 @@ module TaskLoop
       @dates = dates
     end
 
-    def is_week_value?
-      return false
-    end
-
     def is_conform_rule?(last_exec_time)
       current = Time.now
       result = false

data/lib/taskloop/rules/default_rule.rb

@@ -4,10 +4,6 @@ module TaskLoop
       super unit
     end
 
-    def is_week_value?
-      return false
-    end
-
     def is_conform_rule?(last_exec_time)
       return true
     end

data/lib/taskloop/rules/end_point_boundary_rule.rb

@@ -0,0 +1,21 @@
+module TaskLoop
+  class EndPointBoundaryRule < BoundaryRule
+    attr_accessor :value
+    def initialize(unit, value)
+      super unit, :end
+      @value = value
+    end
+
+    def is_conform_rule?(last_exec_time)
+      current = Time.now.to_i
+      date_format = "%Y-%m-%d %H:%M:%S"
+      date_object = Time.strptime(value, date_format)
+      end_time = date_object.to_i
+      return current <= end_time
+    end
+
+    def desc
+      super + " to #{value}"
+    end
+  end
+end

data/lib/taskloop/rules/interval_rule.rb

@@ -8,10 +8,6 @@ module TaskLoop
       @interval = interval
     end
 
-    def is_week_value?
-      return false
-    end
-
     def is_conform_rule?(last_exec_time)
       # interval rule is different for other rules. It should be calculated by combining the interval times of all units.
       # So here returns false

data/lib/taskloop/rules/loop_rule.rb

@@ -8,10 +8,6 @@ module TaskLoop
       @count = count
     end
 
-    def is_week_value?
-      return false
-    end
-
     def is_conform_rule?(last_exec_time)
       # loop rule is different for other rules. It should based on task loop file.
       # So here returns false

data/lib/taskloop/rules/rule.rb

@@ -8,9 +8,11 @@ module TaskLoop
       :day         => 3,      # support interval/scope/specific syntax
       :month       => 4,      # support interval/scope/specific syntax
       :year        => 5,      # support interval/scope/specific syntax
+      :week        => 6,      # support scope/specific syntax
       :loop        => 7,      # only support loop syntax
       :date        => 8,      # only support date list syntax
       :time        => 9,      # only support time list syntax
+      :full        => 10,     # only support boundary syntax
     }
 
     attr_accessor :unit
@@ -19,10 +21,6 @@ module TaskLoop
       @unit = unit
     end
 
-    def is_week_value?
-      raise NotImplementedError, 'subclass need implement this method!'
-    end
-
     def is_conform_rule?(last_exec_time)
       raise NotImplementedError, 'subclass need implement this method!'
     end