dynport_tools 0.2.13 → 0.2.14

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

data/dynport_tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynport_tools}
-  s.version = "0.2.13"
+  s.version = "0.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-08-25}
+  s.date = %q{2011-09-02}
   s.description = %q{Collection of various tools}
   s.email = %q{tobias.schwab@dynport.de}
   s.executables = ["xmldiff", "redis_dumper"]

data/lib/dynport_tools/differ.rb

@@ -85,15 +85,21 @@ module DynportTools
     def all_array_indexes(a, b)
       0.upto([a.length, b.length].max - 1).to_a
     end
+    
+    def hash_value_from_key(hash, key, symbolize = false)
+      if !symbolize || hash.has_key?(key)
+        hash[key]
+      elsif key.is_a?(Symbol)
+        hash[key.to_s]
+      else
+        hash[key.to_sym]
+      end
+    end
   
     def diff_hash_values(a, b, keys)
       ret = keys.uniq.inject({}) do |hash, key|
-        value_a = a[key]
-        value_b = b[key]
-        if symbolize_keys
-          value_a ||= a[key.is_a?(Symbol) ? key.to_s : key.to_sym]
-          value_b ||= b[key.is_a?(Symbol) ? key.to_s : key.to_sym]
-        end
+        value_a = hash_value_from_key(a, key, symbolize_keys)
+        value_b = hash_value_from_key(b, key, symbolize_keys)
         if diff = diff(value_a, value_b)
           hash[key] = diff
         end

data/lib/dynport_tools/eta.rb

@@ -37,6 +37,13 @@ class DynportTools::ETA
     current / running_for
   end
   
+  def seconds_to_time(time)
+    hours = time / 3600.0
+    minutes = time / 60.0
+    seconds = time
+    "%02d:%02d:%02d" % [hours.floor, (minutes.floor % 3600) % 60, seconds.floor % 60]
+  end
+  
   def to_s
     "%.2f%%, %.2f/second, ETA: %s" % [percs * 100, per_second, eta.iso8601]
   end

data/spec/dynport_tools/differ_spec.rb

@@ -35,6 +35,12 @@ describe DynportTools::Differ do
       b = %(-e production 'something)
       uncolor(differ.diff_strings(a, b)).should == %(-e production<_slave|> <"|'>something)
     end
+    
+    it "diffs an edge case correctly" do
+      a = "#!/bin/sh\nssh s7 \"cd /opt/simfy/app/simfy_production/current && ./script/runner -e production \\\"Importer.import_catalog('kontor')\\\"\""
+      b = "cd /opt/simfy/app/simfy_production/current && ./script/runner -e production \"Importer.import_catalog('kontor')\""
+      pending "fix me"
+    end
   end
   
   describe "diffing two hashes" do
@@ -43,6 +49,11 @@ describe DynportTools::Differ do
       differ.diff(hash, hash).should be_nil
     end
     
+    it "works with nil and false values when using symbolize_keys" do
+      differ.symbolize_keys = true
+      differ.diff({"test" => false}, { :test => false}).should be_nil
+    end
+    
     it "returns true when symbolize_keys is set to true and comparing hashes with symbols and strings" do
       differ.symbolize_keys = true
       differ.diff({ :a => 1 }, { "a" => 1 }).should be_nil

data/spec/dynport_tools/eta_spec.rb

@@ -37,6 +37,8 @@ describe "DynportTools::ETA" do
       "00:15:26" => 926,
       "00:00:26" => 26,
       "1:00:26" => 3626,
+      "10.0" => 10,
+      "9000.0" => 9000
     }.each do |from, to|
       it "returns #{to} for #{from}" do
         DynportTools::ETA.parse_time_string(from).should == to
@@ -103,6 +105,14 @@ describe "DynportTools::ETA" do
     DynportTools::ETA.new(:current => 10, :total => 100, :started => time - 1).to_s.should == "10.00%, 10.00/second, ETA: 2011-02-03T04:50:09+01:00"
   end
   
+  describe "#seconds_to_human" do
+    { 1 => "00:00:01", 61 => "00:01:01", 3661 => "01:01:01" }.each do |from, to|
+      it "retrurns #{to} for #{from}" do
+        DynportTools::ETA.new.seconds_to_time(from).should == to
+      end
+    end
+  end
+  
   describe "#from_time_string" do
     it "sets the correct values" do
       eta = DynportTools::ETA.from_time_string("00:01:10", :total => 100)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 2
-  - 13
-  version: 0.2.13
+  - 14
+  version: 0.2.14
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 +02:00
+date: 2011-09-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency