s3deployer 0.0.6 → 0.0.7

data/README.markdown

@@ -13,4 +13,17 @@ Just `cd` to the directory you want to deploy and run
 
     s3deploy -b BUCKET_NAME
 
+## Deploying with multiple people
+
+When working with multiple people who may be deploying code at the same time
+it's helpful to make sure that only one deployment happens at a time. Use
+with\_lock for this.
+
+    deployer = S3Deployer.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'])
+    deployer.bucket_name = "amazon.bucket.name"
+
+    deployer.with_lock do |deployer|
+        deployer.deploy("#{Dir.pwd}/directory_to_deploy")
+    end
+
 ![ShoveIt](s3deployer/raw/master/ShoveItOverThere.jpg)

data/lib/s3deployer.rb

@@ -4,6 +4,8 @@ require 'digest/md5'
 
 class S3Deployer
 
+  class DeploymentLocked < Exception; end
+
   DEFAULT_OPTIONS={
     force_upload: false
   }
@@ -17,8 +19,8 @@ class S3Deployer
     @force_upload = options[:force_upload]
   end
 
-  def deploy(directory_to_deploy, bucket_name)
-    @bucket_name = bucket_name
+  def deploy(directory_to_deploy, bucket_name=nil)
+    @bucket_name = bucket_name unless bucket_name.nil?
     @directory_to_deploy = File.expand_path(directory_to_deploy)
     iterate_through_and_deploy(directory_to_deploy)
   end
@@ -35,9 +37,13 @@ class S3Deployer
     end
   end
 
+  def path_to_file(file)
+    item_as_path = Pathname.new(file)
+    item_as_path.sub("#{@directory_to_deploy}/", '').cleanpath.to_s
+  end
+
   def upload_item(item)
-    item_as_path = Pathname.new(item)
-    s3_name = item_as_path.sub("#{@directory_to_deploy}/", '').cleanpath.to_s
+    s3_name = path_to_file(item)
     if (@force_upload or not item_exists?(item))
       puts "uploading #{item} as #{s3_name}"
       AWS::S3::S3Object.store(s3_name, open(item), bucket_name)
@@ -47,12 +53,26 @@ class S3Deployer
   end
 
   def item_exists?(item)
-    item_as_path = Pathname.new(item)
-    s3_name = item_as_path.sub("#{directory_to_deploy}/", '').cleanpath.to_s
+    s3_name = path_to_file(item)
     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
 
+  def lockfile_name
+    path_to_file "deployment_in_progress"
+  end
+
+  def with_lock(bucket_name, &block)
+    raise DeploymentLocked.new if AWS::S3::S3Object.exists?(lockfile_name, bucket_name)
+
+    begin
+      AWS::S3::S3Object.store(lockfile_name, "", bucket_name)
+      block.call(self, bucket_name)
+    ensure
+      AWS::S3::S3Object.delete(lockfile_name, bucket_name)
+    end
+  end
+
 end

data/lib/s3deployer/version.rb

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

data/spec/s3deployer_spec.rb

@@ -5,6 +5,7 @@ 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(:delete)
     AWS::S3::S3Object.stub(:exists?).and_return(true)
     AWS::S3::S3Object.stub(:find).and_return(stub(etag: '1234'))
     subject.stub(:open).and_return('asdf')
@@ -69,6 +70,27 @@ describe S3Deployer do
         File.delete("#{Dir.pwd}/files/sub/blah.html")
       end
     end
+
+    context "locks deployment" do
+      before do
+        AWS::S3::S3Object.stub(:exists?).and_return(false)
+      end
+
+      it "doesn't deploy if there is a lockfile" do
+        AWS::S3::S3Object.stub(:exists?).and_return(true)
+        expect { subject.with_lock('bucket') { } }.to raise_error(S3Deployer::DeploymentLocked)
+      end
+
+      it "creates a lockfile" do
+        subject.with_lock('bucket') { }
+        AWS::S3::S3Object.should have_received(:store).with "deployment_in_progress", "", 'bucket'
+      end
+
+      it "removes the lockfile" do
+        subject.with_lock('bucket') { }
+        AWS::S3::S3Object.should have_received(:delete).with "deployment_in_progress", 'bucket'
+      end
+    end
   end
 end
 def create_file(filename, content)

metadata

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