rubber 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a078638f1d84a5dda8e80d2276dac5c6351bea83
-  data.tar.gz: 54de9550eefdde6a4529336615d37f6eba5860be
+  metadata.gz: 62f1c83f794e79e016feb8710ab271980a85ab60
+  data.tar.gz: 0c300423e3fbfaea269f3a78461873a4fdfc1f0c
 SHA512:
-  metadata.gz: 689ed2c04caacc4448c02da2ed3bf1605de897709bc3391d393a611d41ce626165f6cb3149975aad7ba26f689936aca98a01989bc81f5dbb1dc7e23fe7f13202
-  data.tar.gz: a6f0cce4b68dcce1a2473806211c5953e6f0910defa0a2b3a236b4e77352b4abdae978b6012228329064af799349ceea22e10c2428cb8fc827aef5c14d994c27
+  metadata.gz: 1054053c44ae3c830e37f39de2d39e26693eed0095043662a2b5bf3e962ec35386d222b13b929d45f226fa114491c1ae9e3731f1b1732f5dcf5c8798d51cc04b
+  data.tar.gz: 21381ae46616fe1fd9f5d32d76e2f220e96782a45d827e5bf635b9803a159fd481dfcdef170597fed0e034507ec007bcfaced14e2361ae45a0fac4f788aa35f7

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0 
   - ruby-head
   - jruby-18mode
   - jruby-19mode

data/CHANGELOG

@@ -1,3 +1,13 @@
+2.4.1 (05/30/2013)
+------------------
+
+Bug Fixes:
+=========
+
+[core] Fixed a problem with transforming templates that reference the "current" directory as part of a deploy <21e3b92>
+[sidekiq] Only try to silence sidekiq if current_path actually exists <f20bd94>
+
+
 2.4.0 (05/24/2013)
 ------------------
 

data/lib/rubber/cloud/fog_storage.rb

@@ -103,7 +103,12 @@ module Rubber
         raise "a key is required" unless key && key.size > 0
         
         if block_given?
-          @directory.files.get(key, opts, &block)
+          # TODO (nirvdrum 05/24/13) Remove when https://github.com/fog/fog/issues/1832 is fixed.
+          begin
+            @directory.files.get(key, opts, &block)
+          rescue Excon::Errors::NotFound
+            nil
+          end
         else
           Rubber::Util.retry_on_failure(*RETRYABLE_EXCEPTIONS) do
             begin

data/lib/rubber/recipes/rubber/deploy.rb

@@ -24,7 +24,7 @@ namespace :rubber do
   task :post_stop do
   end
 
-  after "deploy:update_code", "rubber:config"
+  after "deploy:symlink", "rubber:config"
   after "deploy:rollback_code", "rubber:config"
 
   desc <<-DESC

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

data/templates/sidekiq/config/rubber/deploy-sidekiq.rb

@@ -10,7 +10,7 @@ namespace :rubber do
 
     desc "Quiet sidekiq (stop accepting new work)"
     task :quiet, :roles => :sidekiq do
-      rsudo "cd #{current_path} && if [ -f #{current_path}/tmp/pids/sidekiq.pid ]; then bundle exec sidekiqctl quiet #{current_path}/tmp/pids/sidekiq.pid ; fi", :as => rubber_env.app_user
+      rsudo "if [ -d #{current_path} ]; then cd #{current_path} && if [ -f #{current_path}/tmp/pids/sidekiq.pid ]; then bundle exec sidekiqctl quiet #{current_path}/tmp/pids/sidekiq.pid ; fi; fi", :as => rubber_env.app_user
     end
 
     desc "Stop sidekiq"

data/test/cloud/aws_test.rb

@@ -26,7 +26,7 @@ class AwsTest < Test::Unit::TestCase
     end
 
     should "create instance" do
-      assert @cloud.create_instance('', '', '', '', '')
+      assert @cloud.create_instance('', '', '', '', '', '')
     end
 
   end

data/test/cloud/digital_ocean_test.rb

@@ -19,12 +19,12 @@ class DigitalOceanTest < Test::Unit::TestCase
 
     context '#create_instance' do
       should 'create instance' do
-        assert @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', '512MB', [], 'New York 1')
+        assert @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', '512MB', [], '', 'New York 1')
       end
 
       should 'raise error if invalid region' do
         begin
-          @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', '512MB', [], 'Mars 1')
+          @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', '512MB', [], '', 'Mars 1')
         rescue => e
           assert_equal 'Invalid region for DigitalOcean: Mars 1', e.message
         else
@@ -34,7 +34,7 @@ class DigitalOceanTest < Test::Unit::TestCase
 
       should 'raise an error if invalid image type' do
         begin
-          @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', 'm1.small', [], 'New York 1')
+          @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', 'm1.small', [], '', 'New York 1')
         rescue => e
           assert_equal 'Invalid image type for DigitalOcean: m1.small', e.message
         else
@@ -44,7 +44,7 @@ class DigitalOceanTest < Test::Unit::TestCase
 
       should 'raise an error if invalid image name' do
         begin
-          @cloud.create_instance('my-instance', 'Windows Server 2003', '512MB', [], 'New York 1')
+          @cloud.create_instance('my-instance', 'Windows Server 2003', '512MB', [], '', 'New York 1')
         rescue => e
           assert_equal 'Invalid image name for DigitalOcean: Windows Server 2003', e.message
         else
@@ -58,7 +58,7 @@ class DigitalOceanTest < Test::Unit::TestCase
           env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
           cloud = Rubber::Cloud::DigitalOcean.new(env, nil)
 
-          cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', '512MB', [], 'New York 1')
+          cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', '512MB', [], '', 'New York 1')
         rescue => e
           assert_equal 'Missing key_file for DigitalOcean', e.message
         else

data/test/cloud/fog_test.rb

@@ -29,7 +29,7 @@ class FogTest < Test::Unit::TestCase
     end
 
     should "create instance" do
-      assert @cloud.create_instance('', '', '', '', '')
+      assert @cloud.create_instance('', '', '', '', '', '')
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano