cloud_encrypted_sync_s3_adapter 0.1.2 → 0.2.0

data/Gemfile

@@ -1,4 +1,2 @@
 source 'http://rubygems.org'
-gemspec
-
-gem 'cloud_encrypted_sync', :path => '~/workspace/cloud_encrypted_sync'
+gemspec

data/Gemfile.lock

@@ -2,13 +2,8 @@ PATH
   remote: .
   specs:
     cloud_encrypted_sync_s3_adapter (0.1.2)
-      aws-sdk (~> 1.4.1)
-      cloud_encrypted_sync (~> 0.1.1)
-
-PATH
-  remote: ~/workspace/cloud_encrypted_sync
-  specs:
-    cloud_encrypted_sync (0.1.1)
+      aws-sdk (~> 1.7.1)
+      cloud_encrypted_sync (~> 0.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -16,16 +11,17 @@ GEM
     activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    aws-sdk (1.4.1)
+    aws-sdk (1.7.1)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    httparty (0.8.3)
+    cloud_encrypted_sync (0.2.0)
+    httparty (0.9.0)
       multi_json (~> 1.0)
       multi_xml
     i18n (0.6.0)
-    json (1.7.3)
+    json (1.7.5)
     metaclass (0.0.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
@@ -37,14 +33,13 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    uuidtools (2.1.2)
+    uuidtools (2.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport
-  cloud_encrypted_sync!
   cloud_encrypted_sync_s3_adapter!
   mocha
   rake

data/cloud_encrypted_sync_s3_adapter.gemspec

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

data/lib/cloud_encrypted_sync_s3_adapter/adapter.rb

@@ -4,59 +4,56 @@ module CloudEncryptedSync
   module Adapters
     class S3 < Template
 
-      class << self
-
-        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
-          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
-          end
-          return command_line_options
+      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
         end
-
-        def write(data, key)
-          bucket.objects.create(key,data)
+        opts.on('--s3-credentials ACCESS_KEY_ID,SECRET_ACCESS_KEY', Array, "Credentials for your S3 account." ) do| credentials|
+          command_line_options[:s3_credentials] = credentials
         end
+        return command_line_options
+      end
 
-        def read(key)
-          begin
-            bucket.objects[key].read
-          rescue AWS::S3::Errors::NoSuchKey => exception
-            raise CloudEncryptedSync::Errors::NoSuchKey.new(exception.message)
-          end
-        end
+      def write(data, key)
+        bucket.objects.create(key,data)
+      end
 
-        def delete(key)
-          bucket.objects[key].delete
+      def read(key)
+        begin
+          bucket.objects[key].read
+        rescue AWS::S3::Errors::NoSuchKey => exception
+          raise CloudEncryptedSync::Errors::NoSuchKey.new(exception.message)
         end
+      end
 
-        def key_exists?(key)
-          bucket.objects[key].exists?
-        end
+      def delete(key)
+        bucket.objects[key].delete
+      end
 
-        #######
-        private
-        #######
+      def key_exists?(key)
+        bucket.objects[key].exists?
+      end
 
-        def credentials
-          Configuration.settings[:s3_credentials]
-        end
+      #######
+      private
+      #######
 
-        def connection
-          @connection ||= AWS::S3.new(:access_key_id => credentials[0], :secret_access_key => credentials[1])
-        end
+      def credentials
+        Configuration.settings[:s3_credentials]
+      end
 
-        def bucket_name
-          Configuration.settings[:bucket].to_sym
-        end
+      def connection
+        @connection ||= AWS::S3.new(:access_key_id => credentials[0], :secret_access_key => credentials[1])
+      end
 
-        def bucket
-          connection.buckets[bucket_name]
-        end
+      def bucket_name
+        Configuration.settings[:bucket].to_sym
+      end
 
+      def bucket
+        connection.buckets[bucket_name]
       end
+
     end
   end
 end

data/lib/cloud_encrypted_sync_s3_adapter/version.rb

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

data/test/test_helper.rb

@@ -13,18 +13,10 @@ require 'cloud_encrypted_sync_s3_adapter'
 module CloudEncryptedSyncS3Adapter
   class ActiveSupport::TestCase
 
-    setup :preset_environment
-
-    def preset_environment
-      CloudEncryptedSync::Master.instance_variable_set(:@config,nil)
-      CloudEncryptedSync::Master.instance_variable_set(:@command_line_options, {
-        :data_dir => "#{Etc.getpwuid.dir}/.cloud_encrypted_sync"
-      })
-    end
-
     def adapter
       CloudEncryptedSync::Adapters::S3
     end
+
   end
 end
 require 'mocha'

data/test/unit/adapter_test.rb

@@ -19,6 +19,21 @@ module CloudEncryptedSyncS3Adapter
       create_test_bucket
     end
 
+    def teardown
+      delete_test_bucket
+    end
+
+    test 'should parse command line options' do
+      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)
+      end
+      @option_parser.parse!
+      assert_equal({:bucket => 'foobar', :s3_credentials => ['KEY_ID','ACCESS_KEY']},@command_line_options)
+    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 != []
@@ -27,14 +42,14 @@ module CloudEncryptedSyncS3Adapter
       test_key = 'testkey'
 
       assert !adapter.key_exists?(test_key)
-      assert_difference('adapter.send(:bucket).objects.count') do
+      assert_difference('adapter.instance.send(:bucket).objects.count') do
         adapter.write(test_data,test_key)
       end
       assert adapter.key_exists?(test_key)
 
       assert_equal(test_data,adapter.read(test_key))
 
-      assert_difference('adapter.send(:bucket).objects.count',-1) do
+      assert_difference('adapter.instance.send(:bucket).objects.count',-1) do
         adapter.delete(test_key)
       end
       assert !adapter.key_exists?(test_key)
@@ -54,11 +69,11 @@ module CloudEncryptedSyncS3Adapter
     end
 
     def create_test_bucket
-      adapter.send(:connection).buckets.create(test_bucket_name)
+      adapter.instance.send(:connection).buckets.create(test_bucket_name)
     end
 
     def delete_test_bucket
-      adapter.send(:bucket).delete! unless credentials == [] or !credentials.is_a?(Array)
+      adapter.instance.send(:bucket).delete! unless credentials == [] or !credentials.is_a?(Array)
     end
 
     def test_bucket_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_encrypted_sync_s3_adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: cloud_encrypted_sync
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement