encrypted_s3_copy 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b37ebdcd5efbb338fba9f0d725ea7db0b5135c7a
-  data.tar.gz: 121c6d046e41c227f6a817ca9ca5cd172e3a6360
+  metadata.gz: bd0ff5fcab6597788f33cf6ddf805f3158189c03
+  data.tar.gz: 25b15f638ca1ff29652a8f71981c6cc99b763c30
 SHA512:
-  metadata.gz: feed4d462ee04a808334ac9c9c1d88fa9b3566b5ff126fb033989212da7d58f4900af0d777bad404b109e026adf6a6e2c3c0ad4484d6dfe2d285c5c821a5bcdf
-  data.tar.gz: df2dcb38312ef95b5ad1b909f39040ddf87b68e1f3efeb53b8462bfc78c0703ebba4e4cbc9197c278e928afc402e88802f46ce9834be0e6fe95576f7b734e649
+  metadata.gz: ea8cf92dfd4044e832d4a3e6bd008611600a96cceb483e42463bd0bd72029ec48f372649439c12a47e0654040a2d6c8440b75ff4b35dadf1dd00f1e10b767aa3
+  data.tar.gz: 8890b9d079aa0def0ec3907e737b3ca96c16c7238a70a6fd0af1e05f0d5dabae04d73652f001ca482011a3a4bb409f34491ce1b18e8d0be427b8113a6c904cfc

data/README.md

@@ -25,7 +25,7 @@ command options
 
 For client side encryption of AWS S3, generate symmetric key and save to file.
 
-    $ generate_symmetric_key -k /path/to/symmetric_key/file
+    $ aes_key_gen -k /path/to/symmetric_key/file
 
 ### Upload or download encrypted file from/to AWS S3
 

data/encrypted_s3_copy.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "aws-sdk", "~> 1.50"
+  spec.add_dependency "aws-sdk", "~> 1.30"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ">= 2.99"
 end

data/lib/encrypted_s3_copy/client.rb

@@ -8,11 +8,17 @@ module EncryptedS3Copy
 class Client
   # s3://(a_bucket)/(path/to/target_file)
   S3_PATH = /^s3:\/\/([^\/]+)\/(.+)/
+
+  def initialize(opts={})
+    @source = opts[:source_path]
+    @dest = opts[:destination_path]
+    set_s3_encryption_key(opts[:key_file_path]) if opts[:key_file_path]
+  end
+
   def before
     opt = OptionParser.new
     opt.on('-k', '--key-file=KEY_FILE_PATH') do |path|
-      encoded_key = File.read(path)
-      AWS.config(s3_encryption_key: Base64.decode64(encoded_key.chomp))
+      set_s3_encryption_key(path)
     end
     opt.on('-s', '--source=SOURCE_PATH') do |path|
       @source = path
@@ -31,8 +37,6 @@ class Client
     handle
   end
 
-  private
-
   def handle
     if !(@source =~ S3_PATH) && @dest =~ S3_PATH
       if @is_recursive
@@ -52,12 +56,19 @@ class Client
     end
   end
 
+  private
+
+  def set_s3_encryption_key(path)
+    encoded_key = File.read(path)
+    AWS.config(s3_encryption_key: Base64.decode64(encoded_key.chomp))
+  end
+
   def recursive_download(bucket_name, suffix)
     suffix += '/' unless suffix =~ /\/$/
 
     s3_objects = get_s3_objects(bucket_name)
     s3_objects.with_prefix(suffix).each do |obj|
-      next if obj.content_length < 1
+      next if obj.key =~ /\/$/
       single_download(obj)
     end
   end

data/lib/encrypted_s3_copy/version.rb

@@ -1,3 +1,3 @@
 module EncryptedS3Copy
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/encrypted_s3_copy/client_spec.rb

@@ -1,5 +1,6 @@
+require 'spec_helper'
 # require 'simplecov'
-require_relative '../../lib/encrypted_s3_copy/client'
+# require_relative '../../lib/encrypted_s3_copy/client'
 
 describe EncryptedS3Copy::Client do
   let(:bucket_name) { 'test_bkt' }
@@ -103,7 +104,7 @@ describe EncryptedS3Copy::Client do
           expect(subject).to receive(:single_upload).with('dest', 'dir/file02.txt')
           expect(subject).to receive(:single_upload).
             with('dest', 'dir/dir2/file01.txt')
-          subject.send(:handle)
+          subject.handle
         end
       end
 
@@ -130,13 +131,6 @@ describe EncryptedS3Copy::Client do
           allow(s3_file03_double).to receive(:key).and_return('dir/test/myfile')
           allow(s3_file04_double).to receive(:key).and_return('hoge.txt')
 
-          allow(s3_dir01_double).to receive(:content_length).and_return(0)
-          allow(s3_dir02_double).to receive(:content_length).and_return(0)
-          allow(s3_file01_double).to receive(:content_length).and_return(10)
-          allow(s3_file02_double).to receive(:content_length).and_return(10)
-          allow(s3_file03_double).to receive(:content_length).and_return(10)
-          allow(s3_file04_double).to receive(:content_length).and_return(10)
-
           allow(subject).to receive(:get_s3_objects).with('dest').
             and_return(s3_objects_double)
 
@@ -156,7 +150,7 @@ describe EncryptedS3Copy::Client do
 
           expect(file_double).to receive(:write).with(chunk_double).exactly(4).times
 
-          subject.send(:handle)
+          subject.handle
         end
       end
     end
@@ -173,7 +167,7 @@ describe EncryptedS3Copy::Client do
       end
       it 'should get bucket object' do
         expect(subject).to receive(:get_s3_object).with(bucket_name, dest_s3_suffix)
-        subject.send(:handle)
+        subject.handle
       end
       context 'when destination path is directory path' do
         let(:remote_dest_path) { "s3://#{bucket_name}/#{dest_s3_suffix}" }
@@ -185,20 +179,20 @@ describe EncryptedS3Copy::Client do
         it 'should complement file name' do
           expected_dest = dest_s3_suffix + 'source_file_name'
           expect(subject).to receive(:get_s3_object).with(bucket_name, expected_dest)
-          subject.send(:handle)
+          subject.handle
         end
       end
       it 'should open source file' do
         expect(File).to receive(:open).with(local_source_path)
-        subject.send(:handle)
+        subject.handle
       end
       it 'should write file contents to s3 object' do
         expect(obj_double).to receive(:write).with(file_double)
-        subject.send(:handle)
+        subject.handle
       end
       it 'should close file pointer' do
         expect(file_double).to receive(:close)
-        subject.send(:handle)
+        subject.handle
       end
     end
 
@@ -211,16 +205,16 @@ describe EncryptedS3Copy::Client do
       end
       it 'should execute single_download' do
         expect(subject).to receive(:single_download)
-        subject.send(:handle)
+        subject.handle
       end
       it 'should get bucket' do
         expect(subject).to receive(:get_s3_object)
-        subject.send(:handle)
+        subject.handle
       end
       context 'when destination path is full path' do
         it 'should open local destination file' do
           expect(File).to receive(:open).with(local_dest_path, 'wb')
-          subject.send(:handle)
+          subject.handle
         end
       end
       context 'when destination path is directory path' do
@@ -228,19 +222,19 @@ describe EncryptedS3Copy::Client do
         it 'should complement file name' do
           expected_dest = local_dest_path + 'source_file_name'
           expect(File).to receive(:open).with(expected_dest, 'wb')
-          subject.send(:handle)
+          subject.handle
         end
       end
       it 'should read s3 object' do
         allow(File).to receive(:open).and_yield(file_double)
         expect(obj_double).to receive(:read)
-        subject.send(:handle)
+        subject.handle
       end
       it 'should write contents of s3 object to local file' do
         allow(File).to receive(:open).and_yield(file_double)
         allow(obj_double).to receive(:read).and_yield('chunk')
         expect(file_double).to receive(:write).with('chunk')
-        subject.send(:handle)
+        subject.handle
       end
     end
 
@@ -249,7 +243,7 @@ describe EncryptedS3Copy::Client do
         subject.instance_variable_set(:@source, local_source_path)
         subject.instance_variable_set(:@dest, local_dest_path)
         message = 'either source path or destination path or both are wrong'
-        expect{ subject.send(:handle) }.to raise_error(RuntimeError, message)
+        expect{ subject.handle }.to raise_error(RuntimeError, message)
       end
     end
   end
@@ -285,4 +279,33 @@ describe EncryptedS3Copy::Client do
       subject.execute
     end
   end
+
+  context 'use as library' do
+    describe ".initialize" do
+      let(:opts) do
+        { key_file_path: '/path/to/key_file',
+          source_path: '/path/to/source_file',
+          destination_path: 's3://bucket/path/to/file' }
+      end
+      let(:client) { described_class.new(opts) }
+      let(:key_str) { "a_key_str\n" }
+
+      before :each do
+        allow(File).to receive(:read).with(opts[:key_file_path]).and_return(key_str)
+      end
+
+      it 'set value of s3_encryption_key' do
+        source_value = client.instance_variable_get(:@source)
+        expect(source_value).to eq(opts[:source_path])
+      end
+      it 'set value of destination_path' do
+        dest_value = client.instance_variable_get(:@dest)
+        expect(dest_value).to eq(opts[:destination_path])
+      end
+      it 'set s3_encryption_key' do
+        expect(AWS).to receive(:config).with(s3_encryption_key: Base64.decode64(key_str.chomp))
+        client
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: encrypted_s3_copy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - nabewata07
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.50'
+        version: '1.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.50'
+        version: '1.30'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: upload and download encrypted files to/from AWS S3