rubber 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea9c4664c7c0e3bda464394ec4629938c17d3def
-  data.tar.gz: 80eb42ae9aa0625382878b683fc4ec6d1f708236
+  metadata.gz: 5114eacd77e6f57f82ea071185bba2526ecb1684
+  data.tar.gz: 4dc0cb1cabc07928b0ba0c31ada5d585c1194797
 SHA512:
-  metadata.gz: 38f7bb115c0a64ead7ba2a959bdd5c79ce92ae2239546fbd287b08a8eaf18d6bbac483e4d6ce720b0e065731bb4892df37ee49254b25bfd13f9b775787358e21
-  data.tar.gz: 0115c2d6b31efd08592c940265926080231d42d9284efb45e19f57cf09dcf7d8eaa6155f9b222c69c8c47b9e8acc833a1897ca2955cedbacda414784b9f872d9
+  metadata.gz: 5986315d8ad24328de8c556f3e2eaf4bccc5b61117b98721a9ef19c9600b4a4c34c1d5420f4d2e3a24639099ba15c99783f9655ef4b7beb7df9076f8e70d4156
+  data.tar.gz: 1124e91c5d0fd869bb78de77e1db76a267bde4b570d0dd4b5c66e39996f41a67570fe92448dd54386b23cbfb3728d65cb1f999b560afb51cb6152c369271f753

data/.travis.yml

@@ -13,8 +13,7 @@ rvm:
   - jruby-18mode
   - jruby-19mode
   - jruby-head
-  - rbx-18mode
-  - rbx-19mode
+  - rbx-2
 
 matrix:
   exclude:
@@ -34,15 +33,11 @@ matrix:
       gemfile: Gemfile.1.8.7
     - rvm: jruby-head
       gemfile: Gemfile.1.8.7
-    - rvm: rbx-18mode
-      gemfile: Gemfile
-    - rvm: rbx-19mode
+    - rvm: rbx-2
       gemfile: Gemfile.1.8.7
 
   allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-18mode
+    - rvm: rbx-2
 
 # script: bundle exec rspec spec
 env:

data/CHANGELOG

@@ -1,3 +1,18 @@
+2.6.4 (12/23/2013)
+
+Improvements:
+============
+
+[base]  	Upgraded ruby-build from 20131122.1 to 20131220.1. <c869c00>
+[base] Upgraded default ruby from 1.9.3-p448 to 1.9.3-p484. <d843c0c>
+
+Bug Fixes:
+=========
+
+[core] :only => { :primary => true } getting clobbered <a9814c9>
+[core] Clear out potentially cached state upon initialization if initializing Rubber twice in the same runtime. <1d9fe51>
+
+
 2.6.3 (11/19/2013)
 
 Improvements:

data/lib/capistrano/find_servers_for_task_fix.rb

@@ -0,0 +1,26 @@
+# Overrides a method in Capistrano::Configuration::Servers.  That method allows for configured default_run_options to
+# override the options defined on the task itself.  The problem is it doesn't do a deep merge, so any option that is
+# a hash ends up being completely overwritten rather than being merged itself.  What we're doing here does break the
+# defined contract for Capistrano, but should be equivalent in non-deep merge scenarios.  We need the deep merge in
+# order to specify both a :platform (as a default_run_option) and :primary (as a task option) hash value for the
+# :only option.  NB: For simplicity we're only "deep merging" one level deep, in order to meet our immediate use case.
+#
+# We shouldn't make a habit of patching Capistrano in Rubber. But since Capistrano 2.x is effectively a dead project,
+# getting this fixed upstream is extremely unlikely.
+
+module Capistrano
+  class Configuration
+    def find_servers_for_task(task, options = {})
+      find_options = task.options.dup
+      options.each do |k, v|
+        if find_options[k].is_a?(Hash)
+          find_options[k].merge!(v)
+        else
+          find_options[k] = v
+        end
+      end
+
+      find_servers(find_options)
+    end
+  end
+end

data/lib/rubber.rb

@@ -8,6 +8,9 @@ module Rubber
   def self.initialize(project_root, project_env)
     return if defined?(RUBBER_ROOT) && defined?(RUBBER_ENV)
 
+    @config = nil
+    @instances = nil
+
     @@root = project_root
     @@env = project_env
     Object.const_set('RUBBER_ENV', project_env)
@@ -80,8 +83,8 @@ module Rubber
   
 end
 
-
 require 'rubber/version'
+require 'rubber/platforms'
 require 'rubber/thread_safe_proxy'
 require 'rubber/configuration'
 require 'rubber/environment'

data/lib/rubber/cloud/aws.rb

@@ -55,7 +55,7 @@ module Rubber
           instance[:state] = item.state
           instance[:zone] = item.availability_zone
           instance[:provider] = 'aws'
-          instance[:platform] = item.platform || 'linux'
+          instance[:platform] = item.platform || Rubber::Platforms::LINUX
           instance[:root_device_type] = item.root_device_type
           instances << instance
         end

data/lib/rubber/cloud/digital_ocean.rb

@@ -84,7 +84,7 @@ module Rubber
           instance[:internal_ip] = item.public_ip_address
           instance[:region_id] = item.region_id
           instance[:provider] = 'digital_ocean'
-          instance[:platform] = 'linux'
+          instance[:platform] = Rubber::Platforms::LINUX
           instances << instance
         end
 

data/lib/rubber/cloud/generic.rb

@@ -33,7 +33,7 @@ module Rubber
         instance[:external_ip] = capistrano.rubber.get_env('EXTERNAL_IP', "External IP address for host '#{instance_alias}'", true)
         instance[:internal_ip] = capistrano.rubber.get_env('INTERNAL_IP', "Internal IP address for host '#{instance_alias}'", true, instance[:external_ip])
         instance[:provider] = 'generic'
-        instance[:platform] = 'linux'
+        instance[:platform] = Rubber::Platforms::LINUX
 
         Generic.add_instance(instance)
 

data/lib/rubber/cloud/vsphere.rb

@@ -137,7 +137,7 @@ module Rubber
 
           instance[:region_id] = item.datacenter
           instance[:provider] = 'vsphere'
-          instance[:platform] = 'linux'
+          instance[:platform] = Rubber::Platforms::LINUX
           instances << instance
         end
 

data/lib/rubber/instance.rb

@@ -253,19 +253,19 @@ module Rubber
 
       def platform
         # Deal with old instance configurations that don't have a platform value persisted.
-        @platform || 'linux'
+        @platform || Rubber::Platforms::LINUX
       end
 
       def linux?
-        platform == 'linux'
+        platform == Rubber::Platforms::LINUX
       end
 
       def mac?
-        platform == 'mac'
+        platform == Rubber::Platforms::MAC
       end
 
       def windows?
-        platform == 'windows'
+        platform == Rubber::Platforms::WINDOWS
       end
     end
 

data/lib/rubber/platforms.rb

@@ -0,0 +1,10 @@
+module Rubber
+  module Platforms
+    LINUX = 'linux'.freeze
+    WINDOWS = 'windows'.freeze
+    MAC = 'mac'.freeze
+
+    ALL = [LINUX, WINDOWS, MAC]
+    NON_LINUX = ALL# - [LINUX]
+  end
+end

data/lib/rubber/recipes/rubber.rb

@@ -6,6 +6,7 @@ require 'resolv'
 require 'enumerator'
 require 'capistrano/hostcmd'
 require 'capistrano/thread_safety_fix'
+require 'capistrano/find_servers_for_task_fix'
 require 'pp'
 require 'rubber'
 
@@ -15,9 +16,9 @@ namespace :rubber do
   alias :original_task :task
   def task(name, options={}, &block)
     if options.has_key?(:only)
-      options[:only][:platform] = 'linux'
+      options[:only][:platform] = Rubber::Platforms::LINUX
     else
-      options[:only] = { :platform => 'linux' }
+      options[:only] = { :platform => Rubber::Platforms::LINUX }
     end
 
     original_task(name, options, &block)
@@ -33,9 +34,9 @@ namespace :rubber do
       alias :required_task :task
       def task(name, options={}, &block)
         if options.has_key?(:only)
-          options[:only][:platform] = 'linux'
+          options[:only][:platform] = Rubber::Platforms::LINUX
         else
-          options[:only] = { :platform => 'linux' }
+          options[:only] = { :platform => Rubber::Platforms::LINUX }
         end
 
         required_task(name, options) do
@@ -71,9 +72,9 @@ namespace :rubber do
     default_run_options[:shell] = "/bin/bash -l" if default_run_options[:shell].nil?
 
     if default_run_options.has_key?(:only)
-      default_run_options[:only][:platform] = 'linux'
+      default_run_options[:only][:platform] = Rubber::Platforms::LINUX
     else
-      default_run_options[:only] = { :platform => 'linux' }
+      default_run_options[:only] = { :platform => Rubber::Platforms::LINUX }
     end
 
     set :cloud, Rubber.cloud(self)

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.6.3"
+  VERSION = "2.6.4"
 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: 20131030
+ruby_build_version: 20131220.1
 
 # 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-p448
+ruby_version: 1.9.3-p484
 
 # REQUIRED: Installation path for ruby.
 ruby_path: "/usr/local/rubies/#{ruby_version}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -204,6 +204,7 @@ files:
 - Rakefile
 - TODO
 - bin/rubber
+- lib/capistrano/find_servers_for_task_fix.rb
 - lib/capistrano/hostcmd.rb
 - lib/capistrano/thread_safety_fix.rb
 - lib/rubber.rb
@@ -234,6 +235,7 @@ files:
 - lib/rubber/environment.rb
 - lib/rubber/generator.rb
 - lib/rubber/instance.rb
+- lib/rubber/platforms.rb
 - lib/rubber/railtie.rb
 - lib/rubber/recipes/rubber.rb
 - lib/rubber/recipes/rubber/bundles.rb