fugit 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5457b3ed0c40bebd7f6725f5884ba0894f61c2c
-  data.tar.gz: c1daf99e24e3d241d3ccd4bd591e308b487ecc13
+  metadata.gz: 614db4a7a2630eee78f008aa1a446ec9b59acfd1
+  data.tar.gz: 5325bc91f0aa055571b1c07f6e8e87357929898f
 SHA512:
-  metadata.gz: 8ca834e48c23d1cabae7589ccf2292caf250bc0fc2e7fdaa8e4dd9a431ebf97d62aa08cbf2eacf178ae7cf97a816869b9caf023dfd0b24f0e30c55a56e232cf8
-  data.tar.gz: e16216f72f97619d86c47c1be9502ff854785751091fd99b9829820bc087a260fdd60a02aef1a27ed12f6d0d5439bad361a99847b96f1d6d15d08a8a5dde1d71
+  metadata.gz: 5622b68c6eeec8702bb0a1cba25144c67905a3e92d839e22906192b9acecef71258810043b5ba30d3c8f76757f8adc9a9b60c2b233186bf3d7018e14c59fb00b
+  data.tar.gz: 7a0c9ff30fd795138f664f170d4998aeb981591349a34fe246a0c6b86ec02f33c830a8d9792b6582327723268514b3db1eda50c7d7a73581845f96ce37321e27

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # fugit CHANGELOG.md
 
 
+## fugit 0.9.5  released 2017-01-07
+
+* Implement Fugit.determine_type(s)
+* Rename core.rb to parse.rb
+
+
 ## fugit 0.9.4  released 2017-01-06
 
 * Accept cron strings with seconds

data/lib/fugit.rb

@@ -25,7 +25,7 @@
 
 module Fugit
 
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end
 
 require 'time'
@@ -33,9 +33,9 @@ require 'stringio'
 
 require 'raabro'
 
-require 'fugit/core'
 require 'fugit/misc'
 require 'fugit/cron'
 require 'fugit/duration'
 require 'fugit/nat'
+require 'fugit/parse'
 

data/lib/fugit/cron.rb

@@ -67,6 +67,8 @@ module Fugit
       original = s
       s = SPECIALS[s] || s
 
+      return nil unless s.is_a?(String)
+
 #p s; Raabro.pp(Parser.parse(s, debug: 3))
       h = Parser.parse(s)
 
@@ -80,10 +82,10 @@ module Fugit
       parse(s) || fail(ArgumentError.new("not a cron string #{s.inspect}"))
     end
 
-    class NextTime # TODO at some point, use ZoTime
+    class TimeCursor # TODO at some point, use ZoTime
 
       def initialize(t)
-        @t = t.is_a?(NextTime) ? t.time : t
+        @t = t.is_a?(TimeCursor) ? t.time : t
       end
 
       def time; @t; end
@@ -173,7 +175,7 @@ module Fugit
 
       return true if @monthdays.nil?
 
-      last = (NextTime.new(nt).inc_month.time - 24 * 3600).day + 1
+      last = (TimeCursor.new(nt).inc_month.time - 24 * 3600).day + 1
 
       @monthdays
         .collect { |d| d < 1 ? last + d : d }
@@ -194,7 +196,7 @@ module Fugit
     def match?(t)
 
       t = Fugit.do_parse_at(t)
-      t = NextTime.new(t)
+      t = TimeCursor.new(t)
 
       month_match?(t) && day_match?(t) &&
       hour_match?(t) && min_match?(t) && sec_match?(t)
@@ -202,38 +204,38 @@ module Fugit
 
     def next_time(from=Time.now)
 
-      nt = NextTime.new(from)
+      t = TimeCursor.new(from)
 
       loop do
-#p [ :l, Fugit.time_to_s(nt.time) ]
-        (from.to_i == nt.to_i) && (nt.inc(1); next)
-        month_match?(nt) || (nt.inc_month; next)
-        day_match?(nt) || (nt.inc_day; next)
-        hour_match?(nt) || (nt.inc_hour; next)
-        min_match?(nt) || (nt.inc_min; next)
-        sec_match?(nt) || (nt.inc_sec(@seconds); next)
+#p [ :l, Fugit.time_to_s(t.time) ]
+        (from.to_i == t.to_i) && (t.inc(1); next)
+        month_match?(t) || (t.inc_month; next)
+        day_match?(t) || (t.inc_day; next)
+        hour_match?(t) || (t.inc_hour; next)
+        min_match?(t) || (t.inc_min; next)
+        sec_match?(t) || (t.inc_sec(@seconds); next)
         break
       end
 
-      nt.time
+      t.time
     end
 
     def previous_time(from=Time.now)
 
-      nt = NextTime.new(from)
+      t = TimeCursor.new(from)
 
       loop do
-#p [ :l, Fugit.time_to_s(nt.time) ]
-        (from.to_i == nt.to_i) && (nt.inc(-1); next)
-        month_match?(nt) || (nt.dec_month; next)
-        day_match?(nt) || (nt.dec_day; next)
-        hour_match?(nt) || (nt.dec_hour; next)
-        min_match?(nt) || (nt.dec_min; next)
-        sec_match?(nt) || (nt.dec_sec(@seconds); next)
+#p [ :l, Fugit.time_to_s(t.time) ]
+        (from.to_i == t.to_i) && (t.inc(-1); next)
+        month_match?(t) || (t.dec_month; next)
+        day_match?(t) || (t.dec_day; next)
+        hour_match?(t) || (t.dec_hour; next)
+        min_match?(t) || (t.dec_min; next)
+        sec_match?(t) || (t.dec_sec(@seconds); next)
         break
       end
 
-      nt.time
+      t.time
     end
 
     # Mostly used as a #next_time sanity check.

data/lib/fugit/duration.rb

@@ -40,9 +40,11 @@ module Fugit
 
       original = s
 
-      s = s
-      #s = s.to_i if s.is_a?(Numeric)
-      s = s.to_s.strip
+      s = s.to_s if s.is_a?(Numeric)
+
+      return nil unless s.is_a?(String)
+
+      s = s.strip
       s = s + 's' if s.match(/\A-?(\d*\.)?\d+\z/)
 #p [ original, s ]; Raabro.pp(Parser.parse(s, debug: 3))
 

data/lib/fugit/nat.rb

@@ -32,6 +32,10 @@ module Fugit
 
     def self.parse(s)
 
+      return s if s.is_a?(Fugit::Cron) || s.is_a?(Fugit::Duration)
+
+      return nil unless s.is_a?(String)
+
 #p s; Raabro.pp(Parser.parse(s, debug: 3))
       a = Parser.parse(s)
 
@@ -45,6 +49,11 @@ module Fugit
       end
     end
 
+    def self.do_parse(s)
+
+      parse(s) || fail(ArgumentError.new("could not parse a nat #{s.inspect}"))
+    end
+
     def self.parse_cron(a)
 
       h = { min: nil, hou: [], dom: [ nil ], mon: [ nil ], dow: [ nil ] }

data/lib/fugit/{core.rb → parse.rb}

@@ -36,38 +36,41 @@ module Fugit
     Time.parse(s)
   end
 
-  def self.parse_cron(s)
-
-    ::Fugit::Cron.parse(s)
-  end
-
-  def self.do_parse_cron(s)
-
-    ::Fugit::Cron.do_parse(s)
-  end
+  def self.parse_cron(s); ::Fugit::Cron.parse(s); end
+  def self.parse_duration(s); ::Fugit::Duration.parse(s); end
+  def self.parse_in(s); parse_duration(s); end
+  def self.parse_nat(s); ::Fugit::Nat.parse(s); end
 
-  def self.parse_duration(s)
+  def self.do_parse_cron(s); ::Fugit::Cron.do_parse(s); end
+  def self.do_parse_duration(s); ::Fugit::Duration.do_parse(s); end
+  def self.do_parse_in(s); do_parse_duration(s); end
+  def self.do_parse_nat(s); ::Fugit::Nat.do_parse(s); end
 
-    ::Fugit::Duration.parse(s)
-  end
+  def self.parse(s, opts={})
 
-  def self.do_parse_duration(s)
+    opts[:at] = opts[:in] if opts.has_key?(:in)
 
-    ::Fugit::Duration.do_parse(s)
+    (opts[:cron] != false && parse_cron(s)) ||
+    (opts[:duration] != false && parse_duration(s)) ||
+    (opts[:at] != false && parse_at(s)) ||
+    (opts[:nat] != false && parse_nat(s)) ||
+    nil
   end
 
-  def self.parse_in(s); parse_duration(s); end
-  def self.do_parse_in(s); do_parse_duration(s); end
-
-  def self.parse(s)
+  def self.do_parse(s, opts={})
 
-    parse_cron(s) || parse_duration(s) || parse_at(s)
+    parse(s, opts) ||
+    fail(ArgumentError.new("found no time information in #{s.inspect}"))
   end
 
-  def self.do_parse(s)
+  def self.determine_type(s)
 
-    parse(s) ||
-    fail(ArgumentError.new("fugit found no time information in #{s}.inspect"))
+    case self.parse(s)
+      when ::Time then 'at'
+      when ::Fugit::Cron then 'cron'
+      when ::Fugit::Duration then 'in'
+      else nil
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -53,11 +53,11 @@ files:
 - README.md
 - fugit.gemspec
 - lib/fugit.rb
-- lib/fugit/core.rb
 - lib/fugit/cron.rb
 - lib/fugit/duration.rb
 - lib/fugit/misc.rb
 - lib/fugit/nat.rb
+- lib/fugit/parse.rb
 homepage: http://github.com/floraison/fugit
 licenses:
 - MIT