cloud_encrypted_sync_s3_adapter 0.2.0 → 0.3.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    cloud_encrypted_sync_s3_adapter (0.1.2)
+    cloud_encrypted_sync_s3_adapter (0.3.0)
       aws-sdk (~> 1.7.1)
-      cloud_encrypted_sync (~> 0.2.0)
+      cloud_encrypted_sync (~> 0.3.0)
 
 GEM
   remote: http://rubygems.org/
@@ -16,7 +16,7 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    cloud_encrypted_sync (0.2.0)
+    cloud_encrypted_sync (0.3.0)
     httparty (0.9.0)
       multi_json (~> 1.0)
       multi_xml

data/cloud_encrypted_sync_s3_adapter.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.description = %q{Plugin adapter for CloudEncryptedSync gem that provides interface to AmazonS3.}
 
   s.add_dependency('aws-sdk', '~> 1.7.1')
-  s.add_dependency('cloud_encrypted_sync', '~> 0.2.0')
+  s.add_dependency('cloud_encrypted_sync', '~> 0.3.0')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('mocha')

data/lib/cloud_encrypted_sync_s3_adapter/adapter.rb

@@ -3,15 +3,15 @@ require 'aws-sdk'
 module CloudEncryptedSync
   module Adapters
     class S3 < Template
+      attr_accessor :bucket_name, :credentials
 
-      def parse_command_line_options(opts,command_line_options)
-        opts.on('--bucket BUCKETNAME', 'Name of S3 bucket to use.') do |bucket_name|
-          command_line_options[:bucket] = bucket_name
+      def parse_command_line_options(parser)
+        parser.on('--bucket BUCKETNAME', 'Name of S3 bucket to use.') do |bucket_argument|
+          self.bucket_name = bucket_argument.to_sym
         end
-        opts.on('--s3-credentials ACCESS_KEY_ID,SECRET_ACCESS_KEY', Array, "Credentials for your S3 account." ) do| credentials|
-          command_line_options[:s3_credentials] = credentials
+        parser.on('--s3-credentials ACCESS_KEY_ID,SECRET_ACCESS_KEY', Array, "Credentials for your S3 account." ) do |credentials_argument|
+          self.credentials = credentials_argument
         end
-        return command_line_options
       end
 
       def write(data, key)
@@ -38,18 +38,10 @@ module CloudEncryptedSync
       private
       #######
 
-      def credentials
-        Configuration.settings[:s3_credentials]
-      end
-
       def connection
         @connection ||= AWS::S3.new(:access_key_id => credentials[0], :secret_access_key => credentials[1])
       end
 
-      def bucket_name
-        Configuration.settings[:bucket].to_sym
-      end
-
       def bucket
         connection.buckets[bucket_name]
       end

data/lib/cloud_encrypted_sync_s3_adapter/version.rb

@@ -1,3 +1,3 @@
 module CloudEncryptedSyncS3Adapter
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/test/unit/adapter_test.rb

@@ -7,15 +7,7 @@ module CloudEncryptedSyncS3Adapter
       if File.exist?(CloudEncryptedSync::Configuration.send(:config_file_path))
         @config = YAML.load_file(CloudEncryptedSync::Configuration.send(:config_file_path))
       end
-      CloudEncryptedSync::Configuration.stubs(:settings).returns(
-        {
-          :excryption_key => 'abc',
-          :adapter => 's3',
-          :bucket => test_bucket_name,
-          :sync_path => '/non/existent/path',
-          :s3_credentials => @config['s3_credentials']
-        }
-      )
+      stub_configuration
       create_test_bucket
     end
 
@@ -24,14 +16,17 @@ module CloudEncryptedSyncS3Adapter
     end
 
     test 'should parse command line options' do
+      unstub_configuration
       Object.send(:remove_const,:ARGV)
       ::ARGV = '--bucket foobar --s3-credentials KEY_ID,ACCESS_KEY'.split(/\s/)
       @command_line_options = {}
-      @option_parser = OptionParser.new do |opts|
-        @command_line_options = adapter.parse_command_line_options(opts,@command_line_options)
+      @option_parser = OptionParser.new do |parser|
+        adapter.parse_command_line_options(parser)
       end
       @option_parser.parse!
-      assert_equal({:bucket => 'foobar', :s3_credentials => ['KEY_ID','ACCESS_KEY']},@command_line_options)
+      assert_equal(:foobar,CloudEncryptedSync::Adapters::S3.instance.bucket_name)
+      assert_equal(['KEY_ID','ACCESS_KEY'],CloudEncryptedSync::Adapters::S3.instance.credentials)
+      stub_configuration
     end
 
     test 'should write readable data to s3 and then delete it' do
@@ -80,5 +75,24 @@ module CloudEncryptedSyncS3Adapter
       @test_bucket_name ||= "cloud_encrypted_sync_unit_test_bucket_#{Digest::SHA1.hexdigest(rand.to_s)}"
     end
 
+    def stub_configuration
+      CloudEncryptedSync::Configuration.stubs(:settings).returns(
+        {
+          :excryption_key => 'abc',
+          :adapter => 's3',
+          :bucket => test_bucket_name,
+          :sync_path => '/non/existent/path',
+          :s3_credentials => @config['s3_credentials']
+        }
+      )
+      CloudEncryptedSync::Adapters::S3.any_instance.stubs(:bucket_name).returns(test_bucket_name)
+      CloudEncryptedSync::Adapters::S3.any_instance.stubs(:credentials).returns(@config['s3_credentials'])
+    end
+
+    def unstub_configuration
+      CloudEncryptedSync::Configuration.unstub(:settings)
+      CloudEncryptedSync::Adapters::S3.any_instance.unstub(:bucket_name)
+      CloudEncryptedSync::Adapters::S3.any_instance.unstub(:credentials)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_encrypted_sync_s3_adapter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement