engineyard 2.0.6 → 2.0.7

data/lib/engineyard/cli.rb

@@ -69,8 +69,8 @@ module EY
       :desc => "Name of the account in which the environment can be found"
     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)"
+    method_option :config, :type => :hash, :default => {}, :aliases => %w(--extra-deploy-hook-options),
+      :desc => "Hash made available in deploy hooks (in the 'config' hash), can also override some ey.yml settings."
     def deploy
       app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
 
@@ -258,8 +258,8 @@ module EY
       :desc => "Name of the account in which the environment can be found"
     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)"
+    method_option :config, :type => :hash, :default => {}, :aliases => %w(--extra-deploy-hook-options),
+      :desc => "Hash made available in deploy hooks (in the 'config' hash), can also override some ey.yml settings."
     def rollback
       app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
       env_config    = config.environment_config(app_env.environment_name)

data/lib/engineyard/deploy_config.rb

@@ -26,7 +26,7 @@ module EY
     end
 
     def extra_config
-      @cli_opts.fetch('extra_deploy_hook_options', {})
+      @cli_opts.fetch('config', {})
     end
 
     private

data/lib/engineyard/version.rb

@@ -1,4 +1,4 @@
 module EY
-  VERSION = '2.0.6'
-  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.0.2'
+  VERSION = '2.0.7'
+  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.0.3'
 end

data/spec/ey/deploy_spec.rb

@@ -354,12 +354,12 @@ describe "ey deploy" do
     end
   end
 
-  context "--extra-deploy-hook-options" do
+  context "--config (--extra-deploy-hook-options)" do
     before(:all) do
       login_scenario "one app, one environment"
     end
 
-    def extra_deploy_hook_options
+    def config_options
       if @ssh_commands.last =~ /--config (.*?)(?: -|$)/
         # the echo strips off the layer of shell escaping, leaving us
         # with pristine JSON
@@ -367,11 +367,18 @@ describe "ey deploy" do
       end
     end
 
-    it "passes the extra configuration to engineyard-serverside" do
+    it "passes --config to engineyard-serverside" do
+      ey %w[deploy --config some:stuff more:crap --no-migrate]
+      config_options.should_not be_nil
+      config_options['some'].should == 'stuff'
+      config_options['more'].should == 'crap'
+    end
+
+    it "supports legacy --extra-deploy-hook-options" do
       ey %w[deploy --extra-deploy-hook-options some:stuff more:crap --no-migrate]
-      extra_deploy_hook_options.should_not be_nil
-      extra_deploy_hook_options['some'].should == 'stuff'
-      extra_deploy_hook_options['more'].should == 'crap'
+      config_options.should_not be_nil
+      config_options['some'].should == 'stuff'
+      config_options['more'].should == 'crap'
     end
 
     context "when ey.yml is present" do
@@ -382,8 +389,8 @@ describe "ey deploy" do
       after { File.unlink("ey.yml") }
 
       it "overrides what's in ey.yml" do
-        fast_ey %w[deploy --extra-deploy-hook-options beer:esb]
-        extra_deploy_hook_options['beer'].should == 'esb'
+        fast_ey %w[deploy --config beer:esb]
+        config_options['beer'].should == 'esb'
       end
     end
   end

data/spec/ey/rollback_spec.rb

@@ -27,12 +27,12 @@ describe "ey rollback" do
     @ssh_commands.last.should =~ /--stack nginx_mongrel/
   end
 
-  context "--extra-deploy-hook-options" do
+  context "--config (--extra-deploy-hook-options)" do
     before(:all) do
       login_scenario "one app, one environment"
     end
 
-    def extra_deploy_hook_options
+    def config_options
       if @ssh_commands.last =~ /--config (.*?)(?: -|$)/
         # the echo strips off the layer of shell escaping, leaving us
         # with pristine JSON
@@ -40,11 +40,18 @@ describe "ey rollback" do
       end
     end
 
-    it "passes the extra configuration to engineyard-serverside" do
+    it "passes --config to engineyard-serverside" do
+      ey %w[rollback --config some:stuff more:crap]
+      config_options.should_not be_nil
+      config_options['some'].should == 'stuff'
+      config_options['more'].should == 'crap'
+    end
+
+    it "supports legacy --extra-deploy-hook-options" do
       ey %w[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'
+      config_options.should_not be_nil
+      config_options['some'].should == 'stuff'
+      config_options['more'].should == 'crap'
     end
 
     context "when ey.yml is present" do
@@ -55,8 +62,8 @@ describe "ey rollback" do
       after { File.unlink("ey.yml") }
 
       it "overrides what's in ey.yml" do
-        ey %w[rollback --extra-deploy-hook-options beer:esb]
-        extra_deploy_hook_options['beer'].should == 'esb'
+        ey %w[rollback --config beer:esb]
+        config_options['beer'].should == 'esb'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -408,7 +408,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4411040277516355898
+      hash: 442224955877158192
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -417,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4411040277516355898
+      hash: 442224955877158192
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24