multi_sync 0.0.2 → 0.0.3

data/spec/support/tmpdir.rb

@@ -0,0 +1,18 @@
+require 'tmpdir'
+require 'pathname'
+require 'fileutils'
+RSpec.configure do |config|
+  config.around do |ex|
+    tmpdir = Dir.mktmpdir('multi_sync')
+    tmp = Pathname.new File.join(tmpdir, ex.__id__.to_s)
+    pwd = Dir.pwd
+    FileUtils.mkdir(tmp)
+    begin
+      Dir.chdir(tmp)
+      ex.run
+      Dir.chdir(pwd)
+    ensure
+      FileUtils.remove_entry_secure tmp
+    end
+  end
+end

data/spec/unit/multi_sync/client_spec.rb

@@ -1,29 +1,29 @@
 require 'spec_helper'
 
-describe MultiSync::Client, fakefs: true do
-
+describe MultiSync::Client do
   before do
-    FileUtils.mkdir_p('/tmp/simple')
-    File.open('/tmp/simple/foo.txt', 'w') do |f| f.write('foo') end
-    File.open('/tmp/simple/bar.txt', 'w') do |f| f.write('bar') end
-    FileUtils.mkdir_p('/tmp/simple/in-a-dir')
-    File.open('/tmp/simple/in-a-dir/baz.html', 'w') do |f| f.write('baz') end
+    FileUtils.mkdir_p('tmp/simple')
+    File.open('tmp/simple/foo.txt', File::CREAT | File::RDWR) do |f| f.write('foo') end
+    File.open('tmp/simple/bar.txt', File::CREAT | File::RDWR) do |f| f.write('bar') end
+
+    FileUtils.mkdir_p('tmp/simple/in-a-dir')
+    File.open('tmp/simple/in-a-dir/baz.html', File::CREAT | File::RDWR) do |f| f.write('baz') end
 
-    FileUtils.cp_r('/tmp/simple', '/tmp/simple-with-missing-file')
-    FileUtils.rm_r('/tmp/simple-with-missing-file/foo.txt')
+    FileUtils.cp_r('tmp/simple', 'tmp/simple-with-missing-file')
+    FileUtils.rm_r('tmp/simple-with-missing-file/foo.txt')
 
-    FileUtils.cp_r('/tmp/simple', '/tmp/simple-with-abandoned-file')
-    File.open('/tmp/simple-with-abandoned-file/baz.txt', 'w') do |f| f.write('baz') end
+    FileUtils.cp_r('tmp/simple', 'tmp/simple-with-abandoned-file')
+    File.open('tmp/simple-with-abandoned-file/baz.txt', File::CREAT | File::RDWR) do |f| f.write('baz') end
 
-    FileUtils.cp_r('/tmp/simple', '/tmp/simple-with-outdated-file')
-    File.open('/tmp/simple-with-outdated-file/foo.txt', 'w') do |f| f.write('not-foo') end
+    FileUtils.cp_r('tmp/simple', 'tmp/simple-with-outdated-file')
+    File.open('tmp/simple-with-outdated-file/foo.txt', File::CREAT | File::RDWR) do |f| f.write('not-foo') end
 
-    FileUtils.mkdir_p('/tmp/complex')
-    50.times do
-      File.open("/tmp/complex/#{SecureRandom.urlsafe_base64}.txt", 'w') do |f| f.write(SecureRandom.random_bytes) end
+    FileUtils.mkdir_p('tmp/complex')
+    1_000.times do |i|
+      File.open("tmp/complex/#{i.to_s.rjust(4, '0')}.txt", File::CREAT | File::RDWR) do |f| f.write('foo') end
     end
 
-    FileUtils.mkdir_p('/tmp/complex-empty')
+    FileUtils.mkdir_p('tmp/complex-empty')
   end
 
   context :sync do
@@ -31,36 +31,30 @@ describe MultiSync::Client, fakefs: true do
       context 'simple' do
         it 'should work' do
           missing_files_target_options = {
-            type: :local,
-            target_dir: '/tmp',
+            target_dir: 'tmp',
             destination_dir: 'simple-with-missing-file',
             credentials: {
-              local_root: '/tmp'
+              local_root: 'tmp'
             }
           }
 
           abandoned_files_target_options = {
-            type: :local,
-            target_dir: '/tmp',
+            target_dir: 'tmp',
             destination_dir: 'simple-with-abandoned-file',
             credentials: {
-              local_root: '/tmp'
+              local_root: 'tmp'
             }
           }
 
           outdated_files_target_options = {
-            type: :local,
-            target_dir: '/tmp',
+            target_dir: 'tmp',
             destination_dir: 'simple-with-outdated-file',
             credentials: {
-              local_root: '/tmp'
+              local_root: 'tmp'
             }
           }
 
-          local_source_options = {
-            type: :local,
-            source_dir: '/tmp/simple'
-          }
+          local_source_options = { source_dir: 'tmp/simple' }
 
           missing_files_target = MultiSync::LocalTarget.new(missing_files_target_options)
           abandoned_files_target = MultiSync::LocalTarget.new(abandoned_files_target_options)
@@ -76,10 +70,10 @@ describe MultiSync::Client, fakefs: true do
           expect(outdated_files_target.files[1].body).to eq 'not-foo'
 
           MultiSync.run do
-            target :missing_files_target, missing_files_target_options
-            target :abandoned_files_target, abandoned_files_target_options
-            target :outdated_files_target, outdated_files_target_options
-            source :simple, local_source_options.merge(targets: [:missing_files_target, :abandoned_files_target, :outdated_files_target])
+            local_target(missing_files_target_options)
+            local_target(abandoned_files_target_options)
+            local_target(outdated_files_target_options)
+            local_source(local_source_options)
           end
 
           expect(missing_files_target).to have(3).files
@@ -92,31 +86,27 @@ describe MultiSync::Client, fakefs: true do
       context 'complex' do
         it 'should work' do
           complex_empty_target_options = {
-            type: :local,
-            target_dir: '/tmp',
+            target_dir: 'tmp',
             destination_dir: 'complex-empty',
             credentials: {
-              local_root: '/tmp'
+              local_root: 'tmp'
             }
           }
 
-          local_source_options = {
-            type: :local,
-            source_dir: '/tmp/complex'
-          }
+          local_source_options = { source_dir: 'tmp/complex' }
 
           complex_empty_target = MultiSync::LocalTarget.new(complex_empty_target_options)
           expect(complex_empty_target).to have(0).files
 
           local_source = MultiSync::LocalSource.new(local_source_options)
-          expect(local_source).to have(50).files
+          expect(local_source).to have(1_000).files
 
           MultiSync.run do
-            target :complex_empty_target, complex_empty_target_options
-            source :complex, local_source_options.merge(targets: [:complex_empty_target])
+            local_source(local_source_options)
+            local_target(complex_empty_target_options)
           end
 
-          expect(complex_empty_target).to have(50).files
+          expect(complex_empty_target).to have(1_000).files
         end
       end
     end
@@ -134,9 +124,9 @@ describe MultiSync::Client, fakefs: true do
           directory = connection.directories.create(key: 'multi_sync', public: true)
 
           %w(simple simple-with-missing-file simple-with-abandoned-file simple-with-outdated-file).each do |fixture_name|
-            Dir.glob("/tmp/#{fixture_name}/**/*").reject { |path| File.directory?(path) }.each do |path|
+            Dir.glob("tmp/#{fixture_name}/**/*").reject { |path| File.directory?(path) }.each do |path|
               directory.files.create(
-                key: path.gsub('/tmp/', ''),
+                key: path.gsub('tmp/', ''),
                 body: File.open(path, 'r'),
                 public: true
               )
