vault-tools 0.4.3 → 0.4.4

data/lib/vault-tools.rb

@@ -65,3 +65,4 @@ require 'vault-tools/user'
 require 'vault-tools/web'
 require 'vault-tools/pipeline'
 require 'vault-tools/text_processor'
+require 'vault-tools/time'

data/lib/vault-tools/config.rb

@@ -133,7 +133,7 @@ module Vault
     # @return [Fixnum] The number or nil if the value couldn't be coerced to a
     #   Fixnum.
     def self.int(name)
-      self[name] ? self[name].to_i : nil
+      self[name] && self[name].to_i
     end
 
     # Comma-separated words converted to an array.
@@ -155,8 +155,19 @@ module Vault
       self[name] == 'true'
     end
 
+    # An environment variable converted to a time.
+    #
+    # @param name [String|Symbol] The name of the environment variable to fetch a
+    #   boolean for.
+    # @return [Time] Time if the value is parseable, otherwise false.
     def self.time(name)
-      Time.parse(self[name])
+      if self[name]
+        Time.parse(self[name]) rescue Time.utc(*self[name].split('-'))
+      end
+    end
+
+    def self.uri(name)
+      self[name] && URI.parse(self[name])
     end
 
     # The number of threads to use in Sidekiq workers.

data/lib/vault-tools/time.rb

@@ -0,0 +1,30 @@
+class Time
+  def last_month
+    (self.to_datetime << 1).to_time
+  end
+
+  def next_month
+    (self.to_datetime >> 1).to_time
+  end
+
+  def tomorrow
+    (self.to_datetime + 1).to_time
+  end
+
+  def yesterday
+    (self.to_datetime - 1).to_time
+  end
+end
+
+class Fixnum
+  def weeks
+    self.days * 7
+  end
+  alias :week :weeks
+
+  def days
+    self * 24 * 60 * 60
+  end
+  alias :day :days
+end
+

data/lib/vault-tools/version.rb

@@ -1,5 +1,5 @@
 module Vault
   module Tools
-    VERSION = '0.4.3'
+    VERSION = '0.4.4'
   end
 end

data/test/config_test.rb

@@ -133,6 +133,33 @@ class ConfigTest < Vault::TestCase
     assert_equal(3000, Config.int('FOO'))
   end
 
+  # Config.time returns nil or VAR as time
+  def test_time
+    assert_equal(nil, Config.time('T'))
+    set_env 'T', '2000'
+    assert_equal(Time.utc(2000), Config.time(:t))
+    set_env 'T', '2000-2'
+    assert_equal(Time.utc(2000,2), Config.time(:t))
+    set_env 'T', '2000-2-2'
+    assert_equal(Time.utc(2000,2,2), Config.time(:t))
+    set_env 'T', '2000-2-2T11:11'
+    assert_equal(Time.utc(2000,2,2,11,11), Config.time(:t))
+  end
+
+  # Config.time returns nil or VAR as URI
+  def test_uri
+    assert_equal(nil, Config.uri('URL'))
+    set_env 'URL', 'http://user:password@the-web.com/path/to/greatness?foo=bar'
+    uri = Config.uri('URL')
+    assert_equal('http', uri.scheme)
+    assert_equal('the-web.com', uri.host)
+    assert_equal('/path/to/greatness', uri.path)
+    assert_equal('foo=bar', uri.query)
+    assert_equal(80, uri.port)
+    assert_equal('user', uri.user)
+    assert_equal('password', uri.password)
+  end
+
   # Config.array loads a comma-separated list of words into an array of
   # strings.
   def test_array

data/test/time_test.rb

@@ -1,17 +1,95 @@
 require 'helper'
 
+# TODO: Move this an the implementation to Vault::Tools
 class TimeTest < Vault::TestCase
+  def test_next_month
+    # works on simple case
+    assert_equal(Time.utc(2000,2),
+                 Time.utc(2000,1).next_month)
+    # preserves day
+    assert_equal(Time.utc(2000,2,5),
+                 Time.utc(2000,1,5).next_month)
+    # year boundary
+    assert_equal(Time.utc(2011,1),
+                 Time.utc(2010,12).next_month)
+  end
+
+  def test_last_month
+    # works on simple case
+    assert_equal(Time.utc(2000,1),
+                 Time.utc(2000,2).last_month)
+    # preserves day
+    assert_equal(Time.utc(2000,1,5),
+                 Time.utc(2000,2,5).last_month)
+    # year boundary
+    assert_equal(Time.utc(2010,12),
+                 Time.utc(2011,1).last_month)
+  end
+
+  def test_month_chaining
+    start = Time.utc(2000)
+    assert_equal(start, start.next_month.last_month)
+    assert_equal(start, start.last_month.next_month)
+    assert_equal(start,
+                 Time.utc(2000,3).last_month.last_month)
+    assert_equal(start,
+                 Time.utc(1999,11).next_month.next_month)
+
+  end
+
+  def test_tomorrow
+    # works on simple case
+    assert_equal(Time.utc(2000,1,2),
+                 Time.utc(2000,1,1).tomorrow)
+    # preserves hour
+    assert_equal(Time.utc(2000,1,6,11),
+                 Time.utc(2000,1,5,11).tomorrow)
+    # month/year boundary
+    assert_equal(Time.utc(2011,1),
+                 Time.utc(2010,12,31).tomorrow)
+  end
 
-  # We're always using UTC time
-  def test_now_is_utc
-    local = Time.local(2012,1,1)
-    utc   = Time.utc(2012,1,1)
-    assert_equal(utc, local)
+  def test_yesterday
+    # works on simple case
+    assert_equal(Time.utc(2000,1,2),
+                 Time.utc(2000,1,1).tomorrow)
+    # preserves hour
+    assert_equal(Time.utc(2000,1,6,11),
+                 Time.utc(2000,1,5,11).tomorrow)
+    # month boundary
+    assert_equal(Time.utc(2011,1),
+                 Time.utc(2010,12,31).tomorrow)
   end
 
-  # Default time format is iso8601
-  def test_to_s_is_iso8601
-    t = Time.utc(2012,1,1)
-    assert_equal(t.to_s, t.iso8601)
+  def test_yesterday_tomorrow_chaining
+    start = Time.utc(2000)
+    assert_equal(start, start.tomorrow.yesterday)
+    assert_equal(start, start.yesterday.tomorrow)
+    assert_equal(start, Time.utc(1999,12,30).tomorrow.tomorrow)
+    assert_equal(start, Time.utc(2000,1,3).yesterday.yesterday)
   end
+
+  def test_macbeth
+    assert_equal(Time.utc(2000,1,4),
+                 Time.utc(2000,1,1).tomorrow.tomorrow.tomorrow)
+  end
+
+  def test_days
+    assert_equal(24*60*60,1.days)
+    assert_equal(24*60*60,1.day)
+    assert_equal(Time.utc(2000,1,1) + 1.days,
+                 Time.utc(2000,1,1).tomorrow)
+    assert_equal(Time.utc(2000,1,1) + 1.day,
+                 Time.utc(2000,1,1).tomorrow)
+  end
+
+  def test_weeks
+    assert_equal(7*24*60*60*2,2.weeks)
+    assert_equal(7*24*60*60,1.week)
+    assert_equal(Time.utc(2000,1,8),
+                 Time.utc(2000,1,1) + 1.week)
+    assert_equal(Time.utc(2000,1,15),
+                 Time.utc(2000,1,1) + 2.weeks)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrolls
@@ -152,6 +152,7 @@ files:
 - lib/vault-tools/product.rb
 - lib/vault-tools/sinatra_helpers/html_serializer.rb
 - lib/vault-tools/text_processor.rb
+- lib/vault-tools/time.rb
 - lib/vault-tools/user.rb
 - lib/vault-tools/version.rb
 - lib/vault-tools/web.rb