fugit 0.9.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a69dbc44f95d36f6c14796afffeacf393a7c4b7
-  data.tar.gz: 5d6c7c0c45791960264ea38ce96344414c669a94
+  metadata.gz: b3e0133c5181167fb43ca7228ce7b76d154f402a
+  data.tar.gz: 3ff631d838f4ea26b0af2c11701356f71e9518f4
 SHA512:
-  metadata.gz: b3f31b0534b395e42d5586e0e69c3caa83d439f4dca53b3757534dd29785a2c465ad2bf870dfb376c334337af37e86557b7ee833f172dbbe5b637a8d830e1f10
-  data.tar.gz: feefa45d7ac203a25e07f0de7ef878a5b20c7bd33602a69709ad2cda19bec02f280af8c25529191f9a3cf5b6cb69d67e19664b971464a7289add6a7ba18baf11
+  metadata.gz: cb8cfb83bb07a6289bc86b24a1c9c26510a807734a1f81b8f132f032c7015081320408515f606696a4fea03fa00bc6c7d2278d0ad6390fc3c8a277034e627683
+  data.tar.gz: b1ec3168fd15980353048e3261e848bf63c7e740f47388e20f0f3c8e3b2bd4a9c1cab324a7663d60b5a71aba7ecc473b9453f0d2ee9eab859a4aa5f017df3d87

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # fugit CHANGELOG.md
 
 
+## fugit 1.0.0  released 2017-06-23
+
+* introduce et-orbi dependency (1.0.5 or better)
+* Wire #deflate into Duration.to_long_s / .to_iso_s / .to_plain_s
+
+
 ## fugit 0.9.6  released 2017-05-24
 
 * Provide Duration.to_long_s / .to_iso_s / .to_plain_s at class level

data/fugit.gemspec

@@ -26,7 +26,8 @@ Time tools for flor and the floraison project. Cron parsing and occurence comput
   ]
 
   #s.add_runtime_dependency 'tzinfo'
-  s.add_runtime_dependency 'raabro', '>= 1.1.3'
+  s.add_runtime_dependency 'raabro', '~> 1.1'
+  s.add_runtime_dependency 'et-orbi', '>= 1.0.5'
 
   s.add_development_dependency 'rspec', '~> 3.4'
 

data/lib/fugit.rb

@@ -1,13 +1,14 @@
 
 module Fugit
 
-  VERSION = '0.9.6'
+  VERSION = '1.0.0'
 end
 
 require 'time'
 require 'stringio'
 
 require 'raabro'
+require 'et-orbi'
 
 require 'fugit/misc'
 require 'fugit/cron'

data/lib/fugit/cron.rb

@@ -58,22 +58,20 @@ module Fugit
       parse(s) || fail(ArgumentError.new("not a cron string #{s.inspect}"))
     end
 
-    class TimeCursor # TODO at some point, use ZoTime
+    class TimeCursor
 
       def initialize(t)
-        @t = t.is_a?(TimeCursor) ? t.time : t
+        @t = t.is_a?(TimeCursor) ? t.time : ::EtOrbi.make_time(t)
       end
 
       def time; @t; end
       def to_i; @t.to_i; end
 
-      %w[ year month day wday hour min sec ]
+      %w[ year month day wday hour min sec wday_in_month ]
         .collect(&:to_sym).each { |k| define_method(k) { @t.send(k) } }
 
       def inc(i)
-        u = @t.utc?
-        @t = ::Time.at(@t.to_i + i)
-        @t = @t.utc if u
+        @t = @t + i
         self
       end
       def dec(i); inc(-i); end
@@ -82,7 +80,7 @@ module Fugit
         y = @t.year
         m = @t.month + 1
         if m == 13; m = 1; y += 1; end
-        @t = Time.send((@t.utc? ? :utc : :local), y, m)
+        @t = ::EtOrbi.make(y, m)
         self
       end
       def inc_day; inc((24 - @t.hour) * 3600 - @t.min * 60 - @t.sec); end
@@ -108,20 +106,6 @@ module Fugit
         target = seconds.reverse.find { |s| s < @t.sec } || seconds.last
         inc(target - @t.sec)
       end
-
-      def count_weeks(inc)
-        c = 0
-        t = @t
-        until t.month != @t.month
-          c += 1
-          t += inc * (7 * 24 * 3600)
-        end
-        c
-      end
-
-      def wday_in_month
-        [ count_weeks(-1), - count_weeks(1) ]
-      end
     end
 
     def month_match?(nt); ( ! @months) || @months.include?(nt.month); end
@@ -172,13 +156,12 @@ module Fugit
     def match?(t)
 
       t = Fugit.do_parse_at(t)
-      t = TimeCursor.new(t)
 
       month_match?(t) && day_match?(t) &&
       hour_match?(t) && min_match?(t) && sec_match?(t)
     end
 
-    def next_time(from=Time.now)
+    def next_time(from=::EtOrbi::EoTime.now)
 
       t = TimeCursor.new(from)
 
@@ -196,7 +179,7 @@ module Fugit
       t.time
     end
 
-    def previous_time(from=Time.now)
+    def previous_time(from=::EtOrbi::EoTime.now)
 
       t = TimeCursor.new(from)
 
@@ -228,7 +211,7 @@ module Fugit
 
           deltas = []
 
-          t = Time.parse("#{year}-01-01") - 1
+          t = EtOrbi.make_time("#{year}-01-01") - 1
           t0 = nil
           t1 = nil
           loop do

data/lib/fugit/duration.rb

@@ -97,9 +97,9 @@ module Fugit
     end
 
     class << self
-      def to_plain_s(o); do_parse(o).to_plain_s; end
-      def to_iso_s(o); do_parse(o).to_iso_s; end
-      def to_long_s(o, opts={}); do_parse(o).to_long_s(opts); end
+      def to_plain_s(o); do_parse(o).deflate.to_plain_s; end
+      def to_iso_s(o); do_parse(o).deflate.to_iso_s; end
+      def to_long_s(o, opts={}); do_parse(o).deflate.to_long_s(opts); end
     end
 
     # Warning: this is an "approximation", months are 30 days and years are
@@ -170,6 +170,8 @@ module Fugit
 
     def add_to_time(t)
 
+      t = ::EtOrbi.make_time(t)
+
       INFLA_KEYS.each do |k, a|
 
         v = @h[k]; next unless v
@@ -192,7 +194,7 @@ module Fugit
           at[0], at[1] = at[0] - n, m
         end
 
-        t = Time.send(t.utc? ? :utc : :local, *at)
+        t = ::EtOrbi.make_time(at, t.zone)
       end
 
       t
@@ -201,12 +203,12 @@ module Fugit
     def add(a)
 
       case a
-        when Numeric then add_numeric(a)
-        when Fugit::Duration then add_duration(a)
-        when String then add_duration(self.class.parse(a))
-        when Time then add_to_time(a)
-        else fail ArgumentError.new(
-          "cannot add #{a.class} instance to a Fugit::Duration")
+      when Numeric then add_numeric(a)
+      when Fugit::Duration then add_duration(a)
+      when String then add_duration(self.class.parse(a))
+      when ::Time, EtOrbi::EoTime then add_to_time(a)
+      else fail ArgumentError.new(
+        "cannot add #{a.class} instance to a Fugit::Duration")
       end
     end
     alias + add
@@ -214,12 +216,12 @@ module Fugit
     def substract(a)
 
       case a
