engineyard 2.0.1 → 2.0.2

data/lib/engineyard/cli/ui.rb

@@ -50,7 +50,7 @@ module EY
               highline.ask(question) do |q|
                 q.echo = "*"        if password
                 q.default = default if default
-              end
+              end.to_s
             end
           end
         end

data/lib/engineyard/eyrc.rb

@@ -2,7 +2,7 @@ module EY
   class EYRC
     attr_reader :path
 
-    DEFAULT_PATH = "#{ENV['HOME']}/.eyrc"
+    DEFAULT_PATH = "~/.eyrc"
 
     def self.load
       new(ENV['EYRC'] || DEFAULT_PATH)

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -330,7 +330,6 @@ files:
 - lib/engineyard/cli/ui.rb
 - lib/engineyard/cli/web.rb
 - lib/engineyard/cli.rb
-- lib/engineyard/commands/deploy.rb
 - lib/engineyard/config.rb
 - lib/engineyard/deploy_config/migrate.rb
 - lib/engineyard/deploy_config/ref.rb
@@ -409,7 +408,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1240633916476760802
+      hash: -3647480846806604559
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -418,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1240633916476760802
+      hash: -3647480846806604559
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/engineyard/commands/deploy.rb

@@ -1,60 +0,0 @@
-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 Engine Yard Cloud..."
-        ui.warn "WARNING: Interrupting again may result in a never-finished deployment in the deployment history on Engine Yard 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 Engine Yard 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 Engine Yard Cloud"
-          raise EY::Error, "Deploy failed"
-        end
-      end
-    end
-  end
-end