s3_uploader 0.0.4 → 0.0.5

data/README.md

@@ -28,16 +28,19 @@ Or install it yourself as:
 ## Usage
 
 	S3Uploader.upload_directory('/tmp/test', 'mybucket',
-		{ 	:s3_key => YOUR_KEY, :s3_secret => YOUR_SECRET_KEY,
-			:destination_dir => 'test/', :threads => 4 })
+		{ 	:s3_key => YOUR_KEY,
+			:s3_secret => YOUR_SECRET_KEY,
+			:destination_dir => 'test/',
+			:region => 'eu-west-1',
+			:threads => 4 })
 
-If no keys are provided, it uses S3_KEY and S3_SECRET environment variables.
+If no keys are provided, it uses S3_KEY and S3_SECRET environment variables. us-east-1 is the default region.
 
 	S3Uploader.upload_directory('/tmp/test', 'mybucket', { :destination_dir => 'test/', :threads => 4 })
 	
 Or as a command line binary
 	
-	s3uploader -k YOUR_KEY -s YOUR_SECRET_KEY -d test/ -t 4 /tmp/test mybucket
+	s3uploader -r eu-west-1 -k YOUR_KEY -s YOUR_SECRET_KEY -d test/ -t 4 /tmp/test mybucket
 	
 Again, it uses S3_KEY and S3_SECRET environment variables if non provided in parameters.
 	

data/lib/s3_uploader/s3_uploader.rb

@@ -9,6 +9,8 @@ module S3Uploader
       :region => 'us-east-1'
     }.merge(options)
     
+    log = options[:logger] || Logger.new(STDOUT)
+    
     raise 'Source must be a directory' unless File.directory?(source)
     
     source = source.chop if source.end_with?('/')
@@ -21,12 +23,16 @@ module S3Uploader
       files << f
     end
     
-    connection = Fog::Storage.new({
-        :provider => 'AWS',
-        :aws_access_key_id => options[:s3_key],
-        :aws_secret_access_key => options[:s3_secret],
-        :region => options[:region]
-    })
+    if options[:connection]
+      connection = options[:connection]
+    else
+      connection = Fog::Storage.new({
+          :provider => 'AWS',
+          :aws_access_key_id => options[:s3_key],
+          :aws_secret_access_key => options[:s3_secret],
+          :region => options[:region]
+      })
+    end
     
     directory = connection.directories.new(:key => bucket)
     
@@ -45,7 +51,7 @@ module S3Uploader
           file = files.pop
           key = file.gsub(source, '')[1..-1]
           dest = "#{options[:destination_dir]}#{key}"
-          puts "[#{file_number}/#{total_files}] Uploading #{key} to s3://#{bucket}/#{dest}"
+          log.info("[#{file_number}/#{total_files}] Uploading #{key} to s3://#{bucket}/#{dest}")
           
           directory.files.create(
             :key    => dest,

data/lib/s3_uploader/version.rb

@@ -1,3 +1,3 @@
 module S3Uploader
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/s3_uploader.rb

@@ -1,4 +1,5 @@
 require 'fog'
 require 'thread'
+require 'logger'
 require "s3_uploader/version"
 require "s3_uploader/s3_uploader"

data/spec/s3uploader_spec.rb

@@ -3,28 +3,42 @@ require 'spec_helper'
 describe S3Uploader do  
     before :all do
       Fog.mock!
-      @base_test_directory = '/tmp/test_s3_uploader'
-      create_test_files(@base_test_directory, 10)
-      create_test_files(File.join(@base_test_directory, 'subdir1'), 5)
+      
+      @connection = Fog::Storage.new({
+        :provider                 => 'AWS',
+        :aws_access_key_id        => '11111111111',
+        :aws_secret_access_key    => 'XXXXXXXXXXXXXXXXXXXXXXXXXXX'
+      })
+      
+      @connection.directories.create(
+        :key    => 'mybucket',
+        :public => true
+      )
+      
+      @tmp_directory = File.join(Dir.tmpdir, 'test_s3_uploader')
+      create_test_files(@tmp_directory, 10)
+      create_test_files(File.join(@tmp_directory, 'subdir1'), 5)
+      @logger = Logger.new(StringIO.new)
     end
     
     it "should upload all files in a directory" do
-      S3Uploader.upload_directory(@base_test_directory, 'mybucket', { :destination_dir => 'test1/' })
+      
+      @logger.should_receive(:info).exactly(15).times.with(/Uploading/)
+      
+      S3Uploader.upload_directory(@tmp_directory, 'mybucket',
+        { :destination_dir => 'test1/',
+          :logger => @logger,
+          :connection => @connection
+        })
+      
     end
     
-    after :all do
-      FileUtils.rm @base_test_directory
-    end
 end
 
 def create_test_files(directory, number_of_files)
   FileUtils.mkdir_p directory
-  
-  $stdout = File.new( '/dev/null', 'w' )
 
   number_of_files.times do |i|
-    `dd if=/dev/zero of=#{directory}/file#{i}.txt count=1024 bs=1024`
-  end
-  
-  $stdout = STDOUT  
-end
+    Open3.popen3('dd if=/dev/zero of=#{directory}/file#{i}.txt count=1024 bs=1024')
+  end  
+end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require 'rspec'
 require 's3_uploader'
+require 'tmpdir'
+require 'fog'
+require 'open3'
 
 RSpec.configure do |config|
   config.color_enabled = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_uploader
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2152457700 !ruby/object:Gem::Requirement
+  requirement: &2152669100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152457700
+  version_requirements: *2152669100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152457280 !ruby/object:Gem::Requirement
+  requirement: &2152668680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152457280
+  version_requirements: *2152668680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152456860 !ruby/object:Gem::Requirement
+  requirement: &2152668260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152456860
+  version_requirements: *2152668260
 description: S3 multithreaded directory uploader
 email:
 - chrishein@gmail.com