-        when Numeric then add_numeric(-a)
-        when Fugit::Duration then add_duration(-a)
-        when String then add_duration(-self.class.parse(a))
-        when Time then opposite.add_to_time(a)
-        else fail ArgumentError.new(
-          "cannot substract #{a.class} instance to a Fugit::Duration")
+      when Numeric then add_numeric(-a)
+      when Fugit::Duration then add_duration(-a)
+      when String then add_duration(-self.class.parse(a))
+      when ::Time, ::EtOrbi::EoTime then add_to_time(a)
+      else fail ArgumentError.new(
+        "cannot substract #{a.class} instance to a Fugit::Duration")
       end
     end
     alias - substract
@@ -235,7 +237,7 @@ module Fugit
       @h.hash
     end
 
-    def next_time(from=Time.now)
+    def next_time(from=::EtOrbi::EoTime.now)
 
       add(from)
     end

data/lib/fugit/misc.rb

@@ -19,9 +19,9 @@ module Fugit
     isostamp(true, true, false, t)
   end
 
-  def self.time_to_plain_s(t=Time.now)
+  def self.time_to_plain_s(t=Time.now, z=true)
 
-    t.strftime('%Y-%m-%d %H:%M:%S') + (t.utc? ? ' Z' : '')
+    t.strftime('%Y-%m-%d %H:%M:%S') + (z && t.utc? ? ' Z' : '')
   end
 
   def self.time_to_zone_s(t=Time.now)

data/lib/fugit/nat.rb

@@ -116,19 +116,19 @@ module Fugit
             v = tt.string.downcase
 
             case k
-              when :numeral_hour
-                [ k, NUMS.index(v) ]
-              when :simple_hour
-                [ k, v.to_i ]
-              when :digital_hour
-                v = v.gsub(/:/, '')
-                [ k, [ v[0, 2], v[2, 2] ] ]
-              when :name_hour
-                [ :digital_hour, NHOURS[v] ]
-              when :name_day
-                [ k, WEEKDAYS.index(v[0, 3]) ]
-              else
-                [ k, v ]
+            when :numeral_hour
+              [ k, NUMS.index(v) ]
+            when :simple_hour
+              [ k, v.to_i ]
+            when :digital_hour
+              v = v.gsub(/:/, '')
+              [ k, [ v[0, 2], v[2, 2] ] ]
+            when :name_hour
+              [ :digital_hour, NHOURS[v] ]
+            when :name_day
+              [ k, WEEKDAYS.index(v[0, 3]) ]
+            else
+              [ k, v ]
             end
           }
       end

data/lib/fugit/parse.rb

@@ -3,13 +3,12 @@ module Fugit
 
   def self.parse_at(s)
 
-    Time.parse(s) rescue nil
+    ::EtOrbi.make_time(s) rescue nil
   end
 
   def self.do_parse_at(s)
 
-    return s if s.is_a?(Time)
-    Time.parse(s)
+    ::EtOrbi.make_time(s)
   end
 
   def self.parse_cron(s); ::Fugit::Cron.parse(s); end
@@ -42,10 +41,10 @@ module Fugit
   def self.determine_type(s)
 
     case self.parse(s)
-      when ::Time then 'at'
-      when ::Fugit::Cron then 'cron'
-      when ::Fugit::Duration then 'in'
-      else nil
+    when ::Fugit::Cron then 'cron'
+    when ::Fugit::Duration then 'in'
+    when ::Time, ::EtOrbi::EoTime then 'at'
+    else nil
     end
   end
 end

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 1.0.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: et-orbi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 description: Time tools for flor and the floraison project. Cron parsing and occurence
@@ -46,18 +60,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- CREDITS.md
+- LICENSE.txt
 - Makefile
+- README.md
+- fugit.gemspec
+- lib/fugit.rb
 - lib/fugit/cron.rb
 - lib/fugit/duration.rb
 - lib/fugit/misc.rb
 - lib/fugit/nat.rb
 - lib/fugit/parse.rb
-- lib/fugit.rb
-- fugit.gemspec
-- LICENSE.txt
-- CHANGELOG.md
-- CREDITS.md
-- README.md
 homepage: http://github.com/floraison/fugit
 licenses:
 - MIT
@@ -68,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: time tools for flor