engineyard 2.0.9 → 2.0.10

data/lib/engineyard/cli.rb

@@ -16,19 +16,20 @@ module EY
 
     include Thor::Actions
 
-    def self.start(*)
+    def self.start(given_args=ARGV, config={})
+      Thor::Base.shell = EY::CLI::UI
       ui = EY::CLI::UI.new
-      super
+      super(given_args, {:shell => ui}.merge(config))
     rescue EY::Error, EY::CloudClient::Error => e
       ui.print_exception(e)
-      raise
+      exit 1
     rescue Interrupt => e
       puts
       ui.print_exception(e)
       ui.say("Quitting...")
       raise
-    rescue SystemExit
-      # don't print a message for exit
+    rescue SystemExit, Errno::EPIPE
+      # don't print a message for safe exits
       raise
     rescue Exception => e
       ui.print_exception(e)
@@ -37,6 +38,7 @@ module EY
 
     class_option :api_token, :type => :string, :desc => "Use API-TOKEN to authenticate this command"
     class_option :serverside_version, :type => :string, :desc => "Please use with care! Override deploy system version (same as ENV variable ENGINEYARD_SERVERSIDE_VERSION)"
+    class_option :quiet, :aliases => %w[-q], :type => :boolean, :desc => "Quieter CLI output."
 
     desc "deploy [--environment ENVIRONMENT] [--ref GIT-REF]",
       "Deploy specified branch, tag, or sha to specified environment."
@@ -91,10 +93,10 @@ module EY
 
       runner = serverside_runner(app_env, deploy_config.verbose, deployment.serverside_version, options[:ignore_bad_master])
 
-      out = EY::CLI::UI::Tee.new(ui.out, deployment.out)
-      err = EY::CLI::UI::Tee.new(ui.err, deployment.err)
+      out = EY::CLI::UI::Tee.new(ui.out, deployment.output)
+      err = EY::CLI::UI::Tee.new(ui.err, deployment.output)
 
-      ui.info  "Beginning deploy..."
+      ui.info  "Beginning deploy...", :green
       begin
         deployment.start
         ui.show_deployment(deployment)
@@ -120,14 +122,14 @@ module EY
         ui.print_exception(e)
         raise
       ensure
+        ui.info "Saving log... ", :green
         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."
+          ui.info "Successful deployment recorded on Engine Yard Cloud.", :green
+          ui.info "Run `ey launch` to open the application in a browser."
         else
-          ui.info "Failed deployment recorded on Engine Yard Cloud"
+          ui.info "Failed deployment recorded on Engine Yard Cloud", :green
           raise EY::Error, "Deploy failed"
         end
       end
@@ -151,11 +153,7 @@ module EY
       app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
       deployment = app_env.last_deployment
       if deployment
-        ui.say "# Status of last deployment of #{app_env.hierarchy_name}:"
-        ui.say "#"
-        ui.show_deployment(deployment)
-        ui.say "#"
-        ui.deployment_result(deployment)
+        ui.deployment_status(deployment)
       else
         raise EY::Error, "Application #{app_env.app.name} has not been deployed on #{app_env.environment.name}."
       end
@@ -184,7 +182,7 @@ module EY
       if options[:all] && options[:simple]
         ui.print_simple_envs api.environments
       elsif options[:all]
-        ui.print_envs(api.apps)
+        ui.print_envs api.apps
       else
         remotes = nil
         if options[:app] == ''
@@ -241,7 +239,7 @@ module EY
       :desc => "Name of the account in which the environment can be found"
     def rebuild
       environment = fetch_environment(options[:environment], options[:account])
-      ui.debug("Rebuilding #{environment.name}")
+      ui.info "Updating instances on #{environment.hierarchy_name}"
       environment.rebuild
     end
     map "update" => :rebuild
@@ -270,7 +268,7 @@ module EY
       env_config    = config.environment_config(app_env.environment_name)
       deploy_config = EY::DeployConfig.new(options, env_config, repo, ui)
 
-      ui.info("Rolling back #{app_env.hierarchy_name}")
+      ui.info "Rolling back #{app_env.hierarchy_name}"
 
       runner = serverside_runner(app_env, deploy_config.verbose)
       runner.rollback do |args|
@@ -370,15 +368,15 @@ module EY
     def logs
       environment = fetch_environment(options[:environment], options[:account])
       environment.logs.each do |log|
-        ui.info log.instance_name
+        ui.say "Instance: #{log.instance_name}"
 
         if log.main
-          ui.info "Main logs for #{environment.name}:"
+          ui.say "Main logs for #{environment.name}:", :green
           ui.say  log.main
         end
 
         if log.custom
-          ui.info "Custom logs for #{environment.name}:"
+          ui.say "Custom logs for #{environment.name}:", :green
           ui.say  log.custom
         end
       end
@@ -483,10 +481,10 @@ module EY
     def logout
       eyrc = EYRC.load
       if eyrc.delete_api_token
-        ui.say "API token removed: #{eyrc.path}"
-        ui.say "Run any other command to login again."
+        ui.info "API token removed: #{eyrc.path}"
+        ui.info "Run any other command to login again."
       else
-        ui.say "Already logged out. Run any other command to login again."
+        ui.info "Already logged out. Run any other command to login again."
       end
     end
 

data/lib/engineyard/cli/api.rb

@@ -76,7 +76,7 @@ module EY
         @source    = "credentials"
         @specified = false
 
-        @ui.info("We need to fetch your API token; please log in.")
+        @ui.info "We need to fetch your API token; please log in."
         begin
           email  = @ui.ask("Email: ")
           passwd = @ui.ask("Password: ", true)

data/lib/engineyard/cli/recipes.rb

@@ -60,17 +60,17 @@ module EY
       no_tasks do
         def apply_recipes(environment)
           environment.run_custom_recipes
-          ui.say "Uploaded recipes started for #{environment.name}"
+          ui.info "Uploaded recipes started for #{environment.name}"
         end
 
         def upload_recipes(environment, filename)
           if filename && filename != ''
             environment.upload_recipes_at_path(filename)
-            ui.say "Recipes file #{filename} uploaded successfully for #{environment.name}"
+            ui.info "Recipes file #{filename} uploaded successfully for #{environment.name}"
           else
             path = cookbooks_dir_archive_path
             environment.upload_recipes_at_path(path)
-            ui.say "Recipes in cookbooks/ uploaded successfully for #{environment.name}"
+            ui.info "Recipes in cookbooks/ uploaded successfully for #{environment.name}"
           end
         end
 
@@ -114,7 +114,7 @@ module EY
         cmd = "tar xzf '#{recipes.path}' cookbooks"
 
         if system(cmd)
-          ui.say "Recipes downloaded successfully for #{environment.name}"
+          ui.info "Recipes downloaded successfully for #{environment.name}"
         else
           raise EY::Error, "Could not unarchive recipes.\nCommand `#{cmd}` exited with an error."
         end

data/lib/engineyard/cli/ui.rb

@@ -36,7 +36,7 @@ module EY
         end
 
         def self.interactive?
-          @mock || ($stdin && $stdin.tty?)
+          @mock || ($stdout && $stdout.tty?)
         end
 
         def self.ask(question, password = false, default = nil)
@@ -77,7 +77,7 @@ module EY
           if interactive?
             block.call
           else
-            Timeout.timeout(5, &block)
+            Timeout.timeout(2, &block)
           end
         end
       end
@@ -93,8 +93,9 @@ module EY
         say_with_status(name, message, :yellow)
       end
 
-      def info(name, message = nil)
-        say_with_status(name, message, :green)
+      def info(message, color = nil)
+        return if quiet?
+        say_with_status(message, nil, color)
       end
 
       def debug(name, message = nil)
@@ -156,7 +157,18 @@ module EY
         end
       end
 
+      def deployment_status(deployment)
+        unless quiet?
+          say "# Status of last deployment of #{deployment.app_environment.hierarchy_name}:"
+          say "#"
+          show_deployment(deployment)
+          say "#"
+        end
+        deployment_result(deployment)
+      end
+
       def show_deployment(dep)
+        return if quiet?
         output = []
         output << ["Account",         dep.app.account.name]
         output << ["Application",     dep.app.name]
@@ -177,11 +189,11 @@ module EY
 
       def deployment_result(dep)
         if dep.successful?
-          info 'This deployment was successful.'
+          say 'Deployment was successful.', :green
         elsif dep.finished_at.nil?
-          warn 'This deployment is not finished.'
+          say 'Deployment is not finished.', :yellow
         else
-          say_with_status('This deployment failed.', nil, :red)
+          say 'Deployment failed.', :red
         end
       end
 

data/lib/engineyard/deploy_config/migrate.rb

@@ -78,11 +78,12 @@ module EY
         if @perfom.nil? && @command = command_from_config
           @perform = true
           env_config.migrate = @perform
-          ui.warn "********************************************************************************"
+          ui.info "********************************************************************************"
           ui.info "#{env_config.path} config for #{env_config.name} has been updated to"
           ui.info "migrate by default to maintain previous expected default behavior."
-          ui.warn "********************************************************************************"
-          ui.say  "It's a good idea to git commit #{env_config.path} with these new changes."
+          ui.info ""
+          ui.info "Please git commit #{env_config.path} with these new changes.", :yellow
+          ui.info ""
           true
         else
           false
@@ -90,15 +91,14 @@ module EY
       end
 
       def perform_from_interaction
-        ui.warn "Please choose a default migration behavior for this environment."
         @perform = ui.agree("Run migrations by default on #{env_config.name}? ", true)
         env_config.migrate = @perform
         if @perform
           command_from_interaction
         end
-        ui.say "#{env_config.path}: migrate settings saved for #{env_config.name}."
-        ui.say "You can override this default with --migrate or --no-migrate."
-        ui.info "Please git commit #{env_config.path} with these new changes."
+        ui.info "#{env_config.path}: migrate settings saved for #{env_config.name}."
+        ui.info "You can override this default with --migrate or --no-migrate."
+        ui.info "Please git commit #{env_config.path} with these new changes.", :yellow
         true
       rescue Timeout::Error
         @perform = nil

data/lib/engineyard/serverside_runner.rb

@@ -88,7 +88,7 @@ module EY
       end
 
       out << "Running command on #{@username}@#{@hostname}.\n"
-      out << cmd << "\n" if @verbose
+      out << cmd << "\n" if @verbose || ENV['PRINT_CMD']
 
       if ENV["NO_SSH"]
         out << "NO_SSH is set. No output.\n"

data/lib/engineyard/thor.rb

@@ -12,13 +12,9 @@ module EY
       @config ||= EY::Config.new
     end
 
+    # engineyard gem uses ui everywhere, thore supplies shell
     def ui
-      @ui ||= load_ui
-    end
-
-    def load_ui
-      Thor::Base.shell = EY::CLI::UI
-      EY::CLI::UI.new
+      shell
     end
 
     def in_repo?
@@ -45,7 +41,7 @@ module EY
 
     def use_default_environment
       if env = config.default_environment
-        ui.say "Using default environment #{config.default_environment.inspect} from ey.yml."
+        ui.info "Using default environment #{config.default_environment.inspect} from ey.yml."
         env
       end
     end

data/lib/engineyard/version.rb

@@ -1,4 +1,4 @@
 module EY
-  VERSION = '2.0.9'
-  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.0.3'
+  VERSION = '2.0.10'
+  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.0.4'
 end

data/spec/engineyard/cli/api_spec.rb

@@ -29,7 +29,9 @@ describe EY::CLI::API do
       EY::CLI::UI::Prompter.add_answer "my@email.example.com"
       EY::CLI::UI::Prompter.add_answer "secret"
 
-      @api = EY::CLI::API.new('http://fake.local', EY::CLI::UI.new)
+      capture_stdout do
+        @api = EY::CLI::API.new('http://fake.local', EY::CLI::UI.new)
+      end
     end
 
     it "asks you for your credentials" do

data/spec/engineyard/deploy_config_spec.rb

@@ -26,8 +26,13 @@ describe EY::DeployConfig::Migrate do
         @parent.should_receive(:set_environment_option).with('envname', 'migrate', true)
         @parent.should_receive(:set_environment_option).with('envname', 'migration_command', 'rake db:migrate')
         dc = deploy_config({})
-        dc.migrate.should be_true
-        dc.migrate_command.should == 'rake db:migrate'
+        out = capture_stdout do
+          dc.migrate.should be_true
+          dc.migrate_command.should == 'rake db:migrate'
+        end
+        out.should =~ /path: migrate settings saved for envname/
+        out.should =~ /You can override this default with --migrate or --no-migrate/
+        out.should =~ /Please git commit path with these new changes./
       end
 
       it "prompts migration_command if first answer is yes" do
@@ -36,16 +41,20 @@ describe EY::DeployConfig::Migrate do
         @parent.should_receive(:set_environment_option).with('envname', 'migrate', true)
         @parent.should_receive(:set_environment_option).with('envname', 'migration_command', 'ruby script/migrate')
         dc = deploy_config({})
-        dc.migrate.should be_true
-        dc.migrate_command.should == 'ruby script/migrate'
+        capture_stdout do
+          dc.migrate.should be_true
+          dc.migrate_command.should == 'ruby script/migrate'
+        end
       end
 
       it "doesn't prompt migration_command if first answer is no" do
         EY::CLI::UI::Prompter.add_answer "no" # default
         @parent.should_receive(:set_environment_option).with('envname', 'migrate', false)
         dc = deploy_config({})
-        dc.migrate.should be_false
-        dc.migrate_command.should be_nil
+        capture_stdout do
+          dc.migrate.should be_false
+          dc.migrate_command.should be_nil
+        end
       end
     end
 
@@ -120,7 +129,10 @@ describe EY::DeployConfig::Migrate do
         before { env_config('branch' => 'default') }
 
         it "uses the configured default if ref is not passed" do
-          deploy_config({}).ref.should == 'default'
+          out = capture_stdout do
+            deploy_config({}).ref.should == 'default'
+          end
+          out.should =~ /Using default branch "default" from ey.yml/
         end
 
         it "raises if a default is set and --ref is passed on the cli (and they don't match)" do
@@ -132,18 +144,27 @@ describe EY::DeployConfig::Migrate do
         end
 
         it "returns the ref if force_ref is set" do
-          deploy_config({'ref' => 'master', 'force_ref' => true}).ref.should == 'master'
+          out = capture_stdout do
+            deploy_config({'ref' => 'master', 'force_ref' => true}).ref.should == 'master'
+          end
+          out.should =~ /Default ref overridden with "master"/
         end
 
         it "returns the ref if force_ref is a branch" do
-          deploy_config({'force_ref' => 'master'}).ref.should == 'master'
+          out = capture_stdout do
+            deploy_config({'force_ref' => 'master'}).ref.should == 'master'
+          end
+          out.should =~ /Default ref overridden with "master"/
         end
       end
 
       context "no options, no default" do
         it "uses the repo's current branch" do
           @repo.should_receive(:current_branch).and_return('current')
-          deploy_config({}).ref.should == 'current'
+          out = capture_stdout do
+            deploy_config({}).ref.should == 'current'
+          end
+          out.should =~ /Using current HEAD branch "current"/
         end
       end
     end

data/spec/ey/deploy_spec.rb

@@ -69,9 +69,9 @@ describe "ey deploy" do
       ENV['NO_SSH'] = 'true'
     end
 
-    it "tells you that you need to add an appropriate ssh key" do
+    it "tells you that you need to add an appropriate ssh key (even with --quiet)" do
       login_scenario "one app, one environment"
-      fast_failing_ey %w[deploy --no-migrate]
+      fast_failing_ey %w[deploy --no-migrate --quiet]
       @err.should include("Authentication Failed")
     end
   end
@@ -249,19 +249,6 @@ describe "ey deploy" do
   end
 
   context "choosing something to deploy" do
-    define_git_repo('deploy test') do
-      # we'll have one commit on master
-      system("echo 'source :gemcutter' > Gemfile")
-      system("git add Gemfile")
-      system("git commit -m 'initial commit' >/dev/null 2>&1")
-
-      # and a tag
-      system("git tag -a -m 'version one' v1")
-
-      # and we need a non-master branch
-      system("git checkout -b current-branch >/dev/null 2>&1")
-    end
-
     use_git_repo('deploy test')
 
     before(:all) do
@@ -363,7 +350,7 @@ describe "ey deploy" do
       if @ssh_commands.last =~ /--config (.*?)(?: -|$)/
         # the echo strips off the layer of shell escaping, leaving us
         # with pristine JSON
-        JSON.parse `echo #{$1}`
+        MultiJson.load `echo #{$1}`
       end
     end
 

data/spec/ey/rebuild_spec.rb

@@ -11,7 +11,7 @@ describe "ey rebuild" do
   end
 
   def verify_ran(scenario)
-    @out.should =~ /Rebuilding #{scenario[:environment]}/
+    @out.should =~ /Updating instances on \w+\/#{scenario[:environment]}/
   end
 
   include_examples "it takes an environment name and an account name"

data/spec/ey/recipes/upload_spec.rb

@@ -3,10 +3,6 @@ require 'spec_helper'
 describe "ey recipes upload" do
   given "integration"
 
-  define_git_repo('+cookbooks') do |git_dir|
-    git_dir.join("cookbooks").mkdir
-    git_dir.join("cookbooks/file").open("w") {|f| f << "boo" }
-  end
   use_git_repo('+cookbooks')
 
   def command_to_run(opts)
@@ -26,9 +22,6 @@ end
 describe "ey recipes upload -f recipes.tgz" do
   given "integration"
 
-  define_git_repo('+recipes') do |git_dir|
-    link_recipes_tgz(git_dir)
-  end
   use_git_repo('+recipes')
 
   def command_to_run(opts)
@@ -73,15 +66,6 @@ describe "ey recipes upload from a separate cookbooks directory" do
   given "integration"
 
   context "without any git remotes" do
-    define_git_repo "only cookbooks, no remotes" do |git_dir|
-      `git --git-dir "#{git_dir}/.git" remote`.split("\n").each do |remote|
-        `git --git-dir "#{git_dir}/.git" remote rm #{remote}`
-      end
-
-      git_dir.join("cookbooks").mkdir
-      File.open(git_dir.join("cookbooks/file"), "w"){|f| f << "stuff" }
-    end
-
     use_git_repo "only cookbooks, no remotes"
 
     it "takes the environment specified by -e" do
@@ -102,17 +86,6 @@ describe "ey recipes upload from a separate cookbooks directory" do
   end
 
   context "with a git remote unrelated to any application" do
-    define_git_repo "only cookbooks, unrelated remotes" do |git_dir|
-      `git --git-dir "#{git_dir}/.git" remote`.split("\n").each do |remote|
-        `git --git-dir "#{git_dir}/.git" remote rm #{remote}`
-      end
-
-      `git remote add origin polly@pirate.example.com:wanna/cracker.git`
-
-      git_dir.join("cookbooks").mkdir
-      File.open(git_dir.join("cookbooks/file"), "w"){|f| f << "rawk" }
-    end
-
     use_git_repo "only cookbooks, unrelated remotes"
 
     it "takes the environment specified by -e" do

data/spec/ey/rollback_spec.rb

@@ -36,7 +36,7 @@ describe "ey rollback" do
       if @ssh_commands.last =~ /--config (.*?)(?: -|$)/
         # the echo strips off the layer of shell escaping, leaving us
         # with pristine JSON
-        JSON.parse `echo #{$1}`
+        MultiJson.load `echo #{$1}`
       end
     end
 

data/spec/ey/ssh_spec.rb

@@ -26,6 +26,7 @@ shared_examples_for "running ey ssh for select role" do
   def command_to_run(opts)
     cmd = ["ssh", opts[:ssh_command]].compact + (@ssh_flag || [])
     cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--quiet" if opts[:quiet]
     cmd
   end
 
@@ -42,6 +43,13 @@ shared_examples_for "running ey ssh for select role" do
     end.count.should == @hosts.count
   end
 
+  it "is quiet" do
+    login_scenario "one app, one environment"
+    ey command_to_run(:ssh_command => "ls", :environment => 'giblets', :quiet => true)
+    @out.should =~ /ssh.*ls/
+    @out.should_not =~ /Loading application data/
+  end
+
   it "raises an error when there are no matching hosts" do
     login_scenario "one app, one environment, no instances"
     ey command_to_run({:ssh_command => "ls", :environment => 'giblets', :verbose => true}), :expect_failure => true

data/spec/ey/status_spec.rb

@@ -25,6 +25,21 @@ describe "ey environments" do
     @out.should =~ /Deployed by:\s+One App Many Envs/
     @out.should =~ /Started at:/
     @out.should =~ /Finished at:/
-    @out.should =~ /This deployment was successful/
+    @out.should =~ /Deployment was successful/
+  end
+
+  it "quiets almost all of the output with --quiet" do
+    fast_ey %w[deploy -e giblets --ref HEAD --no-migrate]
+    fast_ey %w[status -e giblets -q]
+    @out.should_not =~ /Application:\s+rails232app/
+    @out.should_not =~ /Environment:\s+giblets/
+    @out.should_not =~ /Ref:\s+HEAD/
+    @out.should_not =~ /Resolved Ref:\s+resolved-HEAD/
+    @out.should_not =~ /Commit:\s+[a-f0-9]{40}/
+    @out.should_not =~ /Migrate:\s+false/
+    @out.should_not =~ /Deployed by:\s+One App Many Envs/
+    @out.should_not =~ /Started at:/
+    @out.should_not =~ /Finished at:/
+    @out.should =~ /Deployment was successful/
   end
 end

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ require 'net/ssh'
 require 'fakeweb'
 require 'fakeweb_matcher'
 
-require 'json'
+require 'multi_json'
 
 # Engineyard gem
 $LOAD_PATH.unshift(File.join(EY_ROOT, "lib"))
@@ -47,7 +47,6 @@ RSpec.configure do |config|
 
   config.extend SpecHelpers::GitRepoHelpers
   config.extend SpecHelpers::Given
-  config.extend SpecHelpers::Fixtures
 
   def clean_tmpdir
     TMPDIR.rmtree if TMPDIR.exist?
@@ -78,12 +77,6 @@ RSpec.configure do |config|
 
 end
 
-EY.define_git_repo("default") do |git_dir|
-  system("echo 'source :gemcutter' > Gemfile")
-  system("git add Gemfile")
-  system("git commit -m 'initial commit' >/dev/null 2>&1")
-end
-
 shared_examples_for "integration" do
   use_git_repo('default')
 

data/spec/support/git_repos.rb

@@ -24,6 +24,24 @@ module EY
       git_repo_dir_cache[name] = git_dir
     end
 
+    def chdir_to_repo(repo_name)
+      @_original_wd ||= []
+      @_original_wd << Dir.getwd
+      Dir.chdir(git_repo_dir(repo_name))
+    end
+
+    def chdir_return
+      Dir.chdir(@_original_wd.pop) if @_original_wd && @_original_wd.any?
+    end
+
+    def fixture_recipes_tgz
+      File.expand_path('../fixture_recipes.tgz', __FILE__)
+    end
+
+    def link_recipes_tgz(git_dir)
+      system("ln -s #{fixture_recipes_tgz} #{git_dir.join('recipes.tgz')}")
+    end
+
     protected
 
     def git_repo_setup
@@ -34,4 +52,64 @@ module EY
       @git_repo_dir_cache ||= {}
     end
   end
+
+  define_git_repo("default") do |git_dir|
+    system("echo 'source :gemcutter' > Gemfile")
+    system("git add Gemfile")
+    system("git commit -m 'initial commit' >/dev/null 2>&1")
+  end
+
+  define_git_repo('deploy test') do
+    # we'll have one commit on master
+    system("echo 'source :gemcutter' > Gemfile")
+    system("git add Gemfile")
+    system("git commit -m 'initial commit' >/dev/null 2>&1")
+
+    # and a tag
+    system("git tag -a -m 'version one' v1")
+
+    # and we need a non-master branch
+    system("git checkout -b current-branch >/dev/null 2>&1")
+  end
+
+  define_git_repo('+cookbooks') do |git_dir|
+    git_dir.join("cookbooks").mkdir
+    git_dir.join("cookbooks/file").open("w") {|f| f << "boo" }
+  end
+
+  define_git_repo('+recipes') do |git_dir|
+    link_recipes_tgz(git_dir)
+  end
+
+  define_git_repo "only cookbooks, no remotes" do |git_dir|
+    `git --git-dir "#{git_dir}/.git" remote`.split("\n").each do |remote|
+      `git --git-dir "#{git_dir}/.git" remote rm #{remote}`
+    end
+
+    git_dir.join("cookbooks").mkdir
+    File.open(git_dir.join("cookbooks/file"), "w"){|f| f << "stuff" }
+  end
+
+  define_git_repo "only cookbooks, unrelated remotes" do |git_dir|
+    `git --git-dir "#{git_dir}/.git" remote`.split("\n").each do |remote|
+      `git --git-dir "#{git_dir}/.git" remote rm #{remote}`
+    end
+
+    `git remote add origin polly@pirate.example.com:wanna/cracker.git`
+
+    git_dir.join("cookbooks").mkdir
+    File.open(git_dir.join("cookbooks/file"), "w"){|f| f << "rawk" }
+  end
+
+  define_git_repo('dup test') do
+    system("git remote add dup git://github.com/engineyard/dup.git")
+  end
+
+  define_git_repo("not actually a git repo") do |git_dir|
+    # in case we screw up and are not in a freshly-generated test
+    # git repository, don't blow away the thing we're developing
+    system("rm -rf .git") if `git remote -v`.include?("path/to/repo.git")
+    git_dir.join("cookbooks").mkdir
+    link_recipes_tgz(git_dir)
+  end
 end

data/spec/support/helpers.rb

@@ -12,16 +12,6 @@ module SpecHelpers
     end
   end
 
-  module Fixtures
-    def fixture_recipes_tgz
-      File.expand_path('../fixture_recipes.tgz', __FILE__)
-    end
-
-    def link_recipes_tgz(git_dir)
-      system("ln -s #{fixture_recipes_tgz} #{git_dir.join('recipes.tgz')}")
-    end
-  end
-
   module IntegrationHelpers
     def run_ey(command_options, ey_options={})
 
@@ -55,13 +45,11 @@ module SpecHelpers
 
     def use_git_repo(repo_name)
       before(:all) do
-        @_original_wd ||= []
-        @_original_wd << Dir.getwd
-        Dir.chdir(EY.git_repo_dir(repo_name))
+        EY.chdir_to_repo(repo_name)
       end
 
       after(:all) do
-        Dir.chdir(@_original_wd.pop)
+        EY.chdir_return
       end
     end
   end
@@ -93,11 +81,11 @@ module SpecHelpers
     ensure_eyrc
 
     begin
+      debug = options[:debug] ? 'true' : nil
       err, out = StringIO.new, StringIO.new
-      debug = options[:debug] == false ? nil : 'true'
       capture_stderr_into(err) do
         capture_stdout_into(out) do
-          with_env('DEBUG' => debug) do
+          with_env('DEBUG' => debug, 'PRINT_CMD' => 'true') do
             EY::CLI.start(args)
           end
         end
@@ -145,7 +133,8 @@ module SpecHelpers
     path_prepends = options[:prepend_to_path]
 
     ey_env = {
-      'DEBUG'     => 'true',
+      'DEBUG'     => ENV['DEBUG'],
+      'PRINT_CMD' => 'true',
       'EYRC'      => ENV['EYRC'],
       'CLOUD_URL' => ENV['CLOUD_URL'],
     }
@@ -282,7 +271,7 @@ module SpecHelpers
       if ENV.has_key?(k)
         old_env_vars[k] = ENV[k]
       end
-      ENV[k] = v
+      ENV[k] = v if v
     end
 
     retval = yield

data/spec/support/shared_behavior.rb

@@ -1,11 +1,6 @@
 require 'ostruct'
 
 shared_examples_for "it has an ambiguous git repo" do
-
-  define_git_repo('dup test') do
-    system("git remote add dup git://github.com/engineyard/dup.git")
-  end
-
   use_git_repo('dup test')
 
   before(:all) do
@@ -141,15 +136,6 @@ shared_examples_for "it takes an environment name" do
   end
 
   context "outside a git repo" do
-
-    define_git_repo("not actually a git repo") do |git_dir|
-      # in case we screw up and are not in a freshly-generated test
-      # git repository, don't blow away the thing we're developing
-      system("rm -rf .git") if `git remote -v`.include?("path/to/repo.git")
-      git_dir.join("cookbooks").mkdir
-      link_recipes_tgz(git_dir)
-    end
-
     use_git_repo("not actually a git repo")
 
     before :all do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -43,22 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +226,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -250,7 +234,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -299,6 +283,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem allows you to deploy your rails application to the Engine Yard
   cloud directly from the command line.
 email: cloud@engineyard.com
@@ -425,7 +425,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 961483598276783294
+      hash: 4323358539070812213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -434,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 961483598276783294
+      hash: 4323358539070812213
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24