engineyard 1.2.4 → 1.3.0

data/lib/engineyard/cli.rb

@@ -46,6 +46,8 @@ module EY
       :desc => "Name of the application to deploy"
     method_option :verbose, :type => :boolean, :aliases => %w(-v),
       :desc => "Be verbose"
+    method_option :extra_deploy_hook_options, :type => :hash, :default => {},
+      :desc => "Additional options to be made available in deploy hooks (in the 'config' hash)"
     def deploy
       app         = fetch_app(options[:app])
       environment = fetch_environment(options[:environment], app)
@@ -65,12 +67,7 @@ module EY
 
       EY.ui.info "Beginning deploy for '#{app.name}' in '#{environment.name}' on server..."
 
-      # missing means do what the yaml file says
-      # nil means don't do it
-      # true (the lazy default) means do it with the custom command
-      # a string means do it with this specific command
-
-      deploy_options = {}
+      deploy_options = {'extras' => options[:extra_deploy_hook_options]}
       deploy_options['migrate'] = options['migrate'] if options.has_key?('migrate')
       deploy_options['verbose'] = options['verbose'] if options.has_key?('verbose')
 
@@ -145,6 +142,8 @@ module EY
       :desc => "Name of the application to roll back"
     method_option :verbose, :type => :boolean, :aliases => %w(-v),
       :desc => "Be verbose"
+    method_option :extra_deploy_hook_options, :type => :hash, :default => {},
+      :desc => "Additional options to be made available in deploy hooks (in the 'config' hash)"
     def rollback
       app = fetch_app(options[:app])
       env = fetch_environment(options[:environment], app)
@@ -152,7 +151,9 @@ module EY
       loudly_check_engineyard_serverside(env)
 
       EY.ui.info("Rolling back '#{app.name}' in '#{env.name}'")
-      if env.rollback(app, options[:verbose])
+      if env.rollback(app,
+          options[:extra_deploy_hook_options],
+          options[:verbose])
         EY.ui.info "Rollback complete"
       else
         raise EY::Error, "Rollback failed"

data/lib/engineyard/model/environment.rb

@@ -36,44 +36,17 @@ module EY
       end
 
       def deploy(app, ref, deploy_options={})
-        # regarding deploy_options['migrate']:
-        #
-        # missing means migrate how the yaml file says to
-        # nil means don't migrate
-        # true means migrate w/custom command (if present) or default
-        # a string means migrate with this specific command
-
-        default_migration_command = config['migration_command'] || 'rake db:migrate --trace'
-
-        migration_from_config = if config.has_key?('migrate')
-                                  if config['migrate']
-                                    default_migration_command
-                                  else
-                                    nil
-                                  end
-                                else
-                                  default_migration_command
-                                end
-
-        migration_from_command_line = if deploy_options['migrate'].nil?
-                                        nil
-                                      elsif deploy_options['migrate'].respond_to?(:to_str)
-                                        deploy_options['migrate'].to_str
-                                      else
-                                        default_migration_command
-                                      end
-
-        cmd = if deploy_options.has_key?('migrate')
-                migration_from_command_line
-              else
-                migration_from_config
-              end
-
-        app_master!.deploy(app, ref, cmd, config, deploy_options['verbose'])
+        app_master!.deploy(app,
+          ref,
+          migration_command(deploy_options),
+          config.merge(deploy_options['extras']),
+          deploy_options['verbose'])
       end
 
-      def rollback(app, verbose=false)
-        app_master!.rollback(app, config, verbose)
+      def rollback(app, extra_deploy_hook_options={}, verbose=false)
+        app_master!.rollback(app,
+          config.merge(extra_deploy_hook_options),
+          verbose)
       end
 
       def take_down_maintenance_page(app, verbose=false)
@@ -151,7 +124,50 @@ module EY
       def shorten_name_for(app)
         name.gsub(/^#{Regexp.quote(app.name)}_/, '')
       end
+
+      private
+
+      def migration_command(deploy_options)
+        # regarding deploy_options['migrate']:
+        #
+        # missing means migrate how the yaml file says to
+        # nil means don't migrate
+        # true means migrate w/custom command (if present) or default
+        # a string means migrate with this specific command
+        if deploy_options.has_key?('migrate')
+          migration_command_from_command_line(deploy_options)
+        else
+          migration_command_from_config
+        end
+      end
+
+      def migration_command_from_config
+        if config.has_key?('migrate')
+          if config['migrate']
+            default_migration_command
+          else
+            nil
+          end
+        else
+          default_migration_command
+        end
+      end
+
+      def migration_command_from_command_line(deploy_options)
+        if deploy_options['migrate'].nil?
+          nil
+        elsif deploy_options['migrate'].respond_to?(:to_str)
+          deploy_options['migrate'].to_str
+        else
+          default_migration_command
+        end
+      end
+
+
+      def default_migration_command
+        config['migration_command'] || 'rake db:migrate --trace'
+      end
+
     end
   end
-
 end

data/lib/engineyard/model/instance.rb

@@ -96,6 +96,18 @@ module EY
               "cd `mktemp -d` && #{gem_path} install engineyard-serverside --no-rdoc --no-ri -v #{ENGINEYARD_SERVERSIDE_VERSION}"]))
       end
 
+    protected
+
+      def engineyard_serverside_hostname
+        # If we tell engineyard-serverside to use 'localhost', it'll run
+        # commands on the instance directly (#system). If we give it the
+        # instance's actual hostname, it'll SSH to itself.
+        #
+        # Using 'localhost' instead of its EC2 hostname speeds up
+        # deploys on solos and single-app-server clusters significantly.
+        app_master? ? 'localhost' : hostname
+      end
+
     private
 
       def ssh(remote_command, output = true)
@@ -113,13 +125,21 @@ module EY
 
       def invoke_engineyard_serverside(deploy_args, verbose=false)
         start = [engineyard_serverside_path, "_#{ENGINEYARD_SERVERSIDE_VERSION}_", 'deploy']
-        instance_args = environment.instances.find_all do |inst|
-          inst.has_app_code?
-        end.inject(['--instances']) do |command, inst|
-          instance_tuple = [inst.public_hostname, inst.role]
-          instance_tuple << inst.name if inst.name
 
-          command << instance_tuple.join(',')
+        instances = environment.instances.select { |inst| inst.has_app_code? }
+        instance_args = ['']
+        if !instances.empty?
+          instance_args << '--instances'
+          instance_args += instances.collect { |i| i.engineyard_serverside_hostname }
+
+          instance_args << '--instance-roles'
+          instance_args += instances.collect { |i| [i.engineyard_serverside_hostname, i.role].join(':') }
+
+          instance_names = instances.collect { |i| i.name ? [i.engineyard_serverside_hostname, i.name].join(':') : nil }.compact
+          unless instance_names.empty?
+            instance_args << '--instance-names'
+            instance_args += instance_names
+          end
         end
 
         framework_arg = ['--framework-env', environment.framework_env]
@@ -135,6 +155,10 @@ module EY
         "/usr/local/ey_resin/ruby/bin/engineyard-serverside"
       end
 
+      def app_master?
+        environment.app_master == self
+      end
+
       def gem_path
         "/usr/local/ey_resin/ruby/bin/gem"
       end

data/lib/engineyard/serverside_version.rb

@@ -1,3 +1,3 @@
 module EY
-  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '1.2.2'
+  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '1.3.1'
 end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.2.4'
+  VERSION = '1.3.0'
 end

data/spec/ey/deploy_spec.rb

@@ -264,6 +264,40 @@ describe "ey deploy" do
     end
   end
 
+  context "--extra-deploy-hook-options" do
+    before(:all) do
+      api_scenario "one app, one environment"
+    end
+
+    def extra_deploy_hook_options
+      if @ssh_commands.last =~ /--config (.*?)(?: -|$)/
+        # the echo strips off the layer of shell escaping, leaving us
+        # with pristine JSON
+        JSON.parse `echo #{$1}`
+      end
+    end
+
+    it "passes the extra configuration to engineyard-serverside" do
+      ey "deploy --extra-deploy-hook-options some:stuff more:crap"
+      extra_deploy_hook_options.should_not be_nil
+      extra_deploy_hook_options['some'].should == 'stuff'
+      extra_deploy_hook_options['more'].should == 'crap'
+    end
+
+    context "when ey.yml is present" do
+      before do
+        write_yaml({"environments" => {"giblets" => {"beer" => "stout"}}})
+      end
+
+      after { File.unlink("ey.yml") }
+
+      it "overrides what's in ey.yml" do
+        ey "deploy --extra-deploy-hook-options beer:esb"
+        extra_deploy_hook_options['beer'].should == 'esb'
+      end
+    end
+  end
+
   context "specifying the application" do
     before(:all) do
       api_scenario "one app, one environment"

data/spec/ey/rollback_spec.rb

@@ -27,4 +27,38 @@ describe "ey rollback" do
     @ssh_commands.last.should =~ /--stack nginx_mongrel/
   end
 
+  context "--extra-deploy-hook-options" do
+    before(:all) do
+      api_scenario "one app, one environment"
+    end
+
+    def extra_deploy_hook_options
+      if @ssh_commands.last =~ /--config (.*?)(?: -|$)/
+        # the echo strips off the layer of shell escaping, leaving us
+        # with pristine JSON
+        JSON.parse `echo #{$1}`
+      end
+    end
+
+    it "passes the extra configuration to engineyard-serverside" do
+      ey "rollback --extra-deploy-hook-options some:stuff more:crap"
+      extra_deploy_hook_options.should_not be_nil
+      extra_deploy_hook_options['some'].should == 'stuff'
+      extra_deploy_hook_options['more'].should == 'crap'
+    end
+
+    context "when ey.yml is present" do
+      before do
+        write_yaml({"environments" => {"giblets" => {"beer" => "stout"}}})
+      end
+
+      after { File.unlink("ey.yml") }
+
+      it "overrides what's in ey.yml" do
+        ey "deploy --extra-deploy-hook-options beer:esb"
+        extra_deploy_hook_options['beer'].should == 'esb'
+      end
+    end
+  end
+
 end

data/spec/support/shared_behavior.rb

@@ -150,12 +150,12 @@ shared_examples_for "it invokes engineyard-serverside" do
 
     it "passes along instance information to engineyard-serverside" do
       instance_args = [
-        Regexp.quote("app_master_hostname.compute-1.amazonaws.com,app_master"),
-        Regexp.quote("app_hostname.compute-1.amazonaws.com,app"),
-        Regexp.quote("util_fluffy_hostname.compute-1.amazonaws.com,util,fluffy"),
+        /--instances localhost app_hostname[^\s]+ util_fluffy/,
+        /--instance-roles localhost:app_master app_hostname[^\s]+:app util_fluffy[^\s]+:util/,
+        /--instance-names util_fluffy_hostname[^\s]+:fluffy/
       ]
 
-      db_instance = Regexp.quote("db_master_hostname.compute-1.amazonaws.com,db_master")
+      db_instance = /db_master/
 
       # apps + utilities are all mentioned
       instance_args.each do |i|
@@ -164,15 +164,22 @@ shared_examples_for "it invokes engineyard-serverside" do
 
       # but not database instances
       @ssh_commands.last.should_not =~ /#{db_instance}/
-
-      # and it's all after the option '--instances'
-      @ssh_commands.last.should match(/--instances (#{instance_args.join('|')})/)
     end
 
     it "passes the framework environment" do
       @ssh_commands.last.should match(/--framework-env production/)
     end
+  end
+
+  context "when no instances have names" do
+    before(:each) do
+      api_scenario "two apps"
+      run_ey({:env => 'giblets', :app => 'rails232app', :ref => 'master', :verbose => true})
+    end
 
+    it "omits the --instance-names parameter" do
+      @ssh_commands.last.should_not include("--instance-names")
+    end
   end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 4
-  version: 1.2.4
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,100 +15,100 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -07:00
+date: 2010-09-13 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 39
         segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 0
+        - 14
+        - 0
+        version: 0.14.0
   requirement: *id001
   type: :runtime
-  name: highline
-- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 7
         segments: 
-        - 0
-        - 14
-        - 0
-        version: 0.14.0
+        - 1
+        - 4
+        version: "1.4"
   requirement: *id002
   type: :runtime
-  name: thor
-- !ruby/object:Gem::Dependency 
+  name: rest-client
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
   requirement: *id003
   type: :runtime
-  name: ruby-termios
-- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
         - 0
-        - 0
-        - 4
-        version: 0.0.4
+        version: "0"
   requirement: *id004
   type: :runtime
-  name: escape
-- !ruby/object:Gem::Dependency 
+  name: ruby-termios
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 4
-        version: "1.4"
+        - 0
+        version: "0"
   requirement: *id005
   type: :runtime
-  name: rest-client
-- !ruby/object:Gem::Dependency 
+  name: json_pure
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 4
+        version: 0.0.4
   requirement: *id006
   type: :runtime
-  name: json_pure
+  name: escape
+  prerelease: false
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.
 email: cloud@engineyard.com
 executables: