sml-rubber 0.9.4 → 0.9.5

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/bin/vulcanize

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+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
+    end
+  end
+end
+
+require 'initializer'
+class Rails::Initializer
+  def load_environment; end
+end
+
+Rails::Initializer.run do |config|
+  config.frameworks -= [:active_record, :action_controller]
+end
+
+require 'rails_generator'
+require 'rails_generator/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+Rails::Generator::Scripts::Generate.new.run(['vulcanize'] + ARGV)

data/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb

@@ -3,13 +3,57 @@ namespace :rubber do
   
     rubber.allow_optional_tasks(self)
 
+
+    before "rubber:install_packages", "rubber:base:pre_install_ruby"
+    task :pre_install_ruby do
+
+      # figure out which hosts we have specified enterprise ruby for
+      sys_ruby_hosts = []
+      ent_ruby_hosts = []
+      rubber_cfg.instance.filtered.each do |ic|
+        env = rubber_cfg.environment.bind(ic.role_names, ic.name)
+        if env.use_enterprise_ruby
+          ent_ruby_hosts << ic.full_name
+        end
+      end
+
+      if ent_ruby_hosts.size > 0
+
+        task :_install_enterprise_ruby, :hosts => ent_ruby_hosts do
+
+          # preferences to pick up specific Ruby packages from brightbox
+          prefs = <<-DATA
+            Package: *
+            Pin: release l=brightbox
+            Pin-Priority: 1001
+
+            Package: ruby1.8-elisp
+            Pin: release l=Ubuntu
+            Pin-Priority: 1001
+          DATA
+
+          prefs.gsub!(/^ */, '') # remove leading whitespace
+          put(prefs, '/etc/apt/preferences')
+
+          rubber.sudo_script 'install_enterprise_ruby', <<-ENDSCRIPT
+            wget http://apt.brightbox.net/release.asc -O - | apt-key add -
+            echo "deb http://apt.brightbox.net/ hardy rubyee" > /etc/apt/sources.list.d/brightbox-rubyee.list
+          ENDSCRIPT
+
+        end
+
+        _install_enterprise_ruby
+      end
+
+    end
+
     #  The ubuntu rubygem package is woefully out of date, so install it manually
     after "rubber:install_packages", "rubber:base:install_rubygems"
     task :install_rubygems do
-      ver = "1.3.1"
-      src_url = "http://rubyforge.org/frs/download.php/45905/rubygems-#{ver}.tgz"
+      ver = "1.3.5"
+      src_url = "http://rubyforge.org/frs/download.php/60718/rubygems-#{ver}.tgz"
       rubber.sudo_script 'install_rubygems', <<-ENDSCRIPT
-        if [ ! -f /usr/bin/gem ]; then
+        if [[ `gem --version 2>&1` != "#{ver}" ]]; then
           wget -qP /tmp #{src_url}
           tar -C /tmp -xzf /tmp/rubygems-#{ver}.tgz
           ruby -C /tmp/rubygems-#{ver} setup.rb
@@ -35,6 +79,12 @@ namespace :rubber do
           apt-get install liberror-perl libdigest-sha1-perl
           wget -qO /tmp/git.deb ${src}
           dpkg -i /tmp/git.deb
+
+          if [[ "#{repository}" =~ "@" ]]; then
+            # Get host key for src machine to prevent ssh from failing
+            rm -f ~/.ssh/known_hosts
+            ! ssh -o 'StrictHostKeyChecking=no' #{repository.gsub(/:.*/, '')} &> /dev/null
+          fi
         fi
       ENDSCRIPT
     end

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

@@ -121,10 +121,13 @@ assigned_security_groups: [default]
 # creation, so its good to have some empty ones predefined.
 auto_security_groups: true
 
+# OPTIONAL: Set if you want to use Ruby Enterprise Edition instead of the standard ubuntu one
+use_enterprise_ruby: false
+
 # OPTIONAL: The packages to install on all instances
 # You can install a specific version of a package by using a sub-array of pkg, version
 # For example, packages: [[rake, 0.7.1], irb]
-packages: [build-essential, ruby-full, ruby1.8-dev, rake, irb, subversion]
+packages: [build-essential, ruby-full, ruby1.8-dev, rake, irb]
 
 # 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

data/generators/vulcanize/templates/passenger/config/rubber/deploy-passenger.rb

@@ -9,13 +9,13 @@ namespace :rubber do
     
     task :custom_install, :roles => :web do
       rubber.sudo_script 'install_passenger', <<-ENDSCRIPT
-        echo -en "\n\n\n\n" | passenger-install-apache2-module
-        wget -q http://rubyforge.org/frs/download.php/58679/ruby-enterprise_1.8.6-20090610_i386.deb
-        dpkg -i ruby-enterprise_1.8.6-20090610_i386.deb
-        # disable ubuntu default site
-        a2dissite default
+        if [[ ! -f /usr/lib/ruby/gems/*/gems/passenger-*/ext/apache2/mod_passenger.so ]]; then
+          echo -en "\n\n\n\n" | passenger-install-apache2-module
+          # disable ubuntu default site
+          a2dissite default
+        fi
       ENDSCRIPT
-    end
+    end  
     
     # serial_task can only be called after roles defined - not normally a problem, but
     # rubber auto-roles don't get defined till after all tasks are defined
@@ -48,5 +48,17 @@ namespace :rubber do
       serial_reload
     end
     
+    deploy.task :restart, :roles => :web do
+      rubber.passenger.restart
+    end
+    
+    deploy.task :stop, :roles => :web do
+      rubber.passenger.stop
+    end
+    
+    deploy.task :start, :roles => :web do
+      rubber.passenger.start
+    end
+    
   end
 end

data/generators/vulcanize/templates/passenger/config/rubber/role/web/vhost.conf

@@ -4,7 +4,9 @@
 %>
 <VirtualHost *:80>
   ServerName      <%= rubber_env.domain %>
+<%- if rubber_env.web_aliases -%>
   ServerAlias	    <%= rubber_env.web_aliases.join(" ") %>
+<%- end -%>
   DocumentRoot    <%= RUBBER_ROOT + "/public" %>
 
   ErrorDocument 404 /404.html

data/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml

@@ -1,4 +1,14 @@
+security_groups:
+  web:
+    description: To open up port 80 for http server on web role
+    rules:
+      - protocol: tcp
+        from_port: 80
+        to_port: 80
+        source_ips: [0.0.0.0/0]
+
 roles:
   web:
-    packages: [apache2-mpm-prefork apache2-prefork-dev]
+    packages: [apache2-mpm-prefork, apache2-prefork-dev]
     gems: [fastthread, rack, [passenger, 2.2.4]]
+    assigned_security_groups: [web]

data/lib/rubber/tasks/rubber.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 require 'date'
 require 'time'
-
+require 'aws/s3'
 require 'rubber'
 
 namespace :rubber do
@@ -14,9 +14,12 @@ namespace :rubber do
     Rubber::Configuration.rubber_instances
   end
 
+  def cloud_provider
+    rubber_env.cloud_providers[rubber_env.cloud_provider]
+  end
+
   def init_s3()
-    env = rubber_env
-    AWS::S3::Base.establish_connection!(:access_key_id => env.aws_access_key, :secret_access_key => env.aws_secret_access_key)
+    AWS::S3::Base.establish_connection!(:access_key_id => cloud_provider.access_key, :secret_access_key => cloud_provider.secret_access_key)
   end
 
   desc "Generate system config files by transforming the files in the config tree"
@@ -127,7 +130,7 @@ namespace :rubber do
     puts "Created backup: #{backup_file}"
     
     s3_prefix = "db/"
-    backup_bucket = rubber_env.cloud_providers[env.cloud_provider].backup_bucket
+    backup_bucket = cloud_provider.backup_bucket
     if backup_bucket
       init_s3
       unless AWS::S3::Bucket.list.find { |b| b.name == backup_bucket }
@@ -183,7 +186,7 @@ namespace :rubber do
     db_restore_cmd = eval('%Q{' + db_restore_cmd + '}')
 
     # try to fetch a matching file from s3 (if backup_bucket given)
-    backup_bucket = rubber_env.cloud_providers[env.cloud_provider].backup_bucket
+    backup_bucket = cloud_provider.backup_bucket
     raise "No backup_bucket defined in rubber.yml" unless backup_bucket
     if (init_s3 &&
         AWS::S3::Bucket.list.find { |b| b.name == backup_bucket })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sml-rubber
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Matt Conway
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-07 00:00:00 -07:00
-default_executable: 
+date: 2009-08-18 00:00:00 -07:00
+default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -64,8 +64,8 @@ dependencies:
     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: []
-
+executables: 
+- vulcanize
 extensions: []
 
 extra_rdoc_files: 
@@ -75,6 +75,7 @@ files:
 - README
 - TODO
 - VERSION
+- bin/vulcanize
 - generators/vulcanize/USAGE
 - generators/vulcanize/templates/apache/config/rubber/deploy-apache.rb
 - generators/vulcanize/templates/apache/config/rubber/role/web/deflate.conf