tepoch 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0fd0497d83adc7ee28992537b7fc897f1aff495
-  data.tar.gz: 4f211fd3ec23fd5539d12df804e363ff6e0f247e
+  metadata.gz: e0f14e563cc475a7aaa54329b7828626d34cd86b
+  data.tar.gz: 13316e185d45ec84ed9a9be5e1c3010c010b6c0e
 SHA512:
-  metadata.gz: 1f34907b3f5289cbc5dee20d58bd58ce9795c5c1dff14022461303c7125e9fa45da30f10108f7e261181377a608f1e3b51742d59703200b891fa5cd75cb9cd09
-  data.tar.gz: 78d6333a185f8062e562919a6f957ae42aa7e89b4e7caec8df35cbca27a9eef582423fbbb59cd4090142a7849c0deeba0dfac3b9d63b487bd5120f6fc0694ad3
+  metadata.gz: ea1d2297366ea4837c9465889aef16ac3fd93686b78544e4ca20193698c7fafd567e5c41604c22118c1cac8367c4a3d713833041668853d85c7847b941cc4a8c
+  data.tar.gz: b81d7eee040dd2bb8889de9ef1594436f7bfcb8a4584c9f26ab308f715d510e5ba6c32b8c7fc3cb3a45a01b9f1e3dec9b6eb3aecc29f0ef811c3ccbda8f6087a

data/bin/tepoch

@@ -3,13 +3,36 @@
 require 'tepoch'
 require 'optparse'
 
-options = { :utc => true }
+options = { :utc => true, :keep_as_timestamp => false }
 OptionParser.new do |opts|
   opts.banner = "Usage: tepoch [options"
   
-  opts.on("-local", "Convert to local time") do |v|
+  opts.on("--local", "Convert to local time") do |v|
     options[:utc] = false
   end
+
+  opts.on("--timestamp", "Keep as timestamp") do |v|
+    options[:keep_as_timestamp] = true
+  end
 end.parse!
 
-puts ARGV.map { |timestamp| Tepoch::Tepoch.to_time(timestamp.to_i, options[:utc]) }
+arithmetic_symbols = %w(- +)
+if ARGV[1] && arithmetic_symbols.include?(ARGV[1])
+  t1 = ARGV[0].to_i
+  t2 = ARGV[2].to_i
+  
+  diff = t1.send(ARGV[1], t2)
+
+  if ARGV[1] == "-"
+    puts Tepoch::Tepoch.seconds_to_string(diff)
+  else
+    puts options[:keep_as_timestamp] ? diff.to_i : Tepoch::Tepoch.to_time(diff, options[:utc])
+  end
+
+else
+  if options[:keep_as_timestamp]
+    puts ARGV
+  else
+    puts ARGV.map { |timestamp| Tepoch::Tepoch.to_time(timestamp.to_i, options[:utc]) }
+  end
+end

data/lib/tepoch/version.rb

@@ -1,7 +1,7 @@
 module Tepoch
   class Version
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     def self.to_s

data/lib/tepoch.rb

@@ -6,6 +6,29 @@ module Tepoch
       to_utc ? new_time.utc : new_time
     end
 
+    def self.seconds_to_string(s)
+
+      # d = days, h = hours, m = minutes, s = seconds
+      m = (s / 60).floor
+      s = s % 60
+      h = (m / 60).floor
+      m = m % 60
+      d = (h / 24).floor
+      h = h % 24
+
+      output = "#{s} second#{Tepoch.pluralize(s)}" if (s > 0)
+      output = "#{m} minute#{Tepoch.pluralize(m)}, #{s} second#{Tepoch.pluralize(s)}" if (m > 0)
+      output = "#{h} hour#{Tepoch.pluralize(h)}, #{m} minute#{Tepoch.pluralize(m)}, #{s} second#{Tepoch.pluralize(s)}" if (h > 0)
+      output = "#{d} day#{Tepoch.pluralize(d)}, #{h} hour#{Tepoch.pluralize(h)}, #{m} minute#{Tepoch.pluralize(m)}, #{s} second#{Tepoch.pluralize(s)}" if (d > 0)
+
+      return output
+    end
+
+    def self.pluralize number
+      return "s" unless number == 1
+      return ""
+    end
+
     private
 
     def self.milliseconds?(timestamp)

data/spec/tepoch/formatter_spec.rb

@@ -13,4 +13,5 @@ describe Tepoch::Tepoch do
   it 'convert can convert to utc' do
     Tepoch::Tepoch.to_time(timestamp, true).should be_utc
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tepoch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Jorgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,7 +38,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Easy way to convert and interactive with epoch timestamps in the terminal
+description: Easy way to convert and interact with epoch timestamps in the terminal
 email: andrew@andrewjorgensen.com
 executables:
 - tepoch
@@ -51,7 +51,7 @@ files:
 - ./spec/tepoch/formatter_spec.rb
 - ./spec/tepoch_spec.rb
 - bin/tepoch
-homepage: http://rubygems.org/gems/hola
+homepage: https://github.com/ajorgensen/tepoch
 licenses:
 - MIT
 metadata: {}