rubber 1.5.7 → 1.5.8

data/CHANGELOG

@@ -1,3 +1,10 @@
+1.5.7
+-----
+
+allow access to calling generator so can determine stuff like fake_root <fa6354c> [Matt Conway]
+refactor create using refresh <12df4c4> [Matt Conway]
+save config in refresh <cdb8344> [Matt Conway]
+
 1.5.6
 -----
 

data/VERSION

@@ -1 +1 @@
-1.5.7
+1.5.8

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/*", "log/*"]
+  set :copy_exclude, [".git/*", ".bundle/*", "log/*"]
 end
 
 # Use a simple directory tree copy here to make demo easier.

data/generators/vulcanize/templates/base/config/rubber/common/crontab

@@ -6,7 +6,7 @@
 # cron clears out enviroment variables, so we need to add these in
 # to make sure we are running the correct ruby (rvm env vars, plus paths)
 <%- ENV.select {|k, v| k =~ /rvm|ruby|bundler|gem|path/i }.each do |k, v| -%>
-<%= k %>=<%= v %>
+<%= k %>='<%= v %>'
 <%- end -%>
 
 MAILTO=<%= rubber_env.admin_email %>

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

@@ -12,7 +12,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
 
 # REQUIRED: the version of rvm itself
-rvm_version: 0.1.38
+rvm_version: 1.0.1
 
 # REQUIRED: Set to the rvm version string for the ruby version you wish to use
 # Run "rvm list known" to see the list of possible options

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

@@ -75,12 +75,12 @@ cloud_providers:
 
     # REQUIRED: the ami and instance type for creating instances
     # The Ubuntu images at http://alestic.com/ work well
-    # Ubuntu 10.04 Lucid	base install	32-bit	ami-2d4aa444
-    # Ubuntu 10.04 Lucid	base install	64-bit	ami-fd4aa494
+    # Ubuntu 10.04 Lucid	base install	32-bit	ami-1437dd7d
+    # Ubuntu 10.04 Lucid	base install	64-bit	ami-4234de2b
     #
-    image_id: ami-2d4aa444
     # m1.small or m1.large or m1.xlarge
     image_type: m1.small
+    image_id: "#{ %w{m1.small c2.medium}.include?(image_type) ? 'ami-1437dd7d' : 'ami-4234de2b' }"
 
     # OPTIONAL: EC2 spot instance request support.
     #
@@ -141,9 +141,7 @@ packages: [postfix, build-essential, git-core, ec2-ami-tools]
 # OPTIONAL: The gems to install on all instances
 # You can install a specific version of a gem by using a sub-array of gem, version
 # For example, gem: [[rails, 2.2.2], open4, aws-s3]
-# gems: [rubber, rails, open4, aws-s3]
-# The above is the correct line once rails3 has been released
-gems: [open4, aws-s3, tzinfo, builder, i18n, memcache-client, rack, rake, rack-test, erubis, mail, text-format, thor, bundler, [rack-mount, 0.4], [rails, 3.0.0.beta3], [rubber, "#{Rubber.version}"]]
+gems: [open4, aws-s3, bundler, [rubber, "#{Rubber.version}"]]
 
 # OPTIONAL: A string prepended to shell command strings that cause multi
 # statement shell commands to fail fast.  You may need to comment this out

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/*", "log/*"]
+  set :copy_exclude, [".git/*", ".bundle/*", "log/*"]
 end
 
 # Use a simple directory tree copy here to make demo easier.

data/lib/generators/vulcanize/templates/base/config/rubber/common/crontab

@@ -6,7 +6,7 @@
 # cron clears out enviroment variables, so we need to add these in
 # to make sure we are running the correct ruby (rvm env vars, plus paths)
 <%- ENV.select {|k, v| k =~ /rvm|ruby|bundler|gem|path/i }.each do |k, v| -%>
-<%= k %>=<%= v %>
+<%= k %>='<%= v %>'
 <%- end -%>
 
 MAILTO=<%= rubber_env.admin_email %>

data/lib/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml

@@ -12,7 +12,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
 
 # REQUIRED: the version of rvm itself
-rvm_version: 0.1.38
+rvm_version: 1.0.1
 
 # REQUIRED: Set to the rvm version string for the ruby version you wish to use
 # Run "rvm list known" to see the list of possible options

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

@@ -75,12 +75,12 @@ cloud_providers:
 
     # REQUIRED: the ami and instance type for creating instances
     # The Ubuntu images at http://alestic.com/ work well
-    # Ubuntu 10.04 Lucid	base install	32-bit	ami-2d4aa444
-    # Ubuntu 10.04 Lucid	base install	64-bit	ami-fd4aa494
+    # Ubuntu 10.04 Lucid	base install	32-bit	ami-1437dd7d
+    # Ubuntu 10.04 Lucid	base install	64-bit	ami-4234de2b
     #
-    image_id: ami-2d4aa444
     # m1.small or m1.large or m1.xlarge
     image_type: m1.small
+    image_id: "#{ %w{m1.small c2.medium}.include?(image_type) ? 'ami-1437dd7d' : 'ami-4234de2b' }"
 
     # OPTIONAL: EC2 spot instance request support.
     #
@@ -141,9 +141,7 @@ packages: [postfix, build-essential, git-core, ec2-ami-tools]
 # OPTIONAL: The gems to install on all instances
 # You can install a specific version of a gem by using a sub-array of gem, version
 # For example, gem: [[rails, 2.2.2], open4, aws-s3]
-# gems: [rubber, rails, open4, aws-s3]
-# The above is the correct line once rails3 has been released
-gems: [open4, aws-s3, tzinfo, builder, i18n, memcache-client, rack, rake, rack-test, erubis, mail, text-format, thor, bundler, [rack-mount, 0.4], [rails, 3.0.0.beta3], [rubber, "#{Rubber.version}"]]
+gems: [open4, aws-s3, bundler, [rubber, "#{Rubber.version}"]]
 
 # OPTIONAL: A string prepended to shell command strings that cause multi
 # statement shell commands to fail fast.  You may need to comment this out

data/lib/rubber/recipes/rubber/instances.rb

@@ -243,15 +243,24 @@ namespace :rubber do
       instance_item.platform = instance[:platform]
       rubber_instances.save()
 
-      # turn back on root ssh access if we are using root as the capistrano user for connecting
-      enable_root_ssh(instance_item.external_ip, fetch(:initial_ssh_user, 'ubuntu')) if (user == 'root' && ! instance_item.windows?)
+      # weird cap/netssh bug, sometimes just hangs forever on initial connect, so force a timeout
+      begin
+        Timeout::timeout(10) do
+          # turn back on root ssh access if we are using root as the capistrano user for connecting
+          enable_root_ssh(instance_item.external_ip, fetch(:initial_ssh_user, 'ubuntu')) if (user == 'root' && ! instance_item.windows?)
 
-      # setup amazon elastic ips if configured to do so
-      setup_static_ips
+          # setup amazon elastic ips if configured to do so
+          setup_static_ips
       
-      # Need to setup aliases so ssh doesn't give us errors when we
-      # later try to connect to same ip but using alias
-      setup_local_aliases
+          # Need to setup aliases so ssh doesn't give us errors when we
+          # later try to connect to same ip but using alias
+          setup_local_aliases
+        end
+      rescue Timeout::Error
+        logger.info "timeout in initial connect, retrying"
+        retry
+      end
+
 
       # re-load the roles since we may have just defined new ones
       load_roles() unless env.disable_auto_roles

data/lib/rubber/recipes/rubber/setup.rb

@@ -253,7 +253,19 @@ namespace :rubber do
   DESC
   after "deploy:update_code", "rubber:install_bundler_gems" if Rubber::Util.is_bundler?
   task :install_bundler_gems do
-    rsudo "cd #{current_release} && RAILS_ENV=#{RUBBER_ENV} bundle install --without development test"
+    # copied from bundler/capistrano in bundler distro
+    bundle_dir     = fetch(:bundle_dir,         " #{fetch(:shared_path)}/bundle")
+    bundle_without = [*fetch(:bundle_without,   [:development, :test])].compact
+    bundle_flags   = fetch(:bundle_flags, "--deployment --quiet")
+    bundle_gemfile = fetch(:bundle_gemfile,     "Gemfile")
+    bundle_cmd     = fetch(:bundle_cmd, "bundle")
+  
+    args = ["--gemfile #{fetch(:latest_release)}/#{bundle_gemfile}"]
+    args << "--path #{bundle_dir}" unless bundle_dir.to_s.empty?
+    args << bundle_flags.to_s
+    args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
+
+    rsudo "#{bundle_cmd} install #{args.join(' ')}"
   end
 
   desc <<-DESC

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 7
-  version: 1.5.7
+  - 8
+  version: 1.5.8
 platform: ruby
 authors: 
 - Matt Conway
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -04:00
+date: 2010-09-01 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency