s3_uploader 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d6399ae8ff54b55635cf668b0f6b711c907fdb1
-  data.tar.gz: b3607639a7a60dcaacdbb41963f4f7e5dddfd5bb
+  metadata.gz: 8b848eda8fa6b0f9875dfe9c4fab1821a8c1b794
+  data.tar.gz: e71958d6cdc905d5834f4a89e06442a04a3d11c0
 SHA512:
-  metadata.gz: ebb2a6aab8ddd480ea1dc3f163f92f435f0847cca276fc41dbc937848827690d44e092e4af0ac1eb52ab86c1f3a0cd3577bf6d892417eed355b03cb34b1c5391
-  data.tar.gz: 81301dba831306bed8f4de9d7323509a477540c8d5da8cc12ecdc4aed5380896f821110a4f5ee824bdce88555c6cb5836ef1608c99191893900e0379adbe1489
+  metadata.gz: 73573d90c03156f3db0bfb8963990f62e34c517120d98e16d44d8198b7945629f23844f17d2991d8b7072ec85b6d0e5278768d85193a95ce526a03e0e9212eb7
+  data.tar.gz: 872868c71287c74f5e27bf4c61faa597c43b47f7dd44ea58c4d14c8fb27cc89cdea93ab6da74b72bb0877a95d33f0c3f73a2c05475e6de180c922eea7ce57001

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.1.1
+script: rspec spec

data/README.md

@@ -1,6 +1,7 @@
 # S3Uploader
 
 [![Gem Version](https://badge.fury.io/rb/s3_uploader.png)](http://badge.fury.io/rb/s3_uploader)
+[![Build Status](https://travis-ci.org/chrishein/s3_uploader.svg?branch=master)](https://travis-ci.org/chrishein/s3_uploader)
 
 Multithreaded recursive directory uploader to S3 using [fog](https://github.com/fog/fog).
 

data/lib/s3_uploader/s3_uploader.rb

@@ -60,8 +60,9 @@ module S3Uploader
       end
     end
 
-    def upload(source, bucket)
-      raise 'Source directory is requiered' if source.to_s.empty?
+    def upload(source_dir, bucket)
+      raise 'Source directory is requiered' if source_dir.to_s.empty?
+      source = source_dir.dup
       source << '/' unless source.end_with?('/')
       raise 'Source must be a directory' unless File.directory?(source)
 

data/lib/s3_uploader/version.rb

@@ -1,3 +1,3 @@
 module S3Uploader
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/s3_uploader.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'fog-aws'
   gem.add_dependency 'mime-types'
 
-  gem.add_development_dependency 'rspec', '~>2.14.1'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec-collection_matchers'
   gem.add_development_dependency 'rake'
 end

data/spec/s3uploader_spec.rb

@@ -45,22 +45,25 @@ describe S3Uploader do
   end
 
   it 'when called with missing access keys it should raise an exception' do
-    lambda {
+    expect {
       S3Uploader.upload('/tmp', 'mybucket',
                                   { destination_dir: 'test1/',
                                     s3_key:          nil,
                                     s3_secret:       nil })
-    }.should raise_error('Missing access keys')
+    }.to raise_error('Missing access keys')
   end
 
   it 'when called with source not directory it should raise an exception' do
-    lambda {
-      S3Uploader.upload('/xzzaz1232', 'mybucket')
-    }.should raise_error('Source must be a directory')
+    expect {
+      S3Uploader.upload('/xzzaz1232', 'mybucket', {
+        s3_key:          '11111111111',
+        s3_secret:       'XXXXXXXXXXXXXXXXXXXXXXXXXXX'
+        })
+    }.to raise_error('Source must be a directory')
   end
 
   it 'should upload all files in a directory' do
-    connection.directories.get('mybucket', prefix: 'test1/').files.empty?.should be_true
+    expect(connection.directories.get('mybucket', prefix: 'test1/').files.empty?).to be true
 
     S3Uploader.upload(tmp_directory, 'mybucket',
                                 { destination_dir: 'test1/',
@@ -73,7 +76,7 @@ describe S3Uploader do
   end
 
   it 'should still support upload_directory static method for backwards compatibility' do
-    connection.directories.get('mybucket', prefix: 'test1/').files.empty?.should be_true
+    expect(connection.directories.get('mybucket', prefix: 'test1/').files.empty?).to be true
 
     S3Uploader.upload_directory(tmp_directory, 'mybucket',
                                 { destination_dir: 'test1/',
@@ -104,12 +107,12 @@ describe S3Uploader do
   describe 'gzip' do
 
     it "should require a gzip working directory" do
-      lambda {
+      expect {
         S3Uploader.upload('/tmp', 'mybucket',
                                     { logger:     logger,
                                       connection: connection,
                                       gzip: true })
-      }.should raise_error('gzip_working_dir required when using gzip')
+      }.to raise_error('gzip_working_dir required when using gzip')
     end
 
     it 'should compress files before upload when needed' do
@@ -131,9 +134,11 @@ describe S3Uploader do
 
     it 'when called with bad gzip_working_dir it should raise an exception' do
       expect {
-        S3Uploader.upload(tmp_directory, 'mybucket',
-                                    { gzip:             true,
-                                      gzip_working_dir: File.join(tmp_directory, 'working_dir') })
+        S3Uploader.upload(tmp_directory, 'mybucket', {
+                                  s3_key:          '11111111111',
+                                  s3_secret:       'XXXXXXXXXXXXXXXXXXXXXXXXXXX',
+                                  gzip:             true,
+                                  gzip_working_dir: File.join(tmp_directory, 'working_dir') })
       }.to raise_error('gzip_working_dir may not be located within source-folder')
 
       expect {

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
 require 'rspec'
+require 'rspec/collection_matchers'
 require 's3_uploader'
 require 'tmpdir'
 require 'open3'
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
   config.formatter = 'documentation'
-  config.treat_symbols_as_metadata_keys_with_true_values = true
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_uploader
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Christian Hein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -42,16 +42,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md