rufus-scheduler 3.4.2 → 3.7.0

data/lib/rufus/scheduler/util.rb

@@ -1,13 +1,13 @@
 
-module Rufus
+class Rufus::Scheduler
 
-  class Scheduler
+  class << self
 
     #--
     # time and string methods
     #++
 
-    def self.parse(o, opts={})
+    def parse(o, opts={})
 
       opts[:no_error] = true
 
@@ -17,17 +17,14 @@ module Rufus
       fail(ArgumentError.new("couldn't parse #{o.inspect} (#{o.class})"))
     end
 
-    def self.parse_cron(o, opts)
+    def parse_cron(o, opts={})
 
-      o.is_a?(CronLine) ? o : CronLine.new(o)
-
-    rescue ArgumentError => ae
-
-      return nil if opts[:no_error]
-      fail ae
+      opts[:no_error] ?
+        Fugit.parse_cron(o) :
+        Fugit.do_parse_cron(o)
     end
 
-    def self.parse_in(o, opts={})
+    def parse_in(o, opts={})
 
       #o.is_a?(String) ? parse_duration(o, opts) : o
 
@@ -42,7 +39,7 @@ module Rufus
       fail ae
     end
 
-    def self.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)
@@ -54,23 +51,6 @@ module Rufus
       fail se
     end
 
-    DURATIONS2M = [
-      [ 'y', 365 * 24 * 3600 ],
-      [ 'M', 30 * 24 * 3600 ],
-      [ 'w', 7 * 24 * 3600 ],
-      [ 'd', 24 * 3600 ],
-      [ 'h', 3600 ],
-      [ 'm', 60 ],
-      [ 's', 1 ]
-    ]
-    DURATIONS2 = DURATIONS2M.dup
-    DURATIONS2.delete_at(1)
-
-    DURATIONS = DURATIONS2M.inject({}) { |r, (k, v)| r[k] = v; r }
-    DURATION_LETTERS = DURATIONS.keys.join
-
-    DU_KEYS = DURATIONS2M.collect { |k, v| k.to_sym }
-
     # 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).
@@ -98,37 +78,17 @@ module Rufus
     #   Rufus::Scheduler.parse_duration "-0.5"   # => -0.5
     #   Rufus::Scheduler.parse_duration "-1h"    # => -3600.0
     #
-    def self.parse_duration(string, opts={})
-
-      s = string.to_s.strip
-      mod = s[0, 1] == '-' ? -1 : 1
-      s = s[1..-1] if mod == -1
-
-      ss = mod < 0 ? '-' : ''
-      r = 0.0
-
-      s.scan(/(\d*\.\d+|\d+\.?)([#{DURATION_LETTERS}]?)/) do |f, d|
-        ss += "#{f}#{d}"
-        r += f.to_f * (DURATIONS[d] || 1.0)
-      end
-
-      if ss == '-' || ss != string.to_s.strip
-        return nil if opts[:no_error]
-        fail ArgumentError.new("invalid time duration #{string.inspect}")
-      end
+    def parse_duration(str, opts={})
 
-      mod * r
+      d =
+        opts[:no_error] ?
+        Fugit::Duration.parse(str, opts) :
+        Fugit::Duration.do_parse(str, opts)
+      d ?
+        d.to_sec :
+        nil
     end
 
-    class << self
-      #-
-      # for compatibility with rufus-scheduler 2.x
-      #+
-      alias parse_duration_string parse_duration
-      alias parse_time_string parse_duration
-    end
-
-
     # Turns a number of seconds into a a time string
     #
     #   Rufus.to_duration 0                    # => '0s'
@@ -158,45 +118,27 @@ module Rufus
     #
     # * :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
+    # * :drop_seconds, if set to true, seconds and milliseconds will be
+    #   trimmed from the result
     #
-    def self.to_duration(seconds, options={})
+    def to_duration(seconds, options={})
 
-      h = to_duration_hash(seconds, options)
-
-      return (options[:drop_seconds] ? '0m' : '0s') if h.empty?
-
-      s =
-        DU_KEYS.inject('') { |r, key|
-          count = h[key]
-          count = nil if count == 0
-          r << "#{count}#{key}" if count
-          r
-        }
-
-      ms = h[:ms]
-      s << ms.to_s if ms
-
-      s
-    end
+      #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
 
-    class << self
-      #-
-      # for compatibility with rufus-scheduler 2.x
-      #+
-      alias to_duration_string to_duration
-      alias to_time_string to_duration
+      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
-    #     # => { :ms => "51" }
+    #     # => { :s => 0.051 }
     #   Rufus.to_duration_hash 7.051
-    #     # => { :s => 7, :ms => "51" }
+    #     # => { :s => 7.051 }
     #   Rufus.to_duration_hash 0.120 + 30 * 24 * 3600 + 1
-    #     # => { :w => 4, :d => 2, :s => 1, :ms => "120" }
+    #     # => { :w => 4, :d => 2, :s => 1.120 }
     #
     # This method is used by to_duration behind the scenes.
     #
@@ -204,62 +146,71 @@ module Rufus
     #
     # * :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
+    # * :drop_seconds, if set to true, seconds and milliseconds will be
+    #   trimmed from the result
     #
-    def self.to_duration_hash(seconds, options={})
+    def to_duration_hash(seconds, options={})
 
-      h = {}
-
-      if seconds.is_a?(Float)
-        h[:ms] = (seconds % 1 * 1000).to_i
-        seconds = seconds.to_i
-      end
-
-      if options[:drop_seconds]
-        h.delete(:ms)
-        seconds = (seconds - seconds % 60)
-      end
-
-      durations = options[:months] ? DURATIONS2M : DURATIONS2
+      to_fugit_duration(seconds, options).to_rufus_h
+    end
 
-      durations.each do |key, duration|
+    # Used by both .to_duration and .to_duration_hash
+    #
+    def to_fugit_duration(seconds, options={})
 
-        count = seconds / duration
-        seconds = seconds % duration
+      d = Fugit::Duration
+        .parse(seconds, options)
+        .deflate
 
-        h[key.to_sym] = count if count > 0
-      end
+      d = d.drop_seconds if options[:drop_seconds]
+      d = d.deflate(:month => options[:months]) if options[:months]
 
-      h
+      d
     end
 
     #--
     # misc
     #++
 
-    # Produces the UTC string representation of a Time instance
-    #
-    # like "2009/11/23 11:11:50.947109 UTC"
-    #
-    def self.utc_to_s(t=Time.now)
+    if RUBY_VERSION > '1.9.9'
 
-      "#{t.utc.strftime('%Y-%m-%d %H:%M:%S')}.#{sprintf('%06d', t.usec)} UTC"
-    end
+      # 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.dup.utc.strftime('%F %T.%6N')} UTC"
+      end
 
-    # Produces a hour/min/sec/milli string representation of Time instance
-    #
-    def self.h_to_s(t=Time.now)
+      # Produces a hour/min/sec/milli string representation of Time instance
+      #
+      def h_to_s(t=Time.now)
+        t.strftime('%T.%6N')
+      end
+    else
 
-      "#{t.strftime('%H:%M:%S')}.#{sprintf('%06d', t.usec)}"
+      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,19 +18,31 @@ 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}',
+    'CHANGELOG.{md,txt}', 'CREDITS.{md,txt}', 'LICENSE.{md,txt}',
     'Makefile',
     'lib/**/*.rb', #'spec/**/*.rb', 'test/**/*.rb',
-    '*.gemspec', '*.txt', '*.rdoc', '*.md'
+    "#{s.name}.gemspec",
   ]
 
   s.required_ruby_version = '>= 1.9'
 
-  s.add_runtime_dependency 'et-orbi', '~> 1.0'
+  s.add_runtime_dependency 'fugit', '~> 1.1', '>= 1.1.6'
 
-  s.add_development_dependency 'rspec', '~> 3.4'
-  s.add_development_dependency 'chronic'
+  s.add_development_dependency 'rspec', '~> 3.7'
+  s.add_development_dependency 'chronic', '~> 0.10'
 
   s.require_path = 'lib'
 end

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.7.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: et-orbi
+  name: fugit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 description: Job scheduler for Ruby (at, cron, in and every jobs). Not a replacement
   for crond.
 email:
@@ -60,47 +66,44 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- CREDITS.md
+- LICENSE.txt
 - Makefile
-- lib/rufus/scheduler/cronline.rb
+- README.md
+- 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
-- lib/rufus/scheduler.rb
-- lib/rufus-scheduler.rb
 - rufus-scheduler.gemspec
-- CHANGELOG.txt
-- CREDITS.txt
-- fail.txt
-- fail18.txt
-- LICENSE.txt
-- log.txt
-- n.txt
-- pics.txt
-- TODO.txt
-- README.md
-- sofia.md
-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:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rufus
-rubygems_version: 2.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: job scheduler for Ruby (at, cron, in and every jobs)