checksummer 0.2.6 → 0.3.0

data/Gemfile

@@ -6,11 +6,13 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 gem "json"
+gem "thor"
 
 group :development do
+  gem 'dynport_tools'
   gem 'autotest'
   gem 'autotest-growl'
-  gem 'ruby-debug19'
+  gem 'ruby-debug'
   gem "cucumber", ">= 0"
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -2,12 +2,11 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.4.2)
-    archive-tar-minitar (0.5.2)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-growl (0.2.9)
     builder (3.0.0)
-    columnize (0.3.2)
+    columnize (0.3.4)
     cucumber (0.10.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -15,6 +14,12 @@ GEM
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
+    dynport_tools (0.2.18)
+      diff-lcs
+      nokogiri
+      redis
+      term-ansicolor
+      typhoeus
     gherkin (2.3.5)
       json (>= 1.4.6)
     git (1.2.5)
@@ -23,10 +28,14 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.5.1)
-    linecache19 (0.5.11)
-      ruby_core_source (>= 0.1.4)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mime-types (1.16)
+    nokogiri (1.5.0)
     rake (0.8.7)
+    rbx-require-relative (0.0.5)
     rcov (0.9.9)
+    redis (2.2.2)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -35,18 +44,17 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    ruby-debug-base19 (0.11.24)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
-      archive-tar-minitar (>= 0.5.2)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     term-ansicolor (1.0.5)
+    thor (0.14.6)
     timecop (0.3.5)
+    typhoeus (0.2.4)
+      mime-types
+      mime-types
 
 PLATFORMS
   ruby
@@ -56,9 +64,11 @@ DEPENDENCIES
   autotest-growl
   bundler (~> 1.0.0)
   cucumber
+  dynport_tools
   jeweler (~> 1.5.2)
   json
   rcov
   rspec (~> 2.3.0)
-  ruby-debug19
+  ruby-debug
+  thor
   timecop

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.3.0

data/bin/checksummer2

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+$:<<File.expand_path("../lib", File.dirname(__FILE__))
+require "rubygems"
+require "thor"
+require "checksummer"
+
+class ChecksummerThor < Thor
+  desc "checksum DESTINATION", "checksum"
+  method_options :sleep => 0.1, :replace => false
+  method_option :dst, :required => true
+  def checksum
+    if !File.exists?(options.dst)
+      puts "ERROR: #{options.dst} does not exist!"
+    end
+    Checksummer.new(options.dst, :replace => options[:replace], :sleep => options.sleep).checksum_stream($stdin.readlines)
+  end
+  
+  default_task :checksum
+end
+
+ChecksummerThor.start

data/checksummer.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{checksummer}
-  s.version = "0.2.6"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-08-10}
+  s.date = %q{2011-09-13}
   s.description = %q{Replace files with links to md5 files}
   s.email = %q{tobias.schwab@dynport.de}
-  s.executables = ["checksummer"]
+  s.executables = ["checksummer2", "checksummer"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "autotest/discover.rb",
     "bin/checksummer",
+    "bin/checksummer2",
     "checksummer.gemspec",
     "features/checksum.feature",
     "features/step_definitions/checksum_steps.rb",
@@ -36,16 +37,18 @@ Gem::Specification.new do |s|
     "lib/checksummer.rb",
     "lib/checksummer_file.rb",
     "spec/checksummer_file_spec.rb",
+    "spec/checksummer_integration_spec.rb",
     "spec/checksummer_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/dynport/checksummer}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Replace files with links to md5 files}
   s.test_files = [
     "spec/checksummer_file_spec.rb",
+    "spec/checksummer_integration_spec.rb",
     "spec/checksummer_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -55,9 +58,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<thor>, [">= 0"])
+      s.add_development_dependency(%q<dynport_tools>, [">= 0"])
       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<ruby-debug>, [">= 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"])
@@ -66,9 +71,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<timecop>, [">= 0"])
     else
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<thor>, [">= 0"])
+      s.add_dependency(%q<dynport_tools>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<autotest-growl>, [">= 0"])
-      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -78,9 +85,11 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<thor>, [">= 0"])
+    s.add_dependency(%q<dynport_tools>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<autotest-growl>, [">= 0"])
-    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/checksummer.rb

@@ -5,6 +5,50 @@ require "json"
 class Checksummer
   DEFAULT_SLEEP = 0.1
   
+  attr_accessor :dst, :sleep_in_seconds, :replace
+  
+  def initialize(dst, options = {})
+    self.dst = dst
+    self.sleep_in_seconds = options[:sleep] || DEFAULT_SLEEP
+    self.replace = !!options[:replace]
+  end
+  
+  def checksum_stream(stream)
+    default = { :started => started, :total => stream.count }
+    stream.each_with_index do |line, i|
+      log ChecksummerFile.from_line(line).checksum_to!(dst, :replace => replace).merge(default).merge(:index => i + 1, :time => current_time, 
+        :sleep => sleep_now? ? sleep_in_seconds : 0
+      )
+      sleep_if_necessary
+    end
+  end
+  
+  def log(hash)
+    puts hash.to_json
+  end
+  
+  def started
+    @started ||= Time.now.iso8601
+  end
+  
+  def current_time
+    Time.now.iso8601
+  end
+  
+  def log(hash)
+    puts hash.to_json
+  end
+  
+  def sleep_if_necessary
+    sleep sleep_in_seconds if sleep_now?
+  end
+  
+  def sleep_now?
+    !Range.new(0, 7).include?(Time.now.hour)
+  end
+  
+  # LEGACY STUFF
+  
   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
@@ -44,7 +88,7 @@ class Checksummer
     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
+      puts ChecksummerFile.from_line(line).checksum_to!(checksum_to, :replace => true).merge(extra).to_json
       $stdout.flush
       sleep sleep if !Range.new(0,7).include?(Time.now.hour)
     end

data/lib/checksummer_file.rb

@@ -33,25 +33,49 @@ class ChecksummerFile
     stream.map { |path| self.new(:path => path.chomp.split("\t").first) }
   end
   
-  def checksum_to!(checksum_dir)
+  def copy_to_checksummed_path
+    if !File.exists?(checksummed_path)
+      FileUtils.mkdir_p(File.dirname(checksummed_path))
+      FileUtils.cp(path, "#{checksummed_path}.tmp")
+      FileUtils.mv("#{checksummed_path}.tmp", checksummed_path)
+      :copied
+    else
+      :exists
+    end
+  end
+  
+  def do_symlink
+    mtime = File.mtime(self.path)
+    FileUtils.ln_sf(checksummed_path, self.path)
+    FileUtils.touch(self.path, :mtime => mtime) rescue nil
+  end
+  
+  def checksummed_path(base = nil)
+    base ||= self.current_base
+    raise "no current base set" if base.nil?
+    File.expand_path(md5_path(base))
+  end
+  
+  attr_accessor :current_base
+  
+  REPLACE_MAPPING = {
+    :exists => :symlinked,
+    :copied => :replaced
+  }
+  
+  def checksum_to!(base, options = {})
+    self.current_base = base
     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)
-        :copied
-      else
-        :symlinked
+      status[:status] = copy_to_checksummed_path
+      status[:checksummed_path] = checksummed_path
+      status[:checksum] = File.basename(checksummed_path)
+      if options[:replace] == true
+        do_symlink
+        status[:status] = REPLACE_MAPPING[status[:status]] || status[:status]
       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) rescue nil
     else
       status[:status] = :was_symlink
       status[:realpath] = Pathname.new(path).realpath

data/spec/checksummer_file_spec.rb

@@ -30,8 +30,33 @@ describe ChecksummerFile do
     end
   end
   
+  let(:file) { ChecksummerFile.new(:path => "/some/text.csv") }
+  
+  describe "#do_symlink" do
+    before(:each) do
+      file.stub!(:checksummed_path).and_return("/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9")
+      FileUtils.stub!(:ln_sf)
+      FileUtils.stub!(:touch)
+      File.stub!(:mtime).and_return "some time"
+    end
+    
+    it "creates a symlink for the copied file" do
+      FileUtils.should_receive(:ln_sf).with("/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9", "/some/text.csv")
+      file.do_symlink
+    end
+    
+    it "changes the mtime of the symlink to the mtime of the original file" do
+      FileUtils.should_receive(:touch).with("/some/text.csv", :mtime => "some time")
+      file.do_symlink
+    end
+    
+    it "does not break when touch raises an error" do
+      FileUtils.should_receive(:touch).and_raise("not allowed")
+      file.do_symlink
+    end
+  end
+  
   describe "#checksum_to!" do
-    let(:file) { ChecksummerFile.new(:path => "/some/text.csv") }
     let(:time) { Time.local(2010, 9, 10, 11, 12, 13) }
     let(:md5) { "fde8dad8ea43640b00cdd1e92e532ca9" }
     
@@ -81,11 +106,32 @@ describe ChecksummerFile do
       file.checksum_to!("/tmp/data")[:status].should == :not_found
     end
     
-    it "includes status :no_exusts when path is nil" do
+    it "includes status :not_exists when path is nil" do
       file.path = nil
       file.checksum_to!("/tmp/data")[:status].should == :not_found
     end
     
+    describe "with replace being false" do
+      before(:each) do
+        file.stub(:checksummed_path).and_return "/some/path"
+      end
+      
+      it "sets status to :copied" do
+        file.stub!(:copy_to_checksummed_path).and_return :exists
+        file.checksum_to!("/tmp/data")[:status].should == :exists
+      end
+      
+      it "returns copied when copied" do
+        file.stub!(:copy_to_checksummed_path).and_return :copied
+        file.checksum_to!("/tmp/data")[:status].should == :copied
+      end
+      
+      it "does not call do_symlink" do
+        file.should_not_receive(:do_symlink)
+        file.checksum_to!("/tmp/data")
+      end
+    end
+    
     describe "with the file not being checksummed" do
       it "copys the file to it's md5" do
         File.stub!(:exists?).with("/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9").and_return false
@@ -103,10 +149,10 @@ describe ChecksummerFile do
         FileUtils.should_receive(:mkdir_p).with("/tmp/data/f/d/e/8")
         file.checksum_to!("/tmp/data")
       end
-
-      it "creates a symlink for the copied file" do
-        FileUtils.should_receive(:ln_sf).with("/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9", "/some/text.csv")
-        file.checksum_to!("/tmp/data")
+      
+      it "calls do_symlink when replace is set to true" do
+        file.should_receive(:do_symlink)
+        file.checksum_to!("/tmp/data", :replace => true)[:status].should == :replaced
       end
 
       it "returns :copied when copied" do
@@ -116,16 +162,6 @@ describe ChecksummerFile do
       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
-        FileUtils.should_receive(:touch).with("/some/text.csv", :mtime => time)
-        file.checksum_to!("/tmp/data")
-      end
-      
-      it "does not break when touch raises an error" do
-        FileUtils.should_receive(:touch).and_raise("not allowed")
-        file.checksum_to!("/tmp/data")[:status].should == :copied
-      end
     end
     
     describe "with the file being checksummed already" do
@@ -143,13 +179,8 @@ describe ChecksummerFile do
         file.checksum_to!("/tmp/data")
       end
       
-      it "does symlink the file" do
-        FileUtils.should_receive(:ln_sf).with("/tmp/data/f/d/e/8/fde8dad8ea43640b00cdd1e92e532ca9", "/some/text.csv")
-        file.checksum_to!("/tmp/data")
-      end
-      
       it "returns :symlinked" do
-        file.checksum_to!("/tmp/data")[:status].should == :symlinked
+        file.checksum_to!("/tmp/data", :replace => true)[:status].should == :symlinked
       end
       
       it "includes the checksummed_path" do
@@ -159,11 +190,6 @@ describe ChecksummerFile do
       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
-        FileUtils.should_receive(:touch).with("/some/text.csv", :mtime => time)
-        file.checksum_to!("/tmp/data")
-      end
     end
     
     describe "with the file being a symlink" do

data/spec/checksummer_integration_spec.rb

@@ -0,0 +1,131 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Checksummer Integration Spec" do
+  let(:cmd) { root.join("bin", "checksummer2") }
+  
+  before(:each) do
+    FileUtils.rm_rf(root.join("tmp"))
+    %w(src dst).map { |dir| FileUtils.mkdir_p(root.join("tmp", dir) ) }
+  end
+  
+  def invoke(*args)
+    `ruby #{cmd} #{args.join(" ")} 2>&1`
+  end
+  
+  def create_files(hash)
+    hash.each do |path, content|
+      full_path = root.join("tmp", path)
+      FileUtils.mkdir_p(File.dirname(full_path))
+      File.open(full_path, "w") do |f|
+        f.puts(content)
+      end
+    end
+  end
+  
+  it "does not break when calling with not found files" do
+    create_files("src/file1.txt" => "file 1")
+    out = `echo "#{root.join("tmp/src/file1.txt")}\n#{root.join("tmp/src/file2.txt")}" | ruby #{cmd} --dst #{root.join("tmp/dst")}`
+    File.should_not be_symlink("#{root}/tmp/src/file1.txt")
+    File.should_not be_exists("#{root}/tmp/src/file2.txt")
+    
+    File.should be_file("#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf")
+    File.should_not be_exists("#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e")
+    
+    atts = out.split("\n").map { |l| JSON.parse(l) }
+    atts.first.should have_attributes("status" => "copied")
+    atts.at(1).should have_attributes("status" => "not_found")
+  end
+  
+  it "checksums all files from stdin to dst when dst exists" do
+    create_files("src/file1.txt" => "file 1", "src/file2.txt" => "file 2")
+    out = `echo "#{root.join("tmp/src/file1.txt")}\n#{root.join("tmp/src/file2.txt")}" | ruby #{cmd} --dst #{root.join("tmp/dst")}`
+    
+    File.should_not be_symlink("#{root}/tmp/src/file1.txt")
+    File.should_not be_symlink("#{root}/tmp/src/file2.txt")
+    
+    File.should be_file("#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf")
+    File.should be_file("#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e")
+    
+    atts = out.split("\n").map { |l| JSON.parse(l) }
+    atts.first.should have_attributes(
+      "original_path"=>"#{root}/tmp/src/file1.txt", "original_line"=>"#{root}/tmp/src/file1.txt", "total"=>2, 
+      "checksum"=>"e243bb39c844b3543a7726576c869caf", "checksummed_path"=>"#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf", "index"=>1,
+      "status"=>"copied", "sleep" => 0.1
+    )
+    atts.at(1).should have_attributes(
+      "original_path"=>"#{root}/tmp/src/file2.txt", "original_line"=>"#{root}/tmp/src/file2.txt", "total"=>2, 
+      "checksum"=>"4349cfeff8e2eb74dffc369bb5fd084e", "checksummed_path"=>"#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e", "index"=>2, 
+      "status"=>"copied"
+    )
+    
+    out = `echo "#{root.join("tmp/src/file1.txt")}\n#{root.join("tmp/src/file2.txt")}" | ruby #{cmd} --sleep 0.01 --dst #{root.join("tmp/dst")}`
+    atts = out.split("\n").map { |l| JSON.parse(l) }
+    File.should_not be_symlink("#{root}/tmp/src/file1.txt")
+    File.should_not be_symlink("#{root}/tmp/src/file2.txt")
+    
+    File.should be_file("#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf")
+    File.should be_file("#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e")
+    
+    atts.first.should have_attributes("status" => "exists", "sleep" => 0.01)
+    atts.at(1).should have_attributes("status" => "exists")
+    
+    out = `echo "#{root.join("tmp/src/file1.txt")}\n#{root.join("tmp/src/file2.txt")}" | ruby #{cmd} --replace --dst #{root.join("tmp/dst")}`
+    atts = out.split("\n").map { |l| JSON.parse(l) }
+    
+    File.should be_symlink("#{root}/tmp/src/file1.txt")
+    File.should be_file("#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf")
+    Pathname.new("#{root}/tmp/src/file1.txt").realpath.to_s.should == "#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf"
+    
+    File.should be_symlink("#{root}/tmp/src/file2.txt")
+    File.should be_file("#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e")
+    Pathname.new("#{root}/tmp/src/file2.txt").realpath.to_s.should == "#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e"
+    
+    atts.first.should have_attributes("status" => "symlinked")
+    atts.at(1).should have_attributes("status" => "symlinked")
+  end
+  
+  it "replaces the original files with symlinks when started with --replace" do
+    create_files("src/file1.txt" => "file 1", "src/file2.txt" => "file 2")
+    out = `echo "#{root.join("tmp/src/file1.txt")}\n#{root.join("tmp/src/file2.txt")}" | ruby #{cmd} --dst #{root.join("tmp/dst")} --replace`
+    
+    File.should be_symlink("#{root}/tmp/src/file1.txt")
+    File.should be_file("#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf")
+    Pathname.new("#{root}/tmp/src/file1.txt").realpath.to_s.should == "#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf"
+    
+    File.should be_symlink("#{root}/tmp/src/file2.txt")
+    File.should be_file("#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e")
+    Pathname.new("#{root}/tmp/src/file2.txt").realpath.to_s.should == "#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e"
+    
+    atts = out.split("\n").map { |l| JSON.parse(l) }
+    atts.first.should have_attributes(
+      "original_path"=>"#{root}/tmp/src/file1.txt", "original_line"=>"#{root}/tmp/src/file1.txt", "total"=>2, 
+      "checksum"=>"e243bb39c844b3543a7726576c869caf", "checksummed_path"=>"#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf", "index"=>1,
+      "status"=>"replaced"
+    )
+
+    atts.at(1).should have_attributes(
+      "original_path"=>"#{root}/tmp/src/file2.txt", "original_line"=>"#{root}/tmp/src/file2.txt", "total"=>2, 
+      "checksum"=>"4349cfeff8e2eb74dffc369bb5fd084e", "checksummed_path"=>"#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e", "index"=>2, 
+      "status"=>"replaced"
+    )
+    
+    out = `echo "#{root.join("tmp/src/file1.txt")}\n#{root.join("tmp/src/file2.txt")}" | ruby #{cmd} --dst #{root.join("tmp/dst")} --replace`
+    
+    File.should be_symlink("#{root}/tmp/src/file1.txt")
+    File.should be_file("#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf")
+    Pathname.new("#{root}/tmp/src/file1.txt").realpath.to_s.should == "#{root}/tmp/dst/e/2/4/3/e243bb39c844b3543a7726576c869caf"
+    
+    File.should be_symlink("#{root}/tmp/src/file2.txt")
+    File.should be_file("#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e")
+    Pathname.new("#{root}/tmp/src/file2.txt").realpath.to_s.should == "#{root}/tmp/dst/4/3/4/9/4349cfeff8e2eb74dffc369bb5fd084e"
+    
+    atts = out.split("\n").map { |l| JSON.parse(l) }
+    atts.first.should have_attributes("status" => "was_symlink")
+    atts.at(1).should have_attributes("status" => "was_symlink")
+  end
+  
+  it "prints something when dst does not exist" do
+    out = `echo "#{root.join("tmp/src/file1.txt")}" | ruby #{cmd} --dst #{root.join("tmp/dst2")}`
+    out.should match(/ERROR.*?tmp\/dst2 does not exist/)
+  end
+end

data/spec/checksummer_spec.rb

@@ -106,8 +106,8 @@ describe "Checksummer" do
         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({})
+        double1.should_receive(:checksum_to!).with("/tmp", :replace => true).and_return({})
+        double2.should_receive(:checksum_to!).with("/tmp", :replace => true).and_return({})
         Checksummer.run_for_args(["--stdin", "/tmp"])
       end
     end
@@ -153,21 +153,122 @@ describe "Checksummer" do
       end
       
       it "calls checksum_to! with dst" do
-        checksum_file.should_receive(:checksum_to!).with("/tmp")
+        checksum_file.should_receive(:checksum_to!).with("/tmp", :replace => true)
         Checksummer.run_for_args(["/some/path", "/tmp"])
       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\",\"index\":1,\"total\":1,\"started_at\":\"2011-02-03T04:05:06+01:00\"}"
-        )
+        Checksummer.should_receive(:puts).with do |line|
+          JSON.parse(line).should == {
+            "index" => 1, "some" => "result", "total" => 1, "started_at" => "2011-02-03T04:05:06+01:00"
+          }
+        end
         Checksummer.run_for_args(["/some/path", "/tmp"])
       end
     end
   end
   
+  let(:dst) { "/path/to/dst" }
+  let(:checksummer) { Checksummer.new(dst) }
+  
+  before(:each) do
+    checksummer.stub!(:log)
+  end
+  
+  describe "#initialize" do
+    it "sets the dst" do
+      Checksummer.new(dst).dst.should == dst
+    end
+    
+    it "sets sleep when given" do
+      Checksummer.new(dst, :sleep => 0.34).sleep_in_seconds.should == 0.34
+    end
+    
+    it "sets replace to false when not given" do
+      Checksummer.new(dst).replace.should == false
+    end
+    
+    it "sets replace to true when given" do
+      Checksummer.new(dst, :replace => true).replace.should == true
+    end
+  end
+  
+  describe "#checksum_stream" do
+    let(:file1) { double("file", :checksum_to! => { :status => "ok" }).as_null_object }
+    let(:file2) { double("file2", :checksum_to! => { :status => "not_found" }).as_null_object }
+    
+    before(:each) do
+      ChecksummerFile.stub(:from_line).with("line1").and_return file1
+      ChecksummerFile.stub(:from_line).with("line2").and_return file2
+    end
+    
+    it "initializes a new ChecksummerFile" do
+      # ChecksummerFile.from_line(line).checksum_to!(checksum_to, :replace => true)
+      ChecksummerFile.should_receive(:from_line).with("line1").and_return file1
+      ChecksummerFile.should_receive(:from_line).with("line2").and_return file2
+      checksummer.checksum_stream(%w(line1 line2))
+    end
+    
+    it "calls checksum_to! on all lines with correct " do
+      file1.should_receive(:checksum_to!).with(dst, :replace => false).and_return({})
+      file2.should_receive(:checksum_to!).with(dst, :replace => false).and_return({})
+      checksummer.checksum_stream(%w(line1 line2))
+    end
+    
+    it "calls checksum_to! with replace => true when set" do
+      file1.should_receive(:checksum_to!).with(dst, :replace => true).and_return({})
+      checksummer.replace = true
+      checksummer.checksum_stream(%w(line1))
+    end
+    
+    it "calls sleep if necessary 2 times" do
+      checksummer.should_receive(:sleep_if_necessary).exactly(2).times
+      checksummer.checksum_stream(%w(line1 line2))
+    end
+    
+    it "calls puts with correct attributes" do
+      cs = Checksummer.new(dst)
+      cs.stub!(:started).and_return "2011-01-02T03:04:05+01:00"
+      cs.stub(:current_time).and_return("2011-01-02T03:04:07+01:00", "2011-01-02T03:04:08+01:00")
+      cs.should_receive(:log).with({ :index => 1, :total => 2, :status => "ok", :started => "2011-01-02T03:04:05+01:00", :time => "2011-01-02T03:04:07+01:00", :sleep => 0.1 })
+      cs.should_receive(:log).with({ :index => 2, :total => 2, :status => "not_found", :started => "2011-01-02T03:04:05+01:00", :time => "2011-01-02T03:04:08+01:00", :sleep => 0.1 })
+      cs.checksum_stream(%w(line1 line2))
+    end
+  end
+  
+  describe "#sleep_if_necessary" do
+    it "calls sleep with set sleep when time inside sleep zone" do
+      checksummer.sleep_in_seconds = 10
+      checksummer.stub!(:sleep_now?).and_return true
+      checksummer.should_receive(:sleep).with(10)
+      checksummer.sleep_if_necessary
+    end
+    
+    it "does not call sleep in seconds when sleep_now? returns false" do
+      checksummer.should_receive(:sleep_now?).and_return false
+      checksummer.should_not_receive(:sleep)
+      checksummer.sleep_if_necessary
+    end
+    
+    it "sleeps for the default number of seconds when not set" do
+      checksummer.stub(:sleep_now?).and_return true
+      checksummer.should_receive(:sleep).with(0.1)
+      checksummer.sleep_if_necessary
+    end
+  end
+  
+  describe "#sleep_now?" do
+    { "08:00" => true, "07:59" => false, "00:00" => false, "23:59" => true }.each do |time, value|
+      it "returns #{value} for #{time}" do
+        Timecop.freeze(Time.parse("2011-01-02 #{time}")) do
+          checksummer.sleep_now?.should == value
+        end
+      end
+    end
+  end
+  
   describe "#integration" do
     let(:root) { File.expand_path("tmp", File.dirname(__FILE__)) }
     

data/spec/spec_helper.rb

@@ -3,11 +3,19 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'checksummer'
 require "ruby-debug"
+require "dynport_tools"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+
 RSpec.configure do |config|
-  
+  config.include(DynportTools::HaveAttributesMatcher)
+end
+
+def root
+  Pathname.new(File.expand_path("../", File.dirname(__FILE__)))
 end
+
+require "timecop"

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: checksummer
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
-  version: 0.2.6
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -10,121 +15,187 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 Z
+date: 2011-09-13 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
-  version_requirements: *id001
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: autotest
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: dynport_tools
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: autotest
   prerelease: false
-  version_requirements: *id002
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: autotest-growl
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: ruby-debug
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id004
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id005
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
   type: :development
-  prerelease: false
-  version_requirements: *id006
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *id007
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
   type: :development
-  prerelease: false
-  version_requirements: *id008
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id009
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   name: timecop
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id010
+  requirement: *id012
 description: Replace files with links to md5 files
 email: tobias.schwab@dynport.de
 executables: 
+- checksummer2
 - checksummer
 extensions: []
 
@@ -143,6 +214,7 @@ files:
 - VERSION
 - autotest/discover.rb
 - bin/checksummer
+- bin/checksummer2
 - checksummer.gemspec
 - features/checksum.feature
 - features/step_definitions/checksum_steps.rb
@@ -150,8 +222,10 @@ files:
 - lib/checksummer.rb
 - lib/checksummer_file.rb
 - spec/checksummer_file_spec.rb
+- spec/checksummer_integration_spec.rb
 - spec/checksummer_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/dynport/checksummer
 licenses: 
 - MIT
@@ -165,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -652076464801799004
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -174,15 +248,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Replace files with links to md5 files
 test_files: 
 - spec/checksummer_file_spec.rb
+- spec/checksummer_integration_spec.rb
 - spec/checksummer_spec.rb
 - spec/spec_helper.rb