checksummer 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/checksummer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{checksummer}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-04-04}
+  s.date = %q{2011-04-06}
   s.default_executable = %q{checksummer}
   s.description = %q{Replace files with links to md5 files}
   s.email = %q{tobias.schwab@dynport.de}

data/features/checksum.feature

@@ -92,4 +92,12 @@ Feature: Checksum
     Then I should see 1 files in "tmp/dst"
     Then I should see the following files
       | symlink        | path                                         | content |
-      | src/file11.txt | dst/7/1/5/0/715081268e5e053a7e89daf6c155244a | file 11 |
+      | src/file11.txt | dst/7/1/5/0/715081268e5e053a7e89daf6c155244a | file 11 |
+  
+  Scenario: Checksum not existing file
+    Given I clear tmp
+    And the directory "dst" exists
+    When I call "checksummer tmp/src/file11.txt tmp/dst"
+    Then I should get the following response
+      | status        | not_found          |
+      | original_line | tmp/src/file11.txt |

data/features/step_definitions/checksum_steps.rb

@@ -67,4 +67,13 @@ end
 
 Given /^I freeze time to "([^"]*)"$/ do |time|
   Timecop.freeze(Time.parse(time))
+end
+
+Then /^I should get the following response$/ do |table|
+  json = JSON.parse(@out.to_s)
+  headers = ([table.headers] + table.rows).map(&:first)
+  result = headers.map do |header|
+    [header, json[header]]
+  end
+  table.diff!(result)
 end

data/lib/checksummer.rb

@@ -3,6 +3,8 @@ $:<< File.expand_path(File.dirname(__FILE__))
 require "checksummer_file"
 require "json"
 class Checksummer
+  DEFAULT_SLEEP = 0.1
+  
   def self.find(directory, options = nil)
     Kernel.send(:`, %(find #{directory} #{options ? "#{options} " : ""}-type f -printf "%p\t%T+\t%s\t%Y\t%l\n")).split("\n")
   end
@@ -12,31 +14,42 @@ class Checksummer
       puts File.read(File.expand_path("../VERSION", File.dirname(__FILE__)))
       return
     end
-    directory, checksum_to = args[0,2]
-    sleep = 0.1
-    if idx = args.index("--sleep")
-      args.delete_at(idx)
-      sleep = args.delete_at(idx).to_i / 1000.0
-    end
-    if directory && checksum_to && File.directory?(checksum_to)
-      if File.file?(directory)
-        puts ChecksummerFile.from_line(directory).checksum_to!(checksum_to).to_json
+    directory_or_file, checksum_to = args[0,2]
+    sleep = sleep_from_args(args)
+    if directory_or_file && checksum_to && File.directory?(checksum_to)
+      lines = if directory_or_file == "--stdin"
+        $stdin.readlines
+      elsif File.directory?(directory_or_file)
+        find(directory_or_file, args[2..-1].join(" "))
       else
-        started_at = Time.now
-        lines = directory == "--stdin" ? $stdin.readlines : find(directory, args[2..-1].join(" "))
-        total = lines.count
-        lines.each_with_index do |line, index|
-          extra = { :index => index + 1, :total => lines.count, :started_at => started_at.iso8601 }
-          puts ChecksummerFile.from_line(line).checksum_to!(checksum_to).merge(extra).to_json
-          $stdout.flush
-          sleep sleep if !Range.new(0,7).include?(Time.now.hour)
-        end
+        [directory_or_file]
       end
+      checksum_many(lines, checksum_to, sleep)
       return true
     end
     puts usage
   end
   
+  def self.sleep_from_args(args)
+    if idx = args.index("--sleep")
+      args.delete_at(idx)
+      args.delete_at(idx).to_i / 1000.0
+    else
+      DEFAULT_SLEEP
+    end
+  end
+  
+  def self.checksum_many(lines, checksum_to, sleep = DEFAULT_SLEEP)
+    started_at = Time.now
+    total = lines.count
+    lines.each_with_index do |line, index|
+      extra = { :index => index + 1, :total => lines.count, :started_at => started_at.iso8601 }
+      puts ChecksummerFile.from_line(line).checksum_to!(checksum_to).merge(extra).to_json
+      $stdout.flush
+      sleep sleep if !Range.new(0,7).include?(Time.now.hour)
+    end
+  end
+  
   def self.usage
     out = ["checksummer <directory_to_checksum> <directory_to_store_checksummed_files> [options]"]
     out << ["OPTIONS", "--sleep <sleep in ms>", "<any find option>"]

data/spec/checksummer_spec.rb

@@ -140,18 +140,13 @@ describe "Checksummer" do
     end
     
     describe "with a direct file given" do
-      let(:checksum_file) { double("checksummer_file", :checksum_to! => true)}
+      let(:checksum_file) { double("checksummer_file", :checksum_to! => {})}
       
       before(:each) do
         File.stub!(:file?).and_return true
         ChecksummerFile.stub!(:from_line).and_return(checksum_file)
       end
       
-      it "calls File.file? on src" do
-        File.should_receive(:file?).with("/some/path").and_return true
-        Checksummer.run_for_args(["/some/path", "/tmp"])
-      end
-      
       it "calls ChecksummerFile.from_line with file" do
         ChecksummerFile.should_receive(:from_line).with("/some/path").and_return(checksum_file)
         Checksummer.run_for_args(["/some/path", "/tmp"])
@@ -163,8 +158,11 @@ describe "Checksummer" do
       end
       
       it "puts result of checksum_to!" do
+        Time.stub(:now).and_return Time.local(2011, 2, 3, 4, 5, 6)
         checksum_file.stub!(:checksum_to!).and_return(:some => "result")
-        Checksummer.should_receive(:puts).with("{\"some\":\"result\"}")
+        Checksummer.should_receive(:puts).with(
+          "{\"some\":\"result\",\"index\":1,\"total\":1,\"started_at\":\"2011-02-03T04:05:06+01:00\"}"
+        )
         Checksummer.run_for_args(["/some/path", "/tmp"])
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +02:00
+date: 2011-04-06 00:00:00 +02:00
 default_executable: checksummer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1489982257138281223
+      hash: -691865504154105386
       segments: 
       - 0
       version: "0"