engineyard 0.7.0 → 0.7.1

data/lib/engineyard/cli.rb

@@ -40,6 +40,8 @@ module EY
       :desc => "Git ref to deploy. May be a branch, a tag, or a SHA."
     method_option :app, :type => :string, :aliases => %w(-a),
       :desc => "Name of the application to deploy"
+    method_option :verbose, :type => :boolean, :aliases => %w(-v),
+      :desc => "Be verbose"
     def deploy
       app         = fetch_app(options[:app])
       environment = fetch_environment(options[:environment], app)
@@ -56,9 +58,9 @@ module EY
 
       loudly_check_eysd(environment)
 
-      EY.ui.info "Running deploy for '#{environment.name}' on server..."
+      EY.ui.info "Beginning deploy for '#{app.name}' in '#{environment.name}' on server..."
 
-      if environment.deploy(app, deploy_ref, options[:migrate])
+      if environment.deploy(app, deploy_ref, options[:migrate], options[:verbose])
         EY.ui.info "Deploy complete"
       else
         raise EY::Error, "Deploy failed"
@@ -77,10 +79,18 @@ module EY
     DESC
 
     method_option :all, :type => :boolean, :aliases => %(-a)
+    method_option :simple, :type => :boolean, :aliases => %(-s)
     def environments
-      apps = get_apps(options[:all])
-      EY.ui.warn(NoAppError.new(repo).message) unless apps.any? || options[:all]
-      EY.ui.print_envs(apps, EY.config.default_environment)
+      if options[:all] && options[:simple]
+        # just put each env
+        api.environments.each do |env|
+          puts env.name
+        end
+      else
+        apps = get_apps(options[:all])
+        EY.ui.warn(NoAppError.new(repo).message) unless apps.any? || options[:all]
+        EY.ui.print_envs(apps, EY.config.default_environment, options[:simple])
+      end
     end
     map "envs" => :environments
 
@@ -113,14 +123,16 @@ module EY
       :desc => "Environment in which to roll back the application"
     method_option :app, :type => :string, :aliases => %w(-a),
       :desc => "Name of the application to roll back"
+    method_option :verbose, :type => :boolean, :aliases => %w(-v),
+      :desc => "Be verbose"
     def rollback
       app = fetch_app(options[:app])
       env = fetch_environment(options[:environment], app)
 
       loudly_check_eysd(env)
 
-      EY.ui.info("Rolling back #{env.name}")
-      if env.rollback(app)
+      EY.ui.info("Rolling back '#{app.name}' in '#{env.name}'")
+      if env.rollback(app, options[:verbose])
         EY.ui.info "Rollback complete"
       else
         raise EY::Error, "Rollback failed"

data/lib/engineyard/cli/ui.rb

@@ -59,25 +59,32 @@ module EY
         end
       end
 
-      def print_envs(apps, default_env_name = nil)
-        apps.each do |app|
-          puts app.name
-          if app.environments.any?
-            app.environments.each do |env|
-              short_name = env.shorten_name_for(app)
+      def print_envs(apps, default_env_name = nil, simple = false)
+        if simple
+          envs = apps.map{ |a| a.environments }
+          envs.flatten.map{|x| x.name}.uniq.each do |env|
+            puts env
+          end
+        else
+          apps.each do |app|
+            puts app.name
+            if app.environments.any?
+              app.environments.each do |env|
+                short_name = env.shorten_name_for(app)
 
-              icount = env.instances_count
-              iname = (icount == 1) ? "instance" : "instances"
+                icount = env.instances_count
+                iname = (icount == 1) ? "instance" : "instances"
 
-              default_text = env.name == default_env_name ? " [default]" : ""
+                default_text = env.name == default_env_name ? " [default]" : ""
 
-              puts "  #{short_name}#{default_text} (#{icount} #{iname})"
+                puts "  #{short_name}#{default_text} (#{icount} #{iname})"
+              end
+            else
+              puts "  (This application is not in any environments; you can make one at #{EY.config.endpoint})"
             end
-          else
-            puts "  (This application is not in any environments; you can make one at #{EY.config.endpoint})"
-          end
 
-          puts ""
+            puts ""
+          end
         end
       end
 
@@ -101,7 +108,7 @@ module EY
       end
 
       def set_color(string, color, bold=false)
-        $stdout.tty? ? super : string
+        ($stdout.tty? || ENV['THOR_SHELL']) ? super : string
       end
 
     end

data/lib/engineyard/cli/web.rb

@@ -7,12 +7,14 @@ module EY
         :desc => "Environment on which to take down the maintenance page"
       method_option :app, :type => :string, :aliases => %w(-a),
         :desc => "Name of the application whose maintenance page will be removed"
+      method_option :verbose, :type => :boolean, :aliases => %w(-v),
+        :desc => "Be verbose"
       def enable
         app         = fetch_app(options[:app])
         environment = fetch_environment(options[:environment], app)
         loudly_check_eysd(environment)
-        EY.ui.info "Taking down maintenance page for #{environment.name}"
-        environment.take_down_maintenance_page(app)
+        EY.ui.info "Taking down maintenance page for '#{app.name}' in '#{environment.name}'"
+        environment.take_down_maintenance_page(app, options[:verbose])
       end
 
       desc "disable [--environment/-e ENVIRONMENT]",
@@ -32,12 +34,14 @@ module EY
         :desc => "Environment on which to put up the maintenance page"
       method_option :app, :type => :string, :aliases => %w(-a),
         :desc => "Name of the application whose maintenance page will be put up"
+      method_option :verbose, :type => :boolean, :aliases => %w(-v),
+        :desc => "Be verbose"
       def disable
         app         = fetch_app(options[:app])
         environment = fetch_environment(options[:environment], app)
         loudly_check_eysd(environment)
-        EY.ui.info "Putting up maintenance page for #{environment.name}"
-        environment.put_up_maintenance_page(app)
+        EY.ui.info "Putting up maintenance page for '#{app.name}' in '#{environment.name}'"
+        environment.put_up_maintenance_page(app, options[:verbose])
       end
     end
   end

data/lib/engineyard/model/environment.rb

@@ -32,20 +32,20 @@ module EY
         app_master!.ensure_eysd_present(&blk)
       end
 
-      def deploy(app, ref, migration_command=nil)
-        app_master!.deploy(app, ref, migration_command, config)
+      def deploy(app, ref, migration_command=nil, verbose=false)
+        app_master!.deploy(app, ref, migration_command, config, verbose)
       end
 
-      def rollback(app)
-        app_master!.rollback(app, config)
+      def rollback(app, verbose=false)
+        app_master!.rollback(app, config, verbose)
       end
 
-      def take_down_maintenance_page(app)
-        app_master!.take_down_maintenance_page(app)
+      def take_down_maintenance_page(app, verbose=false)
+        app_master!.take_down_maintenance_page(app, verbose)
       end
 
-      def put_up_maintenance_page(app)
-        app_master!.put_up_maintenance_page(app)
+      def put_up_maintenance_page(app, verbose=false)
+        app_master!.put_up_maintenance_page(app, verbose)
       end
 
       def rebuild

data/lib/engineyard/model/instance.rb

@@ -3,7 +3,7 @@ require 'escape'
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment)
-      EYSD_VERSION = ENV["EY_DEPLOY_VERSION"] || "0.7.0"
+      EYSD_VERSION = ENV["EY_DEPLOY_VERSION"] || "0.7.1"
       EXIT_STATUS = Hash.new { |h,k| raise EY::Error, "ey-deploy version checker exited with unknown status code #{k}" }
       EXIT_STATUS.merge!({
         255 => :ssh_failed,
@@ -14,7 +14,7 @@ module EY
       alias :hostname :public_hostname
 
 
-      def deploy(app, ref, migration_command=nil, extra_configuration=nil)
+      def deploy(app, ref, migration_command=nil, extra_configuration=nil, verbose=false)
         deploy_args = [
           '--app',    app.name,
           '--repo',   app.repository_uri,
@@ -30,10 +30,10 @@ module EY
           deploy_args << "--migrate" << migration_command
         end
 
-        invoke_eysd_deploy(deploy_args)
+        invoke_eysd_deploy(deploy_args, verbose)
       end
 
-      def rollback(app, extra_configuration=nil)
+      def rollback(app, extra_configuration=nil, verbose=false)
         deploy_args = ['rollback',
           '--app',   app.name,
           '--stack', environment.stack_name,
@@ -43,16 +43,16 @@ module EY
           deploy_args << '--config' << extra_configuration.to_json
         end
 
-        invoke_eysd_deploy(deploy_args)
+        invoke_eysd_deploy(deploy_args, verbose)
       end
 
 
-      def put_up_maintenance_page(app)
-        invoke_eysd_deploy(['enable_maintenance_page', '--app', app.name])
+      def put_up_maintenance_page(app, verbose=false)
+        invoke_eysd_deploy(['enable_maintenance_page', '--app', app.name], verbose)
       end
 
-      def take_down_maintenance_page(app)
-        invoke_eysd_deploy(['disable_maintenance_page', '--app', app.name])
+      def take_down_maintenance_page(app, verbose=false)
+        invoke_eysd_deploy(['disable_maintenance_page', '--app', app.name], verbose)
       end
 
 
@@ -76,7 +76,7 @@ module EY
         if ENV["NO_SSH"]
           :ok
         else
-          ssh "#{gem_path} list ey-deploy | grep \"ey-deploy \" | egrep -q '#{escaped_eysd_version}[,)]'"
+          ssh "#{gem_path} list ey-deploy | grep \"ey-deploy \" | egrep -q '#{escaped_eysd_version}[,)]'", false
           EXIT_STATUS[$?.exitstatus]
         end
       end
@@ -100,7 +100,7 @@ module EY
 
         cmd = Escape.shell_command(%w[ssh -o StrictHostKeyChecking=no -q] << "#{user}@#{hostname}" << remote_command)
         cmd << " > /dev/null" unless output
-        output ? puts(cmd) : EY.ui.debug(cmd)
+        EY.ui.debug(cmd)
         unless ENV["NO_SSH"]
           system cmd
         else
@@ -108,7 +108,7 @@ module EY
         end
       end
 
-      def invoke_eysd_deploy(deploy_args)
+      def invoke_eysd_deploy(deploy_args, verbose=false)
         start = [eysd_path, "_#{EYSD_VERSION}_", 'deploy']
         instance_args = environment.instances.inject(['--instances']) do |command, inst|
           instance_tuple = [inst.public_hostname, inst.role]
@@ -117,7 +117,11 @@ module EY
           command << instance_tuple.join(',')
         end
 
-        ssh Escape.shell_command(start + deploy_args + instance_args)
+        verbose_arg = verbose ? ['--verbose'] : []
+
+        cmd = Escape.shell_command(start + deploy_args + instance_args + verbose_arg)
+        puts cmd if verbose
+        ssh cmd
       end
 
       def eysd_path

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/ey/deploy_spec.rb

@@ -31,11 +31,12 @@ describe "ey deploy" do
     cmd << " --environment #{options[:env]}" if options[:env]
     cmd << " --app #{options[:app]}" if options[:app]
     cmd << " --ref #{options[:ref]}" if options[:ref]
+    cmd << " --verbose" if options[:verbose]
     cmd
   end
 
   def verify_ran(scenario)
-    @out.should match(/Running deploy for '#{scenario[:environment]}'/)
+    @out.should match(/Beginning deploy for.*#{scenario[:application]}.*#{scenario[:environment]}/)
     @ssh_commands.should have_command_like(/eysd.*deploy.*--app #{scenario[:application]}/)
   end
 
@@ -62,7 +63,7 @@ describe "ey deploy" do
     end
 
     it "complains when environment is not specified and app is in >1 environment" do
-      api_scenario "one app, two environments"
+      api_scenario "one app, many environments"
       ey "deploy", :expect_failure => true
       @err.should match(/single environment.*2/i)
     end
@@ -193,7 +194,7 @@ describe "ey deploy" do
 
     it "lets you choose by complete name even if the complete name is ambiguous" do
       ey "deploy --environment railsapp_staging"
-      @out.should match(/Running deploy for 'railsapp_staging'/)
+      @out.should match(/Beginning deploy for.*'railsapp_staging'/)
     end
   end
 

data/spec/ey/list_environments_spec.rb

@@ -5,7 +5,7 @@ describe "ey environments" do
   given "integration"
 
   before(:all) do
-    api_scenario "one app, two environments"
+    api_scenario "one app, many environments"
   end
 
   it "lists the environments your app is in" do
@@ -22,4 +22,20 @@ describe "ey environments" do
     end
   end
 
+  it "lists all environments that have apps with -a" do
+    ey "environments -a"
+    @out.should include("bakon")
+    @out.should include("giblets")
+  end
+
+  it "outputs simply with -s" do
+    ey "environments -s", :debug => false
+    @out.split(/\n/).sort.should == ["bakon", "giblets"]
+  end
+
+  it "outputs all environments (including ones with no apps) simply with -a and -s" do
+    ey "environments -a -s", :debug => false
+    @out.split(/\n/).sort.should == ["bakon", "beef", "giblets"]
+  end
+
 end

data/spec/ey/logs_spec.rb

@@ -12,7 +12,7 @@ describe "ey logs" do
   end
 
   it "complains when it can't infer the environment" do
-    api_scenario "one app, two environments"
+    api_scenario "one app, many environments"
     ey "logs", :expect_failure => true
     @err.should =~ /single environment/
   end

data/spec/ey/rollback_spec.rb

@@ -7,11 +7,12 @@ describe "ey rollback" do
     cmd = "rollback"
     cmd << " -e #{opts[:env]}" if opts[:env]
     cmd << " -a #{opts[:app]}" if opts[:app]
+    cmd << " --verbose" if opts[:verbose]
     cmd
   end
 
   def verify_ran(scenario)
-    @out.should match(/Rolling back #{scenario[:environment]}/)
+    @out.should match(/Rolling back.*#{scenario[:application]}.*#{scenario[:environment]}/)
     @err.should be_empty
     @ssh_commands.last.should match(/eysd.*deploy rollback.*--app #{scenario[:application]}/)
   end

data/spec/ey/ssh_spec.rb

@@ -6,7 +6,7 @@ describe "ey ssh" do
   given "integration"
 
   before(:all) do
-    api_scenario "one app, two environments"
+    api_scenario "one app, many environments"
   end
 
   it "complains if it has no app master" do

data/spec/ey/web/disable_spec.rb

@@ -7,6 +7,7 @@ describe "ey web disable" do
     cmd = "web disable"
     cmd << " -e #{opts[:env]}" if opts[:env]
     cmd << " -a #{opts[:app]}" if opts[:app]
+    cmd << " --verbose" if opts[:verbose]
     cmd
   end
 

data/spec/ey/web/enable_spec.rb

@@ -7,6 +7,7 @@ describe "ey web enable" do
     cmd = "web enable"
     cmd << " -e #{opts[:env]}" if opts[:env]
     cmd << " -a #{opts[:app]}" if opts[:app]
+    cmd << " --verbose" if opts[:verbose]
     cmd
   end
 

data/spec/support/fake_awsm.ru

@@ -32,8 +32,8 @@ class FakeAwsm < Sinatra::Base
                      Scenario::LinkedApp
                    when "one app, one environment, app master red"
                      Scenario::LinkedAppRedMaster
-                   when "one app, two environments"
-                     Scenario::OneAppTwoEnvs
+                   when "one app, many environments"
+                     Scenario::OneAppManyEnvs
                    when "one app, many similarly-named environments"
                      Scenario::OneAppManySimilarlyNamedEnvs
                    else
@@ -252,7 +252,7 @@ private
       end
     end
 
-    class OneAppTwoEnvs < Empty
+    class OneAppManyEnvs < Empty
       def apps
         apps = [{
             "name" => "rails232app",
@@ -325,6 +325,15 @@ private
             "stack_name" => "nginx_passenger",
             "id" => 8371,
             "app_master" => nil,
+          }, {
+            "ssh_username" => "hamburger",
+            "instances" => [],
+            "name" => "beef",
+            "apps" => [],
+            "instances_count" => 0,
+            "stack_name" => "nginx_passenger",
+            "id" => 8372,
+            "app_master" => nil,
           }]
       end
     end # OneAppTwoEnvs

data/spec/support/helpers.rb

@@ -20,8 +20,10 @@ module Spec
       hide_err = options.has_key?(:hide_err) ? options[:hide_err] : options[:expect_failure]
       path_prepends = options[:prepend_to_path]
 
-      ey_env = {}
-      ey_env['DEBUG'] = options[:debug].to_s if options[:debug]
+      ey_env = {'DEBUG' => 'true'}
+      if options.has_key?(:debug)
+        ey_env['DEBUG'] = options[:debug] ? "true" : nil
+      end
 
       if path_prepends
         tempdir = File.join(Dir.tmpdir, "ey_test_cmds_#{Time.now.tv_sec}#{Time.now.tv_usec}_#{$$}")

data/spec/support/shared_behavior.rb

@@ -113,6 +113,12 @@ end
 shared_examples_for "it invokes eysd" do
   include Spec::Helpers::SharedIntegrationTestUtils
 
+  it "passes --verbose to eysd" do
+    api_scenario "one app, one environment"
+    run_ey({:env => 'giblets', :verbose => true})
+    @ssh_commands.should have_command_like(/eysd.*deploy.*--verbose/)
+  end
+
   it "passes along instance information to eysd" do
     api_scenario "one app, one environment"
     run_ey({:env => 'giblets'})

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -07:00
+date: 2010-06-29 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency