engineyard 1.4.14 → 1.4.15

data/lib/engineyard/api.rb

@@ -82,7 +82,7 @@ module EY
       rescue RestClient::ResourceNotFound
         raise ResourceNotFound, "The requested resource could not be found"
       rescue RestClient::BadGateway
-        raise RequestFailed, "AppCloud API is temporarily unavailable. Please try again soon."
+        raise RequestFailed, "EY Cloud API is temporarily unavailable. Please try again soon."
       rescue RestClient::RequestFailed => e
         raise RequestFailed, "#{e.message} #{e.response}"
       rescue OpenSSL::SSL::SSLError

data/lib/engineyard/cli.rb

@@ -30,8 +30,9 @@ module EY
       command can be specified via --migrate "ruby do_migrations.rb". Migrations
       can also be skipped entirely by using --no-migrate.
     DESC
-    method_option :ignore_default_branch, :type => :boolean,
-      :desc => "Force a deploy of the specified branch even if a default is set"
+    method_option :force_ref, :type => :string, :aliases => %w(--ignore-default-branch -R),
+      :lazy_default => true,
+      :desc => "Force a deploy of the specified git ref even if a default is set in ey.yml."
     method_option :ignore_bad_master, :type => :boolean,
       :desc => "Force a deploy even if the master is in a bad state"
     method_option :migrate, :type => :string, :aliases => %w(-m),
@@ -40,7 +41,7 @@ module EY
     method_option :environment, :type => :string, :aliases => %w(-e),
       :desc => "Environment in which to deploy this application"
     method_option :ref, :type => :string, :aliases => %w(-r --branch --tag),
-      :desc => "Git ref to deploy. May be a branch, a tag, or a SHA."
+      :desc => "Git ref to deploy. May be a branch, a tag, or a SHA. Use -R to deploy a different ref if a default is set."
     method_option :app, :type => :string, :aliases => %w(-a),
       :desc => "Name of the application to deploy"
     method_option :account, :type => :string, :aliases => %w(-c),
@@ -55,10 +56,10 @@ module EY
       app, environment = fetch_app_and_environment(options[:app], options[:environment], options[:account])
       environment.ignore_bad_master = options[:ignore_bad_master]
       deploy_ref  = if options[:app]
-                      environment.resolve_branch(options[:ref], options[:ignore_default_branch]) ||
+                      environment.resolve_branch(options[:ref], options[:force_ref]) ||
                         raise(EY::Error, "When specifying the application, you must also specify the ref to deploy\nUsage: ey deploy --app <app name> --ref <branch|tag|ref>")
                     else
-                      environment.resolve_branch(options[:ref], options[:ignore_default_branch]) ||
+                      environment.resolve_branch(options[:ref], options[:force_ref]) ||
                         repo.current_branch ||
                         raise(DeployArgumentError)
                     end
@@ -124,7 +125,7 @@ module EY
         apps = api.apps_for_repo(repo)
 
         if apps.size > 1
-          message = "This git repo matches multiple Applications in AppCloud:\n"
+          message = "This git repo matches multiple Applications in EY Cloud:\n"
           apps.each { |app| message << "\t#{app.name}\n" }
           message << "The following environments contain those applications:\n\n"
           EY.ui.warn(message)
@@ -342,7 +343,7 @@ module EY
 
     desc "launch [--environment ENVIRONMENT] [--account ACCOUNT]", "Open application in browser."
     method_option :environment, :type => :string, :aliases => %w(-e),
-      :desc => "Environment with the interesting logs"
+      :desc => "Name of the environment"
     method_option :account, :type => :string, :aliases => %w(-c),
       :desc => "Name of the account in which the environment can be found"
     def launch

data/lib/engineyard/cli/api.rb

@@ -7,6 +7,9 @@ module EY
 
       def initialize(token = nil)
         @token = token
+        if ENV['ENGINEYARD_API_TOKEN']
+          @token = ENV['ENGINEYARD_API_TOKEN']
+        end
         @token ||= EY::EYRC.load.api_token
         @token ||= self.class.fetch_token
         raise EY::Error, "Sorry, we couldn't get your API token." unless @token

data/lib/engineyard/cli/recipes.rb

@@ -24,7 +24,7 @@ module EY
         "Upload custom chef recipes to specified environment so they can be applied."
       long_desc <<-DESC
         Make an archive of the "cookbooks/" subdirectory in your current working
-        directory and upload it to AppCloud's recipe storage.
+        directory and upload it to EY Cloud's recipe storage.
 
         Alternatively, specify a .tgz of a cookbooks/ directory yourself as follows:
 

data/lib/engineyard/model/environment.rb

@@ -115,11 +115,19 @@ module EY
         })
       end
 
-      def resolve_branch(branch, allow_non_default_branch=false)
-        if !allow_non_default_branch && branch && default_branch && (branch != default_branch)
-          raise BranchMismatchError.new(default_branch, branch)
+      # If force_ref is a string, use it as the ref, otherwise use it as a boolean.
+      def resolve_branch(ref, force_ref=false)
+        if String === force_ref
+          ref, force_ref = force_ref, true
+        end
+
+        if !ref
+          default_branch
+        elsif force_ref || !default_branch || ref == default_branch
+          ref
+        else
+          raise BranchMismatchError.new(default_branch, ref)
         end
-        branch || default_branch
       end
 
       def configuration

data/lib/engineyard/model/instance.rb

@@ -41,7 +41,7 @@ module EY
       ensure
         if deployment
           deployment.finished(successful, output)
-          EY.ui.info "#{successful ? 'Successful' : 'Failed'} deployment recorded in AppCloud"
+          EY.ui.info "#{successful ? 'Successful' : 'Failed'} deployment recorded in EY Cloud"
         end
       end
 

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.4.14'
+  VERSION = '1.4.15'
 end

data/spec/engineyard/api_spec.rb

@@ -34,6 +34,6 @@ describe EY::API do
 
     lambda {
       EY::API.fetch_token("a@b.com", "foo")
-    }.should raise_error(EY::API::RequestFailed, /AppCloud API is temporarily unavailable/)
+    }.should raise_error(EY::API::RequestFailed, /API is temporarily unavailable/)
   end
 end

data/spec/engineyard/cli/api_spec.rb

@@ -15,6 +15,12 @@ describe EY::CLI::API do
     EY::CLI::API.new.should == EY::CLI::API.new("asdf")
   end
 
+  it "uses the token from $ENGINEYARD_API_TOKEN if set" do
+    ENV['ENGINEYARD_API_TOKEN'] = 'envtoken'
+    EY::CLI::API.new.token.should == 'envtoken'
+    ENV.delete('ENGINEYARD_API_TOKEN')
+  end
+
   context "without saved api token" do
     before(:each) do
       FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :body => %|{"api_token": "asdf"}|, :content_type => 'application/json')

data/spec/ey/deploy_spec.rb

@@ -37,7 +37,7 @@ describe "ey deploy" do
 
   def verify_ran(scenario)
     @out.should match(/Beginning deploy of ref '[^']+' for '#{scenario[:application]}' in '#{scenario[:environment]}'/)
-    @out.should match(/deployment recorded in AppCloud/i)
+    @out.should match(/deployment recorded/i)
     @ssh_commands.should have_command_like(/engineyard-serverside.*deploy.*--app #{scenario[:application]}/)
   end
 
@@ -264,7 +264,7 @@ describe "ey deploy" do
         @ssh_commands.last.should =~ /--ref resolved-master/
       end
 
-      it "complains about a non-default branch without --ignore-default_branch" do
+      it "complains about a non-default branch without --ignore-default-branch" do
         fast_failing_ey %w[deploy -r current-branch]
         @err.should =~ /deploy branch is set to "master"/
       end
@@ -273,6 +273,11 @@ describe "ey deploy" do
         fast_ey %w[deploy -r current-branch --ignore-default-branch]
         @ssh_commands.last.should =~ /--ref resolved-current-branch/
       end
+
+      it "deploys a non-default branch with --R ref" do
+        fast_ey %w[deploy -R current-branch]
+        @ssh_commands.last.should =~ /--ref resolved-current-branch/
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 4
-  - 14
-  version: 1.4.14
+  - 15
+  version: 1.4.15
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 Z
+date: 2011-12-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement