rufus-scheduler 3.5.1 → 3.8.0

data/lib/rufus/scheduler/util.rb

@@ -1,200 +1,216 @@
 
-module Rufus
+class Rufus::Scheduler
 
-  class Scheduler
+  class << self
 
-    class << self
+    #--
+    # time and string methods
+    #++
 
-      #--
-      # time and string methods
-      #++
+    def parse(o, opts={})
 
-      def parse(o, opts={})
+      opts[:no_error] = true
 
-        opts[:no_error] = true
+      parse_cron(o, opts) ||
+      parse_in(o, opts) || # covers 'every' schedule strings
+      parse_at(o, opts) ||
+      fail(ArgumentError.new("couldn't parse #{o.inspect} (#{o.class})"))
+    end
 
-        parse_cron(o, opts) ||
-        parse_in(o, opts) || # covers 'every' schedule strings
-        parse_at(o, opts) ||
-        fail(ArgumentError.new("couldn't parse #{o.inspect} (#{o.class})"))
-      end
+    def parse_cron(o, opts={})
 
-      def parse_cron(o, opts)
+      opts[:no_error] ?
+        Fugit.parse_cron(o) :
+        Fugit.do_parse_cron(o)
+    end
 
-        Fugit.parse_cron(o)
-      end
+    def parse_in(o, opts={})
 
-      def parse_in(o, opts={})
+      #o.is_a?(String) ? parse_duration(o, opts) : o
 
-        #o.is_a?(String) ? parse_duration(o, opts) : o
+      return parse_duration(o, opts) if o.is_a?(String)
+      return o if o.is_a?(Numeric)
 
-        return parse_duration(o, opts) if o.is_a?(String)
-        return o if o.is_a?(Numeric)
+      fail ArgumentError.new("couldn't parse time point in #{o.inspect}")
 
-        fail ArgumentError.new("couldn't parse time point in #{o.inspect}")
+    rescue ArgumentError => ae
 
-      rescue ArgumentError => ae
+      return nil if opts[:no_error]
+      fail ae
+    end
 
-        return nil if opts[:no_error]
-        fail ae
-      end
+    def parse_at(o, opts={})
 
-      def parse_at(o, opts={})
+      return o if o.is_a?(EoTime)
+      return EoTime.make(o) if o.is_a?(Time)
+      EoTime.parse(o, opts)
 
-        return o if o.is_a?(EoTime)
-        return EoTime.make(o) if o.is_a?(Time)
-        EoTime.parse(o, opts)
+    rescue StandardError => se
 
-      rescue StandardError => se
+      return nil if opts[:no_error]
+      fail se
+    end
 
-        return nil if opts[:no_error]
-        fail se
-      end
+    # Turns a string like '1m10s' into a float like '70.0', more formally,
+    # turns a time duration expressed as a string into a Float instance
+    # (millisecond count).
+    #
+    # w -> week
+    # d -> day
+    # h -> hour
+    # m -> minute
+    # s -> second
+    # M -> month
+    # y -> year
+    # 'nada' -> millisecond
+    #
+    # Some examples:
+    #
+    #   Rufus::Scheduler.parse_duration "0.5"    # => 0.5
+    #   Rufus::Scheduler.parse_duration "500"    # => 0.5
+    #   Rufus::Scheduler.parse_duration "1000"   # => 1.0
+    #   Rufus::Scheduler.parse_duration "1h"     # => 3600.0
+    #   Rufus::Scheduler.parse_duration "1h10s"  # => 3610.0
+    #   Rufus::Scheduler.parse_duration "1w2d"   # => 777600.0
+    #
+    # Negative time strings are OK (Thanks Danny Fullerton):
+    #
+    #   Rufus::Scheduler.parse_duration "-0.5"   # => -0.5
+    #   Rufus::Scheduler.parse_duration "-1h"    # => -3600.0
+    #
+    def parse_duration(str, opts={})
+
+      d =
+        opts[:no_error] ?
+        Fugit::Duration.parse(str, opts) :
+        Fugit::Duration.do_parse(str, opts)
+      d ?
+        d.to_sec :
+        nil
+    end
 
-      # Turns a string like '1m10s' into a float like '70.0', more formally,
-      # turns a time duration expressed as a string into a Float instance
-      # (millisecond count).
-      #
-      # w -> week
-      # d -> day
-      # h -> hour
-      # m -> minute
-      # s -> second
-      # M -> month
-      # y -> year
-      # 'nada' -> millisecond
-      #
-      # Some examples:
-      #
-      #   Rufus::Scheduler.parse_duration "0.5"    # => 0.5
-      #   Rufus::Scheduler.parse_duration "500"    # => 0.5
-      #   Rufus::Scheduler.parse_duration "1000"   # => 1.0
-      #   Rufus::Scheduler.parse_duration "1h"     # => 3600.0
-      #   Rufus::Scheduler.parse_duration "1h10s"  # => 3610.0
-      #   Rufus::Scheduler.parse_duration "1w2d"   # => 777600.0
-      #
-      # Negative time strings are OK (Thanks Danny Fullerton):
-      #
-      #   Rufus::Scheduler.parse_duration "-0.5"   # => -0.5
-      #   Rufus::Scheduler.parse_duration "-1h"    # => -3600.0
-      #
-      def parse_duration(str, opts={})
-
-        d =
-          opts[:no_error] ?
-          Fugit::Duration.parse(str, opts) :
-          Fugit::Duration.do_parse(str, opts)
-        d ?
-          d.to_sec :
-          nil
-      end
+    # Turns a number of seconds into a a time string
+    #
+    #   Rufus.to_duration 0                    # => '0s'
+    #   Rufus.to_duration 60                   # => '1m'
+    #   Rufus.to_duration 3661                 # => '1h1m1s'
+    #   Rufus.to_duration 7 * 24 * 3600        # => '1w'
+    #   Rufus.to_duration 30 * 24 * 3600 + 1   # => "4w2d1s"
+    #
+    # It goes from seconds to the year. Months are not counted (as they
+    # are of variable length). Weeks are counted.
+    #
+    # For 30 days months to be counted, the second parameter of this
+    # method can be set to true.
+    #
+    #   Rufus.to_duration 30 * 24 * 3600 + 1, true   # => "1M1s"
+    #
+    # If a Float value is passed, milliseconds will be displayed without
+    # 'marker'
+    #
+    #   Rufus.to_duration 0.051                       # => "51"
+    #   Rufus.to_duration 7.051                       # => "7s51"
+    #   Rufus.to_duration 0.120 + 30 * 24 * 3600 + 1  # => "4w2d1s120"
+    #
+    # (this behaviour mirrors the one found for parse_time_string()).
+    #
+    # Options are :
+    #
+    # * :months, if set to true, months (M) of 30 days will be taken into
+    #   account when building up the result
+    # * :drop_seconds, if set to true, seconds and milliseconds will be
+    #   trimmed from the result
+    #
+    def to_duration(seconds, options={})
 
-      # Turns a number of seconds into a a time string
-      #
-      #   Rufus.to_duration 0                    # => '0s'
-      #   Rufus.to_duration 60                   # => '1m'
-      #   Rufus.to_duration 3661                 # => '1h1m1s'
-      #   Rufus.to_duration 7 * 24 * 3600        # => '1w'
-      #   Rufus.to_duration 30 * 24 * 3600 + 1   # => "4w2d1s"
-      #
-      # It goes from seconds to the year. Months are not counted (as they
-      # are of variable length). Weeks are counted.
-      #
-      # For 30 days months to be counted, the second parameter of this
-      # method can be set to true.
-      #
-      #   Rufus.to_duration 30 * 24 * 3600 + 1, true   # => "1M1s"
-      #
-      # If a Float value is passed, milliseconds will be displayed without
-      # 'marker'
-      #
-      #   Rufus.to_duration 0.051                       # => "51"
-      #   Rufus.to_duration 7.051                       # => "7s51"
-      #   Rufus.to_duration 0.120 + 30 * 24 * 3600 + 1  # => "4w2d1s120"
-      #
-      # (this behaviour mirrors the one found for parse_time_string()).
-      #
-      # Options are :
-      #
-      # * :months, if set to true, months (M) of 30 days will be taken into
-      #   account when building up the result
-      # * :drop_seconds, if set to true, seconds and milliseconds will be
-      #   trimmed from the result
-      #
-      def to_duration(seconds, options={})
+      #d = Fugit::Duration.parse(seconds, options).deflate
+      #d = d.drop_seconds if options[:drop_seconds]
+      #d = d.deflate(:month => options[:months]) if options[:months]
+      #d.to_rufus_s
 
-        #d = Fugit::Duration.parse(seconds, options).deflate
-        #d = d.drop_seconds if options[:drop_seconds]
-        #d = d.deflate(:month => options[:months]) if options[:months]
-        #d.to_rufus_s
+      to_fugit_duration(seconds, options).to_rufus_s
+    end
 
-        to_fugit_duration(seconds, options).to_rufus_s
-      end
+    # Turns a number of seconds (integer or Float) into a hash like in :
+    #
+    #   Rufus.to_duration_hash 0.051
+    #     # => { :s => 0.051 }
+    #   Rufus.to_duration_hash 7.051
+    #     # => { :s => 7.051 }
+    #   Rufus.to_duration_hash 0.120 + 30 * 24 * 3600 + 1
+    #     # => { :w => 4, :d => 2, :s => 1.120 }
+    #
+    # This method is used by to_duration behind the scenes.
+    #
+    # Options are :
+    #
+    # * :months, if set to true, months (M) of 30 days will be taken into
+    #   account when building up the result
+    # * :drop_seconds, if set to true, seconds and milliseconds will be
+    #   trimmed from the result
+    #
+    def to_duration_hash(seconds, options={})
 
-      # Turns a number of seconds (integer or Float) into a hash like in :
-      #
-      #   Rufus.to_duration_hash 0.051
-      #     # => { :s => 0.051 }
-      #   Rufus.to_duration_hash 7.051
-      #     # => { :s => 7.051 }
-      #   Rufus.to_duration_hash 0.120 + 30 * 24 * 3600 + 1
-      #     # => { :w => 4, :d => 2, :s => 1.120 }
-      #
-      # This method is used by to_duration behind the scenes.
-      #
-      # Options are :
-      #
-      # * :months, if set to true, months (M) of 30 days will be taken into
-      #   account when building up the result
-      # * :drop_seconds, if set to true, seconds and milliseconds will be
-      #   trimmed from the result
-      #
-      def to_duration_hash(seconds, options={})
+      to_fugit_duration(seconds, options).to_rufus_h
+    end
 
-        to_fugit_duration(seconds, options).to_rufus_h
-      end
+    # Used by both .to_duration and .to_duration_hash
+    #
+    def to_fugit_duration(seconds, options={})
 
-      # Used by both .to_duration and .to_duration_hash
-      #
-      def to_fugit_duration(seconds, options={})
+      d = Fugit::Duration
+        .parse(seconds, options)
+        .deflate
 
-        d = Fugit::Duration
-          .parse(seconds, options)
-          .deflate
+      d = d.drop_seconds if options[:drop_seconds]
+      d = d.deflate(:month => options[:months]) if options[:months]
 
-        d = d.drop_seconds if options[:drop_seconds]
-        d = d.deflate(:month => options[:months]) if options[:months]
+      d
+    end
 
-        d
-      end
+    #--
+    # misc
+    #++
 
-      #--
-      # misc
-      #++
+    if RUBY_VERSION > '1.9.9'
 
       # Produces the UTC string representation of a Time instance
       #
       # like "2009/11/23 11:11:50.947109 UTC"
       #
       def utc_to_s(t=Time.now)
-
-        "#{t.utc.strftime('%Y-%m-%d %H:%M:%S')}.#{sprintf('%06d', t.usec)} UTC"
+        "#{t.dup.utc.strftime('%F %T.%6N')} UTC"
       end
 
       # Produces a hour/min/sec/milli string representation of Time instance
       #
       def h_to_s(t=Time.now)
+        t.strftime('%T.%6N')
+      end
+    else
 
+      def utc_to_s(t=Time.now)
+        "#{t.utc.strftime('%Y-%m-%d %H:%M:%S')}.#{sprintf('%06d', t.usec)} UTC"
+      end
+      def h_to_s(t=Time.now)
         "#{t.strftime('%H:%M:%S')}.#{sprintf('%06d', t.usec)}"
       end
     end
 
-    # Debugging tools...
-    #
-    class D
-
-      def self.h_to_s(t=Time.now); Rufus::Scheduler.h_to_s(t); end
+    if defined?(Process::CLOCK_MONOTONIC)
+      def monow; Process.clock_gettime(Process::CLOCK_MONOTONIC); end
+    else
+      def monow; Time.now.to_f; end
     end
+
+    def ltstamp; Time.now.strftime('%FT%T.%3N'); end
+  end
+
+  # Debugging tools...
+  #
+  class D
+
+    def self.h_to_s(t=Time.now); Rufus::Scheduler.h_to_s(t); end
   end
 end
 

data/rufus-scheduler.gemspec

@@ -10,8 +10,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.authors = [ 'John Mettraux' ]
   s.email = [ 'jmettraux@gmail.com' ]
-  s.homepage = 'http://github.com/jmettraux/rufus-scheduler'
-  s.rubyforge_project = 'rufus'
+  s.homepage = 'https://github.com/jmettraux/rufus-scheduler'
   s.license = 'MIT'
   s.summary = 'job scheduler for Ruby (at, cron, in and every jobs)'
 
@@ -19,6 +18,16 @@ Gem::Specification.new do |s|
 Job scheduler for Ruby (at, cron, in and every jobs). Not a replacement for crond.
   }.strip
 
+  s.metadata = {
+    'changelog_uri' => s.homepage + '/blob/master/CHANGELOG.md',
+    'bug_tracker_uri' => s.homepage + '/issues',
+    'homepage_uri' =>  s.homepage,
+    'source_code_uri' => s.homepage,
+    #'wiki_uri' => s.homepage + '/flor/wiki',
+    #'documentation_uri' => s.homepage + '/tree/master/doc',
+    #'mailing_list_uri' => 'https://groups.google.com/forum/#!forum/floraison',
+  }
+
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
     'README.{md,txt}',
@@ -30,7 +39,7 @@ Job scheduler for Ruby (at, cron, in and every jobs). Not a replacement for cron
 
   s.required_ruby_version = '>= 1.9'
 
-  s.add_runtime_dependency 'fugit', '~> 1.1', '>= 1.1.4'
+  s.add_runtime_dependency 'fugit', '~> 1.1', '>= 1.1.6'
 
   s.add_development_dependency 'rspec', '~> 3.7'
   s.add_development_dependency 'chronic', '~> 0.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.8.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fugit
@@ -19,7 +19,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +74,20 @@ files:
 - lib/rufus-scheduler.rb
 - lib/rufus/scheduler.rb
 - lib/rufus/scheduler/job_array.rb
-- lib/rufus/scheduler/jobs.rb
+- lib/rufus/scheduler/jobs_core.rb
+- lib/rufus/scheduler/jobs_one_time.rb
+- lib/rufus/scheduler/jobs_repeat.rb
 - lib/rufus/scheduler/locks.rb
 - lib/rufus/scheduler/util.rb
 - rufus-scheduler.gemspec
-homepage: http://github.com/jmettraux/rufus-scheduler
+homepage: https://github.com/jmettraux/rufus-scheduler
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/jmettraux/rufus-scheduler/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/jmettraux/rufus-scheduler/issues
+  homepage_uri: https://github.com/jmettraux/rufus-scheduler
+  source_code_uri: https://github.com/jmettraux/rufus-scheduler
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -97,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rufus
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: job scheduler for Ruby (at, cron, in and every jobs)