s3deployer 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3deployer (0.0.2)
+    s3deployer (0.0.5)
       aws-s3
 
 GEM

data/README.markdown

@@ -11,6 +11,6 @@ Because sometimes, you just want to shove a bunch of stuff onto S3
 
 Just `cd` to the directory you want to deploy and run
 
-    s3deploy BUCKET_NAME
+    s3deploy -b BUCKET_NAME
 
 ![ShoveIt](s3deployer/raw/master/ShoveItOverThere.jpg)

data/bin/s3deploy

@@ -1,14 +1,44 @@
 #!/usr/bin/env ruby
 
 require 's3deployer'
+require 'optparse'
+
+options = {}
+
+optparse = OptionParser.new do|opts|
+
+  opts.on( '-h', '--help', 'Display this dialog' ) do
+    puts opts
+    exit
+  end
+
+  options[:force_upload] = false
+  opts.on("-f", "--force", "Force Reuploading of files regardless of checksums" ) do
+    options[:force_upload] = true
+  end
+
+  options[:bucket_name] = ""
+  opts.on( '-b', '--bucket BUCKET', 'S3 Bucket to upload to' ) do|b|
+    options[:bucket_name] = b
+  end
+
+  options[:directory] = "."
+  opts.on( '-d', '--directory DIRECTORY', 'Directory to deploy' ) do|d|
+    if File.directory? d
+      options[:directory] = d
+    else
+      puts "Directory #{d} does not exist"
+      exit
+    end
+  end
 
-if ARGV[0].nil?
-  raise "Please supply a bucket name"
-  exit 1
 end
 
-bucket = ARGV[0]
-access_key,secret_key = ENV['ACCESS_KEY'],ENV['SECRET_KEY']
-deployer = S3Deployer.new access_key, secret_key
-deployer.deploy '.', bucket
+optparse.parse!
+
+options[:access_key] ||= ENV['AMAZON_ACCESS_KEY_ID']
+options[:secret_key] ||= ENV['AMAZON_SECRET_ACCESS_KEY']
+
+deployer = S3Deployer.new(options[:access_key], options[:secret_key], options)
+deployer.deploy options[:directory], options[:bucket_name]
 

data/lib/s3deployer/version.rb

@@ -1,3 +1,3 @@
 class S3Deployer
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/s3deployer.rb

@@ -1,13 +1,22 @@
 require 'aws/s3'
 require 'pathname'
+require 'digest/md5'
 
 class S3Deployer
+
+  DEFAULT_OPTIONS={
+    force_upload: false
+  }
   attr_accessor :directory_to_deploy, :bucket_name
-  def initialize(access_key, secret_key)
+
+  def initialize(access_key, secret_key, options=DEFAULT_OPTIONS)
     AWS::S3::Base.establish_connection!({
         :access_key_id => access_key,
-        :secret_access_key => secret_key})
+        :secret_access_key => secret_key
+    })
+    @force_upload = options[:force_upload]
   end
+
   def deploy(directory_to_deploy, bucket_name)
     @bucket_name = bucket_name
     @directory_to_deploy = File.expand_path(directory_to_deploy)
@@ -29,7 +38,21 @@ class S3Deployer
   def upload_item(item)
     item_as_path = Pathname.new(item)
     s3_name = item_as_path.sub("#{@directory_to_deploy}/", '').cleanpath.to_s
-    puts "uploading #{item} as #{s3_name}"
-    AWS::S3::S3Object.store(s3_name, open(item), bucket_name)
+    if (@force_upload or not item_exists?(item))
+      puts "uploading #{item} as #{s3_name}"
+      AWS::S3::S3Object.store(s3_name, open(item), bucket_name)
+    else
+      puts "not uploading #{item}, it exists on S3 as #{s3_name}"
+    end
   end
+
+  def item_exists?(item)
+    item_as_path = Pathname.new(item)
+    s3_name = item_as_path.sub("#{directory_to_deploy}/", '').cleanpath.to_s
+    return false unless AWS::S3::S3Object.exists?(s3_name, bucket_name)
+    existing = AWS::S3::S3Object.find(s3_name, bucket_name)
+    md5 = Digest::MD5.hexdigest(File.read(item))
+    existing.etag == md5
+  end
+
 end

data/spec/s3deployer_spec.rb

@@ -5,18 +5,26 @@ describe S3Deployer do
     AWS::S3::Base.stub(:establish_connection!)
     Dir.mkdir('files') unless Dir.exists?('files')
     AWS::S3::S3Object.stub(:store)
+    AWS::S3::S3Object.stub(:exists?).and_return(true)
+    AWS::S3::S3Object.stub(:find).and_return(stub(etag: '1234'))
     subject.stub(:open).and_return('asdf')
   end
-  subject { S3Deployer.new("abc", "123") }
+
+
+  subject { S3Deployer.new('abc', '123') }
   describe "instantiation" do
     it "Connects to Amazon S3 with access and secret keys" do
-      S3Deployer.new("abc", "123")
+      options = {}
+      options[:force_upload] = false
+      options[:directory] = '.'
+      S3Deployer.new('abc', '123', options)
       AWS::S3::Base.should have_received(:establish_connection!).with({
         :access_key_id=>'abc',
         :secret_access_key=>'123'
       })
     end
   end
+
   describe "deploy" do
     context "with multiple files" do
       it "uploads them to S3" do
@@ -29,6 +37,19 @@ describe S3Deployer do
         File.delete("#{Dir.pwd}/files/hiphopper")
       end
     end
+
+    context "when a file exists in the same state" do
+      it "Does not store the file" do
+        create_file("word", "asdf")
+        md5 = Digest::MD5.hexdigest(File.read("#{Dir.pwd}/files/word"))
+        AWS::S3::S3Object.stub(:find).and_return(stub(etag: md5))
+        subject.deploy "#{Dir.pwd}/files", 'bucket'
+        AWS::S3::S3Object.should_not have_received(:store).with('word', 'asdf', 'bucket')
+        File.delete("#{Dir.pwd}/files/word")
+      end
+
+    end
+
     context "with . as directory to deploy" do
       it "doesn't strip out .'s in file names" do
         create_file("blah.html", "asdf")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3deployer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70175425134860 !ruby/object:Gem::Requirement
+  requirement: &70179732131360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175425134860
+  version_requirements: *70179732131360
 description: A simple way to deploy a directory to Amazon s3
 email:
 - zee@zeespencer.com