init.rb lib/rubber/capistrano.rb lib/rubber/recipes/rubber.rb lib/rubber/recipes/rubber/bundles.rb lib/rubber/recipes/rubber/deploy.rb lib/rubber/recipes/rubber/instances.rb lib/rubber/recipes/rubber/security_groups.rb lib/rubber/recipes/rubber/setup.rb lib/rubber/recipes/rubber/static_ips.rb lib/rubber/recipes/rubber/utils.rb lib/rubber/recipes/rubber/volumes.rb lib/rubber/tasks/rubber.rb rails/init.rb rubber.gemspec @@ -11,7 +11,7 @@ begin s.description = "The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to AmazonÕs Elastic Compute Cloud (EC2). Like capistrano, rubber is role based, so you can define a set of configuration files for a role and then assign that role to as many concrete instances as needed. One can also assign multiple roles to a single instance. This lets one start out with a single ec2 instance (belonging to all roles), and add new instances into the mix as needed to scale specific facets of your deployment, e.g. adding in instances that serve only as an 'app' role to handle increased app server load." s.rubyforge_project = 'rubber' s.authors = ["Matt Conway"] - s.files = FileList["[A-Z]*", "{generators,lib,recipes}/**/*"] + s.files = FileList["[A-Z][A-Z]*", "{generators,lib,recipes}/**/*"] s.add_dependency 'capistrano' s.add_dependency 'amazon-ec2' s.add_dependency 'aws-s3' Rakefile @@ -2,6 +2,7 @@ load 'deploy' if respond_to?(:namespace) # cap2 differentiator require 'rubber' Rubber::initialize(File.dirname(__FILE__), (ENV['RAILS_ENV'] ||= 'production')) -Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) } +require 'rubber/capistrano' +Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) } load 'config/deploy' generators/vulcanize/templates/base/Capfile @@ -72,7 +72,7 @@ cloud_providers: # create an instance, ssh into it, and copy the file /mnt/openssh_id.pub # key_name: gsg-keypair - key_file: "#{Dir[(File.expand_path('~') rescue '/root') + '/.ec2/*' + key_name].first}" + key_file: "#{Dir[(File.expand_path('~') rescue '/root') + '/.ec2/*' + cloud_providers.aws.key_name].first}" # OPTIONAL: Needed for bundling a running instance using rubber:bundle # generators/vulcanize/templates/base/config/rubber/rubber.yml @@ -1,3 +1,4 @@ require 'rubber' -Rubber::initialize(File.dirname(__FILE__) + '../../', (ENV['RAILS_ENV'] ||= 'development')) -require 'rubber/tasks/rubber.rake' +Rubber::initialize(File.dirname(__FILE__) + '/../..', (ENV['RAILS_ENV'] ||= 'development')) + +require 'rubber/tasks/rubber' generators/vulcanize/templates/base/lib/tasks/rubber.rake @@ -1,9 +1,10 @@ $:.unshift(File.dirname(__FILE__)) module Rubber - VERSION = '0.9.0' - + def self.initialize(project_root, project_env) + return if defined?(PROJECT_ROOT) && defined?(RUBBER_ENV) + Object.const_set('RUBBER_ENV', project_env) Object.const_set('PROJECT_ROOT', project_root) @@ -22,6 +23,8 @@ module Rubber LOGGER.formatter = lambda {|severity, time, progname, msg| "Rubber[%s]: %s\n" % [severity, msg.to_s.lstrip]} end end + + VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION')).chomp end lib/rubber.rb @@ -3,10 +3,10 @@ require "rubber/cloud/base" module Rubber module Cloud - def self.get_provider(provider, env) + def self.get_provider(provider, env, capistrano) require "rubber/cloud/#{provider}" clazz = Rubber::Cloud.const_get(provider.capitalize) - return clazz.new(env) + return clazz.new(env, capistrano) end end lib/rubber/cloud.rb @@ -109,7 +109,9 @@ module Rubber if val.instance_of? Hash def val.method_missing(method_id) key = method_id.id2name - self[key] + v = val[name] + v = get(name, true, true) unless v + return v end end lib/rubber/environment.rb @@ -107,6 +107,9 @@ class EnvironmentTest < Test::Unit::TestCase assert_equal 'val3', e.var2.var3, 'env not retrieving right val' assert_equal({'var5' => 'val5'}, e.var2.var4, 'env not retrieving right val') assert_equal ['val6a', 'val6b'], e.var2.var6, 'env not retrieving right val' + assert_equal 'val1', e.var7, 'env not retrieving right val' + assert_equal 'val3', e.var9, 'env not retrieving right val' + assert_equal 'val5', e.var9, 'env not retrieving right val' end end test/environment_test.rb @@ -4,3 +4,6 @@ var2: var4: var5: val5 var6: [val6a, val6b] + var7: "#{var1}" + var8: "#{var3}" + var9: "#{var2.var4.var5}" test/fixtures/nested/rubber.yml lib/rubber/tasks/rubber.rake recipes/rubber.rb recipes/rubber/bundles.rb recipes/rubber/deploy.rb recipes/rubber/instances.rb recipes/rubber/security_groups.rb recipes/rubber/setup.rb recipes/rubber/static_ips.rb recipes/rubber/utils.rb recipes/rubber/volumes.rb bf908790b31586689abc4da626113ec8ccde02fe Matt Conway wr0ngway@yahoo.com http://github.com/wr0ngway/rubber/commit/dc350a0a7bec93f6bf80a8b23cc8dae8deb0c1df dc350a0a7bec93f6bf80a8b23cc8dae8deb0c1df 2009-06-15T20:06:22-07:00 2009-06-15T20:06:22-07:00 initial gem support 659a27cef2dceb97747eea31ac0cebe14d5a8559 Matt Conway wr0ngway@yahoo.com