@@ -146,7 +136,6 @@ describe MultiSync::Client, fakefs: true do
 
         it 'should work' do
           missing_files_target_options = {
-            type: :aws,
             target_dir: 'multi_sync',
             destination_dir: 'simple-with-missing-file',
             credentials: {
@@ -157,7 +146,6 @@ describe MultiSync::Client, fakefs: true do
           }
 
           abandoned_files_target_options = {
-            type: :aws,
             target_dir: 'multi_sync',
             destination_dir: 'simple-with-abandoned-file',
             credentials: {
@@ -168,7 +156,6 @@ describe MultiSync::Client, fakefs: true do
           }
 
           outdated_files_target_options = {
-            type: :aws,
             target_dir: 'multi_sync',
             destination_dir: 'simple-with-outdated-file',
             credentials: {
@@ -178,10 +165,7 @@ describe MultiSync::Client, fakefs: true do
             }
           }
 
-          local_source_options = {
-            type: :local,
-            source_dir: '/tmp/simple'
-          }
+          local_source_options = { source_dir: 'tmp/simple' }
 
           missing_files_target = MultiSync::AwsTarget.new(missing_files_target_options)
           abandoned_files_target = MultiSync::AwsTarget.new(abandoned_files_target_options)
@@ -197,10 +181,10 @@ describe MultiSync::Client, fakefs: true do
           expect(outdated_files_target.files[1].body).to eq 'not-foo'
 
           MultiSync.run do
-            target :missing_files_target, missing_files_target_options
-            target :abandoned_files_target, abandoned_files_target_options
-            target :outdated_files_target, outdated_files_target_options
-            source :simple, local_source_options.merge(targets: [:missing_files_target, :abandoned_files_target, :outdated_files_target])
+            local_source(local_source_options)
+            aws_target(missing_files_target_options)
+            aws_target(abandoned_files_target_options)
+            aws_target(outdated_files_target_options)
           end
 
           expect(missing_files_target).to have(3).files
@@ -224,7 +208,6 @@ describe MultiSync::Client, fakefs: true do
 
         it 'should work' do
           complex_empty_target_options = {
-            type: :aws,
             target_dir: 'multi_sync',
             destination_dir: 'complex-empty',
             credentials: {
@@ -234,23 +217,20 @@ describe MultiSync::Client, fakefs: true do
             }
           }
 
-          local_source_options = {
-            type: :local,
-            source_dir: '/tmp/complex'
-          }
+          local_source_options = { source_dir: 'tmp/complex' }
 
           complex_empty_target = MultiSync::AwsTarget.new(complex_empty_target_options)
           expect(complex_empty_target).to have(0).files
 
           local_source = MultiSync::LocalSource.new(local_source_options)
-          expect(local_source).to have(50).files
+          expect(local_source).to have(1_000).files
 
           MultiSync.run do
-            target :complex_empty_target, complex_empty_target_options
-            source :complex, local_source_options.merge(targets: [:complex_empty_target])
+            local_source(local_source_options)
+            aws_target(complex_empty_target_options)
           end
 
-          expect(complex_empty_target).to have(50).files
+          expect(complex_empty_target).to have(1_000).files
         end
       end
 
@@ -268,7 +248,6 @@ describe MultiSync::Client, fakefs: true do
 
         it 'should work' do
           without_destination_dir_target_options = {
-            type: :aws,
             target_dir: 'without_destination_dir',
             credentials: {
               region: 'us-east-1',
@@ -277,10 +256,7 @@ describe MultiSync::Client, fakefs: true do
             }
           }
 
-          local_source_options = {
-            type: :local,
-            source_dir: '/tmp/simple'
-          }
+          local_source_options = { source_dir: 'tmp/simple' }
 
           without_destination_dir_target = MultiSync::AwsTarget.new(without_destination_dir_target_options)
           expect(without_destination_dir_target).to have(0).files
@@ -289,8 +265,8 @@ describe MultiSync::Client, fakefs: true do
           expect(local_source).to have(3).files
 
           MultiSync.run do
-            target :without_destination_dir_target, without_destination_dir_target_options
-            source :local, local_source_options.merge(targets: :without_destination_dir_target)
+            local_source(local_source_options)
+            aws_target(without_destination_dir_target_options)
           end
 
           expect(without_destination_dir_target).to have(3).files
@@ -298,6 +274,7 @@ describe MultiSync::Client, fakefs: true do
       end
 
       context 'with resource_options' do
+        # TODO: tests...
       end
     end
   end

data/spec/unit/multi_sync/configuration_spec.rb

@@ -1,91 +1,62 @@
 require 'spec_helper'
 
-describe MultiSync::Configuration, fakefs: true do
-
-  before do
-    FileUtils.mkdir_p('/tmp/fog')
-    File.open('/tmp/fog/.fog', 'w') do |f|
-      f << "default:\n"
-      f << "  aws_access_key_id: AWS_ACCESS_KEY_ID_DEFAULT\n"
-      f << "  aws_secret_access_key: AWS_SECRET_ACCESS_KEY_DEFAULT\n"
-      f << "alt:\n"
-      f << "  aws_access_key_id: AWS_ACCESS_KEY_ID_ALT\n"
-      f << '  aws_secret_access_key: AWS_SECRET_ACCESS_KEY_ALT'
-    end
-  end
-
+describe MultiSync::Configuration do
   let(:configuration) { MultiSync::Configuration.new }
-
-  context :target_pool_size do
-    context :defaults do
-      describe :size do
-        subject { configuration.target_pool_size }
-        it { should > 1 }
+  context :configuration do
+    describe :target_pool_size do
+      it 'should default to celluloid_cores' do
+        expect(configuration.target_pool_size).to eq Celluloid.cores
       end
-    end
-
-    context :custom do
-      before do
+      it 'should be settable' do
         configuration.target_pool_size = 3
-      end
-
-      describe :size do
-        subject { configuration.target_pool_size }
-        it { should eq 3 }
-      end
-    end
-  end
-
-  context :credentials do
-    before do
-      Fog.instance_variable_set('@credential_path', nil)
-      Fog.instance_variable_set('@credentials', nil)
-      Fog.instance_variable_set('@credential', nil)
-    end
-
-    after do
-      ENV['FOG_RC'] = nil
-      ENV['FOG_CREDENTIAL'] = 'default'
-      Fog.instance_variable_set('@credential_path', nil)
-      Fog.instance_variable_set('@credentials', nil)
-      Fog.instance_variable_set('@credential', nil)
-    end
-
-    context 'with default fog credentials' do
-      before do
-        ENV['FOG_RC'] = nil
-        ENV['FOG_CREDENTIAL'] = 'default'
-      end
-
-      describe :credentials do
-        subject { configuration.credentials }
-        it { should be_empty }
-      end
-    end
-
-    context 'with custom .fog path set' do
-      before do
-        ENV['FOG_RC'] = '/tmp/fog/.fog'
-        ENV['FOG_CREDENTIAL'] = 'default'
-      end
-
-      describe :credentials do
-        subject { configuration.credentials }
-        its([:aws_access_key_id]) { should eq 'AWS_ACCESS_KEY_ID_DEFAULT' }
-        its([:aws_secret_access_key]) { should eq 'AWS_SECRET_ACCESS_KEY_DEFAULT' }
-      end
-    end
-
-    context "with 'alt' credential set" do
-      before do
-        ENV['FOG_RC'] = '/tmp/fog/.fog'
-        ENV['FOG_CREDENTIAL'] = 'alt'
-      end
-
-      describe :credentials do
-        subject { configuration.credentials }
-        its([:aws_access_key_id]) { should eq 'AWS_ACCESS_KEY_ID_ALT' }
-        its([:aws_secret_access_key]) { should eq 'AWS_SECRET_ACCESS_KEY_ALT' }
+        expect(configuration.target_pool_size).to be 3
+      end
+    end
+    describe :credentials do
+      it 'should be settable' do
+        configuration.credentials = { foo: 'bar' }
+        expect(configuration.credentials).to eq foo: 'bar'
+      end
+      context 'fog environment variables' do
+        before do
+          FileUtils.mkdir_p('/tmp/fog')
+          File.open('/tmp/fog/.fog', 'w') do |f|
+            f << "default:\n"
+            f << "  aws_access_key_id: AWS_ACCESS_KEY_ID_DEFAULT\n"
+            f << "  aws_secret_access_key: AWS_SECRET_ACCESS_KEY_DEFAULT\n"
+            f << "alt:\n"
+            f << "  aws_access_key_id: AWS_ACCESS_KEY_ID_ALT\n"
+            f << '  aws_secret_access_key: AWS_SECRET_ACCESS_KEY_ALT'
+          end
+          Fog.instance_variable_set('@credential_path', nil)
+          Fog.instance_variable_set('@credentials', nil)
+          Fog.instance_variable_set('@credential', nil)
+        end
+        after do
+          ENV['FOG_RC'] = nil
+          ENV['FOG_CREDENTIAL'] = 'default'
+          Fog.instance_variable_set('@credential_path', nil)
+          Fog.instance_variable_set('@credentials', nil)
+          Fog.instance_variable_set('@credential', nil)
+        end
+        it 'should default to fog credentials' do
+          ENV['FOG_RC'] = nil
+          ENV['FOG_CREDENTIAL'] = 'default'
+          expect(configuration.credentials).to eq Fog.credentials
+        end
+        it 'should use fog credentials' do
+          ENV['FOG_RC'] = '/tmp/fog/.fog'
+          ENV['FOG_CREDENTIAL'] = 'default'
+          expect(configuration.credentials).to eq(aws_access_key_id: 'AWS_ACCESS_KEY_ID_DEFAULT', aws_secret_access_key: 'AWS_SECRET_ACCESS_KEY_DEFAULT')
+        end
+        it 'should use fog \'alt\' credentials' do
+          ENV['FOG_RC'] = '/tmp/fog/.fog'
+          ENV['FOG_CREDENTIAL'] = 'alt'
+          expect(configuration.credentials).to eq(
+                                                    aws_access_key_id: 'AWS_ACCESS_KEY_ID_ALT',
+                                                    aws_secret_access_key: 'AWS_SECRET_ACCESS_KEY_ALT'
+          )
+        end
       end
     end
   end

data/spec/unit/multi_sync/resources/local_resource_spec.rb

@@ -2,19 +2,21 @@ require 'spec_helper'
 
 describe MultiSync::LocalResource, fakefs: true do
   before do
-    FileUtils.mkdir_p('/tmp/local-resource')
-    File.open('/tmp/local-resource/foo.txt', 'w') do |f| f.write('foo') end
+    FileUtils.mkdir_p('tmp/local-resource')
+    File.open('tmp/local-resource/foo.txt', 'w') do |f| f.write('foo') end
   end
 
   describe :local do
     context :valid do
       it 'should return correct file details' do
-        # binding.pry
-        resource = MultiSync::LocalResource.new(path_with_root: Pathname.new('/tmp/local-resource/foo.txt'), path_without_root: Pathname.new('foo.txt'))
+        resource = MultiSync::LocalResource.new(
+          path_with_root: Pathname.new('tmp/local-resource/foo.txt'),
+          path_without_root: Pathname.new('foo.txt')
+        )
         expect(resource.body).to eq 'foo'
         expect(resource.content_length).to eq 3
         expect(resource.content_type).to eq 'text/plain'
-        expect(resource.mtime).to eq Time.now
+        expect(resource.mtime).to be_within(1).of(Time.now)
         expect(resource.etag).to eq 'acbd18db4cc2f85cedef654fccc4a4d8'
       end
     end
@@ -22,7 +24,7 @@ describe MultiSync::LocalResource, fakefs: true do
     context :known do
       it 'should return correct file details (with overwritten info)' do
         resource = MultiSync::LocalResource.new(
-          path_with_root: Pathname.new('/tmp/local-resource/foo.txt'),
+          path_with_root: Pathname.new('tmp/local-resource/foo.txt'),
           path_without_root: Pathname.new('foo.txt'),
           content_length: 42,
           mtime: Time.now - 1,
@@ -39,7 +41,7 @@ describe MultiSync::LocalResource, fakefs: true do
     context :unknown do
       it 'should return default file details' do
         resource = MultiSync::LocalResource.new(
-          path_with_root: Pathname.new('/tmp/local-resource/missing.txt'),
+          path_with_root: Pathname.new('tmp/local-resource/missing.txt'),
           path_without_root: Pathname.new('missing.txt')
         )
         expect(resource.body).to eq nil