closync 0.0.3 → 0.1.0

data/Changelog.md

@@ -0,0 +1,4 @@
+## 0.1.0 (2012-10-23)
+
+* new feature: files that do not appear in the origin bucket are now automatically deleted from the destination bucket
+* enhancement: to save bandwidth and reduce the number of PUT requests, only stale files are copied from origin to destination bucket

data/lib/closync/sync.rb

@@ -12,43 +12,42 @@ module Closync
     end
 
     def push!
-      push_new_data!
-      delete_old_data!
+      @local.directory.files.each do |local_file|
+        upload!(local_file) if stale_on_remote?(local_file)
+      end
+      @remote.directory.files.each do |remote_file|
+        remote_file.destroy unless exists_locally?(remote_file)
+      end
     end
 
     private
 
-    def push_new_data!
-      @local.directory.files.each do |file|
-        upload!(file) if upload?(file)
-      end
-    end
 
-    def delete_old_data!
-      # @remote.directory.files.each do |file|
-      #   file.delete unless @local.directory.files.head(file)
-      # end
+    def exists_locally?(remote_file)
+      return true if @local.directory.files.head(remote_file.key)
+      false
     end
 
-    def upload?(file)
-      # TODO(wenzowski): check if file already exists
-      #
-      # upload = false
-      # if ( remote_file = @remote.directory.files.head(file.key) )
-      #   # TODO(wenzowski): check etag to see if file has changed
-      # else
-      #   upload = true
-      # end
-      # upload
-      true
+    # TODO(wenzowski): local_file.should.respond_to?(:content_md5)
+    def stale_on_remote?(local_file)
+      remote_file = @remote.directory.files.head(local_file.key)
+      return true unless remote_file # file is missing from remote, therefore stale
+      if remote_file.respond_to?(:content_md5) && local_file.respond_to?(:content_md5)
+        (
+          ( remote_file.content_length != local_file.content_length ) &&
+          ( remote_file.content_md5 != local_file.content_md5 )
+        )
+      else
+        ( remote_file.content_length != local_file.content_length )
+      end
     end
 
     # If file already exists on remote it will be overwritten.
-    def upload!(file)
+    def upload!(local_file)
       @remote.directory.files.create(
-        key:            file.key,
-        body:           file.body,
-        cache_control:  "public, max-age=#{max_age(file)}",
+        key:            local_file.key,
+        body:           local_file.body,
+        cache_control:  "public, max-age=#{max_age(local_file)}",
         public:         true
       )
     end

data/lib/closync/version.rb

@@ -1,3 +1,3 @@
 module Closync
-  VERSION = "0.0.3"
+  VERSION = '0.1.0'
 end

data/spec/lib/closync/sync_spec.rb

@@ -15,27 +15,61 @@ describe Closync::Storage do
     config
   }
 
-  context 'local sync' do
-    before(:each) do
-      FileUtils.mkdir_p local_dir
-      FileUtils.mkdir_p remote_dir
-      FileUtils.touch "#{local_dir}/index.html"
-      FileUtils.touch "#{local_dir}/pic.jpg"
-    end
-    after(:each) do
-      FileUtils.rm_rf local_dir
-      FileUtils.rm_rf remote_dir
-    end
+  before(:each) do
+    FileUtils.mkdir_p local_dir
+    FileUtils.mkdir_p remote_dir
+    FileUtils.touch "#{remote_dir}/missing.html"
+    FileUtils.touch "#{remote_dir}/stale.html"
+    FileUtils.touch "#{local_dir}/index.html"
+    FileUtils.touch "#{local_dir}/pic.jpg"
+    File.open("#{local_dir}/stale.html", 'w') {|f| f.write('new data') }
+  end
+  after(:each) do
+    FileUtils.rm_rf local_dir
+    FileUtils.rm_rf remote_dir
+  end
 
-    it { lambda {Closync::Sync.new(config)}.should_not raise_error }
+  it { lambda {Closync::Sync.new(config)}.should_not raise_error }
 
-    it 'pushes files to remote' do
+  context 'before sync' do
+    its 'new files exist locally' do
+      File.exists?("#{local_dir}/index.html").should be_true
+      File.exists?("#{local_dir}/pic.jpg").should be_true
+    end
+    its 'new files do not exist on remote' do
       File.exists?("#{remote_dir}/index.html").should be_false
       File.exists?("#{remote_dir}/pic.jpg").should be_false
-      Closync::Sync.new(config).push!
+    end
+    its 'missing files do not exist locally' do
+      File.exists?("#{local_dir}/missing.html").should be_false
+    end
+    its 'missing files exist on remote' do
+      File.exists?("#{remote_dir}/missing.html").should be_true
+    end
+    its 'stale files are a different size on remote' do
+      File.size("#{remote_dir}/stale.html").should_not == File.size("#{local_dir}/stale.html")
+    end
+  end
+
+  context 'after sync' do
+    before(:each) { Closync::Sync.new(config).push! }
+    its 'new files exist locally' do
+      File.exists?("#{local_dir}/index.html").should be_true
+      File.exists?("#{local_dir}/pic.jpg").should be_true
+    end
+    its 'new files exist on remote' do
       File.exists?("#{remote_dir}/index.html").should be_true
       File.exists?("#{remote_dir}/pic.jpg").should be_true
     end
+    its 'missing files do not exist locally' do
+      File.exists?("#{local_dir}/missing.html").should be_false
+    end
+    its 'missing files do not exist on remote' do
+      File.exists?("#{remote_dir}/missing.html").should be_false
+    end
+    its 'stale files are the same size on remote' do
+      File.size("#{remote_dir}/stale.html").should == File.size("#{local_dir}/stale.html")
+    end
   end
 
 end

data/spec/lib/closync/version_spec.rb

@@ -2,5 +2,5 @@ require 'spec_helper'
 require 'closync/version'
 
 describe Closync do
-  it { Closync::VERSION.should eq('0.0.2'), "Please don't bump the version." }
+  it { Closync::VERSION.should eq('0.1.0'), "Please don't bump the version." }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closync
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -39,6 +39,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- Changelog.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -71,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 932699495062180289
+      hash: 12197200572235269
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 932699495062180289
+      hash: 12197200572235269
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24