engineyard 1.3.15 → 1.3.16

data/lib/engineyard/cli.rb

@@ -189,7 +189,7 @@ module EY
       raise NoCommandError.new if cmd.nil? and hosts.count != 1
 
       hosts.each do |host|
-        system "ssh #{environment.username}@#{host} #{cmd}"
+        system Escape.shell_command(['ssh', "#{environment.username}@#{host}", cmd].compact)
       end
     end
 

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.15'
+  VERSION = '1.3.16'
 end

data/spec/ey/deploy_spec.rb

@@ -11,7 +11,7 @@ describe "ey deploy without an eyrc file" do
   end
 
   it "prompts for authentication before continuing" do
-    ey("deploy", :hide_err => true) do |input|
+    ey(%w[deploy], :hide_err => true) do |input|
       input.puts("test@test.test")
       input.puts("test")
     end
@@ -28,12 +28,12 @@ describe "ey deploy" do
   given "integration"
 
   def command_to_run(opts)
-    cmd = "deploy"
-    cmd << " --environment #{opts[:environment]}" if opts[:environment]
-    cmd << " --app #{opts[:app]}" if opts[:app]
-    cmd << " --account #{opts[:account]}" if opts[:account]
-    cmd << " --ref #{opts[:ref]}" if opts[:ref]
-    cmd << " --verbose" if opts[:verbose]
+    cmd = ["deploy"]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--app"         << opts[:app]         if opts[:app]
+    cmd << "--account"     << opts[:account]     if opts[:account]
+    cmd << "--ref"         << opts[:ref]         if opts[:ref]
+    cmd << "--verbose"                           if opts[:verbose]
     cmd
   end
 
@@ -308,7 +308,7 @@ describe "ey deploy" do
     end
 
     it "passes the extra configuration to engineyard-serverside" do
-      ey "deploy --extra-deploy-hook-options some:stuff more:crap"
+      ey %w[deploy --extra-deploy-hook-options some:stuff more:crap]
       extra_deploy_hook_options.should_not be_nil
       extra_deploy_hook_options['some'].should == 'stuff'
       extra_deploy_hook_options['more'].should == 'crap'

data/spec/ey/ey_spec.rb

@@ -9,14 +9,14 @@ describe "ey" do
 
   context "run with an argument that is not a command" do
     it "tells the user that is not a command" do
-      ey "foobarbaz", :expect_failure => true
+      ey %w[foobarbaz], :expect_failure => true
       @err.should include("Could not find command")
     end
   end
 
   context "run a command and a bad flag" do
     it "tells the user that is not a valid flag" do
-      ey "help --expect-failure", :expect_failure => true
+      ey %w[help --expect-failure], :expect_failure => true
       @err.should include("Unknown switches")
     end
   end

data/spec/ey/list_environments_spec.rb

@@ -9,7 +9,7 @@ describe "ey environments" do
   end
 
   it "lists the environments your app is in" do
-    ey "environments"
+    ey %w[environments]
     @out.should include('rails232app (main)')
     @out.should =~ /giblets/
     @out.should =~ /bakon/
@@ -17,25 +17,25 @@ describe "ey environments" do
 
   it "reports failure to find a git repo when not in one" do
     Dir.chdir("/tmp") do
-      ey "environments", :expect_failure => true
+      ey %w[environments], :expect_failure => true
       @err.should =~ /fatal: No git remotes found in .*\/tmp/
       @out.should_not =~ /no application configured/
     end
   end
 
   it "lists all environments that have apps with -a" do
-    ey "environments -a"
+    ey %w[environments -a]
     @out.should include("bakon")
     @out.should include("giblets")
   end
 
   it "outputs simply with -s" do
-    ey "environments -s", :debug => false
+    ey %w[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
+    ey %w[environments -a -s], :debug => false
     @out.split(/\n/).sort.should == ["bakon", "beef", "giblets"]
   end
 
@@ -46,7 +46,7 @@ describe "ey environments with an ambiguous git repo" do
   it_should_behave_like "it has an ambiguous git repo"
 
   it "lists environments from all apps using the git repo" do
-    ey "environments"
+    ey %w[environments]
     @out.should =~ /git repo matches multiple/i
     @out.should include("giblets")
     @out.should include("keycollector_production")

data/spec/ey/logs_spec.rb

@@ -5,7 +5,7 @@ describe "ey logs" do
 
   it "prints logs returned by awsm" do
     api_scenario "one app, one environment"
-    ey "logs -e giblets"
+    ey %w[logs -e giblets]
     @out.should match(/MAIN LOG OUTPUT/)
     @out.should match(/CUSTOM LOG OUTPUT/)
     @err.should be_empty
@@ -13,7 +13,7 @@ describe "ey logs" do
 
   it "complains when it can't infer the environment" do
     api_scenario "one app, many environments"
-    ey "logs", :expect_failure => true
+    ey %w[logs], :expect_failure => true
     @err.should =~ /repository url in this directory is ambiguous/i
   end
 end
@@ -22,9 +22,9 @@ describe "ey logs" do
   given "integration"
 
   def command_to_run(opts)
-    cmd = "logs"
-    cmd << " --environment #{opts[:environment]}" if opts[:environment]
-    cmd << " --account #{opts[:account]}" if opts[:account]
+    cmd = ["logs"]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
     cmd
   end
 

data/spec/ey/rebuild_spec.rb

@@ -4,9 +4,9 @@ describe "ey rebuild" do
   given "integration"
 
   def command_to_run(opts)
-    cmd = "rebuild"
-    cmd << " --environment #{opts[:environment]}" if opts[:environment]
-    cmd << " --account #{opts[:account]}" if opts[:account]
+    cmd = ["rebuild"]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
     cmd
   end
 

data/spec/ey/recipes/apply_spec.rb

@@ -4,9 +4,9 @@ describe "ey recipes apply" do
   given "integration"
 
   def command_to_run(opts)
-    cmd = "recipes apply"
-    cmd << " -e #{opts[:environment]}" if opts[:environment]
-    cmd << " --account #{opts[:account]}" if opts[:account]
+    cmd = %w[recipes apply]
+    cmd << "-e"        << opts[:environment] if opts[:environment]
+    cmd << "--account" << opts[:account]     if opts[:account]
     cmd
   end
 
@@ -17,13 +17,13 @@ describe "ey recipes apply" do
   it_should_behave_like "it takes an environment name and an account name"
 
   it "fails when given a bad option" do
-    ey "web enable --lots --of --bogus --options", :expect_failure => true
+    ey %w[web enable --lots --of --bogus --options], :expect_failure => true
     @err.should include("Unknown switches")
   end
 end
 
 describe "ey recipes apply with an ambiguous git repo" do
   given "integration"
-  def command_to_run(_) "recipes apply" end
+  def command_to_run(_) %w[recipes apply] end
   it_should_behave_like "it requires an unambiguous git repo"
 end

data/spec/ey/recipes/download_spec.rb

@@ -15,9 +15,9 @@ describe "ey recipes download" do
   end
 
   def command_to_run(opts)
-    cmd = "recipes download"
-    cmd << " --environment #{opts[:environment]}" if opts[:environment]
-    cmd << " --account #{opts[:account]}" if opts[:account]
+    cmd = %w[recipes download]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
     cmd
   end
 
@@ -31,13 +31,13 @@ describe "ey recipes download" do
   it "fails when cookbooks/ already exists" do
     api_scenario "one app, one environment"
     Dir.mkdir("cookbooks")
-    ey "recipes download", :expect_failure => true
+    ey %w[recipes download], :expect_failure => true
     @err.should match(/cookbooks.*already exists/i)
   end
 end
 
 describe "ey recipes download with an ambiguous git repo" do
   given "integration"
-  def command_to_run(_) "recipes download" end
+  def command_to_run(_) %w[recipes download] end
   it_should_behave_like "it requires an unambiguous git repo"
 end

data/spec/ey/recipes/upload_spec.rb

@@ -10,9 +10,9 @@ describe "ey recipes upload" do
   use_git_repo('+cookbooks')
 
   def command_to_run(opts)
-    cmd = "recipes upload"
-    cmd << " --environment #{opts[:environment]}" if opts[:environment]
-    cmd << " --account #{opts[:account]}" if opts[:account]
+    cmd = %w[recipes upload]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
     cmd
   end
 
@@ -25,7 +25,7 @@ end
 
 describe "ey recipes upload with an ambiguous git repo" do
   given "integration"
-  def command_to_run(_) "recipes upload" end
+  def command_to_run(_) %w[recipes upload] end
   it_should_behave_like "it requires an unambiguous git repo"
 end
 
@@ -47,7 +47,7 @@ describe "ey recipes upload from a separate cookbooks directory" do
     it "takes the environment specified by -e" do
       api_scenario "one app, one environment"
 
-      ey "recipes upload -e giblets"
+      ey %w[recipes upload -e giblets]
       @out.should =~ /Recipes uploaded successfully/
     end
   end
@@ -69,7 +69,7 @@ describe "ey recipes upload from a separate cookbooks directory" do
     it "takes the environment specified by -e" do
       api_scenario "one app, one environment"
 
-      ey "recipes upload -e giblets"
+      ey %w[recipes upload -e giblets]
       @out.should =~ /Recipes uploaded successfully/
     end
 

data/spec/ey/rollback_spec.rb

@@ -4,11 +4,11 @@ describe "ey rollback" do
   given "integration"
 
   def command_to_run(opts)
-    cmd = "rollback"
-    cmd << " -e #{opts[:environment]}" if opts[:environment]
-    cmd << " -a #{opts[:app]}" if opts[:app]
-    cmd << " -c #{opts[:account]}" if opts[:account]
-    cmd << " --verbose" if opts[:verbose]
+    cmd = ["rollback"]
+    cmd << "-e" << opts[:environment] if opts[:environment]
+    cmd << "-a" << opts[:app]         if opts[:app]
+    cmd << "-c" << opts[:account]     if opts[:account]
+    cmd << "--verbose"                if opts[:verbose]
     cmd
   end
 
@@ -23,7 +23,7 @@ describe "ey rollback" do
 
   it "passes along the web server stack to engineyard-serverside" do
     api_scenario "one app, one environment"
-    ey "rollback"
+    ey %w[rollback]
     @ssh_commands.last.should =~ /--stack nginx_mongrel/
   end
 
@@ -41,7 +41,7 @@ describe "ey rollback" do
     end
 
     it "passes the extra configuration to engineyard-serverside" do
-      ey "rollback --extra-deploy-hook-options some:stuff more:crap"
+      ey %w[rollback --extra-deploy-hook-options some:stuff more:crap]
       extra_deploy_hook_options.should_not be_nil
       extra_deploy_hook_options['some'].should == 'stuff'
       extra_deploy_hook_options['more'].should == 'crap'
@@ -55,7 +55,7 @@ describe "ey rollback" do
       after { File.unlink("ey.yml") }
 
       it "overrides what's in ey.yml" do
-        ey "rollback --extra-deploy-hook-options beer:esb"
+        ey %w[rollback --extra-deploy-hook-options beer:esb]
         extra_deploy_hook_options['beer'].should == 'esb'
       end
     end

data/spec/ey/ssh_spec.rb

@@ -7,7 +7,13 @@ shared_examples_for "running ey ssh" do
   include Spec::Helpers::SharedIntegrationTestUtils
 
   def extra_ey_options
-    {:prepend_to_path => {'ssh' => "#!/bin/sh\necho ssh $*"}}
+    ssh_cmd = <<-RUBY
+#!#{`which ruby`}
+require "rubygems"
+require "escape"
+puts "ssh \#{Escape.shell_command(ARGV)}"
+    RUBY
+    {:prepend_to_path => {'ssh' => ssh_cmd}}
   end
 end
 
@@ -20,9 +26,8 @@ shared_examples_for "running ey ssh for select role" do
   end
 
   def command_to_run(opts)
-    cmd = "ssh #{opts[:ssh_command]}"
-    cmd << " #{@ssh_flag}"
-    cmd << " --environment #{opts[:environment]}" if opts[:environment]
+    cmd = ["ssh", opts[:ssh_command]].compact + (@ssh_flag || [])
+    cmd << "--environment" << opts[:environment] if opts[:environment]
     cmd
   end
 
@@ -60,7 +65,7 @@ describe "ey ssh" do
   end
 
   it "complains if it has no app master" do
-    ey "ssh -e bakon", :expect_failure => true
+    ey %w[ssh -e bakon], :expect_failure => true
     @err.should =~ /'bakon' does not have any matching instances/
   end
 
@@ -68,7 +73,7 @@ end
 
 describe "ey ssh with an ambiguous git repo" do
   it_should_behave_like "running ey ssh"
-  def command_to_run(_) "ssh ls" end
+  def command_to_run(_) %w[ssh ls] end
   it_should_behave_like "it requires an unambiguous git repo"
 end
 
@@ -76,9 +81,9 @@ describe "ey ssh without a command" do
   it_should_behave_like "running ey ssh"
 
   def command_to_run(opts)
-    cmd = "ssh"
-    cmd << " --environment #{opts[:environment]}" if opts[:environment]
-    cmd << " --account #{opts[:account]}" if opts[:account]
+    cmd = ["ssh"]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
     cmd
   end
 
@@ -94,9 +99,9 @@ describe "ey ssh with a command" do
   it_should_behave_like "running ey ssh"
 
   def command_to_run(opts)
-    cmd = "ssh ls"
-    cmd << " --environment #{opts[:environment]}" if opts[:environment]
-    cmd << " --account #{opts[:account]}" if opts[:account]
+    cmd = %w[ssh ls]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
     cmd
   end
 
@@ -108,9 +113,27 @@ describe "ey ssh with a command" do
   it_should_behave_like "it takes an environment name and an account name"
 end
 
+describe "ey ssh with a multi-part command" do
+  it_should_behave_like "running ey ssh"
+
+  def command_to_run(opts)
+    cmd = ['ssh', 'echo "echo"']
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
+    cmd
+  end
+
+  def verify_ran(scenario)
+    ssh_target = scenario[:ssh_username] + '@' + scenario[:master_hostname]
+    @raw_ssh_commands.should == ["ssh #{ssh_target} 'echo \"echo\"'"]
+  end
+
+  it_should_behave_like "it takes an environment name and an account name"
+end
+
 describe "ey ssh --all" do
   before do
-    @ssh_flag = "--all"
+    @ssh_flag = %w[--all]
     @hosts = %w(app_hostname 
                 app_master_hostname 
                 util_fluffy_hostname 
@@ -126,7 +149,7 @@ end
 
 describe "ey ssh --app-servers" do
   before do
-    @ssh_flag = "--app-servers"
+    @ssh_flag = %w[--app-servers]
     @hosts = %w(app_hostname app_master_hostname)
   end
 
@@ -136,7 +159,7 @@ end
 
 describe "ey ssh --db-master" do
   before do
-    @ssh_flag = "--db-master"
+    @ssh_flag = %w[--db-master]
     @hosts = %w(db_master_hostname)
   end
 
@@ -146,7 +169,7 @@ end
 
 describe "ey ssh --db-slaves" do
   before do
-    @ssh_flag = "--db-slaves"
+    @ssh_flag = %w[--db-slaves]
     @hosts = %w(db_slave_1_hostname db_slave_2_hostname)
   end
 
@@ -156,7 +179,7 @@ end
 
 describe "ey ssh --db-servers" do
   before do
-    @ssh_flag = "--db-servers"
+    @ssh_flag = %w[--db-servers]
     @hosts = %w(db_master_hostname db_slave_1_hostname db_slave_2_hostname)
   end
 
@@ -166,7 +189,7 @@ end
 
 describe "ey ssh --utilities" do
   before do
-    @ssh_flag = "--utilities"
+    @ssh_flag = %w[--utilities]
     @hosts = %w(util_fluffy_hostname util_rocky_hostname)
   end
 
@@ -176,7 +199,7 @@ end
 
 describe "ey ssh --utilities fluffy" do
   before do
-    @ssh_flag = "--utilities fluffy"
+    @ssh_flag = %w[--utilities fluffy]
     @hosts = %w(util_fluffy_hostname)
   end
 
@@ -186,7 +209,7 @@ end
 
 describe "ey ssh --utilities fluffy rocky" do
   before do
-    @ssh_flag = "--utilities fluffy rocky"
+    @ssh_flag = %w[--utilities fluffy rocky]
     @hosts = %w(util_fluffy_hostname util_rocky_hostname)
   end
 

data/spec/ey/web/disable_spec.rb

@@ -4,11 +4,11 @@ describe "ey web disable" do
   given "integration"
 
   def command_to_run(opts)
-    cmd = "web disable"
-    cmd << " -e #{opts[:environment]}" if opts[:environment]
-    cmd << " -a #{opts[:app]}" if opts[:app]
-    cmd << " -c #{opts[:account]}" if opts[:account]
-    cmd << " --verbose" if opts[:verbose]
+    cmd = %w[web disable]
+    cmd << "-e" << opts[:environment] if opts[:environment]
+    cmd << "-a" << opts[:app]         if opts[:app]
+    cmd << "-c" << opts[:account]     if opts[:account]
+    cmd << "--verbose"                if opts[:verbose]
     cmd
   end
 

data/spec/ey/web/enable_spec.rb

@@ -4,11 +4,11 @@ describe "ey web enable" do
   given "integration"
 
   def command_to_run(opts)
-    cmd = "web enable"
-    cmd << " -e #{opts[:environment]}" if opts[:environment]
-    cmd << " -a #{opts[:app]}" if opts[:app]
-    cmd << " -c #{opts[:account]}" if opts[:account]
-    cmd << " --verbose" if opts[:verbose]
+    cmd = %w[web enable]
+    cmd << "-e" << opts[:environment] if opts[:environment]
+    cmd << "-a" << opts[:app]         if opts[:app]
+    cmd << "-c" << opts[:account]     if opts[:account]
+    cmd << "--verbose"                if opts[:verbose]
     cmd
   end
 
@@ -20,7 +20,7 @@ describe "ey web enable" do
   it_should_behave_like "it invokes engineyard-serverside"
 
   it "fails when given a bad option" do
-    ey "web enable --lots --of --bogus --options", :expect_failure => true
+    ey %w[web enable --lots --of --bogus --options], :expect_failure => true
     @err.should include("Unknown switches")
   end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ end
 EY_ROOT = File.expand_path("../..", __FILE__)
 require 'rubygems'
 require 'bundler/setup'
+require 'escape'
 
 # Bundled gems
 require 'fakeweb'

data/spec/support/helpers.rb

@@ -69,7 +69,7 @@ module Spec
       $stdout = STDOUT
     end
 
-    def ey(cmd = nil, options = {}, &block)
+    def ey(args = [], options = {}, &block)
       hide_err = options.has_key?(:hide_err) ? options[:hide_err] : options[:expect_failure]
       path_prepends = options[:prepend_to_path]
 
@@ -94,7 +94,7 @@ module Spec
       eybin = File.expand_path('../bundled_ey', __FILE__)
 
       with_env(ey_env) do
-        exit_status = Open4::open4("#{eybin} #{cmd}") do |pid, stdin, stdout, stderr|
+        exit_status = Open4::open4("#{eybin} #{Escape.shell_command(args)}") do |pid, stdin, stdout, stderr|
           block.call(stdin) if block
           @err = stderr.read
           @out = stdout.read

data/spec/support/shared_behavior.rb

@@ -110,7 +110,7 @@ shared_examples_for "it takes an environment name and an account name" do
 
       it "returns the error message to the user" do
         lambda do
-          fast_ey(command_to_run({:environment => "giblets", :account => "main"}).split(" "))
+          fast_ey(command_to_run({:environment => "giblets", :account => "main"}))
         end.should raise_error(EY::Error, /400.*Important infos/)
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 59
+  prerelease: 
   segments: 
   - 1
   - 3
-  - 15
-  version: 1.3.15
+  - 16
+  version: 1.3.16
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -08:00
+date: 2011-02-16 00:00:00 -08:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,10 +30,10 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
-  requirement: *id001
+  prerelease: false
   type: :runtime
+  requirement: *id001
   name: thor
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,10 +46,10 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  requirement: *id002
+  prerelease: false
   type: :runtime
+  requirement: *id002
   name: rest-client
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,10 +62,10 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  requirement: *id003
+  prerelease: false
   type: :runtime
+  requirement: *id003
   name: highline
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -76,10 +76,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  prerelease: false
   type: :runtime
+  requirement: *id004
   name: json_pure
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -92,10 +92,10 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
-  requirement: *id005
+  prerelease: false
   type: :runtime
+  requirement: *id005
   name: escape
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -108,26 +108,160 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  requirement: *id006
+  prerelease: false
   type: :runtime
+  requirement: *id006
   name: engineyard-serverside-adapter
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 11
         segments: 
         - 2
+        - 1
         - 0
-        - 23
-        version: 2.0.23
-  requirement: *id007
+        version: 2.1.0
+  prerelease: false
   type: :runtime
+  requirement: *id007
   name: net-ssh
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  prerelease: false
+  type: :development
+  requirement: *id008
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id009
+  name: rake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id010
+  name: fakeweb
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id011
+  name: fakeweb-matcher
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id012
+  name: fakefs
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  prerelease: false
+  type: :development
+  requirement: *id013
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id014
+  name: sinatra
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 1
+        - 6
+        version: 0.1.6
+  prerelease: false
+  type: :development
+  requirement: *id015
+  name: realweb
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
   prerelease: false
+  type: :development
+  requirement: *id016
+  name: open4
 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: 
@@ -139,7 +273,6 @@ extra_rdoc_files: []
 files: 
 - bin/ey
 - lib/engineyard/api.rb
-- lib/engineyard/cli/#recipes.rb#
 - lib/engineyard/cli/api.rb
 - lib/engineyard/cli/recipes.rb
 - lib/engineyard/cli/ui.rb
@@ -240,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud

data/lib/engineyard/cli/#recipes.rb#

@@ -1,32 +0,0 @@
-module EY
-  class CLI
-    class Recipes < EY::Thor
-X1gx1GGG      desc "recipes apply [ENVIRONMENT]", <<-DESC
-Run uploaded chef recipes on specified environment.
-
-This is similar to '#{banner_base} rebuild' except Engine Yard's main
-configuration step is skipped.
-      DESC
-
-      def apply(name = nil)
-        environment = fetch_environment(name)
-        environment.run_custom_recipes
-        EY.ui.say "Uploaded recipes started for #{environment.name}"
-      end
-
-      desc "recipes upload [ENVIRONMENT]", <<-DESC
-Upload custom chef recipes to specified environment.
-
-The current directory should contain a subdirectory named "cookbooks" to be
-uploaded.
-      DESC
-
-      def upload(name = nil)
-        environment = fetch_environment(name)
-        environment.upload_recipes
-        EY.ui.say "Recipes uploaded successfully for #{environment.name}"
-      end
-    end
-  end
-
-end