checksummer 0.1.8 → 0.2.0

data/Gemfile

@@ -9,8 +9,10 @@ group :development do
   gem 'autotest'
   gem 'autotest-growl'
   gem 'ruby-debug19'
+  gem "cucumber", ">= 0"
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
+  gem "timecop"
 end

data/Gemfile.lock

@@ -6,13 +6,23 @@ GEM
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-growl (0.2.9)
+    builder (3.0.0)
     columnize (0.3.2)
+    cucumber (0.10.2)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
+    gherkin (2.3.5)
+      json (>= 1.4.6)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    json (1.5.1)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
     rake (0.8.7)
@@ -35,6 +45,8 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.4)
       archive-tar-minitar (>= 0.5.2)
+    term-ansicolor (1.0.5)
+    timecop (0.3.5)
 
 PLATFORMS
   ruby
@@ -43,7 +55,9 @@ DEPENDENCIES
   autotest
   autotest-growl
   bundler (~> 1.0.0)
+  cucumber
   jeweler (~> 1.5.2)
   rcov
   rspec (~> 2.3.0)
   ruby-debug19
+  timecop

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.2.0

data/bin/checksummer

@@ -1,4 +1,5 @@
-#!/usr/bin/env
+#!/usr/bin/env ruby
+$:<<File.expand_path("../lib", File.dirname(__FILE__))
 require "checksummer"
 
 Checksummer.run_for_args(ARGV)

data/checksummer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{checksummer}
-  s.version = "0.1.8"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-03-18}
+  s.date = %q{2011-03-21}
   s.default_executable = %q{checksummer}
   s.description = %q{Replace files with links to md5 files}
   s.email = %q{tobias.schwab@dynport.de}
@@ -31,6 +31,9 @@ Gem::Specification.new do |s|
     "autotest/discover.rb",
     "bin/checksummer",
     "checksummer.gemspec",
+    "features/checksum.feature",
+    "features/step_definitions/checksum_steps.rb",
+    "features/support/env.rb",
     "lib/checksummer.rb",
     "lib/checksummer_file.rb",
     "spec/checksummer_file_spec.rb",
@@ -56,27 +59,33 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<autotest-growl>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<timecop>, [">= 0"])
     else
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<autotest-growl>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<timecop>, [">= 0"])
     end
   else
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<autotest-growl>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<timecop>, [">= 0"])
   end
 end
 

data/features/checksum.feature

@@ -0,0 +1,80 @@
+Feature: Checksum
+  Scenario: Checksum classic
+    Given I clear tmp
+    And the following files exists:
+      | path                                         | content     |
+      | src/file1.txt                                | file 1      |
+      | src/file2.txt                                | file 2      |
+      | src/file3.txt                                | file 3      |
+      | src/file4.txt                                | file 4      |
+      | dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e | old content |
+    And the directory "dst" exists
+    When I call "checksummer tmp/src tmp/dst"
+    Then I should see 4 files in "tmp/dst"
+    Then I should see the following files
+      | symlink       | path                                         | content     |
+      | src/file1.txt | dst/e/2/4/3/e243bb39c844b3543a7726576c869caf | file 1      |
+      | src/file2.txt | dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e | old content |
+      | src/file3.txt | dst/9/c/3/8/9c38e8324dbf031557c89d53a39f0b26 | file 3      |
+      | src/file4.txt | dst/f/b/8/b/fb8b37442ead70d36d54d241a0c7e069 | file 4      |
+  
+  Scenario: Checksum classic with find options
+    Given I clear tmp
+    And the following files exists:
+      | path           | content |
+      | src/file10.txt | file 10 |
+      | src/file11.txt | file 11 |
+      | src/file20.txt | file 20 |
+      | src/file21.txt | file 21 |
+    And the directory "dst" exists
+    When I call "checksummer tmp/src tmp/dst -name 'file1*'"
+    Then I should see 2 files in "tmp/dst"
+    Then I should see the following files
+      | symlink        | path                                         | content |
+      | src/file10.txt | dst/a/9/e/3/a9e3737bb4cf960ff521c4ad4c8275e7 | file 10 |
+      | src/file11.txt | dst/7/1/5/0/715081268e5e053a7e89daf6c155244a | file 11 |
+    And the output should look like this
+      | index | total | checksummed_path                                 |
+      | 1     | 2     | tmp/dst/a/9/e/3/a9e3737bb4cf960ff521c4ad4c8275e7 |
+      | 2     | 2     | tmp/dst/7/1/5/0/715081268e5e053a7e89daf6c155244a |
+  
+  Scenario: Checksum from stdin
+    Given I clear tmp
+    And the following files exists:
+      | path           | content |
+      | src/file10.txt | file 10 |
+      | src/file11.txt | file 11 |
+      | src/file20.txt | file 20 |
+      | src/file21.txt | file 21 |
+    And the directory "dst" exists
+    When I call "checksummer --stdin tmp/dst" piped through "find tmp/src -name 'file1*.txt' -printf '%p\t%s\n'"
+    Then I should see 2 files in "tmp/dst"
+    Then I should see the following files
+      | symlink        | path                                         | content |
+      | src/file10.txt | dst/a/9/e/3/a9e3737bb4cf960ff521c4ad4c8275e7 | file 10 |
+      | src/file11.txt | dst/7/1/5/0/715081268e5e053a7e89daf6c155244a | file 11 |
+    And the output should look like this
+      | index | total | checksummed_path                                 |
+      | 1     | 2     | tmp/dst/a/9/e/3/a9e3737bb4cf960ff521c4ad4c8275e7 |
+      | 2     | 2     | tmp/dst/7/1/5/0/715081268e5e053a7e89daf6c155244a |
+  
+  Scenario: Checksum from plain text
+    Given I clear tmp
+    And the following files exists:
+      | path           | content |
+      | src/file10.txt | file 10 |
+      | src/file11.txt | file 11 |
+      | src/file20.txt | file 20 |
+      | src/file21.txt | file 21 |
+    And the following file list exists in "src/files.txt"
+      | path           |
+      | src/file10.txt |
+      | src/file20.txt |
+      | src/file30.txt |
+    And the directory "dst" exists
+    When I call "checksummer --stdin tmp/dst" piped through "cat tmp/src/files.txt"
+    Then I should see 2 files in "tmp/dst"
+    Then I should see the following files
+      | symlink        | path                                         | content |
+      | src/file10.txt | dst/a/9/e/3/a9e3737bb4cf960ff521c4ad4c8275e7 | file 10 |
+      | src/file20.txt | dst/0/6/7/f/067f81212cf0fb2e982bd628a8606f97 | file 20 |

data/features/step_definitions/checksum_steps.rb

@@ -0,0 +1,70 @@
+require "pathname"
+require "timecop"
+require "time"
+
+def root
+  Pathname.new(File.expand_path("../../", File.dirname(__FILE__)))
+end
+
+Given /^cucumber working$/ do
+end
+
+Given /^the following files exists:$/ do |table|
+  table.hashes.each do |hash|
+    full_path = root.join("tmp/#{hash["path"]}")
+    FileUtils.mkdir_p(File.dirname(full_path))
+    File.open(full_path, "w") do |f|
+      f.puts(hash["content"])
+    end
+  end
+end
+
+Given /^the directory "([^"]*)" exists$/ do |path|
+  FileUtils.mkdir_p(root.join("tmp/#{path}"))
+end
+
+When /^I call "([^"]*)"$/ do |cmd|
+  @out = `ruby #{root}/bin/#{cmd}`
+end
+
+When /^I call "([^"]*)" piped through "([^"]*)"$/ do |cmd, pipe|
+  @out = `#{pipe} | ruby #{root}/bin/#{cmd}`
+end
+
+Given /^I clear tmp$/ do
+  FileUtils.rm_rf(root.join("tmp"))
+end
+
+Then /^I should see the following files$/ do |table|
+  table.hashes.each do |hash|
+    path = root.join("tmp/#{hash["path"]}").to_s
+    Pathname.new(root.join("tmp/#{hash["symlink"]}")).realpath.to_s.should == path
+    File.should be_exists(path)
+    File.read(path).strip.should == hash["content"]
+  end
+end
+
+Then /^I should see (\d+) files in "([^"]*)"$/ do |count, path|
+  Dir.glob("#{root.join("#{path}/**/*")}").select { |file_path| File.file?(file_path) }.count.should == count.to_i
+end
+
+
+Given /^the following file list exists in "([^"]*)"$/ do |path, table|
+  File.open(root.join("tmp/#{path}"), "w") do |f|
+    table.hashes.each do |hash|
+      f.puts root.join("tmp/#{hash["path"]}")
+    end
+  end
+end
+
+Then /^the output should look like this$/ do |table|
+  results = [%w(index total checksummed_path)] + @out.split("\n").map do |line|
+    hash = JSON.parse(line)
+    [hash["index"], hash["total"], hash["checksummed_path"].gsub("#{root}/", "")].map(&:to_s)
+  end
+  table.diff!(results)
+end
+
+Given /^I freeze time to "([^"]*)"$/ do |time|
+  Timecop.freeze(Time.parse(time))
+end

data/features/support/env.rb

@@ -0,0 +1,3 @@
+After do
+  Timecop.return
+end

data/lib/checksummer.rb

@@ -1,26 +1,10 @@
 $:<< File.expand_path(File.dirname(__FILE__))
 
 require "checksummer_file"
+require "json"
 class Checksummer
-  attr_accessor :checksum_to, :paths
-  
-  def initialize(checksum_to)
-    self.checksum_to = File.expand_path(checksum_to)
-  end
-  
-  def checksum_directory(directory, find_options = nil)
-    files = find(directory, find_options)
-    total = files.length
-    files.each_with_index do |file, i|
-      status = file.checksum_to!(checksum_to)
-      yield(status, file, i, total) if block_given?
-    end
-  end
-  
-  def find(directory, options = nil)
-    Kernel.send(:`, %(find #{directory} #{options ? "#{options} " : ""}-type f -printf "%T+\t%s\t%Y\t%p\t%l\n")).split("\n").map do |line|
-      ChecksummerFile.from_line(line)
-    end
+  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
   
   def self.run_for_args(args)
@@ -30,15 +14,19 @@ class Checksummer
       args.delete_at(idx)
       sleep = args.delete_at(idx).to_i / 1000.0
     end
-    if !directory || !File.directory?(directory) || !checksum_to || !File.directory?(checksum_to)
-      puts usage
-    else
-      self.new(checksum_to).checksum_directory(directory, args[2..-1].join(" ")) do |status, file, index, total|
-        puts "%s\t%0#{total.to_s.length}d/%d\t%s\t%s" % [Time.now.strftime("%Y-%m-%d %H:%M:%S"), index, total, status, file.path]
+    if directory && checksum_to && File.directory?(checksum_to)
+      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
+      return true
     end
+    puts usage
   end
   
   def self.usage

data/lib/checksummer_file.rb

@@ -2,7 +2,7 @@ require "time"
 require "fileutils"
 
 class ChecksummerFile
-  attr_accessor :modified_at, :size, :type, :path, :original_path
+  attr_accessor :modified_at, :size, :type, :path, :original_path, :original_line
   
   def initialize(attributes = {})
     attributes.each do |key, value|
@@ -30,16 +30,24 @@ class ChecksummerFile
   end
   
   def self.from_line(line)
-    modified_at, size, type, path, original_path = line.chomp.split("\t")
-    ChecksummerFile.new(:modified_at => Time.parse(modified_at), :size => size.to_i, :type => type, :path => File.expand_path(path), 
-      :original_path => original_path ? File.expand_path(original_path) : nil
-    )
+    if path = line.chomp.split("\t").first
+      ChecksummerFile.new(:original_line => line.chomp, :path => File.expand_path(path))
+    else
+      ChecksummerFile.new
+    end
+  end
+  
+  def self.from_paths(stream)
+    stream.map { |path| self.new(:path => path.chomp.split("\t").first) }
   end
   
   def checksum_to!(checksum_dir)
-    if !File.symlink?(path)
-      new_path = md5_path(checksum_dir)
-      status = if !File.exists?(new_path)
+    status = { :original_line => original_line, :original_path => path }
+    if path.to_s.strip.length == 0 || !File.exists?(path)
+      status[:status] = :not_found
+    elsif !File.symlink?(path)
+      new_path = File.expand_path(md5_path(checksum_dir))
+      status[:status] = if !File.exists?(new_path)
         FileUtils.mkdir_p(File.dirname(new_path))
         FileUtils.cp(path, "#{new_path}.tmp")
         FileUtils.mv("#{new_path}.tmp", new_path)
@@ -47,13 +55,15 @@ class ChecksummerFile
       else
         :symlinked
       end
+      status[:checksummed_path] = new_path
+      status[:checksum] = File.basename(new_path)
       mtime = File.mtime(path)
       FileUtils.ln_sf(new_path, path)
       FileUtils.touch(path, :mtime => mtime)
-      status
     else
-      :was_symlink
+      status[:status] = :was_symlink
     end
+    status
   end
   
   def md5_path(checksum_dir)

data/spec/checksummer_file_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe ChecksummerFile do
-  let(:line) { "2010-09-14+10:16:26.4888617110	66	d	/v1/incoming/	" }
-  let(:line_with_original_path) { "2010-09-14+10:16:26.4888617110	66	d	/v1/incoming/	/tmp" }
+  let(:line) { "/v1/incoming/	2010-09-14+10:16:26.4888617110	66	d	/tmp\n" }
   
   describe "#from_line" do
     before(:each) do
@@ -13,24 +12,21 @@ describe ChecksummerFile do
       @file.should be_an_instance_of(ChecksummerFile)
     end
     
-    { :modified_at => Time.local(2010, 9, 14, 10, 16, 26), :type => "d", :path => "/v1/incoming" }.each do |key, value|
-      it "sets #{key.inspect} to #{value.inspect}" do
-        @file.send(key).to_s.should == value.to_s
-      end
+    it "sets path to the first chunk" do
+      @file.path.should == "/v1/incoming"
     end
     
-    it "sets original_path to nil when not in response" do
-      @file.original_path.should be_nil
+    it "sets the original_line to the chomped line" do
+      @file.original_line.should == "/v1/incoming/	2010-09-14+10:16:26.4888617110	66	d	/tmp"
     end
     
-    it "sets original_path to the path when found in response" do
-      ChecksummerFile.from_line(line_with_original_path).original_path.should == "/tmp"
+    it "calls expans_path on all found paths" do
+      File.should_receive(:expand_path).with("/v1/incoming/").and_return "/some/path"
+      ChecksummerFile.from_line(line).path.should == "/some/path"
     end
     
-    it "calls expans_path on all found paths" do
-      File.should_receive(:expand_path).with("/v1/incoming/", )
-      File.should_receive(:expand_path).with("/tmp")
-      ChecksummerFile.from_line(line_with_original_path)
+    it "does not break when line is nil" do
+      ChecksummerFile.from_line("\n").path.should == nil
     end
   end
   
@@ -49,6 +45,7 @@ describe ChecksummerFile do
       File.stub(:symlink?).and_return false
       File.stub!(:mtime).and_return time
       file.stub!(:md5).and_return md5
+      File.stub(:exists?).with("/some/text.csv").and_return true
     end
     
     it "calls exists with correct parameters" do
@@ -66,15 +63,38 @@ describe ChecksummerFile do
       file.checksum_to!("/tmp/data")
     end
     
+    it "returns a hash" do
+      file.checksum_to!("/tmp/data").should be_an_instance_of(Hash)
+    end
+    
+    it "includes the original line" do
+      file.original_line = "some line"
+      file.checksum_to!("/tmp/data")[:original_line].should == "some line"
+    end
+    
+    it "includes the path" do
+      file.checksum_to!("/tmp/data")[:original_path].should == "/some/text.csv"
+    end
+    
+    it "includes status :not_found when path is blank" do
+      file.path = " "
+      file.checksum_to!("/tmp/data")[:status].should == :not_found
+    end
+    
+    it "includes status :no_exusts when path is nil" do
+      file.path = nil
+      file.checksum_to!("/tmp/data")[:status].should == :not_found
+    end
+    
     describe "with the file not being checksummed" do
       it "copys the file to it's md5" do
-        File.stub!(:exists?).and_return false
+        File.stub!(:exists?).with("/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9").and_return false
         FileUtils.should_receive(:cp).with("/some/text.csv", "/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9.tmp")
         file.checksum_to!("/tmp/data")
       end
       
       it "renames the tmp file to the final name" do
-        File.stub!(:exists?).and_return false
+        File.stub!(:exists?).with("/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9").and_return false
         FileUtils.should_receive(:mv).with("/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9.tmp", "/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9")
         file.checksum_to!("/tmp/data")
       end
@@ -90,7 +110,11 @@ describe ChecksummerFile do
       end
 
       it "returns :copied when copied" do
-        file.checksum_to!("/tmp/data").should == :copied
+        file.checksum_to!("/tmp/data")[:status].should == :copied
+      end
+      
+      it "includes the checksummed_path" do
+        file.checksum_to!("/tmp/data")[:checksummed_path].should == "/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9"
       end
       
       it "changes the mtime of the symlink to the mtime of the original file" do
@@ -120,7 +144,15 @@ describe ChecksummerFile do
       end
       
       it "returns :symlinked" do
-        file.checksum_to!("/tmp/data").should == :symlinked
+        file.checksum_to!("/tmp/data")[:status].should == :symlinked
+      end
+      
+      it "includes the checksummed_path" do
+        file.checksum_to!("/tmp/data")[:checksummed_path].should == "/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9"
+      end
+      
+      it "includes the checksum" do
+        file.checksum_to!("/tmp/data")[:checksum].should == "fde8dad8ea43640b00cdd1e92e532ca9"
       end
       
       it "changes the mtime of the symlink to the mtime of the original file" do
@@ -150,7 +182,7 @@ describe ChecksummerFile do
       end
       
       it "returns :exists" do
-        file.checksum_to!("/tmp/data").should == :was_symlink
+        file.checksum_to!("/tmp/data")[:status].should == :was_symlink
       end
       
       it "changes the mtime of the symlink to the mtime of the original file" do
@@ -158,6 +190,12 @@ describe ChecksummerFile do
         file.checksum_to!("/tmp/data")
       end
     end
+    
+    describe "with the file not existing" do
+      it "returns status :not_exists" do
+        ChecksummerFile.new(:path => "/some/broken/path").checksum_to!("/tmp")[:status].should == :not_found
+      end
+    end
   end
   
   describe "#md5" do
@@ -208,4 +246,25 @@ describe ChecksummerFile do
       file.instance_variable_get(:@md5).should be_nil
     end
   end
+  
+  describe "#from_paths" do
+    let(:stream) { ["/file/1.txt", "/file/2.txt\n"] }
+    
+    it "returns the correct amount of files" do
+      ChecksummerFile.from_paths(stream).length.should == 2
+    end
+    
+    it "sets the correct paths" do
+      ChecksummerFile.from_paths(stream).first.path.should == "/file/1.txt"
+    end
+    
+    it "strips the paths" do
+      ChecksummerFile.from_paths(stream).at(1).path.should == "/file/2.txt"
+    end
+    
+    it "splits the lines by \t" do
+      stream_with_tabs = ["/file/1.txt\t10", "/file/2.txt\t30\n"]
+      ChecksummerFile.from_paths(stream_with_tabs).first.path.should == "/file/1.txt"
+    end
+  end
 end

data/spec/checksummer_spec.rb

@@ -1,61 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Checksummer" do
-  class ChecksummerFile
-  end
-  
   let(:checksum_to) { "/data" }
-  let(:cs) { cs = Checksummer.new(checksum_to) }
-  
-  describe "#intiailize" do
-    it "sets the correct chcksum_to" do
-      cs = Checksummer.new("/data")
-      cs.checksum_to.should == "/data"
-    end
-    
-    it "calls expans path on checksum_to" do
-      dir_double = double("some double")
-      File.should_receive(:expand_path).with(dir_double).and_return "some path"
-      cs = Checksummer.new(dir_double)
-    end
-  end
-  
-  describe "#checksum_directory" do
-    let(:file1) { double("checksummer file 1", :checksum_to! => :copied, :path => "/path1") }
-    let(:file2) { double("checksummer file 2", :checksum_to! => :symlinked, :path => "/path2") }
-    
-    it "calls find with correct parameters" do
-      cs.should_receive(:find).with("path1", "-mtime +1").and_return []
-      cs.checksum_directory("path1", "-mtime +1")
-    end
-    
-    it "calls checksum on all ChecksummerFiles" do
-      file1.should_receive(:checksum_to!).with("/data").and_return true
-      file2.should_receive(:checksum_to!).with("/data").and_return true
-      cs.stub!(:find).and_return [file1, file2]
-      cs.checksum_directory("path1")
-    end
-    
-    it "yields all checksum status messages and files" do
-      yielder = double("yielder")
-      yielder.should_receive(:got_file).with(:copied, file1, 0, 2)
-      yielder.should_receive(:got_file).with(:symlinked, file2, 1, 2)
-      cs.stub!(:find).and_return [file1, file2]
-      cs.checksum_directory("path1") do |status, file, index, total|
-        yielder.got_file(status, file, index, total)
-      end
-    end
-  end
   
   describe "#find" do
     let(:files) do
       [
-        "2010-09-14+10:16:26.4888617110	66	d	/v1/incoming/	",
-        "2010-07-08+17:52:08.6168163060	76	d	/v1/incoming/rsync_from_delivery_host	",
-        "2010-12-06+18:12:13.0000000000	737280	d	/v1/incoming/rsync_from_delivery_host/finetunes	",
-        "2010-07-24+19:46:38.0000000000	30	d	/v1/incoming/rsync_from_delivery_host/finetunes/1069604473114	",
-        "2009-10-31+16:29:51.0000000000	12032	f	/v1/incoming/rsync_from_delivery_host/finetunes/1069604473114/1069604473114.xml	",
-        "2010-07-24+19:46:38.0000000000	30	d	/v1/incoming/rsync_from_delivery_host/finetunes/1069604681256	"
+        "/v1/incoming/	2010-09-14+10:16:26.4888617110	66	d	",
+        "/v1/incoming/rsync_from_delivery_host	2010-07-08+17:52:08.6168163060	76	d	",
+        "d	/v1/incoming/rsync_from_delivery_host/finetunes	2010-12-06+18:12:13.0000000000	737280	",
+        "/v1/incoming/rsync_from_delivery_host/finetunes/1069604473114	2010-07-24+19:46:38.0000000000	30	d	",
+        "/v1/incoming/rsync_from_delivery_host/finetunes/1069604473114/1069604473114.xml	2009-10-31+16:29:51.0000000000	12032	f	",
+        "/v1/incoming/rsync_from_delivery_host/finetunes/1069604681256	2010-07-24+19:46:38.0000000000	30	d	"
       ].join("\n")
     end
     
@@ -64,25 +20,25 @@ describe "Checksummer" do
     end
     
     it "calls system command with correct arguments" do
-      Kernel.should_receive(:`).with(%(find path1 -type f -printf "%T+\t%s\t%Y\t%p\t%l\n"))
-      cs.find("path1")
+      Kernel.should_receive(:`).with(%(find path1 -type f -printf "%p\t%T+\t%s\t%Y\t%l\n"))
+      Checksummer.find("path1")
     end
     
     it "uses find options" do
-      Kernel.should_receive(:`).with(%(find path1 -mtime +1 -type f -printf "%T+\t%s\t%Y\t%p\t%l\n"))
-      cs.find("path1", "-mtime +1")
+      Kernel.should_receive(:`).with(%(find path1 -mtime +1 -type f -printf "%p\t%T+\t%s\t%Y\t%l\n"))
+      Checksummer.find("path1", "-mtime +1")
     end
     
     it "returns the correct amount of files" do
-      cs.find("path1").length.should == 6
+      Checksummer.find("path1").length.should == 6
     end
     
     it "returns objects of type ChecksummerFile" do
-      cs.find("path1").first.should be_an_instance_of(ChecksummerFile)
+      Checksummer.find("path1").first.should be_an_instance_of(String)
     end
     
     it "sets the correct atributes" do
-      cs.find("path1").first.path.should == "/v1/incoming"
+      Checksummer.find("path1").first.should == "/v1/incoming/	2010-09-14+10:16:26.4888617110	66	d	"
     end
   end
   
@@ -106,61 +62,73 @@ describe "Checksummer" do
       Checksummer.run_for_args(["/tmp", "/some/path"])
     end
     
-    it "initializes checksummer with correct checksum_to dir" do
-      Checksummer.should_receive(:new).with("/tmp").and_return(double("checksummer", :checksum_directory => true))
-      Checksummer.run_for_args(["/tmp", "/tmp"])
-    end
-    
-    it "calls checksum_directory wirh correct find options" do
-      checksummer = double("checksummer")
-      Checksummer.stub!(:new).and_return checksummer
-      checksummer.should_receive(:checksum_directory).with("/tmp", %(-name "*.mp3"))
+    it "calls find with the correct attributes" do
+      Checksummer.should_receive(:find).with("/tmp", %(-name "*.mp3")).and_return([])
       Checksummer.run_for_args(["/tmp", "/tmp", "-name", %("*.mp3")])
     end
     
-    it "does not call checksum_directory with sleep parameter" do
-      checksummer = double("checksummer")
-      Checksummer.stub!(:new).and_return checksummer
-      checksummer.should_receive(:checksum_directory).with("/tmp", %(-mtime +1))
-      Checksummer.run_for_args(["/tmp", "/tmp", "-mtime", "+1", "--sleep", "10"])
+    # it "initializes checksummer with correct checksum_to dir" do
+    #       Checksummer.should_receive(:new).with("/tmp").and_return(double("checksummer", :checksum_directory => true))
+    #       Checksummer.run_for_args(["/tmp", "/tmp"])
+    #     end
+    #     
+    #     it "calls checksum_directory with correct find options" do
+    #       checksummer = double("checksummer")
+    #       Checksummer.stub!(:new).and_return checksummer
+    #       checksummer.should_receive(:checksum_directory).with("/tmp", %(-name "*.mp3"))
+    #       Checksummer.run_for_args(["/tmp", "/tmp", "-name", %("*.mp3")])
+    #     end
+    #     
+    #     it "does not call checksum_directory with sleep parameter" do
+    #       checksummer = double("checksummer")
+    #       Checksummer.stub!(:new).and_return checksummer
+    #       checksummer.should_receive(:checksum_directory).with("/tmp", %(-mtime +1))
+    #       Checksummer.run_for_args(["/tmp", "/tmp", "-mtime", "+1", "--sleep", "10"])
+    #     end
+    
+    describe "with files given from stdin" do
+      it "calls from_line with all files from stdin" do
+        $stdin = StringIO.new("/path/1.txt\n/path/2.txt")
+        file_double = double("file", :checksum_to! => {})
+        ChecksummerFile.should_receive(:from_line).with("/path/1.txt\n").and_return file_double
+        ChecksummerFile.should_receive(:from_line).with("/path/2.txt").and_return file_double
+        Checksummer.run_for_args(["--stdin", "/tmp"])
+      end
+      
+      it "calls checksum_files with files_from_stream when --stdin given" do
+        $stdin = StringIO.new("/path/1.txt\n/path/2.txt")
+        double1 = double("double 1")
+        double2 = double("double 2")
+        ChecksummerFile.stub(:from_line).with("/path/1.txt\n").and_return double1
+        ChecksummerFile.stub(:from_line).with("/path/2.txt").and_return double2
+        double1.should_receive(:checksum_to!).with("/tmp").and_return({})
+        double2.should_receive(:checksum_to!).with("/tmp").and_return({})
+        Checksummer.run_for_args(["--stdin", "/tmp"])
+      end
     end
     
     describe "with a cs double" do
       before(:each) do
-        @cs_double = double("cs")
-        Checksummer.stub(:new).with("/tmp").and_return @cs_double
-        def @cs_double.checksum_directory(path, find_options)
-          file1 = ChecksummerFile.new(:path => "/path1.txt")
-          file2 = ChecksummerFile.new(:path => "/path2.txt")
-          yield(:copied, file1, 0, 20)
-          yield(:symlinked, file2, 1, 20)
-        end
-      end
-      
-      it "calls puts with a correct string" do
-        Time.stub(:now).and_return Time.local(2010, 9, 10, 11, 12)
-        Checksummer.should_receive(:puts).with("2010-09-10 11:12:00\t00/20\tcopied\t/path1.txt")
-        Checksummer.should_receive(:puts).with("2010-09-10 11:12:00\t01/20\tsymlinked\t/path2.txt")
-        Checksummer.run_for_args(["/tmp", "/tmp"])
+        Checksummer.stub!(:find).and_return(%w(/path1.txt /path2.txt))
       end
       
       it "calls sleep with 0.1 when between 8 and 23:59" do
-        now = double("now", :hour => 8, :strftime => "some time")
-        Time.stub!(:now).and_return(now)
+        time = Time.local(2011, 1, 2, 8, 0, 0)
+        Time.stub!(:now).and_return(time)
         Checksummer.should_receive(:sleep).with(0.1).at_least(1).times
         Checksummer.run_for_args(["/tmp", "/tmp"])
       end
       
       it "calls sleep with 0.5 when between 8 and 23:59 and custom sleep given" do
-        now = double("now", :hour => 8, :strftime => "some time")
-        Time.stub!(:now).and_return(now)
+        time = Time.local(2011, 1, 2, 8, 0, 0)
+        Time.stub!(:now).and_return(time)
         Checksummer.should_receive(:sleep).with(0.5).at_least(1).times
         Checksummer.run_for_args(["/tmp", "/tmp", "--sleep", "500"])
       end
       
       it "does not call sleep with 0.1 when between 00:00 and 07:59" do
-        now = double("now", :hour => 7, :strftime => "some time")
-        Time.stub!(:now).and_return(now)
+        time = Time.local(2011, 1, 2, 7, 59, 59)
+        Time.stub!(:now).and_return(time)
         Checksummer.should_not_receive(:sleep)
         Checksummer.run_for_args(["/tmp", "/tmp"])
       end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 +01:00
+date: 2011-03-21 00:00:00 +01:00
 default_executable: checksummer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,8 +57,21 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: cucumber
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -70,10 +83,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -85,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +113,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,7 +126,20 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: timecop
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
 description: Replace files with links to md5 files
 email: tobias.schwab@dynport.de
 executables: 
@@ -136,6 +162,9 @@ files:
 - autotest/discover.rb
 - bin/checksummer
 - checksummer.gemspec
+- features/checksum.feature
+- features/step_definitions/checksum_steps.rb
+- features/support/env.rb
 - lib/checksummer.rb
 - lib/checksummer_file.rb
 - spec/checksummer_file_spec.rb
@@ -155,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2013251382581930018
+      hash: 555043968334052607
       segments: 
       - 0
       version: "0"