cloud_encrypted_sync 0.2.0 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloud_encrypted_sync (0.2.0)
+    cloud_encrypted_sync (0.3.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/cloud_encrypted_sync/adapter_template.rb

@@ -14,8 +14,8 @@ module CloudEncryptedSync
           @children ||= {}
         end
 
-        def parse_command_line_options(opts,command_line_options)
-          instance.parse_command_line_options(opts,command_line_options)
+        def parse_command_line_options(parser)
+          instance.parse_command_line_options(parser)
         end
 
         def write(data, key)
@@ -49,7 +49,7 @@ module CloudEncryptedSync
 
       end
 
-      def parse_command_line_options(opts,command_line_options)
+      def parse_command_line_options(parser)
         raise Errors::TemplateMethodCalled.new('parse_command_line_options')
       end
 

data/lib/cloud_encrypted_sync/configuration.rb

@@ -66,16 +66,16 @@ module CloudEncryptedSync
         executable_name = File.basename($PROGRAM_NAME)
         clo = {:data_dir => "#{Etc.getpwuid.dir}/.cloud_encrypted_sync"}
 
-        @option_parser = OptionParser.new do |opts|
-          opts.banner = "Usage: #{executable_name} [options] /path/to/folder/to/sync"
-          opts.on('--data-dir PATH',"Data directory where indexes and config file are found.") do |path|
+        @option_parser = OptionParser.new do |parser|
+          parser.banner = "Usage: #{executable_name} [options] /path/to/folder/to/sync"
+          parser.on('--data-dir PATH',"Data directory where indexes and config file are found.") do |path|
             clo[:data_dir] = path
           end
-          opts.on('--adapter ADAPTERNAME', 'Name of cloud adapter to use.') do |adapter_name|
+          parser.on('--adapter ADAPTERNAME', 'Name of cloud adapter to use.') do |adapter_name|
             clo[:adapter_name] = adapter_name
-            clo = AdapterLiaison.instance.adapters[adapter_name.to_sym].parse_command_line_options(opts,clo)
+            AdapterLiaison.instance.adapters[adapter_name.to_sym].parse_command_line_options(parser)
           end
-          opts.on('--encryption-key KEY') do |key|
+          parser.on('--encryption-key KEY') do |key|
             clo[:encryption_key] = key
           end
         end

data/lib/cloud_encrypted_sync/dummy_adapter.rb

@@ -1,16 +1,16 @@
 module CloudEncryptedSync
   module Adapters
     class Dummy < Template
+      attr_accessor :bucket_name
 
       def write(data,key)
         stored_data[bucket_name][key] = data
       end
 
-      def parse_command_line_options(opts,command_line_options)
-        opts.on('--bucket BUCKETNAME', 'Name of cloud adapter to use.') do |bucket_name|
-          command_line_options[:bucket] = bucket_name
+      def parse_command_line_options(parser)
+        parser.on('--bucket BUCKETNAME', 'Name of cloud adapter to use.') do |bucket_argument|
+          self.bucket_name = bucket_argument
         end
-        return command_line_options
       end
 
       def read(key)
@@ -34,10 +34,6 @@ module CloudEncryptedSync
         @stored_data ||= { bucket_name => {} }
       end
 
-      def bucket_name
-        Configuration.settings[:bucket].to_sym
-      end
-
     end
   end
 end

data/lib/cloud_encrypted_sync/version.rb

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

data/test/test_helper.rb

@@ -33,11 +33,13 @@ module CloudEncryptedSync
         :sync_path => test_source_folder
       })
       Configuration.stubs(:data_folder_path).returns("#{Etc.getpwuid.dir}/.cloud_encrypted_sync")
+      Adapters::Dummy.any_instance.stubs(:bucket_name).returns('test-bucket')
     end
 
     def unstub_configuration
       Configuration.unstub(:settings)
       Configuration.unstub(:data_folder_path)
+      Adapters::Dummy.any_instance.unstub(:bucket_name)
     end
 
     def test_source_folder

data/test/unit/adapter_template_test.rb

@@ -15,7 +15,7 @@ module CloudEncryptedSync
     test 'should raise errors on public methods' do
 
       method_argument_map = {
-        :parse_command_line_options => [:foo,:bar],
+        :parse_command_line_options => :foo,
         :write => [:foo,:bar],
         :read => :foobar,
         :delete => :foobar,

data/test/unit/configuration_test.rb

@@ -17,7 +17,7 @@ module CloudEncryptedSync
       assert_equal('dummy',settings[:adapter_name])
       assert_equal('~/test/folder',settings[:data_dir])
       assert_equal('somestringofcharacters',settings[:encryption_key])
-      assert_equal('foobar',settings[:bucket])
+      assert_equal('foobar',Adapters::Dummy.instance.bucket_name)
     end
 
     test 'should gracefully fail without path in ARGV' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_encrypted_sync
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors: