engineyard 1.3.14 → 1.3.15

data/lib/engineyard/api.rb

@@ -68,7 +68,7 @@ module EY
       rescue RestClient::ResourceNotFound
         raise RequestFailed, "The requested resource could not be found"
       rescue RestClient::RequestFailed => e
-        raise RequestFailed, "#{e.message}"
+        raise RequestFailed, "#{e.message} #{e.response}"
       rescue OpenSSL::SSL::SSLError
         raise RequestFailed, "SSL is misconfigured on your cloud"
       end

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

@@ -0,0 +1,32 @@
+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

data/lib/engineyard/cli/ui.rb

@@ -2,6 +2,31 @@ module EY
   class CLI
     class UI < Thor::Base.shell
 
+      class Prompter
+        class Mock
+          def next_answer=(arg)
+            @answers ||= []
+            @answers << arg
+          end
+          def ask(*args, &block)
+            @questions ||= []
+            @questions << args.first
+            @answers.pop
+          end
+          attr_reader :questions
+        end
+        def self.enable_mock!
+          @backend = Mock.new
+        end
+        def self.backend
+          require 'highline'
+          @backend ||= HighLine.new($stdin)
+        end
+        def self.ask(*args, &block)
+          backend.ask(*args, &block)
+        end
+      end
+
       def error(name, message = nil)
         begin
           orig_out, $stdout = $stdout, $stderr
@@ -45,14 +70,12 @@ module EY
 
       def ask(message, password = false)
         begin
-          require 'highline'
-          @hl ||= HighLine.new($stdin)
           if not $stdin.tty?
-            @hl.ask(message)
+            Prompter.ask(message)
           elsif password
-            @hl.ask(message) {|q| q.echo = "*" }
+            Prompter.ask(message) {|q| q.echo = "*" }
           else
-            @hl.ask(message) {|q| q.readline = true }
+            Prompter.ask(message) {|q| q.readline = true }
           end
         rescue EOFError
           return ''

data/lib/engineyard/version.rb

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

data/spec/engineyard/cli/api_spec.rb

@@ -22,14 +22,15 @@ describe EY::CLI::API do
     before(:each) do
       FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :body => %|{"api_token": "asdf"}|, :content_type => 'application/json')
 
-      capture_stdio("\n\n") do
-        @token = EY::CLI::API.new
-      end
+      EY::CLI::UI::Prompter.enable_mock!
+      EY::CLI::UI::Prompter.backend.next_answer = "my@email.example.com"
+      EY::CLI::UI::Prompter.backend.next_answer = "secret"
+
+      @token = EY::CLI::API.new
     end
 
     it "asks you for your credentials" do
-      @out.should include("Email:")
-      @out.should include("Password:")
+      EY::CLI::UI::Prompter.backend.questions.should == ["Email: ","Password: "]
     end
 
     it "gets the api token" do

data/spec/engineyard/cli_spec.rb

@@ -4,6 +4,7 @@ require 'engineyard/cli'
 describe EY::CLI do
 
   it "sets up EY.ui" do
+    EY.instance_eval{ @ui = nil }
     EY.ui.should be_an(EY::UI)
     capture_stdout do
       EY::CLI.start(["help"])

data/spec/ey/deploy_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'net/ssh'
 
 describe "ey deploy without an eyrc file" do
 
@@ -50,6 +51,23 @@ end
 describe "ey deploy" do
   given "integration"
 
+  context "without ssh keys (with ssh enabled)" do
+    before do
+      ENV['NO_SSH'] = nil
+      Net::SSH.stub!(:start).and_raise(Net::SSH::AuthenticationFailed.new("no key"))
+    end
+
+    after do
+      ENV['NO_SSH'] = 'true'
+    end
+
+    it "tells you that you need to add an appropriate ssh key" do
+      api_scenario "one app, one environment"
+      fast_failing_ey ["deploy"]
+      @err.should include("Authentication Failed")
+    end
+  end
+
   context "with invalid input" do
     it "complains when there is no app" do
       api_scenario "empty"

data/spec/support/helpers.rb

@@ -36,7 +36,7 @@ module Spec
     def fast_failing_ey(*args)
       begin
         fast_ey(*args)
-        raise ZeroExitStatus
+        raise ZeroExitStatus.new(@out, @err)
       rescue SystemExit => exit_status
         # SystemExit typically indicates a bogus command, which we
         # here in expected-to-fail land are entirely happy with.

data/spec/support/shared_behavior.rb

@@ -100,6 +100,21 @@ shared_examples_for "it takes an environment name and an account name" do
           :ssh_username     => 'turkey',
         }))
     end
+
+    context "when the backend raises an error" do
+      before do
+        failed_response = RestClient::Response.create(
+          '{ "message": "Important infos about how you failed!"}', OpenStruct.new(:code => 400), nil)
+        RestClient.stub!(:send).and_raise(RestClient::RequestFailed.new(failed_response))
+      end
+
+      it "returns the error message to the user" do
+        lambda do
+          fast_ey(command_to_run({:environment => "giblets", :account => "main"}).split(" "))
+        end.should raise_error(EY::Error, /400.*Important infos/)
+      end
+    end
+
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 3
-  - 14
-  version: 1.3.14
+  - 15
+  version: 1.3.15
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -08:00
+date: 2011-02-11 00:00:00 -08:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,9 +31,9 @@ dependencies:
         - 6
         version: 0.14.6
   requirement: *id001
+  type: :runtime
   name: thor
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,9 +47,9 @@ dependencies:
         - 0
         version: 1.6.0
   requirement: *id002
+  type: :runtime
   name: rest-client
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,9 +63,9 @@ dependencies:
         - 1
         version: 1.6.1
   requirement: *id003
+  type: :runtime
   name: highline
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,9 +77,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
+  type: :runtime
   name: json_pure
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -93,9 +93,9 @@ dependencies:
         - 4
         version: 0.0.4
   requirement: *id005
+  type: :runtime
   name: escape
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -109,9 +109,9 @@ dependencies:
         - 0
         version: 1.4.0
   requirement: *id006
+  type: :runtime
   name: engineyard-serverside-adapter
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -125,9 +125,9 @@ dependencies:
         - 23
         version: 2.0.23
   requirement: *id007
+  type: :runtime
   name: net-ssh
   prerelease: false
-  type: :runtime
 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,6 +139,7 @@ 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
@@ -201,7 +202,19 @@ has_rdoc: true
 homepage: http://github.com/engineyard/engineyard
 licenses: []
 
-post_install_message: 
+post_install_message: |+
+  
+  Welcome to Engine Yard!
+   
+  Deploying for the first time? The Engine Yard Pandas want to help you! 
+  
+  Email pandas@engineyard.com with your questions or queries. 
+  (Panda = 1. Polite Agent of Non-Destructive Assimilation; 2. Cute fluffy animal.)
+   
+  We wish you every success with your business!
+   
+   - The Pandas
+  
 rdoc_options: []
 
 require_paths: