sml-rubber 0.9.10 → 0.9.11

data/VERSION

@@ -1 +1 @@
-0.9.10
+0.9.11

data/bin/vulcanize

@@ -2,31 +2,40 @@
 
 env = ENV['RUBBER_ENV'] || ENV['RAILS_ENV'] || 'development'
 root = '.'
-RAILS_ENV = ENV['RAILS_ENV'] = env
-RAILS_ROOT = ENV['RAILS_ROOT'] = root
 
-# need a minimal rails environment for generators to run
-require 'rubygems'
-gem 'rails'
-module Rails
-  class << self
-    def vendor_rails?
-      false
+# if in a rails project, then use standard generate, otherwise
+# we need a minimal rails environment for generators to run
+ #
+if File.exist?(File.join(root, 'config', 'environment.rb'))
+  ARGV.insert(0, 'vulcanize')
+  require File.join(root, 'config', 'boot')
+  require 'commands/generate'
+else
+  RAILS_ENV = ENV['RAILS_ENV'] = env
+  RAILS_ROOT = ENV['RAILS_ROOT'] = root
+
+  require 'rubygems'
+  gem 'rails'
+  module Rails
+    class << self
+      def vendor_rails?
+        false
+      end
     end
   end
-end
 
-require 'initializer'
-class Rails::Initializer
-  def load_environment; end
-end
+  require 'initializer'
+  class Rails::Initializer
+    def load_environment; end
+  end
 
-Rails::Initializer.run do |config|
-  config.frameworks -= [:active_record, :action_controller]
-end
+  Rails::Initializer.run do |config|
+    config.frameworks -= [:active_record, :action_controller]
+  end
 
-require 'rails_generator'
-require 'rails_generator/scripts/generate'
+  require 'rails_generator'
+  require 'rails_generator/scripts/generate'
 
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-Rails::Generator::Scripts::Generate.new.run(['vulcanize'] + ARGV)
+  ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+  Rails::Generator::Scripts::Generate.new.run(['vulcanize'] + ARGV)
+end

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

@@ -135,21 +135,6 @@ auto_security_groups: true
 # account, or even multiple apps
 isolate_security_groups: true
 
-# OPTIONAL: Automatically provision and assign instances to a Cloud provided
-# load balancer.
-load_balancers:
-  my_lb_name:
-    listeners:
-      - protocol: http
-        port: 80
-        instance_port: 8080
-      - protocol: tcp
-        port: 443
-        instance_port: 8080
-    target_roles: [app]
-
-isolate_load_balancers: true
-
 # OPTIONAL: Set if you want to use Ruby Enterprise Edition instead of the standard ubuntu one
 use_enterprise_ruby: false
 

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

@@ -330,7 +330,7 @@ namespace :rubber do
     rubber_env.role_dependencies.each do |k, v|
       rhs = Array(v).collect {|r| Rubber::Configuration::RoleItem.parse(r)}
       deps[Rubber::Configuration::RoleItem.parse(k)] = rhs
-    end
+    end if rubber_env.role_dependencies
     return deps
   end
   

data/lib/rubber/recipes/rubber/load_balancers.rb

@@ -1,21 +1,38 @@
 namespace :rubber do
 
-  desc <<-DESC
-    Sets up the network load balancers
-  DESC
-  required_task :setup_load_balancers do
-    setup_load_balancers()
-  end
-
-  desc <<-DESC
-    Describes the network load balancers
-  DESC
-  required_task :describe_load_balancers do
-    lbs = cloud.describe_load_balancers()
-    pp lbs
-  end
+  #desc <<-DESC
+  #  Sets up the network load balancers
+  #DESC
+  #required_task :setup_load_balancers do
+  #  setup_load_balancers()
+  #end
+  #
+  #desc <<-DESC
+  #  Describes the network load balancers
+  #DESC
+  #required_task :describe_load_balancers do
+  #  lbs = cloud.describe_load_balancers()
+  #  pp lbs
+  #end
 
   def setup_load_balancers
+    # OPTIONAL: Automatically provision and assign instances to a Cloud provided
+    # load balancer.
+    #load_balancers:
+    #  my_lb_name:
+    #    listeners:
+    #      - protocol: http
+    #        port: 80
+    #        instance_port: 8080
+    #      - protocol: tcp
+    #        port: 443
+    #        instance_port: 8080
+    #    target_roles: [app]
+    #
+    #isolate_load_balancers: true
+
+
+
     # get remote lbs
     # for each local not in remote, add it
     #   get all zones for all instances for roles, and make sure in lb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sml-rubber
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Matt Conway
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency