rubber 1.6.1 → 1.6.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+1.6.1
+-----
+
+Fixed issue with Rakefile generation for Rails 2.x. <f239f0e> [Kevin Menard]
+Fixed RVM installation. <79dcf17> [Kevin Menard]
+Bump the version of RVM. <324e939> [Kevin Menard]
+
 1.6.0
 -----
 

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

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: 1.0.5
+rvm_version: 1.0.11
 
 # 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-1437dd7d
-    # Ubuntu 10.04 Lucid	base install	64-bit	ami-4234de2b
+    # Ubuntu 10.04 Lucid	base install	32-bit	ami-6407f20d
+    # Ubuntu 10.04 Lucid	base install	64-bit	ami-ac07f2c5
     #
     # m1.small or m1.large or m1.xlarge
     image_type: m1.small
-    image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-1437dd7d' : 'ami-4234de2b' }"
+    image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-6407f20d' : 'ami-ac07f2c5' }"
 
     # OPTIONAL: EC2 spot instance request support.
     #

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: 1.0.5
+rvm_version: 1.0.11
 
 # 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-1437dd7d
-    # Ubuntu 10.04 Lucid	base install	64-bit	ami-4234de2b
+    # Ubuntu 10.04 Lucid	base install	32-bit	ami-6407f20d
+    # Ubuntu 10.04 Lucid	base install	64-bit	ami-ac07f2c5
     #
     # m1.small or m1.large or m1.xlarge
     image_type: m1.small
-    image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-1437dd7d' : 'ami-4234de2b' }"
+    image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-6407f20d' : 'ami-ac07f2c5' }"
 
     # OPTIONAL: EC2 spot instance request support.
     #

data/lib/rubber.rb

@@ -12,6 +12,15 @@ module Rubber
     Object.const_set('RUBBER_ENV', project_env)
     Object.const_set('RUBBER_ROOT', File.expand_path(project_root))
 
+    if ! defined?(Rails) && ! Rubber::Util::is_bundler?
+      # pull in basic rails env.  rubber only needs RAILS_ROOT and RAILS_ENV.
+      # We actually do NOT want the entire rails environment because it
+      # complicates bootstrap (i.e. can't run config to create db because full
+      # rails env needs db to exist as some plugin accesses model or something)
+      rails_boot_file = File.join(RUBBER_ROOT, 'config', 'boot.rb')
+      require(rails_boot_file) if File.exists? rails_boot_file
+    end
+
     if defined?(Rails.logger) && Rails.logger
       @@logger = Rails.logger
     else
@@ -58,10 +67,4 @@ require 'rubber/generator'
 require 'rubber/instance'
 require 'rubber/util'
 require 'rubber/cloud'
-require 'rubber/dns'
-
-if Rubber::Util::is_rails3?
-  module Rubber
-    require 'rubber/railtie'
-  end
-end
+require 'rubber/dns'

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

@@ -243,19 +243,21 @@ namespace :rubber do
       instance_item.platform = instance[:platform]
       rubber_instances.save()
 
-      # weird cap/netssh bug, sometimes just hangs forever on initial connect, so force a timeout
-      begin
-        Timeout::timeout(30) 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?)
-          # force a connection so if above isn't enabled we still timeout if initial connection hangs
-          direct_connection(instance_item.external_ip) do
-            run "echo"
+      unless instance_item.windows?
+        # weird cap/netssh bug, sometimes just hangs forever on initial connect, so force a timeout
+        begin
+          Timeout::timeout(30) 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'
+            # force a connection so if above isn't enabled we still timeout if initial connection hangs
+            direct_connection(instance_item.external_ip) do
+              run "echo"
+            end
           end
+        rescue Timeout::Error
+          logger.info "timeout in initial connect, retrying"
+          retry
         end
-      rescue Timeout::Error
-        logger.info "timeout in initial connect, retrying"
-        retry
       end
 
       # setup amazon elastic ips if configured to do so
@@ -268,20 +270,20 @@ namespace :rubber do
       # re-load the roles since we may have just defined new ones
       load_roles() unless env.disable_auto_roles
 
-      # Connect to newly created instance and grab its internal ip
-      # so that we can update all aliases
-      direct_connection(instance_item.external_ip) do
-        # There's no good way to get the internal IP for a Windows host, so just set it to the external
-        # and let the router handle mapping to the internal network.
-        if instance_item.windows?
-          instance_item.internal_ip = instance_item.external_ip
-        else
+      # There's no good way to get the internal IP for a Windows host, so just set it to the external
+      # and let the router handle mapping to the internal network.
+      if instance_item.windows?
+        instance_item.internal_ip = instance_item.external_ip
+      else
+        # Connect to newly created instance and grab its internal ip
+        # so that we can update all aliases
+        direct_connection(instance_item.external_ip) do
           instance_item.internal_ip = capture(print_ip_command).strip
         end
-
-        rubber_instances.save()
       end
 
+      rubber_instances.save()
+
       # Add the aliases for this instance to all other hosts
       setup_remote_aliases
       setup_dns_aliases

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -04:00
+date: 2010-09-27 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency