engineyard 2.0.0.pre2 → 2.0.0.pre3

data/lib/engineyard/commands/deploy.rb

@@ -0,0 +1,60 @@
+class EY
+  module Commands
+    class Deploy
+      app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
+
+      env_config    = config.environment_config(app_env.environment_name)
+      deploy_config = EY::DeployConfig.new(options, env_config, repo, ui)
+
+      deployment = app_env.new_deployment({
+        :ref             => deploy_config.ref,
+        :migrate         => deploy_config.migrate,
+        :migrate_command => deploy_config.migrate_command,
+        :extra_config    => deploy_config.extra_config,
+      })
+
+      runner = serverside_runner(app_env, deploy_config.verbose, options[:ignore_bad_master])
+
+      out = EY::CLI::UI::Tee.new(ui.out, deployment.out)
+      err = EY::CLI::UI::Tee.new(ui.err, deployment.err)
+
+      ui.info  "Beginning deploy..."
+      begin
+        deployment.start
+        ui.show_deployment(deployment)
+        out << "Deploy initiated.\n"
+
+        runner.deploy do |args|
+          args.config  = deployment.config          if deployment.config
+          if deployment.migrate
+            args.migrate = deployment.migrate_command
+          else
+            args.migrate = false
+          end
+          args.ref     = deployment.resolved_ref
+        end
+        deployment.successful = runner.call(out, err)
+      rescue Interrupt
+        err << "Interrupted. Deployment halted.\n"
+        ui.warn "Recording canceled deployment in EY Cloud..."
+        ui.warn "WARNING: Interrupting again may result in a never-finished deployment in the deployment history on EY Cloud."
+        raise
+      rescue StandardError => e
+        deployment.err << "Error encountered during deploy.\n#{e.class} #{e}\n"
+        ui.print_exception(e)
+        raise
+      ensure
+        deployment.finished
+
+        if deployment.successful?
+          ui.info "Successful deployment recorded on EY Cloud"
+          ui.info "Deploy complete"
+          ui.info "Now you can run `ey launch' to open the application in a browser."
+        else
+          ui.info "Failed deployment recorded on EY Cloud"
+          raise EY::Error, "Deploy failed"
+        end
+      end
+    end
+  end
+end

data/lib/engineyard/deploy_config.rb

@@ -26,11 +26,7 @@ module EY
     end
 
     def extra_config
-      extras = @cli_opts.fetch('extra_deploy_hook_options', {})
-      if in_repo?
-        extras = @env_config.merge(extras)
-      end
-      extras
+      @cli_opts.fetch('extra_deploy_hook_options', {})
     end
 
     private

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '2.0.0.pre2'
+  VERSION = '2.0.0.pre3'
 end

data/spec/ey/deploy_spec.rb

@@ -304,9 +304,9 @@ describe "ey deploy" do
         File.unlink("ey.yml")
       end
 
-      it "gets passed along to engineyard-serverside" do
+      it "no longer gets passed along to engineyard-serverside (since serverside will read it on its own)" do
         fast_ey %w[deploy --no-migrate]
-        @ssh_commands.last.should =~ /--config '{.*"bert":"ernie".*}'/
+        @ssh_commands.last.should_not =~ /"bert":"ernie"/
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre2
+        version: 2.0.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre2
+        version: 2.0.0.pre3
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement