rubber 2.7.4 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a0367c57a8cd82b8ab54df3da8ab662a9d4916f
-  data.tar.gz: 80834fe8e281c253564f1b17e70162d09d56cdc1
+  metadata.gz: 12a21d909c8eaa9564ee987b045ab189387d5c46
+  data.tar.gz: 24830a98a3204ebab53f6fd88ec070dd6c487e3f
 SHA512:
-  metadata.gz: d4382da1309c8c96da31715e26f979d313635df182fb5cd50fa53a23f8f11f65ff7c83f9892b9e6479844fd7e9669856787cf38fbb112f3ea8ff54f089ce42d1
-  data.tar.gz: 21ac25a9a64412cbc0c30adfa121eb1addd6e0866d2d89b9bf0a60a5ce0bcd386ab5da964209615e42fb7f4ae47ed19d4b0ad2baaf6970f35826c5e63a6496ca
+  metadata.gz: f6c6fde0e0c084d19292a0656780ec0f731ac8fb0386e218d52c18e9b66b6204650dee4be70b9e50c3118c2163bbc9cf045da0446b73df35ed78c086fc0f85ec
+  data.tar.gz: 61bbc6df7047f11afeef55b3f6d7c27d379db6712f5e7c3e04a0c749a974caf42d299e3ddb08b2fcb0e5ac5c3aa91f56d8cae57c46fe2b5a3542eeb3ca358a3a

data/.travis.yml

@@ -43,6 +43,7 @@ matrix:
     - rvm: rbx-2
     - rvm: 1.8.7
     - rvm: jruby-18mode
+    - rvm: jruby-head
 
 # script: bundle exec rspec spec
 env:

data/CHANGELOG

@@ -1,3 +1,18 @@
+2.7.5 (03/28/2014)
+
+Improvements:
+============
+
+[base] Upgraded ruby-build from 20140210 to 20140225 and bumped the default ruby version from 1.9.3-p484 to 2.0.0-p451. <396b72e>
+[core] Install iptables if it's not already installed and it's needed to set up (non-EC2) firewall rules. <581c2e0>
+[redis] Upgraded from redis 2.8.7 to 2.8.8. <8775a76>
+
+Bug Fixes:
+=========
+
+[core] Fixed a problem whereby if a part of the :deploy_to path (e.g., /mnt) is remounted with an attached volume, the code may not deploy properly. <a98edcc>
+
+
 2.7.4 (03/13/2014)
 
 Improvements:

data/lib/rubber/cloud/base.rb

@@ -97,7 +97,7 @@ module Rubber
       end
 
       def setup_security_groups(host=nil, roles=[])
-        raise "Digital Ocean provider can only set up one host a time" if host.split(',').size != 1
+        raise "Provider can only set up security groups for one host a time" if host.split(',').size != 1
 
         rubber_cfg = Rubber::Configuration.get_configuration(Rubber.env)
         scoped_env = rubber_cfg.environment.bind(roles, host)
@@ -114,6 +114,11 @@ module Rubber
         groups = isolate_groups(groups)
 
         script = <<-ENDSCRIPT
+          # Install iptables if it's not already installed.
+          if ! dpkg -l $SOFTWARE; then
+            export DEBIAN_FRONTEND=noninteractive; apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes install iptables
+          fi
+
           # Clear out all firewall rules to start.
           iptables -F
 

data/lib/rubber/cloud/fog.rb

@@ -31,11 +31,11 @@ module Rubber
 
       def create_instance(instance_alias, ami, ami_type, security_groups, availability_zone, region)
         response = compute_provider.servers.create(:image_id => ami,
-                                                    :flavor_id => ami_type,
-                                                    :groups => security_groups,
-                                                    :availability_zone => availability_zone,
-                                                    :key_name => env.key_name,
-                                                    :name => instance_alias)
+                                                   :flavor_id => ami_type,
+                                                   :groups => security_groups,
+                                                   :availability_zone => availability_zone,
+                                                   :key_name => env.key_name,
+                                                   :name => instance_alias)
 
         response.id
       end
@@ -49,34 +49,37 @@ module Rubber
       end
   
       def reboot_instance(instance_id)
-        response = compute_provider.servers.get(instance_id).reboot()
+        compute_provider.servers.get(instance_id).reboot()
       end
 
       def stop_instance(instance, force=false)
         # Don't force the stop process. I.e., allow the instance to flush its file system operations.
-        response = compute_provider.servers.get(instance.instance_id).stop(force)
+        compute_provider.servers.get(instance.instance_id).stop(force)
       end
 
       def start_instance(instance)
-        response = compute_provider.servers.get(instance.instance_id).start()
+        compute_provider.servers.get(instance.instance_id).start()
       end
 
       def create_static_ip
         address = compute_provider.addresses.create()
-        return address.public_ip
+
+        address.public_ip
       end
 
       def attach_static_ip(ip, instance_id)
         address = compute_provider.addresses.get(ip)
         server = compute_provider.servers.get(instance_id)
         response = (address.server = server)
-        return ! response.nil?
+
+        ! response.nil?
       end
 
       def detach_static_ip(ip)
         address = compute_provider.addresses.get(ip)
         response = (address.server = nil)
-        return ! response.nil?
+
+        ! response.nil?
       end
 
       def describe_static_ips(ip=nil)
@@ -90,12 +93,13 @@ module Rubber
           ip[:ip] = item.public_ip
           ips << ip
         end
-        return ips
+
+        ips
       end
 
       def destroy_static_ip(ip)
         address = compute_provider.addresses.get(ip)
-        return address.destroy
+        address.destroy
       end
 
       def create_image(image_name)
@@ -114,7 +118,8 @@ module Rubber
           image[:root_device_type] = item.root_device_type
           images << image
         end
-        return images
+
+        images
       end
 
       def destroy_image(image_id)

data/lib/rubber/recipes/rubber/volumes.rb

@@ -44,9 +44,9 @@ namespace :rubber do
     deploy_to = fetch(:deploy_to, nil)
 
     unless deploy_to.nil?
-      deployed = capture("echo $(ls /var/run/reboot-required 2> /dev/null)")
+      deployed = capture("echo $(ls #{deploy_to} 2> /dev/null)")
 
-      unless deployed
+      if deployed.strip.size == 0
         set :rubber_code_was_updated, false
       end
     end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.7.4"
+  VERSION = "2.7.5"
 end

data/templates/base/config/rubber/rubber-ruby.yml

@@ -12,12 +12,12 @@ packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, z
 
 # REQUIRED: The version of ruby-build to use for building ruby.
 # It must be one of the versions from https://github.com/sstephenson/ruby-build/blob/master/CHANGELOG.md
-ruby_build_version: 20140210
+ruby_build_version: 20140225
 
 # REQUIRED: Set to the version string for the ruby version you wish to use
 # Run "ruby-build --definitions" to see the list of possible options or look through the list of
 # recipes online at https://github.com/sstephenson/ruby-build/tree/master/share/ruby-build
-ruby_version: 1.9.3-p484
+ruby_version: 2.0.0-p451
 
 # REQUIRED: Installation path for ruby.
 ruby_path: "/usr/local/rubies/#{ruby_version}"

data/templates/redis/config/rubber/rubber-redis.yml

@@ -1,4 +1,4 @@
-redis_server_version: 2.8.7
+redis_server_version: 2.8.8
 redis_server_pid_file: /var/run/redis-server.pid
 redis_server_conf_file: /etc/redis.conf
 redis_server_log_file: /var/log/redis-server.log

data/test/cloud/fog_test.rb

@@ -7,10 +7,10 @@ class FogTest < Test::Unit::TestCase
   context "fog" do
 
     setup do
-      env = {'compute_credentials' =>
-                 {'rackspace_api_key' => "XXX", 'rackspace_username' => "YYY", 'provider' => "rackspace"},
+      env = { 'compute_credentials' =>
+                 { 'rackspace_api_key' => 'XXX', 'rackspace_username' => 'YYY', 'provider' => 'rackspace'},
              'storage_credentials' =>
-                 {'rackspace_api_key' => "XXX", 'rackspace_username' => "YYY", 'provider' => "rackspace"}}
+                 { 'rackspace_api_key' => 'XXX', 'rackspace_username' => 'YYY', 'provider' => 'rackspace'}}
       env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
       @cloud = Rubber::Cloud::Fog.new(env, nil)
     end
@@ -21,7 +21,7 @@ class FogTest < Test::Unit::TestCase
     end
 
     should "provide storage" do
-      assert_raises(Fog::Errors::MockNotImplemented) { @cloud.storage('mybucket') }
+      assert @cloud.storage('mybucket')
     end
 
     should "not provide table store" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano