cloud_encrypted_sync_s3_adapter 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloud_encrypted_sync_s3_adapter (0.3.0)
+    cloud_encrypted_sync_s3_adapter (0.3.1)
       aws-sdk (~> 1.7.1)
       cloud_encrypted_sync (~> 0.3.0)
 

data/lib/cloud_encrypted_sync_s3_adapter/adapter.rb

@@ -3,14 +3,17 @@ require 'aws-sdk'
 module CloudEncryptedSync
   module Adapters
     class S3 < Template
-      attr_accessor :bucket_name, :credentials
+      attr_writer :bucket_name, :access_key, :access_key_id
 
       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
+          self.bucket_name = bucket_argument
         end
-        parser.on('--s3-credentials ACCESS_KEY_ID,SECRET_ACCESS_KEY', Array, "Credentials for your S3 account." ) do |credentials_argument|
-          self.credentials = credentials_argument
+        parser.on('--access-key KEY', 'Access Key for S3 login.') do |bucket_argument|
+          self.access_key = bucket_argument
+        end
+        parser.on('--access-key-id KEYID', 'Access Key ID for S3 login.') do |bucket_argument|
+          self.access_key_id = bucket_argument
         end
       end
 
@@ -38,8 +41,20 @@ module CloudEncryptedSync
       private
       #######
 
+      def bucket_name
+        @bucket_name || Configuration.settings['s3-bucket']
+      end
+
+      def access_key
+        @access_key || Configuration.settings['s3-access-key']
+      end
+
+      def access_key_id
+        @access_key_id || Configuration.settings['s3-access-key-id']
+      end
+
       def connection
-        @connection ||= AWS::S3.new(:access_key_id => credentials[0], :secret_access_key => credentials[1])
+        @connection ||= AWS::S3.new(:access_key_id => access_key_id, :secret_access_key => access_key)
       end
 
       def bucket

data/lib/cloud_encrypted_sync_s3_adapter/version.rb

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

data/test/unit/adapter_test.rb

@@ -18,20 +18,21 @@ module CloudEncryptedSyncS3Adapter
     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/)
+      ::ARGV = '--bucket foobar --access-key-id KEY_ID --access-key ACCESS_KEY'.split(/\s/)
       @command_line_options = {}
       @option_parser = OptionParser.new do |parser|
         adapter.parse_command_line_options(parser)
       end
       @option_parser.parse!
-      assert_equal(:foobar,CloudEncryptedSync::Adapters::S3.instance.bucket_name)
-      assert_equal(['KEY_ID','ACCESS_KEY'],CloudEncryptedSync::Adapters::S3.instance.credentials)
+      assert_equal('foobar',CloudEncryptedSync::Adapters::S3.instance.send(:bucket_name))
+      assert_equal('KEY_ID',CloudEncryptedSync::Adapters::S3.instance.send(:access_key_id))
+      assert_equal('ACCESS_KEY',CloudEncryptedSync::Adapters::S3.instance.send(:access_key))
       stub_configuration
     end
 
     test 'should write readable data to s3 and then delete it' do
 
-      skip 'S3 credentials for test bucket not provided.' unless credentials.is_a?(Array) and credentials != []
+      skip 'S3 credentials for test bucket not provided.' unless access_key and access_key_id
 
       test_data = 'testdata'
       test_key = 'testkey'
@@ -59,8 +60,12 @@ module CloudEncryptedSyncS3Adapter
     private
     #######
 
-    def credentials
-      @config['s3_credentials']
+    def access_key
+      @config['s3-access-key']
+    end
+
+    def access_key_id
+      @config['s3-access-key-id']
     end
 
     def create_test_bucket
@@ -68,7 +73,7 @@ module CloudEncryptedSyncS3Adapter
     end
 
     def delete_test_bucket
-      adapter.instance.send(:bucket).delete! unless credentials == [] or !credentials.is_a?(Array)
+      adapter.instance.send(:bucket).delete! if access_key and access_key_id
     end
 
     def test_bucket_name
@@ -80,19 +85,19 @@ module CloudEncryptedSyncS3Adapter
         {
           :excryption_key => 'abc',
           :adapter => 's3',
-          :bucket => test_bucket_name,
-          :sync_path => '/non/existent/path',
-          :s3_credentials => @config['s3_credentials']
+          :sync_path => '/any/path',
         }
       )
       CloudEncryptedSync::Adapters::S3.any_instance.stubs(:bucket_name).returns(test_bucket_name)
-      CloudEncryptedSync::Adapters::S3.any_instance.stubs(:credentials).returns(@config['s3_credentials'])
+      CloudEncryptedSync::Adapters::S3.any_instance.stubs(:access_key).returns(access_key)
+      CloudEncryptedSync::Adapters::S3.any_instance.stubs(:access_key_id).returns(access_key_id)
     end
 
     def unstub_configuration
       CloudEncryptedSync::Configuration.unstub(:settings)
       CloudEncryptedSync::Adapters::S3.any_instance.unstub(:bucket_name)
-      CloudEncryptedSync::Adapters::S3.any_instance.unstub(:credentials)
+      CloudEncryptedSync::Adapters::S3.any_instance.unstub(:access_key)
+      CloudEncryptedSync::Adapters::S3.any_instance.unstub(:access_key_id)
     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.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors: