s3_uploader 0.0.2 → 0.0.3

data/lib/s3_uploader/s3_uploader.rb

@@ -5,7 +5,8 @@ module S3Uploader
       :threads => 5,
       :s3_key => ENV['S3_KEY'],
       :s3_secret => ENV['S3_SECRET'],
-      :public => false
+      :public => false,
+      :region => 'us-east-1'
     }.merge(options)
     
     raise 'Source must be a directory' unless File.directory?(source)
@@ -23,7 +24,8 @@ module S3Uploader
     connection = Fog::Storage.new({
         :provider => 'AWS',
         :aws_access_key_id => options[:s3_key],
-        :aws_secret_access_key => options[:s3_secret]
+        :aws_secret_access_key => options[:s3_secret],
+        :region => options[:region]
     })
     
     directory = connection.directories.new(:key => bucket)

data/lib/s3_uploader/version.rb

@@ -1,3 +1,3 @@
 module S3Uploader
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/s3uploader_spec.rb

@@ -1,9 +1,30 @@
 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)
+    end
     
     it "should upload all files in a directory" do
-      pending 'Write real test'
-      S3Uploader.upload_directory('/tmp/test', 'mybucket', { :destination_dir => 'test/' })
+      S3Uploader.upload_directory(@base_test_directory, 'mybucket', { :destination_dir => 'test1/' })
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_uploader
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2153189900 !ruby/object:Gem::Requirement
+  requirement: &2153066020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153189900
+  version_requirements: *2153066020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153189480 !ruby/object:Gem::Requirement
+  requirement: &2153065540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153189480
+  version_requirements: *2153065540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153189060 !ruby/object:Gem::Requirement
+  requirement: &2153065100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153189060
+  version_requirements: *2153065100
 description: S3 multithreaded directory uploader
 email:
 - chrishein@gmail.com