rubber 1.13.0 → 1.13.1

data/CHANGELOG

@@ -1,3 +1,21 @@
+1.13.1
+-----
+
+allow specifying a common role dependency for all instances <f49b662> [Matt Conway]
+allow one to specify HOSTand ROLES when testing rake rubber:config in dev <56b3c8c> [Matt Conway]
+Merged pull request #57 from drync/no_rvmrc. <9aee319> [Matt Conway]
+Exclude .rvmrc from NO_SCM deploys <3fa1502> [Savanah Cummings]
+
+1.13.0
+-----
+
+Forgot target roles for start/stop/restart <9b916e8> [Alex Kremer]
+Fix enabling multiverse on newer canonical AMIs (ie Maverick) <dcf81fa> [Alex Kremer]
+Initial commit of MongoDB Template <c4f7640> [Alex Kremer]
+allow FORCE on destroy_all <0db9347> [Matt Conway]
+Removing a function that wasn't meant to be committed :( <8538041> [Jordan Brock]
+Added support for changing the region end point, using the EC2 gem "server" key. <326448f> [Jordan Brock]
+
 1.13.0
 -----
 

data/VERSION

@@ -1 +1 @@
-1.13.0
+1.13.1

data/generators/vulcanize/templates/base/config/deploy.rb

@@ -6,7 +6,7 @@ on :load do
   set :application, rubber_env.app_name
   set :runner,      rubber_env.app_user
   set :deploy_to,   "/mnt/#{application}-#{RUBBER_ENV}"
-  set :copy_exclude, [".git/*", ".bundle/*", "log/*"]
+  set :copy_exclude, [".git/*", ".bundle/*", "log/*", ".rvmrc"]
 end
 
 # Use a simple directory tree copy here to make demo easier.

data/lib/generators/vulcanize/templates/base/config/deploy.rb

@@ -6,7 +6,7 @@ on :load do
   set :application, rubber_env.app_name
   set :runner,      rubber_env.app_user
   set :deploy_to,   "/mnt/#{application}-#{RUBBER_ENV}"
-  set :copy_exclude, [".git/*", ".bundle/*", "log/*"]
+  set :copy_exclude, [".git/*", ".bundle/*", "log/*", ".rvmrc"]
 end
 
 # Use a simple directory tree copy here to make demo easier.

data/lib/rubber/instance.rb

@@ -155,6 +155,12 @@ module Rubber
 
       def self.expand_role_dependencies(roles, dependency_map, expanded=[])
         roles = Array(roles)
+
+        if expanded.size == 0
+          common_deps = dependency_map[RoleItem.new('common')]
+          roles.concat(common_deps)
+        end
+
         roles.each do |role|
           unless expanded.include?(role)
             expanded << role
@@ -162,6 +168,7 @@ module Rubber
             expand_role_dependencies(needed, dependency_map, expanded)
           end
         end
+        
         return expanded
       end
 

data/lib/rubber/tasks/rubber.rb

@@ -32,7 +32,9 @@ namespace :rubber do
       env = cfg.environment.bind(roles, instance_alias)
       gen = Rubber::Configuration::Generator.new("#{RUBBER_ROOT}/config/rubber", roles, instance_alias)
     elsif ['development', 'test'].include?(Rubber.env)
-      roles = cfg.environment.known_roles
+      instance_alias = ENV['HOST'] || instance_alias
+      roles = ENV['ROLES'].split(',') if ENV['ROLES']
+      roles ||= cfg.environment.known_roles
       role_items = roles.collect do |r|
         Rubber::Configuration::RoleItem.new(r, r == "db" ? {'primary' => true} : {})
       end

data/test/instance_test.rb

@@ -169,4 +169,12 @@ class InstanceTest < Test::Unit::TestCase
                  RoleItem.expand_role_dependencies(RoleItem.new('db'), deps).sort
 
   end
+
+  def test_common_dependencies
+    deps = { RoleItem.new('a') => RoleItem.new('b'),
+             RoleItem.new('common') => [RoleItem.new('c')]}
+    roles = [RoleItem.new('a'), RoleItem.new('b'), RoleItem.new('c')]
+    assert_equal roles, RoleItem.expand_role_dependencies(RoleItem.new('a'), deps).sort
+  end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: rubber
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors: 
 - Matt Conway
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -04:00
+date: 2011-05-16 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency