dir_sync 0.1.1 → 0.1.2

data/HISTORY.rdoc

@@ -1,3 +1,8 @@
+= 0.1.2 Mon 30 Jan 2012 11:32:36 EST
+
+* fixed problem where only one instance of a file was being removed
+* fixed problem where files already in sync were not written to history
+
 = 0.1.1 Sun 29 Jan 2012 14:40:03 EST
 
 * moved everything into a DirSync module to prevent any namespace collisions.

data/features/backup.feature

@@ -22,11 +22,9 @@ Scenario: Syncing two non existant directories
   And a directory named "b" should exist
 
 Scenario: Syncing a single file from left to right
-  Given a directory named "a"
-  And I write to "a/readme.txt" with:
-  """
-  The content
-  """
+  Given the file system:
+  | path         | time |
+  | a/readme.txt | 1000 |
   When I successfully run `dir_sync test a b`
   Then the stdout should contain exactly:
   """
@@ -35,11 +33,9 @@ Scenario: Syncing a single file from left to right
   """
 
 Scenario: Syncing a single file from right to left
-  Given a directory named "b"
-  And I write to "b/readme.txt" with:
-  """
-  The content
-  """
+  Given the file system:
+  | path         | time |
+  | b/readme.txt | 1000 |
   When I successfully run `dir_sync test a b`
   Then the stdout should contain exactly:
   """
@@ -60,6 +56,9 @@ Scenario: Do nothing when files are already in sync with history
   """
 
   """
+  And the synchronisation history should be:
+  | path         | time |
+  | readme.txt   | 1000 |  
 
 Scenario: Detecting a deletion from past history
   Given the file system:
@@ -73,4 +72,21 @@ Scenario: Detecting a deletion from past history
   """
   rm "b/readme.txt"
 
-  """
+  """
+ 
+ Scenario: Delete all copies of a file that has been removed
+   Given the file system:
+   | path         | time |
+   | a/readme.txt | 1000 |
+   | b/readme.txt | 1000 |
+   And past synchronisation history:
+   | path         | time |
+   | readme.txt   | 1000 |
+   When I successfully run `dir_sync test a b c`
+   Then the stdout should contain exactly:
+   """
+   rm "a/readme.txt"
+   rm "b/readme.txt"
+
+   """
+ 

data/features/step_definitions/dir_sync_steps.rb

@@ -19,4 +19,13 @@ Given /^past synchronisation history:$/ do |table|
       f.puts "#{path}:#{time}"
     end
   end
+end
+
+Then /^the synchronisation history should be:$/ do |table|
+  home = File.expand_path '~'
+  history = table.hashes.inject '' do |acc,row|
+    path, time = row['path'], row['time'].to_i
+    "#{acc}#{path}:#{time}\n"
+  end
+  File.read("#{home}/.dir_sync/test").should == history
 end

data/lib/dir_sync/change_resolver.rb

@@ -32,7 +32,7 @@ private
   end
 
   def rm traverser
-    traverser.rm
+    @traversers.select{|t| t.name == traverser.name}.each &:rm
   end
 
   def cp traverser
@@ -41,6 +41,7 @@ private
   end
 
   def ignore traverser
+    @history.report traverser
   end
 
   def report_traversers

data/spec/dir_sync/change_resolver_spec.rb

@@ -100,6 +100,7 @@ describe DirSync::ChangeResolver do
       traversers[0].should_receive(:equivalent?).with(traversers[0]).and_return true
       traversers[0].should_receive(:equivalent?).with(traversers[1]).and_return false
       traversers[0].should_receive :rm
+      traversers[2].should_receive :rm
       resolver.iterate
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-29 00:00:00.000000000Z
+date: 2012-01-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70170387871540 !ruby/object:Gem::Requirement
+  requirement: &70113425411300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170387871540
+  version_requirements: *70113425411300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70170387870300 !ruby/object:Gem::Requirement
+  requirement: &70113425410160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70170387870300
+  version_requirements: *70113425410160
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70170387869340 !ruby/object:Gem::Requirement
+  requirement: &70113425409460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170387869340
+  version_requirements: *70113425409460
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70170387868340 !ruby/object:Gem::Requirement
+  requirement: &70113425408680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170387868340
+  version_requirements: *70113425408680
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70170387867260 !ruby/object:Gem::Requirement
+  requirement: &70113425408040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170387867260
+  version_requirements: *70113425408040
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70170387866340 !ruby/object:Gem::Requirement
+  requirement: &70113425407220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170387866340
+  version_requirements: *70113425407220
 description: ! 'Multidirectional directory synchronisation for any number of directories
 
 '
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3613376495215102755
+      hash: -3650956989958222228
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10