engineyard 1.3.17 → 1.3.18

data/README.rdoc

@@ -5,13 +5,16 @@ Command:
   ey deploy
 
   Options:
-    -r, --branch, --tag, [--ref=REF]       # Git ref to deploy. May be a branch, a tag, or a SHA.
-                [--ignore-bad-master]      # Force a deploy even if the master is in a bad state
-    -v, [--verbose]                        # Be verbose
-    -a, [--app=APP]                        # Name of the application to deploy
-    -m, [--migrate=MIGRATE]                # Run migrations via [MIGRATE], defaults to 'rake db:migrate'; use --no-migrate to avoid running migrations
-                [--ignore-default-branch]  # Force a deploy of the specified branch even if a default is set
-    -e, [--environment=ENVIRONMENT]        # Environment in which to deploy this application
+    -r, --branch, --tag, [--ref=REF]          # Git ref to deploy. May be a branch, a tag, or a SHA.
+        [--ignore-bad-master]                 # Force a deploy even if the master is in a bad state
+    -v, [--verbose]                           # Be verbose
+    -a, [--app=APP]                           # Name of the application to deploy
+    -m, [--migrate=MIGRATE]                   # Run migrations via [MIGRATE], defaults to 'rake db:migrate'; use --no-migrate to avoid running migrations
+        [--ignore-default-branch]             # Force a deploy of the specified branch even if a default is set
+    -e, [--environment=ENVIRONMENT]           # Environment in which to deploy this application
+    -c, [--account=ACCOUNT]                   # Name of the account in which the environment can be found
+        [--extra-deploy-hook-options key:val] # Additional options to be made available in deploy hooks (in the 'config' hash)
+
 
   Description:
     This command must be run with the current directory containing the app to be deployed. If ey.yml specifies a default branch then the ref parameter can be omitted. Furthermore,
@@ -35,6 +38,7 @@ Command:
 
   Options:
     -e, [--environment=ENVIRONMENT]  # Environment with the interesting logs
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
   Description:
     Displays Engine Yard configuration logs for all servers in the environment. If recipes were uploaded to the environment & run, their logs will also be displayed beneath the
@@ -45,6 +49,7 @@ Command:
 
   Options:
     -e, [--environment=ENVIRONMENT]  # Environment to rebuild
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
   Description:
     Engine Yard's main configuration run occurs on all servers. Mainly used to fix failed configuration of new or existing servers, or to update servers to latest Engine Yard stack
@@ -59,6 +64,7 @@ Command:
     -v, [--verbose]                  # Be verbose
     -a, [--app=APP]                  # Name of the application to roll back
     -e, [--environment=ENVIRONMENT]  # Environment in which to roll back the application
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
   Description:
     Uses code from previous deploy in the "/data/APP_NAME/releases" directory on remote server(s) to restart application servers.
@@ -68,6 +74,7 @@ Command:
 
   Options:
     -e, [--environment=ENVIRONMENT]  # Environment in which to apply recipes
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
   Description:
     This is similar to 'ey rebuild' except Engine Yard's main configuration step is skipped.
@@ -77,6 +84,7 @@ Command:
 
   Options:
     -e, [--environment=ENVIRONMENT]  # Environment that will receive the recipes
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
   Description:
     The current directory should contain a subdirectory named "cookbooks" to be uploaded.
@@ -86,6 +94,7 @@ Command:
 
   Options:
     -e, [--environment=ENVIRONMENT]  # Environment for which to download the recipes
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
   Description:
     The recipes will be unpacked into a directory called "cookbooks" in the current directory.
@@ -99,6 +108,7 @@ Command:
     -v, [--verbose]                  # Be verbose
     -a, [--app=APP]                  # Name of the application whose maintenance page will be removed
     -e, [--environment=ENVIRONMENT]  # Environment on which to take down the maintenance page
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
   Remove the maintenance page for this application in the given environment.
 
@@ -109,6 +119,7 @@ Command:
     -v, [--verbose]                  # Be verbose
     -a, [--app=APP]                  # Name of the application whose maintenance page will be put up
     -e, [--environment=ENVIRONMENT]  # Environment on which to put up the maintenance page
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
   Description:
     The maintenance page is taken from the app currently being deployed. This means that you can customize maintenance pages to tell users the reason for downtime on every
@@ -128,6 +139,7 @@ Command:
     -a, [--all]                      # Run command on all servers
         [--db-slaves]                # Run command on the slave database servers
     -e, [--environment=ENVIRONMENT]  # Environment to ssh into
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
 
   Description:
     If a command is supplied, it will be run, otherwise a session will be opened. The application master is used for environments with clusters. Option --all requires a command to

data/bin/ey

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$:.unshift(File.expand_path('../../lib', __FILE__))
 require 'engineyard/cli'
 
 begin

data/lib/engineyard/api.rb

@@ -4,6 +4,8 @@ module EY
   class API
     attr_reader :token
 
+    USER_AGENT_STRING = "EngineYardCLI/#{VERSION}"
+
     def initialize(token = nil)
       @token ||= token
       @token ||= self.class.read_token
@@ -47,10 +49,11 @@ module EY
       require 'json'
 
       url = EY.config.endpoint + "api/v2#{path}"
-      method = ((meth = opts.delete(:method)) && meth.to_s || "get").downcase.to_sym
+      method = (opts.delete(:method) || 'get').to_s.downcase.to_sym
       params = opts.delete(:params) || {}
       headers = opts.delete(:headers) || {}
       headers["Accept"] ||= "application/json"
+      headers["User-Agent"] = USER_AGENT_STRING
 
       begin
         EY.ui.debug("Request", "#{method.to_s.upcase} #{url}")
@@ -67,6 +70,8 @@ module EY
         raise RequestFailed, "Could not reach the cloud API"
       rescue RestClient::ResourceNotFound
         raise RequestFailed, "The requested resource could not be found"
+      rescue RestClient::BadGateway
+        raise RequestFailed, "AppCloud 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

@@ -126,6 +126,7 @@ module EY
       EY.ui.debug("Rebuilding #{environment.name}")
       environment.rebuild
     end
+    map "update" => :rebuild
 
     desc "rollback [--environment ENVIRONMENT]", "Rollback to the previous deploy."
     long_desc <<-DESC
@@ -186,7 +187,7 @@ module EY
       environment = fetch_environment(options[:environment], options[:account])
       hosts = ssh_hosts(options, environment)
 
-      raise NoCommandError.new if cmd.nil? and hosts.count != 1
+      raise NoCommandError.new if cmd.nil? and hosts.size != 1
 
       hosts.each do |host|
         system Escape.shell_command(['ssh', "#{environment.username}@#{host}", cmd].compact)

data/lib/engineyard/cli/recipes.rb

@@ -2,13 +2,13 @@ module EY
   class CLI
     class Recipes < EY::Thor
       desc "apply [--environment ENVIRONMENT]",
-        "Run chef recipes uploaded by the 'recipes upload' command on the specified environment."
+        "Run chef recipes uploaded by '#{banner_base} recipes upload' on the specified environment."
       long_desc <<-DESC
         This is similar to '#{banner_base} rebuild' except Engine Yard's main
         configuration step is skipped.
 
-        The cookbook uploaded by the 'recipes upload' command will be run when
-        you run 'recipes apply'.
+        The cookbook uploaded by the '#{banner_base} recipes upload' command will be run when
+        you run '#{banner_base} recipes apply'.
       DESC
 
       method_option :environment, :type => :string, :aliases => %w(-e),
@@ -17,27 +17,54 @@ module EY
         :desc => "Name of the account in which the environment can be found"
       def apply
         environment = fetch_environment(options[:environment], options[:account])
-        environment.run_custom_recipes
-        EY.ui.say "Uploaded recipes started for #{environment.name}"
+        apply_recipes(environment)
       end
 
       desc "upload [--environment ENVIRONMENT]",
         "Upload custom chef recipes to specified environment so they can be applied."
       long_desc <<-DESC
-        The current working directory should contain a subdirectory named "cookbooks"
-        that is the collection of recipes to be uploaded.
+        Make an archive of the "cookbooks/" subdirectory in your current working
+        directory and upload it to AppCloud's recipe storage.
 
-        The uploaded cookbook will be run when executing 'recipes apply'.
+        Alternatively, specify a .tgz of a cookbooks/ directory yourself as follows:
+
+        $ #{banner_base} recipes upload -f path/to/recipes.tgz
+
+        The uploaded cookbooks will be run when executing '#{banner_base} recipes apply'
+        and also automatically each time you update/rebuild your instances.
       DESC
 
       method_option :environment, :type => :string, :aliases => %w(-e),
         :desc => "Environment that will receive the recipes"
       method_option :account, :type => :string, :aliases => %w(-c),
         :desc => "Name of the account in which the environment can be found"
+      method_option :apply, :type => :boolean,
+        :desc => "Apply the recipes immediately after they are uploaded"
+      method_option :file, :type => :string, :aliases => %w(-f),
+        :desc => "Specify a gzipped tar file (.tgz) for upload instead of cookbooks/ directory"
       def upload
         environment = fetch_environment(options[:environment], options[:account])
-        environment.upload_recipes
-        EY.ui.say "Recipes uploaded successfully for #{environment.name}"
+        upload_recipes(environment, options[:file])
+        if options[:apply]
+          apply_recipes(environment)
+        end
+      end
+
+      no_tasks do
+        def apply_recipes(environment)
+          environment.run_custom_recipes
+          EY.ui.say "Uploaded recipes started for #{environment.name}"
+        end
+
+        def upload_recipes(environment, filename)
+          if options[:file]
+            environment.upload_recipes_at_path(options[:file])
+            EY.ui.say "Recipes file #{options[:file]} uploaded successfully for #{environment.name}"
+          else
+            environment.tar_and_upload_recipes_in_cookbooks_dir
+            EY.ui.say "Recipes in cookbooks/ uploaded successfully for #{environment.name}"
+          end
+        end
       end
 
       desc "download [--environment ENVIRONMENT]",

data/lib/engineyard/cli/ui.rb

@@ -28,43 +28,33 @@ module EY
       end
 
       def error(name, message = nil)
-        begin
-          orig_out, $stdout = $stdout, $stderr
-          if message
-            say_status name, message, :red
-          elsif name
-            say name, :red
-          end
-        ensure
-          $stdout = orig_out
-        end
+        $stdout = $stderr
+        say_with_status(name, message, :red)
+      ensure
+        $stdout = STDOUT
       end
 
       def warn(name, message = nil)
-        if message
-          say_status name, message, :yellow
-        elsif name
-          say name, :yellow
-        end
+        say_with_status(name, message, :yellow)
       end
 
       def info(name, message = nil)
-        if message
-          say_status name, message, :green
-        elsif name
-          say name, :green
-        end
+        say_with_status(name, message, :green)
       end
 
       def debug(name, message = nil)
-        return unless ENV["DEBUG"]
+        if ENV["DEBUG"]
+          name    = name.inspect    unless name.nil? or name.is_a?(String)
+          message = message.inspect unless message.nil? or message.is_a?(String)
+          say_with_status(name, message, :blue)
+        end
+      end
 
+      def say_with_status(name, message=nil, color=nil)
         if message
-          message = message.inspect unless message.is_a?(String)
-          say_status name, message, :blue
+          say_status name, message, color
         elsif name
-          name = name.inspect unless name.is_a?(String)
-          say name, :cyan
+          say name, color
         end
       end
 

data/lib/engineyard/model/environment.rb

@@ -71,6 +71,7 @@ module EY
         tmp = Tempfile.new("recipes")
         tmp.write(api.request("/environments/#{id}/recipes"))
         tmp.flush
+        tmp.close
 
         cmd = "tar xzf '#{tmp.path}' cookbooks"
 
@@ -79,27 +80,36 @@ module EY
         end
       end
 
-      def upload_recipes(file_to_upload = recipe_file)
-        api.request("/environments/#{id}/recipes",
-          :method => :post,
-          :params => {:file => file_to_upload}
-          )
+      def upload_recipes_at_path(recipes_path)
+        recipes_path = Pathname.new(recipes_path)
+        if recipes_path.exist?
+          upload_recipes recipes_path.open('r')
+        else
+          raise EY::Error, "Recipes file not found: #{recipes_path}"
+        end
       end
 
-      def recipe_file
+      def tar_and_upload_recipes_in_cookbooks_dir
         require 'tempfile'
         unless File.exist?("cookbooks")
           raise EY::Error, "Could not find chef recipes. Please run from the root of your recipes repo."
         end
 
-        tmp = Tempfile.new("recipes")
-        cmd = "tar czf '#{tmp.path}' cookbooks/"
+        recipes_file = Tempfile.new("recipes")
+        cmd = "tar czf '#{recipes_file.path}' cookbooks/"
 
         unless system(cmd)
           raise EY::Error, "Could not archive recipes.\nCommand `#{cmd}` exited with an error."
         end
 
-        tmp
+        upload_recipes(recipes_file)
+      end
+
+      def upload_recipes(file_to_upload)
+        api.request("/environments/#{id}/recipes", {
+          :method => :post,
+          :params => {:file => file_to_upload}
+        })
       end
 
       def resolve_branch(branch, allow_non_default_branch=false)

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.17'
+  VERSION = '1.3.18'
 end

data/spec/engineyard/api_spec.rb

@@ -53,4 +53,11 @@ describe EY::API do
     }.should raise_error(EY::Error)
   end
 
+  it "raises RequestFailed with a friendly error when cloud is under maintenance" do
+    FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :status => 502, :content_type => 'text/html')
+
+    lambda {
+      EY::API.fetch_token("a@b.com", "foo")
+    }.should raise_error(EY::API::RequestFailed, /AppCloud API is temporarily unavailable/)
+  end
 end

data/spec/ey/recipes/upload_spec.rb

@@ -17,12 +17,52 @@ describe "ey recipes upload" do
   end
 
   def verify_ran(scenario)
-    @out.should =~ /Recipes uploaded successfully for #{scenario[:environment]}/
+    @out.should =~ %r|Recipes in cookbooks/ uploaded successfully for #{scenario[:environment]}|
   end
 
   it_should_behave_like "it takes an environment name and an account name"
 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)
+    cmd = %w[recipes upload]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
+    cmd << "-f" << "recipes.tgz"
+    cmd
+  end
+
+  def verify_ran(scenario)
+    @out.should =~ %r|Recipes file recipes.tgz uploaded successfully for #{scenario[:environment]}|
+  end
+
+  it_should_behave_like "it takes an environment name and an account name"
+end
+
+describe "ey recipes upload -f with a missing filenamen" do
+  given "integration"
+  def command_to_run(opts)
+    cmd = %w[recipes upload]
+    cmd << "--environment" << opts[:environment] if opts[:environment]
+    cmd << "--account"     << opts[:account]     if opts[:account]
+    cmd << "-f" << "recipes.tgz"
+    cmd
+  end
+
+  it "errors with file not found" do
+    api_scenario "one app, one environment"
+    ey(%w[recipes upload --environment giblets -f recipes.tgz], :expect_failure => true)
+    @err.should match(/Recipes file not found: recipes.tgz/i)
+  end
+end
+
 describe "ey recipes upload with an ambiguous git repo" do
   given "integration"
   def command_to_run(_) %w[recipes upload] end
@@ -48,7 +88,16 @@ describe "ey recipes upload from a separate cookbooks directory" do
       api_scenario "one app, one environment"
 
       ey %w[recipes upload -e giblets]
-      @out.should =~ /Recipes uploaded successfully/
+      @out.should =~ %r|Recipes in cookbooks/ uploaded successfully|
+      @out.should_not =~ /Uploaded recipes started for giblets/
+    end
+
+    it "applies the recipes with --apply" do
+      api_scenario "one app, one environment"
+
+      ey %w[recipes upload -e giblets --apply]
+      @out.should =~ %r|Recipes in cookbooks/ uploaded successfully|
+      @out.should =~ /Uploaded recipes started for giblets/
     end
   end
 
@@ -70,7 +119,7 @@ describe "ey recipes upload from a separate cookbooks directory" do
       api_scenario "one app, one environment"
 
       ey %w[recipes upload -e giblets]
-      @out.should =~ /Recipes uploaded successfully/
+      @out.should =~ %r|Recipes in cookbooks/ uploaded successfully|
     end
 
   end

data/spec/spec_helper.rb

@@ -45,6 +45,7 @@ Spec::Runner.configure do |config|
   config.include Spec::Helpers
   config.include Spec::GitRepo
   config.extend Spec::Helpers::SemanticNames
+  config.extend Spec::Helpers::Fixtures
 
   config.before(:all) do
     FakeWeb.allow_net_connect = false