rubber 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22e517ff32f6b1a5ebb0bbc229d619493e377d1a
-  data.tar.gz: 117569a34d40c27d17d0f62c587109b4aa32c1e9
+  metadata.gz: eea69e220cb373705e078eaa52e02f5e90a170d6
+  data.tar.gz: ff4b8c6ed5e32ce6bbbcc40987e11cf675d83af8
 SHA512:
-  metadata.gz: 06b55aeb4476092dc3d9d6fab6d7bf8819228a086afed91c2a014970d196ce6970761961d74c3274192d0e0f80df42003f7f4d80eeccedf3d78b2f3cac50fd92
-  data.tar.gz: e769eecb972f75a414f9bf3b04d670d335fa0822bd8ec2c3eae7578fff8ca5258a0940a3f5d2a46356aae3a6a82a2abb2863d5d5aa353cfa2a4b8c8aa8c641d4
+  metadata.gz: 0402e07cef45eb6e2d109161e7fee64fd1cf81375b4be06a804462855b15828a5236b26aabf8f35863a7bfd69f828f40067c134f902e476327a0c3f36213de3a
+  data.tar.gz: 57b6878e9a38472c947019b9d8283a773b59bf082ea3529ffa80dfb13fd5cda5a2a3b85dc83fb3c35dc71af93bd81f321099be9431f84085cc11babd835083af

data/CHANGELOG

@@ -1,3 +1,12 @@
+2.5.0 (06/03/2013)
+-----------------
+
+New Features:
+============
+
+[core] Added support for using Rubber as a Vagrant provisioner.  Now you can run Rubber easily against local VMs.
+
+
 2.4.2 (06/01/2013)
 ------------------
 

data/lib/rubber.rb

@@ -76,6 +76,11 @@ require 'rubber/util'
 require 'rubber/cloud'
 require 'rubber/dns'
 
+if defined?(::Vagrant)
+  require 'rubber/vagrant/plugin'
+end
+
+
 if defined?(Rails::Railtie)
   module Rubber
     require 'rubber/railtie'

data/lib/rubber/cloud/aws.rb

@@ -64,6 +64,10 @@ module Rubber
         'running'
       end
 
+      def stopped_state
+        'stopped'
+      end
+
       def before_create_instance(instance_alias, role_names)
         setup_security_groups(instance_alias, role_names)
       end
@@ -83,7 +87,25 @@ module Rubber
           Rubber::Tag::update_instance_tags(instance.name)
         end
       end
-      
+
+      def before_stop_instance(instance)
+        capistrano.fatal "Cannot stop spot instances!" if ! instance.spot_instance_request_id.nil?
+        capistrano.fatal "Cannot stop instances with instance-store root device!" if (instance.root_device_type != 'ebs')
+      end
+
+      def before_start_instance(instance)
+        capistrano.fatal "Cannot start spot instances!" if ! instance.spot_instance_request_id.nil?
+        capistrano.fatal "Cannot start instances with instance-store root device!" if (instance.root_device_type != 'ebs')
+      end
+
+      def after_start_instance(instance)
+        # Re-starting an instance will almost certainly give it a new set of IPs and DNS entries, so refresh the values.
+        capistrano.rubber.refresh_instance(instance.name)
+
+        # Static IPs, DNS, etc. need to be set up for the started instance.
+        capistrano.rubber.post_refresh
+      end
+
       def create_image(image_name)
 
         # validate all needed config set

data/lib/rubber/cloud/base.rb

@@ -26,6 +26,22 @@ module Rubber
         setup_security_groups(instance.name, instance.role_names)
       end
 
+      def before_stop_instance(instance)
+        # No-op by default.
+      end
+
+      def after_stop_instance(instance)
+        # No-op by default.
+      end
+
+      def before_start_instance(instance)
+        # No-op by default.
+      end
+
+      def after_start_instance(instance)
+        # No-op by default.
+      end
+
       def isolate_prefix
         "#{env.app_name}_#{Rubber.env}_"
       end

data/lib/rubber/cloud/fog.rb

@@ -48,13 +48,13 @@ module Rubber
         response = @compute_provider.servers.get(instance_id).reboot()
       end
 
-      def stop_instance(instance_id, force=false)
+      def stop_instance(instance, force=false)
         # Don't force the stop process. I.e., allow the instance to flush its file system operations.
-        response = @compute_provider.servers.get(instance_id).stop(force)
+        response = @compute_provider.servers.get(instance.instance_id).stop(force)
       end
 
-      def start_instance(instance_id)
-        response = @compute_provider.servers.get(instance_id).start()
+      def start_instance(instance)
+        response = @compute_provider.servers.get(instance.instance_id).start()
       end
 
       def create_static_ip

data/lib/rubber/cloud/generic.rb

@@ -45,7 +45,7 @@ module Rubber
         # Since there's no API to query for instance details, the best we can do is use what we have in memory from
         # the :create_instance operation or ask the user for the details again.
         unless Generic.instances
-          create_instance(instance_id, nil, nil, nil, nil)
+          create_instance(instance_id, nil, nil, nil, nil, nil)
         end
 
         Generic.instances

data/lib/rubber/cloud/vagrant.rb

@@ -0,0 +1,57 @@
+require 'rubber/cloud/generic'
+
+module Rubber
+  module Cloud
+    class Vagrant < Generic
+
+      def active_state
+        'running'
+      end
+
+      def stopped_state
+        'saved'
+      end
+
+      def before_create_instance(instance_alias, role_names)
+        unless ENV.has_key?('RUN_FROM_VAGRANT')
+          capistrano.fatal "Since you are using the 'vagrant' provider, you must create instances by running `vagrant up #{instance_alias}`."
+        end
+      end
+
+      def describe_instances(instance_id=nil)
+        output = `vagrant status #{instance_id}`
+
+        output =~ /#{instance_id}\s+(\w+)/m
+        state = $1
+
+        if Generic.instances
+          Generic.instances.each do |instance|
+            if instance[:id] == instance_id
+              instance[:state] = state
+            end
+          end
+
+          Generic.instances
+        else
+          instance = {}
+          instance[:id] = instance_id
+          instance[:state] = state
+
+          [instance]
+        end
+      end
+
+      def destroy_instance(instance_id)
+        system("vagrant destroy #{instance_id} --force")
+      end
+
+      def stop_instance(instance, force=false)
+        system("vagrant suspend #{instance.instance_id}")
+      end
+
+      def start_instance(instance)
+        system("vagrant resume #{instance.instance_id}")
+      end
+    end
+  end
+end

data/lib/rubber/recipes/rubber.rb

@@ -65,7 +65,8 @@ namespace :rubber do
     # NOTE: for some reason Capistrano requires you to have both the public and
     # the private key in the same folder, the public key should have the
     # extension ".pub".
-    ssh_options[:keys] = [cloud.env.key_file].flatten
+
+    ssh_options[:keys] = [ENV['RUBBER_SSH_KEY'] || cloud.env.key_file].flatten.compact
     ssh_options[:timeout] = fetch(:ssh_timeout, 5)
   end
 

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

@@ -220,7 +220,7 @@ namespace :rubber do
         value = Capistrano::CLI.ui.ask("You do not have a primary db role, should #{instance_alias} be it [y/n]?: ")
         roles << "db:primary=true" if value =~ /^y/
       end
-      
+
       ir.concat roles.collect {|r| Rubber::Configuration::RoleItem.parse(r) }
 
       # Add in roles that the given set of roles depends on
@@ -255,7 +255,7 @@ namespace :rubber do
     post_refresh
   end
 
-  set :mutex, Mutex.new
+  set :monitor, Monitor.new
 
   # Creates a new ec2 instance with the given alias and roles
   # Configures aliases (/etc/hosts) on local and remote machines
@@ -263,7 +263,7 @@ namespace :rubber do
     role_names = instance_roles.collect{|x| x.name}
     env = rubber_cfg.environment.bind(role_names, instance_alias)
 
-    mutex.synchronize do
+    monitor.synchronize do
       cloud.before_create_instance(instance_alias, role_names)
     end
 
@@ -318,7 +318,7 @@ namespace :rubber do
     rubber_instances.add(instance_item)
     rubber_instances.save()
 
-    mutex.synchronize do
+    monitor.synchronize do
       cloud.after_create_instance(instance_item)
     end
   end
@@ -350,7 +350,7 @@ namespace :rubber do
 
     instance = cloud.describe_instances(instance_item.instance_id).first
 
-    mutex.synchronize do
+    monitor.synchronize do
       cloud.before_refresh_instance(instance_item)
     end
 
@@ -386,7 +386,7 @@ namespace :rubber do
         end
       end
 
-      mutex.synchronize do
+      monitor.synchronize do
         cloud.after_refresh_instance(instance_item)
       end
 
@@ -499,11 +499,15 @@ namespace :rubber do
       instance_item = rubber_instances[instance_alias]
       
       fatal "Instance does not exist: #{instance_alias}" if ! instance_item
-      fatal "Cannot stop spot instances!" if ! instance_item.spot_instance_request_id.nil?
-      fatal "Cannot stop instances with instance-store root device!" if (instance_item.root_device_type != 'ebs')
       
       instance_item
     end
+
+    monitor.synchronize do
+      instance_items.each do |instance_item|
+        cloud.before_stop_instance(instance_item)
+      end
+    end
     
     # Get user confirmation
     human_instance_list = instance_items.collect{|instance_item| "#{instance_item.name} (#{instance_item.instance_id})"}.join(', ')
@@ -516,13 +520,13 @@ namespace :rubber do
       stop_threads << Thread.new do
         env = rubber_cfg.environment.bind(instance_item.role_names, instance_item.name)
 
-        cloud.stop_instance(instance_item.instance_id)
+        cloud.stop_instance(instance_item)
         
         stopped = false
         while !stopped
           sleep 1
           instance = cloud.describe_instances(instance_item.instance_id).first rescue {}
-          stopped = (instance[:state] == "stopped")
+          stopped = (instance[:state] == cloud.stopped_state)
         end
       end
     end
@@ -536,23 +540,33 @@ namespace :rubber do
     print "\n"
       
     stop_threads.each(&:join)
+
+    monitor.synchronize do
+      instance_items.each do |instance_item|
+        cloud.after_stop_instance(instance_item)
+      end
+    end
   end
 
   # Starts the given ec2 instances.  Note that this operation only works for instances that use an EBS volume for the root
   # device, that are not spot instances, and that are already stopped.
   def start_instances(aliases)
     start_threads = []
-    refresh_threads = []
+    describe_threads = []
     
     instance_items = aliases.collect do |instance_alias|
       instance_item = rubber_instances[instance_alias]
 
       fatal "Instance does not exist: #{instance_alias}" if ! instance_item
-      fatal "Cannot start spot instances!" if ! instance_item.spot_instance_request_id.nil?
-      fatal "Cannot start instances with instance-store root device!" if (instance_item.root_device_type != 'ebs')
 
       instance_item
     end
+
+    monitor.synchronize do
+      instance_items.each do |instance_item|
+        cloud.before_start_instance(instance_item)
+      end
+    end
     
     # Get user confirmation
     human_instance_list = instance_items.collect{|instance_item| "#{instance_item.name} (#{instance_item.instance_id})"}.join(', ')
@@ -565,12 +579,14 @@ namespace :rubber do
       start_threads << Thread.new do
         env = rubber_cfg.environment.bind(instance_item.role_names, instance_item.name)
         
-        cloud.start_instance(instance_item.instance_id)
-        
-        # Re-starting an instance will almost certainly give it a new set of IPs and DNS entries, so refresh the values.
-        refresh_threads << Thread.new do
-          while ! refresh_instance(instance_item.name)
+        cloud.start_instance(instance_item)
+
+        describe_threads << Thread.new do
+          started = false
+          while ! started
             sleep 1
+            instance = cloud.describe_instances(instance_item.instance_id).first rescue {}
+            started = (instance[:state] == cloud.active_state)
           end
         end
       end
@@ -584,10 +600,13 @@ namespace :rubber do
     end
 
     start_threads.each(&:join)
-    refresh_threads.each(&:join)
-    
-    # Static IPs, DNS, etc. need to be set up for the started instances
-    post_refresh
+    describe_threads.each(&:join)
+
+    monitor.synchronize do
+      instance_items.each do |instance_item|
+        cloud.after_start_instance(instance_item)
+      end
+    end
   end
 
   # delete from ~/.ssh/known_hosts all lines that begin with ec2- or instance_alias

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

@@ -9,8 +9,8 @@ namespace :rubber do
     link_bash
     set_timezone
     enable_multiverse
-    install_core_packages
     upgrade_packages
+    install_core_packages
     install_packages
     setup_volumes
     setup_gem_sources
@@ -26,7 +26,7 @@ namespace :rubber do
     # We special-case the 'ubuntu' user since Amazon doesn't since the Canonical AMIs on EC2 don't set the password for
     # this account, making any password prompt potentially confusing.
     orig_password = fetch(:password)
-    set(:password, initial_ssh_user == 'ubuntu' ? nil : Capistrano::CLI.password_prompt("Password for #{initial_ssh_user} @ #{ip}: "))
+    set(:password, initial_ssh_user == 'ubuntu' || ENV.has_key?('RUN_FROM_VAGRANT') ? nil : Capistrano::CLI.password_prompt("Password for #{initial_ssh_user} @ #{ip}: "))
 
     task :_allow_root_ssh, :hosts => "#{initial_ssh_user}@#{ip}" do
       rsudo "mkdir -p /root/.ssh && cp /home/#{initial_ssh_user}/.ssh/authorized_keys /root/.ssh/"

data/lib/rubber/vagrant/config.rb

@@ -0,0 +1,32 @@
+module VagrantPlugins
+  module Rubber
+    class Config < Vagrant.plugin("2", :config)
+      attr_accessor :roles, :rubber_env
+
+      def initialize
+        @roles = UNSET_VALUE
+        @rubber_env = UNSET_VALUE
+      end
+
+      def finalize!
+        @rubber_env = 'vagrant' if @rubber_env == UNSET_VALUE
+
+        ::Rubber::initialize(Dir.pwd, @rubber_env)
+
+        @roles = ::Rubber.config['staging_roles'] if @roles == UNSET_VALUE
+      end
+
+      def validate(machine)
+        if @rubber_env.nil?
+          return { 'rubber' => ['rubber_env must be set to the Rubber environment to use for this cluster'] }
+        end
+
+        if @roles.nil?
+          return { 'rubber' => ['roles must be set to a list of roles to use for this machine'] }
+        end
+
+        {}
+      end
+    end
+  end
+end

data/lib/rubber/vagrant/plugin.rb

@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module Rubber
+    class Plugin < Vagrant.plugin("2")
+      name 'rubber'
+      description 'Provides support for provisioning your virtual machines with Rubber.'
+
+      config(:rubber, :provisioner) do
+        require File.expand_path('../config', __FILE__)
+        Config
+      end
+
+      provisioner(:rubber) do
+        require File.expand_path('../provisioner', __FILE__)
+        Provisioner
+      end
+    end
+  end
+end

data/lib/rubber/vagrant/provisioner.rb

@@ -0,0 +1,59 @@
+module VagrantPlugins
+  module Rubber
+    class Provisioner < Vagrant.plugin("2", :provisioner)
+      attr_reader :ssh_info, :private_ip
+
+      def configure(root_config)
+        root_config.vm.networks.each do |type, info|
+          if type == :private_network
+            @private_ip = info[:ip]
+          end
+        end
+
+        if @private_ip.nil?
+          $stderr.puts "Rubber requires a private network address to be configured in your Vagrantfile."
+          exit(-1)
+        end
+      end
+
+      def provision
+        @ssh_info = machine.ssh_info
+
+        create
+        bootstrap && deploy_migrations
+      end
+
+      private
+
+      def create
+        script = <<-ENDSCRIPT
+          unset GEM_HOME;
+          unset GEM_PATH;
+          PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} bash -c 'bundle exec cap rubber:create -S initial_ssh_user=#{ssh_info[:username]}'
+        ENDSCRIPT
+
+        system(script)
+      end
+
+      def bootstrap
+        script = <<-ENDSCRIPT
+          unset GEM_HOME;
+          unset GEM_PATH;
+          PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c 'bundle exec cap rubber:bootstrap'
+        ENDSCRIPT
+
+        system(script)
+      end
+
+      def deploy_migrations
+        script = <<-ENDSCRIPT
+          unset GEM_HOME;
+          unset GEM_PATH;
+          PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c 'bundle exec cap deploy:migrations'
+        ENDSCRIPT
+
+        system(script)
+      end
+    end
+  end
+end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.4.2"
+  VERSION = "2.5.0"
 end

data/templates/base/config/rubber/rubber-vagrant-env.yml

@@ -0,0 +1,7 @@
+cloud_provider: vagrant
+
+cloud_providers:
+  vagrant:
+    # Rubber assumes every cloud provider has configuration.  Vagrant really doesn't need anything, but until the core
+    # of Rubber handles that, just set a dummy value.
+    dummy: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -215,6 +215,7 @@ files:
 - lib/rubber/cloud/fog.rb
 - lib/rubber/cloud/fog_storage.rb
 - lib/rubber/cloud/generic.rb
+- lib/rubber/cloud/vagrant.rb
 - lib/rubber/commands/config.rb
 - lib/rubber/commands/cron.rb
 - lib/rubber/commands/util.rb
@@ -246,6 +247,9 @@ files:
 - lib/rubber/tag.rb
 - lib/rubber/thread_safe_proxy.rb
 - lib/rubber/util.rb
+- lib/rubber/vagrant/config.rb
+- lib/rubber/vagrant/plugin.rb
+- lib/rubber/vagrant/provisioner.rb
 - lib/rubber/version.rb
 - rails/init.rb
 - rubber.gemspec
@@ -273,6 +277,7 @@ files:
 - templates/base/config/rubber/deploy-util.rb
 - templates/base/config/rubber/rubber-dns.yml
 - templates/base/config/rubber/rubber-ruby.yml
+- templates/base/config/rubber/rubber-vagrant-env.yml
 - templates/base/config/rubber/rubber.yml
 - templates/base/script/rubber
 - templates/base/templates.rb