engineyard 1.3.7 → 1.3.10

data/lib/engineyard/cli/recipes.rb

@@ -2,16 +2,19 @@ module EY
   class CLI
     class Recipes < EY::Thor
       desc "apply [--environment ENVIRONMENT]",
-        "Run uploaded chef recipes on specified environment."
+        "Run chef recipes uploaded by the 'recipes upload' command on the specified environment."
       long_desc <<-DESC
         This is similar to '#{banner_base} rebuild' except Engine Yard's main
         configuration step is skipped.
+
+        The cookbook uploaded by the 'recipes upload' command will be run when
+        you run 'recipes apply'.
       DESC
 
       method_option :environment, :type => :string, :aliases => %w(-e),
         :desc => "Environment in which to apply recipes"
       method_option :account, :type => :string, :aliases => %w(-c),
-        :desc => "Name of the account you want to deploy in"
+        :desc => "Name of the account in which the environment can be found"
       def apply
         environment = fetch_environment(options[:environment], options[:account])
         environment.run_custom_recipes
@@ -19,16 +22,18 @@ module EY
       end
 
       desc "upload [--environment ENVIRONMENT]",
-        "Upload custom chef recipes to specified environment."
+        "Upload custom chef recipes to specified environment so they can be applied."
       long_desc <<-DESC
-        The current directory should contain a subdirectory named "cookbooks" to be
-        uploaded.
+        The current working directory should contain a subdirectory named "cookbooks"
+        that is the collection of recipes to be uploaded.
+
+        The uploaded cookbook will be run when executing 'recipes apply'.
       DESC
 
       method_option :environment, :type => :string, :aliases => %w(-e),
         :desc => "Environment that will receive the recipes"
       method_option :account, :type => :string, :aliases => %w(-c),
-        :desc => "Name of the account you want to deploy in"
+        :desc => "Name of the account in which the environment can be found"
       def upload
         environment = fetch_environment(options[:environment], options[:account])
         environment.upload_recipes
@@ -36,17 +41,17 @@ module EY
       end
 
       desc "download [--environment ENVIRONMENT]",
-        "Download custom chef recipes from ENVIRONMENT into the current directory."
+        "Download a copy of the custom chef recipes from this environment into the current directory."
       long_desc <<-DESC
         The recipes will be unpacked into a directory called "cookbooks" in the
-        current directory.
+        current directory. This is the opposite of 'recipes upload'.
 
         If the cookbooks directory already exists, an error will be raised.
       DESC
       method_option :environment, :type => :string, :aliases => %w(-e),
         :desc => "Environment for which to download the recipes"
       method_option :account, :type => :string, :aliases => %w(-c),
-        :desc => "Name of the account you want to deploy in"
+        :desc => "Name of the account in which the environment can be found"
       def download
         environment = fetch_environment(options[:environment], options[:account])
         environment.download_recipes

data/lib/engineyard/cli/web.rb

@@ -10,7 +10,7 @@ module EY
       method_option :verbose, :type => :boolean, :aliases => %w(-v),
         :desc => "Be verbose"
       method_option :account, :type => :string, :aliases => %w(-c),
-        :desc => "Name of the account you want to deploy in"
+        :desc => "Name of the account in which the environment can be found"
       def enable
         app, environment = fetch_app_and_environment(options[:app], options[:environment], options[:account])
         EY.ui.info "Taking down maintenance page for '#{app.name}' in '#{environment.name}'"
@@ -37,7 +37,7 @@ module EY
       method_option :verbose, :type => :boolean, :aliases => %w(-v),
         :desc => "Be verbose"
       method_option :account, :type => :string, :aliases => %w(-c),
-        :desc => "Name of the account you want to deploy in"
+        :desc => "Name of the account in which the environment can be found"
       def disable
         app, environment = fetch_app_and_environment(options[:app], options[:environment], options[:account])
         EY.ui.info "Putting up maintenance page for '#{app.name}' in '#{environment.name}'"

data/lib/engineyard/cli.rb

@@ -43,7 +43,7 @@ module EY
     method_option :app, :type => :string, :aliases => %w(-a),
       :desc => "Name of the application to deploy"
     method_option :account, :type => :string, :aliases => %w(-c),
-      :desc => "Name of the account you want to deploy in"
+      :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 => {},
@@ -120,7 +120,7 @@ module EY
     method_option :environment, :type => :string, :aliases => %w(-e),
       :desc => "Environment to rebuild"
     method_option :account, :type => :string, :aliases => %w(-c),
-      :desc => "Name of the account you want to rebuild in"
+      :desc => "Name of the account in which the environment can be found"
     def rebuild
       environment = fetch_environment(options[:environment], options[:account])
       EY.ui.debug("Rebuilding #{environment.name}")
@@ -138,7 +138,7 @@ module EY
     method_option :app, :type => :string, :aliases => %w(-a),
       :desc => "Name of the application to roll back"
     method_option :account, :type => :string, :aliases => %w(-c),
-      :desc => "Name of the account you want to roll back in"
+      :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 => {},
@@ -168,7 +168,7 @@ module EY
     method_option :environment, :type => :string, :aliases => %w(-e),
       :desc => "Environment to ssh into"
     method_option :account, :type => :string, :aliases => %w(-c),
-      :desc => "Name of the account you want to deploy in"
+      :desc => "Name of the account in which the environment can be found"
     method_option :all, :type => :boolean, :aliases => %(-a),
       :desc => "Run command on all servers"
     method_option :app_servers, :type => :boolean,
@@ -231,7 +231,7 @@ module EY
     method_option :environment, :type => :string, :aliases => %w(-e),
       :desc => "Environment with the interesting logs"
     method_option :account, :type => :string, :aliases => %w(-c),
-      :desc => "Name of the account you want to deploy in"
+      :desc => "Name of the account in which the environment can be found"
     def logs
       environment = fetch_environment(options[:environment], options[:account])
       environment.logs.each do |log|

data/lib/engineyard/model/deployment.rb

@@ -0,0 +1,51 @@
+require 'escape'
+
+module EY
+  module Model
+    class Deployment < ApiStruct.new(:id, :app, :created_at, :environment, :finished_at, :migration_command, :output, :ref, :successful)
+      def self.started(environment, app, ref, migration_command)
+        from_hash({
+          :app               => app,
+          :environment       => environment,
+          :migration_command => migration_command,
+          :ref               => ref,
+          :created_at        => Time.now.utc,
+        })
+      end
+
+      def finished(successful, output)
+        self.successful = successful
+        self.output = output
+        self.finished_at = Time.now.utc
+        post_to_appcloud!
+      end
+
+      private
+
+      def post_to_appcloud!
+        api.request(api_uri, :method => :post, :params => params)
+        EY.ui.info "Deployment recorded in AppCloud"
+      end
+
+      def params
+        {:deployment => {
+          :created_at      => created_at,
+          :finished_at     => finished_at,
+          :migrate         => !!migration_command,
+          :migrate_command => migration_command,
+          :output          => output,
+          :ref             => ref,
+          :successful      => successful,
+          }}
+      end
+
+      def api_uri
+        "/apps/#{app.id}/environments/#{environment.id}/deployments"
+      end
+
+      def api
+        app.api
+      end
+    end
+  end
+end

data/lib/engineyard/model/environment.rb

@@ -55,7 +55,7 @@ module EY
       end
 
       def rebuild
-        api.request("/environments/#{id}/rebuild", :method => :put)
+        api.request("/environments/#{id}/update_instances", :method => :put)
       end
 
       def run_custom_recipes

data/lib/engineyard/model/instance.rb

@@ -1,4 +1,5 @@
 require 'escape'
+require 'open4'
 
 module EY
   module Model
@@ -19,13 +20,17 @@ module EY
       private :adapter
 
       def deploy(app, ref, migration_command=nil, extra_configuration=nil, verbose=false)
+        deployment = Deployment.started(environment, app, ref, migration_command)
+
         deploy_command = adapter(app, verbose).deploy do |args|
           args.config  = extra_configuration if extra_configuration
           args.migrate = migration_command if migration_command
           args.ref     = ref
         end
 
-        invoke deploy_command
+        successful, output = invoke_with_output(deploy_command)
+        deployment.finished(successful, output)
+        successful
       end
 
       def rollback(app, extra_configuration=nil, verbose=false)
@@ -62,20 +67,29 @@ module EY
 
     private
 
-      def ssh(remote_command, output = true)
+      def ssh(remote_command)
         user = environment.username
+        out = ""
+        tee = lambda do |chunk|
+          out << chunk
+          $stdout << chunk
+        end
 
         cmd = Escape.shell_command(%w[ssh -o StrictHostKeyChecking=no -q] << "#{user}@#{hostname}" << remote_command)
-        cmd << " > /dev/null" unless output
         EY.ui.debug(cmd)
-        unless ENV["NO_SSH"]
-          system cmd
+        if ENV["NO_SSH"]
+          [true, "NO_SSH is set."]
         else
-          true
+          status = Open4.spawn(cmd, :out => tee, :err => tee, :quiet => true)
+          [status.success?, out]
         end
       end
 
       def invoke(action)
+        invoke_with_output(action).first
+      end
+
+      def invoke_with_output(action)
         action.call do |cmd|
           puts cmd if action.verbose
           ssh cmd

data/lib/engineyard/model.rb

@@ -3,6 +3,7 @@ module EY
     autoload :ApiStruct,     'engineyard/model/api_struct'
     autoload :Account,       'engineyard/model/account'
     autoload :App,           'engineyard/model/app'
+    autoload :Deployment,    'engineyard/model/deployment'
     autoload :Environment,   'engineyard/model/environment'
     autoload :Log,           'engineyard/model/log'
     autoload :Instance,      'engineyard/model/instance'

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.7'
+  VERSION = '1.3.10'
 end

data/spec/engineyard/model/environment_spec.rb

@@ -11,13 +11,13 @@ describe "EY::Model::Environment#rebuild" do
 
     FakeWeb.register_uri(
       :put,
-      "https://cloud.engineyard.com/api/v2/environments/#{env.id}/rebuild",
+      "https://cloud.engineyard.com/api/v2/environments/#{env.id}/update_instances",
       :body => ''
     )
 
     env.rebuild
 
-    FakeWeb.should have_requested(:put, "https://cloud.engineyard.com/api/v2/environments/#{env.id}/rebuild")
+    FakeWeb.should have_requested(:put, "https://cloud.engineyard.com/api/v2/environments/#{env.id}/update_instances")
   end
 end
 

data/spec/ey/deploy_spec.rb

@@ -38,6 +38,7 @@ describe "ey deploy" do
 
   def verify_ran(scenario)
     @out.should match(/Beginning deploy for.*#{scenario[:application]}.*#{scenario[:environment]}/)
+    @out.should match(/Deployment recorded in AppCloud/)
     @ssh_commands.should have_command_like(/engineyard-serverside.*deploy.*--app #{scenario[:application]}/)
   end
 

data/spec/support/fake_awsm.ru

@@ -96,7 +96,7 @@ class FakeAwsm < Sinatra::Base
     end
   end
 
-  put "/api/v2/environments/:env_id/rebuild" do
+  put "/api/v2/environments/:env_id/update_instances" do
     status(202)
     ""
   end
@@ -106,6 +106,10 @@ class FakeAwsm < Sinatra::Base
     ""
   end
 
+  post "/api/v2/apps/:app_id/environments/:environment_id/deployments" do
+    {"deployment" => params[:deployment].merge({"id" => 2, "commit" => 'a'*40})}.to_json
+  end
+
   post "/api/v2/authenticate" do
     if valid_user?
       {"api_token" => "deadbeef", "ok" => true}.to_json

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 1
   - 3
-  - 7
-  version: 1.3.7
+  - 10
+  version: 1.3.10
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,102 +14,104 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -08:00
+date: 2010-12-28 00:00:00 -08:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  name: thor
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 14
         - 6
         version: 0.14.6
-  name: thor
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: rest-client
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
         version: "1.4"
-  name: rest-client
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: highline
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 6
         - 1
         version: 1.6.1
-  name: highline
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: json_pure
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: json_pure
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: escape
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 0
         - 4
         version: 0.0.4
-  name: escape
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: engineyard-serverside-adapter
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
         - 0
         version: 1.4.0
-  name: engineyard-serverside-adapter
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: open4
   type: :runtime
-  version_requirements: *id006
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  requirement: *id007
 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: 
@@ -122,63 +123,33 @@ extra_rdoc_files: []
 files: 
 - bin/ey
 - lib/engineyard/cli.rb
-- lib/engineyard/model.rb
+- lib/engineyard/api.rb
 - lib/engineyard/error.rb
-- lib/engineyard/resolver.rb
+- lib/engineyard/ruby_ext.rb
+- lib/engineyard/cli/api.rb
+- lib/engineyard/cli/web.rb
+- lib/engineyard/cli/recipes.rb
+- lib/engineyard/cli/ui.rb
+- lib/engineyard/model/log.rb
+- lib/engineyard/model/instance.rb
+- lib/engineyard/model/environment.rb
+- lib/engineyard/model/app.rb
+- lib/engineyard/model/deployment.rb
+- lib/engineyard/model/account.rb
+- lib/engineyard/model/api_struct.rb
+- lib/engineyard/thor.rb
+- lib/engineyard/model.rb
+- lib/engineyard/repo.rb
 - lib/engineyard/collection/abstract.rb
 - lib/engineyard/collection/apps.rb
 - lib/engineyard/collection/environments.rb
 - lib/engineyard/collection.rb
 - lib/engineyard/config.rb
-- lib/engineyard/repo.rb
-- lib/engineyard/thor.rb
-- lib/engineyard/api.rb
-- lib/engineyard/cli/recipes.rb
-- lib/engineyard/cli/web.rb
-- lib/engineyard/cli/ui.rb
-- lib/engineyard/cli/api.rb
 - lib/engineyard/version.rb
-- lib/engineyard/ruby_ext.rb
-- lib/engineyard/model/account.rb
-- lib/engineyard/model/instance.rb
-- lib/engineyard/model/api_struct.rb
-- lib/engineyard/model/app.rb
-- lib/engineyard/model/environment.rb
-- lib/engineyard/model/log.rb
+- lib/engineyard/resolver.rb
 - lib/engineyard.rb
 - LICENSE
 - README.rdoc
-- spec/support/shared_behavior.rb
-- spec/support/helpers.rb
-- spec/support/bundled_ey
-- spec/support/ruby_ext.rb
-- spec/support/git_repo.rb
-- spec/support/fake_awsm.ru
-- spec/engineyard/resolver_spec.rb
-- spec/engineyard/api_spec.rb
-- spec/engineyard/repo_spec.rb
-- spec/engineyard/cli_spec.rb
-- spec/engineyard/config_spec.rb
-- spec/engineyard/collection/environments_spec.rb
-- spec/engineyard/collection/apps_spec.rb
-- spec/engineyard/cli/api_spec.rb
-- spec/engineyard/model/environment_spec.rb
-- spec/engineyard/model/instance_spec.rb
-- spec/engineyard/model/api_struct_spec.rb
-- spec/ey/rollback_spec.rb
-- spec/ey/rebuild_spec.rb
-- spec/ey/web/enable_spec.rb
-- spec/ey/web/disable_spec.rb
-- spec/ey/deploy_spec.rb
-- spec/ey/ey_spec.rb
-- spec/ey/ssh_spec.rb
-- spec/ey/list_environments_spec.rb
-- spec/ey/logs_spec.rb
-- spec/ey/recipes/upload_spec.rb
-- spec/ey/recipes/download_spec.rb
-- spec/ey/recipes/apply_spec.rb
-- spec/spec_helper.rb
-- spec/engineyard_spec.rb
 has_rdoc: true
 homepage: http://github.com/engineyard/engineyard
 licenses: []
@@ -189,59 +160,55 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud
 test_files: 
-- spec/support/shared_behavior.rb
-- spec/support/helpers.rb
-- spec/support/bundled_ey
-- spec/support/ruby_ext.rb
 - spec/support/git_repo.rb
 - spec/support/fake_awsm.ru
-- spec/engineyard/resolver_spec.rb
-- spec/engineyard/api_spec.rb
-- spec/engineyard/repo_spec.rb
+- spec/support/ruby_ext.rb
+- spec/support/helpers.rb
+- spec/support/bundled_ey
+- spec/support/shared_behavior.rb
 - spec/engineyard/cli_spec.rb
 - spec/engineyard/config_spec.rb
-- spec/engineyard/collection/environments_spec.rb
-- spec/engineyard/collection/apps_spec.rb
 - spec/engineyard/cli/api_spec.rb
+- spec/engineyard/model/api_struct_spec.rb
 - spec/engineyard/model/environment_spec.rb
 - spec/engineyard/model/instance_spec.rb
-- spec/engineyard/model/api_struct_spec.rb
+- spec/engineyard/resolver_spec.rb
+- spec/engineyard/collection/apps_spec.rb
+- spec/engineyard/collection/environments_spec.rb
+- spec/engineyard/repo_spec.rb
+- spec/engineyard/api_spec.rb
+- spec/ey/list_environments_spec.rb
 - spec/ey/rollback_spec.rb
+- spec/ey/logs_spec.rb
 - spec/ey/rebuild_spec.rb
-- spec/ey/web/enable_spec.rb
-- spec/ey/web/disable_spec.rb
+- spec/ey/recipes/download_spec.rb
+- spec/ey/recipes/apply_spec.rb
+- spec/ey/recipes/upload_spec.rb
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
+- spec/ey/web/disable_spec.rb
+- spec/ey/web/enable_spec.rb
 - spec/ey/ssh_spec.rb
-- spec/ey/list_environments_spec.rb
-- spec/ey/logs_spec.rb
-- spec/ey/recipes/upload_spec.rb
-- spec/ey/recipes/download_spec.rb
-- spec/ey/recipes/apply_spec.rb
-- spec/spec_helper.rb
 - spec/engineyard_spec.rb
+- spec/spec_helper.rb