sml-rubber 0.9.5 → 0.9.6

data/TODO

@@ -1,9 +1,8 @@
-* try to do less stuff as root
-* extract ec2 specific code, and ubuntu specific code into a strategy/factory pattern so this can be used with other grid computing system
+* extract ubuntu specific code into a strategy/factory pattern
+* integrate chef and/or sprinkle for more robust package installs?
 * figure out how to test the capistrano bits
-* make rubber into a gem
-* divorce from rails for use in deploying other things
-* Script setup of round robin dns (Web role), mx records (mail role), etc in generators 
+* Script setup of round robin dns (Web role), mx records (mail role), etc in generators
 * add scripted failover to generated configs for:
     * remove web hosts from round robin on web host failure
     * db failover (promote slave replica? master-master replicas?  cluster?)
+* make passenger default template instead of mongrel

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

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

@@ -75,3 +75,10 @@ task :setup_perms do
   run "find #{shared_path} -name cached-copy -prune -o -print | xargs chown #{runner}:#{runner}"
   run "chown -R #{runner}:#{runner} #{current_path}/tmp"
 end
+
+# Uncomment this is you want to install gems defined in the rails environment.rb
+# after "deploy:update", "install_rails_gems"
+task :install_rails_gems do
+  sudo "sh -c 'cd #{current_path} && rake gems:install'"
+end
+

data/generators/vulcanize/templates/base/config/rubber/rubber.yml

@@ -85,10 +85,10 @@ cloud_providers:
 
     # REQUIRED: the ami and instance type for creating instances
     # The Ubuntu images at http://alestic.com/ work well
-    # Ubuntu 9.04 Jaunty	base install	32-bit	2.6.21.7-2.fc8xen	ami-bf5eb9d6
-    # Ubuntu 9.04 Jaunty	base install	64-bit	2.6.21.7-2.fc8xen	ami-bc5eb9d5
+    # Ubuntu 9.04 Jaunty	base install	32-bit	2.6.21.7-2.fc8xen	ami-ed46a784
+    # Ubuntu 9.04 Jaunty	base install	64-bit	2.6.21.7-2.fc8xen	ami-5b46a732
     #
-    image_id: ami-bf5eb9d6
+    image_id: ami-ed46a784
     # m1.small or m1.large or m1.xlarge
     image_type: m1.small
 

data/lib/rubber/cloud/aws.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'EC2'
+require 'AWS'
 require 'aws/s3'
 
 module Rubber
@@ -10,7 +10,7 @@ module Rubber
       def initialize(env, capistrano)
         super(env, capistrano)
         @aws_env = env.cloud_providers.aws
-        @ec2 = EC2::Base.new(:access_key_id => @aws_env.access_key, :secret_access_key => @aws_env.secret_access_key)
+        @ec2 = AWS::EC2::Base.new(:access_key_id => @aws_env.access_key, :secret_access_key => @aws_env.secret_access_key)
         AWS::S3::Base.establish_connection!(:access_key_id => @aws_env.access_key, :secret_access_key => @aws_env.secret_access_key)
       end
 
@@ -147,7 +147,9 @@ module Rubber
 
       def describe_static_ips(ip=nil)
         ips = []
-        response = @ec2.describe_addresses()
+        opts = {}
+        opts[:public_ip] = ip if ip
+        response = @ec2.describe_addresses(opts)
         response.addressesSet.item.each do |item|
           ip = {}
           ip[:instance_id] = item.instanceId
@@ -185,7 +187,8 @@ module Rubber
           volume = {}
           volume[:id] = item.volumeId
           volume[:status] = item.status
-          if attach = item.attachmentSet.item[0]
+          if item.attachmentSet
+            attach = item.attachmentSet.item[0]
             volume[:attachment_instance_id] = attach.instanceId
             volume[:attachment_status] = attach.status
           end
@@ -202,7 +205,6 @@ module Rubber
         ec2_key = @aws_env.key_file
         ec2_pk = @aws_env.pk_file
         ec2_cert = @aws_env.cert_file
-        aws_account = @aws_env.account
         ec2_key_dest = "/mnt/#{File.basename(ec2_key)}"
         ec2_pk_dest = "/mnt/#{File.basename(ec2_pk)}"
         ec2_cert_dest = "/mnt/#{File.basename(ec2_cert)}"
@@ -213,13 +215,21 @@ module Rubber
 
         arch = capistrano.capture "uname -m"
         arch = case arch when /i\d86/ then "i386" else arch end
+
         capistrano.sudo_script "create_bundle", <<-CMD
           export RUBYLIB=/usr/lib/site_ruby/
-          ec2-bundle-vol --batch -d /mnt -k #{ec2_pk_dest} -c #{ec2_cert_dest} -u #{account} -p #{image_name} -r #{arch}
+          nohup ec2-bundle-vol --batch -d /mnt -k #{ec2_pk_dest} -c #{ec2_cert_dest} -u #{@aws_env.account} -p #{image_name} -r #{arch}  &> /tmp/ec2-bundle-vol.log &
+          echo "Creating image from instance volume..."
+          while true; do
+            if ! ps ax | grep -q "[e]c2-bundle-vol"; then exit; fi
+            echo -n .
+            sleep 1
+          done
         CMD
 
         capistrano.sudo_script "register_bundle", <<-CMD
           export RUBYLIB=/usr/lib/site_ruby/
+          echo "Uploading image to S3..."
           ec2-upload-bundle --batch -b #{@aws_env.image_bucket} -m /mnt/#{image_name}.manifest.xml -a #{@aws_env.access_key} -s #{@aws_env.secret_access_key}
         CMD
 
@@ -230,7 +240,9 @@ module Rubber
 
       def describe_images(image_id=nil)
         images = []
-        response = @ec2.describe_images(:owner_id => 'self', :image_id => image_id)
+        opts = {:owner_id => 'self'}
+        opts[:image_id] = image_id if image_id
+        response = @ec2.describe_images(opts)
         response.imagesSet.item.each do |item|
           image = {}
           image[:id] = item.imageId

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

@@ -32,6 +32,9 @@ namespace :rubber do
     opts['NO_POST'] = true if ENV['NO_POST']
     opts['FILE'] = ENV['FILE'] if ENV['FILE']
     opts['RUBBER_ENV'] = RUBBER_ENV
+    # we need to set rails env as well because when running rake
+    # in a rails project, rails gets loaded before the rubber hook gets run
+    opts['RAILS_ENV'] = RUBBER_ENV
 
     # when running deploy:migrations, we need to run config against release_path
     opts[:deploy_path] = current_release if fetch(:migrate_target, :current).to_sym == :latest
@@ -49,7 +52,7 @@ namespace :rubber do
       push_files = [rubber_cfg.instance.file] + rubber_cfg.environment.config_files
       push_files.each do |file|
         dest_file = file.sub(/^#{RUBBER_ROOT}\/?/, '')
-        put(File.read(file), File.join(path, dest_file))
+        put(File.read(file), File.join(path, dest_file), :mode => "+r")
       end
     end
 
@@ -57,7 +60,7 @@ namespace :rubber do
     secret = rubber_cfg.environment.config_secret
     if secret && File.exist?(secret)
       base = rubber_cfg.environment.config_root.sub(/^#{RUBBER_ROOT}\/?/, '')
-      put(File.read(secret), File.join(path, base, File.basename(secret)))
+      put(File.read(secret), File.join(path, base, File.basename(secret)), :mode => "+r")
     end
 
     sudo "sh -c 'cd #{path} && #{extra_env} rake rubber:config'"

data/lib/rubber/recipes/rubber/static_ips.rb

@@ -24,7 +24,7 @@ namespace :rubber do
           logger.info "Associating static ip #{ip} with #{ic.full_name}"
           associate_static_ip(ip, ic.instance_id)
 
-          instance = cloud.describe_instances(:instance_id => ic.instance_id).first
+          instance = cloud.describe_instances(ic.instance_id).first
           ic.external_host = instance[:external_host]
           ic.internal_host = instance[:internal_host]
           ic.external_ip = ip
@@ -59,7 +59,7 @@ namespace :rubber do
     format = "%-10s %-15s %-30s"
     results << format % %w[InstanceID IP Alias]
 
-    ips = cloud.describe_addresses()
+    ips = cloud.describe_static_ips()
     ips.each do |ip_data|
       instance_id = ip_data[:instance_id]
       ip = ip_data[:ip]

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

@@ -244,7 +244,8 @@ namespace :rubber do
       print "."
       sleep 2
       volume = cloud.describe_volumes(volume_id).first
-      break if !volume || volume[:attachment_status] == "detached"
+      status = volume && volume[:attachment_status]
+      break if !status || status == "detached"
     end
     print "\n"
 

data/lib/rubber.rb

@@ -8,7 +8,7 @@ module Rubber
     return if defined?(RUBBER_ROOT) && defined?(RUBBER_ENV)
 
     Object.const_set('RUBBER_ENV', project_env)
-    Object.const_set('RUBBER_ROOT', project_root)
+    Object.const_set('RUBBER_ROOT', File.expand_path(project_root))
 
     # pull in basic rails env.  rubber only needs RAILS_ROOT and RAILS_ENV.
     # We actually do NOT want the entire rails environment because it

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sml-rubber
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Matt Conway
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: "The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to Amazon\xD5s 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."
 email: matt@conwaysplace.com
 executables: