engineyard 1.3.31 → 1.3.32

data/lib/engineyard/cli.rb

@@ -63,9 +63,12 @@ module EY
       EY.ui.info "Beginning deploy for '#{app.name}' in '#{environment.name}' on server..."
 
       deploy_options = {'extras' => options[:extra_deploy_hook_options]}
-      deploy_options['migrate'] = options['migrate'] if options.has_key?('migrate')
+      if options.has_key?('migrate') # thor set migrate => nil when --no-migrate
+        deploy_options['migrate'] = options['migrate'].respond_to?(:to_str) ? options['migrate'] : !!options['migrate']
+      end
       deploy_options['verbose'] = options['verbose'] if options.has_key?('verbose')
 
+
       if environment.deploy(app, deploy_ref, deploy_options)
         EY.ui.info "Deploy complete"
         EY.ui.info "Now you can run `ey launch' to open the application in a browser."

data/lib/engineyard/model/environment.rb

@@ -1,6 +1,8 @@
 module EY
   module Model
-    class Environment < ApiStruct.new(:id, :account, :name, :framework_env, :instances, :instances_count, :apps, :app_master, :username, :app_server_stack_name, :load_balancer_ip_address, :api)
+    class Environment < ApiStruct.new(:id, :account, :name, :framework_env, :instances, :instances_count,
+                                      :apps, :app_master, :username, :app_server_stack_name, :deployment_configurations,
+                                      :load_balancer_ip_address, :api)
       require 'launchy'
 
       attr_accessor :ignore_bad_master
@@ -36,7 +38,7 @@ module EY
       def deploy(app, ref, deploy_options={})
         app_master!.deploy(app,
           ref,
-          migration_command(deploy_options),
+          migration_command(app, deploy_options),
           config.merge(deploy_options['extras']),
           deploy_options['verbose'])
       end
@@ -137,49 +139,48 @@ module EY
         Launchy.open(app_master!.hostname_url)
       end
 
-      private
-
-      def migration_command(deploy_options)
+      def migration_command(app, 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
+        return nil if no_migrate?(deploy_options)
+        command = migration_command_from_command_line(deploy_options)
+        unless command
+          return nil if no_migrate?(config)
+          command = migration_command_from_config
         end
+        command = migration_command_from_environment(app) unless command
+        command
+      end
+
+      private
+
+      def no_migrate?(hash)
+        hash.key?('migrate') && hash['migrate'] == false
       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
+        config['migration_command'] if config['migrate'] || config['migration_command']
       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
+        if migrate = deploy_options['migrate']
+          migrate.respond_to?(:to_str) ? migrate.to_str : (config['migration_command'] || default_migration_command)
         end
       end
 
+      def migration_command_from_environment(app)
+        if deploy_config = deployment_configurations[app.name]
+          deploy_config['migrate']['command'] if deploy_config['migrate']['perform']
+        end
+      end
 
       def default_migration_command
-        config['migration_command'] || 'rake db:migrate --trace'
+        'rake db:migrate'
       end
-
     end
   end
 end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.31'
+  VERSION = '1.3.32'
 end

data/spec/engineyard/model/environment_spec.rb

@@ -153,3 +153,52 @@ describe "EY::Model::Environment#shorten_name_for(app)" do
     short('dev', 'dev').should == 'dev'
   end
 end
+
+describe "EY::Model::Environment#migration_command" do
+  before do
+    @app = EY::Model::App.from_hash({:name => 'fake'})
+    @migrate = EY::Model::Environment.from_hash({
+        "id" => 10291,
+        "api" => @api,
+        'name' => 'migrate',
+        'deployment_configurations' => {'fake' => {'migrate' => {'command' => 'fake db:migrate', 'perform' => true}}}
+    })
+
+    @no_migrate = EY::Model::Environment.from_hash({
+        "id" => 10291,
+        "api" => @api,
+        'name' => 'no_migrate',
+        'deployment_configurations' => {'fake' => {'migrate' => {'command' => 'fake db:migrate', 'perform' => false}}}
+    })
+  end
+
+  it "returns the migration command for the environment when the perform flag is true" do
+    @migrate.migration_command(@app, {}).should == 'fake db:migrate'
+  end
+
+  it "returns nil when the perform flag in the environment is false" do
+    @no_migrate.migration_command(@app, {}).should == nil
+  end
+
+  context "with the migrate deploy option" do
+    it "returns the default migration command when is true" do
+      @migrate.migration_command(@app, {'migrate' => true}).should == 'rake db:migrate'
+    end
+
+    it "return the custom migration command when is a string" do
+      @migrate.migration_command(@app, {'migrate' => 'foo migrate'}).should == 'foo migrate'
+    end
+  end
+
+  context "with the migrate option in the global configuration" do
+    it "return the default migration command when the option is true" do
+      EY.config.environments['migrate'] = {'migrate' => true, 'migration_command' => 'bar migrate'}
+      @migrate.migration_command(@app, {}).should == 'bar migrate'
+    end
+
+    it "return the custom migration command when the option is a string" do
+      EY.config.environments['migrate'] = {'migration_command' => 'bar migrate'}
+      @migrate.migration_command(@app, {}).should == 'bar migrate'
+    end
+  end
+end

data/spec/ey/deploy_spec.rb

@@ -108,7 +108,7 @@ describe "ey deploy" do
     it "defaults to 'rake db:migrate'" do
       fast_ey %w[deploy]
       @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
-      @ssh_commands.last.should =~ /--migrate 'rake db:migrate --trace'/
+      @ssh_commands.last.should =~ /--migrate 'rake db:migrate'/
     end
 
     it "can be disabled with --no-migrate" do
@@ -119,7 +119,7 @@ describe "ey deploy" do
 
     it "uses the default when --migrate is specified with no value" do
       fast_ey %w[deploy --migrate]
-      @ssh_commands.last.should match(/--migrate 'rake db:migrate --trace'/)
+      @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
     end
 
     context "customized in ey.yml" do
@@ -151,7 +151,7 @@ describe "ey deploy" do
 
       it "migrates with the default when --migrate is specified with no value" do
         fast_ey %w[deploy --migrate]
-        @ssh_commands.last.should match(/--migrate 'rake db:migrate --trace'/)
+        @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
       end
     end
 
@@ -161,7 +161,7 @@ describe "ey deploy" do
 
       it "migrates with the default" do
         fast_ey %w[deploy]
-        @ssh_commands.last.should match(/--migrate 'rake db:migrate --trace'/)
+        @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
       end
     end
 

data/spec/support/scenarios.rb

@@ -84,6 +84,11 @@ module Scenario
           "instances_count" => 4,
           "app_server_stack_name" => "nginx_mongrel",
           "load_balancer_ip_address" => '127.0.0.0',
+          "deployment_configurations" => {
+            "rails232app" => {
+              'migrate' => {'command' => 'rake db:migrate', 'perform' => true}
+            }
+          },
           "framework_env" => "production"}]
     end
 
@@ -165,6 +170,11 @@ module Scenario
           "id" => 200,
           "app_server_stack_name" => "nginx_mongrel",
           "load_balancer_ip_address" => '127.0.0.0',
+          "deployment_configurations" => {
+            "rails232app" => {
+              'migrate' => {'command' => 'rake db:migrate', 'perform' => true}
+            }
+          },
           "framework_env" => "production"}]
     end
 
@@ -211,6 +221,11 @@ module Scenario
           "app_server_stack_name" => "nginx_mongrel",
           "load_balancer_ip_address" => '127.0.0.0',
           "framework_env" => "production",
+          "deployment_configurations" => {
+            "rails232app" => {
+              'migrate' => {'command' => 'rake db:migrate', 'perform' => true}
+            }
+          },
         }, {
           "ssh_username" => "ham",
           "instances" => [],
@@ -219,6 +234,11 @@ module Scenario
           "app_server_stack_name" => "nginx_passenger",
           "load_balancer_ip_address" => '127.0.0.0',
           "id" => 202,
+          "deployment_configurations" => {
+            "rails232app" => {
+              'migrate' => {'command' => 'rake db:migrate', 'perform' => true}
+            }
+          },
         }, {
           "ssh_username" => "hamburger",
           "instances" => [],
@@ -284,6 +304,11 @@ module Scenario
           "instances" => [railsapp_master],
           "app_server_stack_name" => "nginx_unicorn",
           "load_balancer_ip_address" => '127.0.0.0',
+          "deployment_configurations" => {
+            "rails232app" => {
+              'migrate' => {'command' => 'rake db:migrate', 'perform' => true}
+            }
+          },
         }, {
           "id" => 439,
           "framework_env" => "production",
@@ -293,6 +318,11 @@ module Scenario
           "load_balancer_ip_address" => '127.0.0.0',
           "app_server_stack_name" => "nginx_mongrel",
           "instances" => [keycollector_master],
+          "deployment_configurations" => {
+            "keycollector" => {
+              'migrate' => {'command' => 'rake db:migrate', 'perform' => true}
+            }
+          },
         }]
     end
   end # TwoApps
@@ -330,6 +360,11 @@ module Scenario
           "load_balancer_ip_address" => '127.0.0.0',
           "app_server_stack_name" => "nginx_mongrel",
           "framework_env" => "production",
+          "deployment_configurations" => {
+            "rails232app" => {
+              'migrate' => {'command' => 'rake db:migrate', 'perform' => true}
+            }
+          },
         }, {
           "id" => 202,
           "ssh_username" => "ham",
@@ -344,6 +379,11 @@ module Scenario
           "load_balancer_ip_address" => '127.3.2.1',
           "app_server_stack_name" => "nginx_passenger",
           "framework_env" => "production",
+          "deployment_configurations" => {
+            "rails232app" => {
+              'migrate' => {'command' => 'rake db:migrate', 'perform' => true}
+            }
+          },
         }, {
           "ssh_username" => "ham",
           "instances" => [{
@@ -358,6 +398,11 @@ module Scenario
           "id" => 204,
           "load_balancer_ip_address" => '127.0.0.2',
           "framework_env" => "production",
+          "deployment_configurations" => {
+            "rails232app" => {
+              'migrate' => {'command' => 'rake db:migrate', 'perform' => true}
+            }
+          },
         }]
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 91
   prerelease: 
   segments: 
   - 1
   - 3
-  - 31
-  version: 1.3.31
+  - 32
+  version: 1.3.32
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,13 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 -07:00
-default_executable: ey
+date: 2011-09-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: thor
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,11 +29,11 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
+  name: thor
+  type: :runtime
+  prerelease: false
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: rest-client
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +45,11 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
+  name: rest-client
+  type: :runtime
+  prerelease: false
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: highline
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,11 +61,11 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
+  name: highline
+  type: :runtime
+  prerelease: false
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: json_pure
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,11 +75,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: json_pure
+  type: :runtime
+  prerelease: false
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: escape
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,11 +91,11 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
+  name: escape
+  type: :runtime
+  prerelease: false
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: engineyard-serverside-adapter
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,11 +107,11 @@ dependencies:
         - 4
         - 13
         version: 1.4.13
+  name: engineyard-serverside-adapter
+  type: :runtime
+  prerelease: false
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: net-ssh
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -127,11 +123,11 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
+  name: net-ssh
+  type: :runtime
+  prerelease: false
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: launchy
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,11 +139,11 @@ dependencies:
         - 0
         - 5
         version: 2.0.5
+  name: launchy
+  type: :runtime
+  prerelease: false
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: rspec
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,11 +155,11 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
+  name: rspec
+  type: :development
+  prerelease: false
   requirement: *id009
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: rake
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -173,11 +169,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rake
+  type: :development
+  prerelease: false
   requirement: *id010
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: fakeweb
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -187,11 +183,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: fakeweb
+  type: :development
+  prerelease: false
   requirement: *id011
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: fakeweb-matcher
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -201,11 +197,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: fakeweb-matcher
+  type: :development
+  prerelease: false
   requirement: *id012
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: fakefs
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -215,11 +211,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: fakefs
+  type: :development
+  prerelease: false
   requirement: *id013
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: sinatra
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -229,11 +225,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: sinatra
+  type: :development
+  prerelease: false
   requirement: *id014
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: realweb
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -245,11 +241,11 @@ dependencies:
         - 1
         - 6
         version: 0.1.6
+  name: realweb
+  type: :development
+  prerelease: false
   requirement: *id015
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: open4
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -261,6 +257,9 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
+  name: open4
+  type: :development
+  prerelease: false
   requirement: *id016
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.
 email: cloud@engineyard.com
@@ -335,7 +334,6 @@ files:
 - spec/support/ruby_ext.rb
 - spec/support/scenarios.rb
 - spec/support/shared_behavior.rb
-has_rdoc: true
 homepage: http://github.com/engineyard/engineyard
 licenses: []
 
@@ -377,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud