s3share 0.2 → 0.3

data/bin/s3.rb

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby -rubygems
 
 require "s3share"
-S3Share::Runner.new(*ARGV)
+S3Share::Runner.new(*ARGV).run

data/lib/s3share/foo.diff

@@ -0,0 +1,124 @@
+commit 75686151a5525e3d8bbaeee9474f2312f9a2abe0
+Author: Andrés Mejía <andmej@gmail.com>
+Date:   Sun Nov 28 23:06:05 2010 +0100
+
+    If the bucket you are trying to use doesn't exist yet, create it automatically.
+
+diff --git a/README.markdown b/README.markdown
+index 2fade33..39400f2 100644
+--- a/README.markdown
++++ b/README.markdown
+@@ -29,7 +29,7 @@ You'll need to set the three following ENV variables:
+ * `AMAZON_SECRET_ACCESS_KEY`: AWS secret access key.
+ * `AMAZON_S3_DEFAULT_BUCKET`: Name of the bucket where the uploads will be held.
+ 
+-The last variable is visible in the URL returned to the user: `http://s3.amazonaws.com/{AMAZON_S3_DEFAULT_BUCKET}/some_photo.png`, so make sure you choose something pretty. This value is global for all the S3 namespace, meaning you need to find something unique between all the S3 users ("some-user-name_uploads" should do the trick).
++The last variable is visible in the URL returned to the user: `http://s3.amazonaws.com/{AMAZON_S3_DEFAULT_BUCKET}/some_photo.png`, so make sure you choose something pretty. This value is global for all the S3 namespace, meaning you need to find something unique between all the S3 users ("some-user-name_uploads" should do the trick). If the specified bucket doesn't exist, it will be automatically created.
+ 
+ You can set these variables in a `~/.amazon_keys` file:
+ 
+diff --git a/lib/s3share/runner.rb b/lib/s3share/runner.rb
+index e0c5dc7..e9cb328 100644
+--- a/lib/s3share/runner.rb
++++ b/lib/s3share/runner.rb
+@@ -60,6 +60,8 @@ module S3Share
+         :access_key_id     => access_key,
+         :secret_access_key => secret_key
+       )
++      
++      create_bucket_if_it_does_not_exist(bucket_name)
+ 
+       AWS::S3::S3Object.store(@filename, open("#{@path}/#{@filename}"),
+                               bucket_name,
+@@ -100,5 +102,14 @@ module S3Share
+       }
+       errors[err].each { |msg| puts msg }
+     end
++    
++    private
++    # Check if the bucket exists and create it if it doesn't.
++    def create_bucket_if_it_does_not_exist(bucket_name)
++      AWS::S3::Bucket.find(bucket_name)
++    rescue AWS::S3::NoSuchBucket => e
++      puts "Bucket '#{bucket_name}' does not exist. Creating it..."
++      AWS::S3::Bucket.create(bucket_name)
++    end
+   end
+ end
+diff --git a/spec/runner_spec.rb b/spec/runner_spec.rb
+index cf28997..50d660d 100644
+--- a/spec/runner_spec.rb
++++ b/spec/runner_spec.rb
+@@ -6,9 +6,10 @@ describe S3Share::Runner do
+     S3Share::Runner.new(filename)
+   end
+ 
+-  let(:relative) { runner("something/spec.opts") }
+-  let(:absolute) { runner("/Users/someone/something/spec.opts") }
+-  let(:file)     { runner("spec.opts") }
++  let(:relative)      { runner("something/spec.opts") }
++  let(:absolute)      { runner("/Users/someone/something/spec.opts") }
++  let(:file)          { runner("spec.opts") }
++  let(:existing_file) { runner(__FILE__) }
+ 
+   describe "#get_directory" do
+     it "correctly expands a relative path" do
+@@ -37,5 +38,31 @@ describe S3Share::Runner do
+       file.clean_filename.should == "spec.opts"
+     end
+   end
++  
++  describe "#upload_file" do
++    it "checks if the bucket exists before starting the upload" do
++      # Stub this method so we don't try a real upload.
++      AWS::S3::S3Object.stub!(:store).and_return(nil) 
++      
++      ENV["AMAZON_S3_DEFAULT_BUCKET"] = "an_imaginary_bucket"
++      existing_file.should_receive(:create_bucket_if_it_does_not_exist).with("an_imaginary_bucket").and_return(:nil)
++      silence_stream(STDOUT) { existing_file.upload_file }
++    end
++  end
++  
++  describe "#create_bucket_if_it_does_not_exist" do
++    it "calls AWS::S3::Bucket.find to see if the bucket exists" do
++      AWS::S3::Bucket.should_receive(:find).with("the_bucket").and_return(nil)
++      existing_file.send :create_bucket_if_it_does_not_exist, "the_bucket"
++    end
++    
++    it "calls AWS::S3::Bucket.create if the bucket doesn't exist" do
++      AWS::S3::Base.establish_connection!(:access_key_id => ENV["AMAZON_ACCESS_KEY_ID"], :secret_access_key => ENV["AMAZON_SECRET_ACCESS_KEY"])
++      AWS::S3::Bucket.should_receive(:create).with("an_imaginary_bucket_that_surely_does_not_exist").and_return(nil)
++      silence_stream(STDOUT) do
++        existing_file.send :create_bucket_if_it_does_not_exist, "an_imaginary_bucket_that_surely_does_not_exist"
++      end
++    end
++  end
+ end
+ 
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 205e799..c3946ff 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,5 +1,20 @@
+ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+ 
+-
+ require 'rspec'
+ require 's3share'
++
++# Silences any stream for the duration of the block.
++#
++#   silence_stream(STDOUT) do
++#     puts 'This will never be seen'
++#   end
++#
++#   puts 'But this will'
++def silence_stream(stream)
++  old_stream = stream.dup
++  stream.reopen('/dev/null')
++  stream.sync = true
++  yield
++ensure
++  stream.reopen(old_stream)
++end
+

data/lib/s3share/runner.rb

@@ -60,7 +60,7 @@ module S3Share
         :access_key_id     => access_key,
         :secret_access_key => secret_key
       )
-      
+
       create_bucket_if_it_does_not_exist(bucket_name)
 
       AWS::S3::S3Object.store(@filename, open("#{@path}/#{@filename}"),
@@ -102,7 +102,7 @@ module S3Share
       }
       errors[err].each { |msg| puts msg }
     end
-    
+
     private
     # Check if the bucket exists and create it if it doesn't.
     def create_bucket_if_it_does_not_exist(bucket_name)

data/lib/s3share/version.rb

@@ -1,3 +1,3 @@
 module S3Share
-  Version = VERSION = '0.2'
+  Version = VERSION = '0.3'
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: s3share
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Federico Builes
@@ -65,6 +65,7 @@ files:
 - Rakefile
 - LICENSE
 - lib/s3share/args.rb
+- lib/s3share/foo.diff
 - lib/s3share/runner.rb
 - lib/s3share/version.rb
 - lib/s3share.rb