engineyard 0.4.0 → 0.5.0

data/lib/engineyard/model/instance.rb

@@ -3,7 +3,7 @@ require 'escape'
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :status, :amazon_id, :public_hostname, :environment)
-      EYSD_VERSION = "~>0.4.0"
+      EYSD_VERSION = "~>0.4.1"
       CHECK_SCRIPT = <<-SCRIPT
 require "rubygems"
 requirement = Gem::Requirement.new("#{EYSD_VERSION}")
@@ -29,7 +29,8 @@ exit(17) # required_version < current_version
 
       alias :hostname :public_hostname
 
-      def deploy!(app, ref, migration_command=nil, extra_configuration=nil)
+
+      def deploy(app, ref, migration_command=nil, extra_configuration=nil)
         deploy_cmd = [eysd_path, 'deploy', '--app', app.name, '--branch', ref]
 
         if extra_configuration
@@ -43,18 +44,42 @@ exit(17) # required_version < current_version
         ssh Escape.shell_command(deploy_cmd)
       end
 
-      def ensure_eysd_present!
+      def rollback(app, extra_configuration=nil)
+        deploy_cmd = [eysd_path, 'deploy', 'rollback', '--app', app.name]
+
+        if extra_configuration
+          deploy_cmd << '--config' << extra_configuration.to_json
+        end
+
+        ssh Escape.shell_command(deploy_cmd)
+      end
+
+
+      def put_up_maintenance_page(app)
+        ssh Escape.shell_command([
+            eysd_path, 'deploy', 'enable_maintenance_page', '--app', app.name
+          ])
+      end
+
+      def take_down_maintenance_page(app)
+        ssh Escape.shell_command([
+            eysd_path, 'deploy', 'disable_maintenance_page', '--app', app.name
+          ])
+      end
+
+
+      def ensure_eysd_present
         case ey_deploy_check
         when :ssh_failed
           raise EnvironmentError, "SSH connection to #{hostname} failed"
         when :eysd_missing
           yield :installing if block_given?
-          install_ey_deploy!
+          install_ey_deploy
         when :too_new
           raise EnvironmentError, "server-side component too new; please upgrade your copy of the engineyard gem."
         when :too_old
           yield :upgrading if block_given?
-          upgrade_ey_deploy!
+          upgrade_ey_deploy
         when :ok
           # no action needed
         else
@@ -66,26 +91,20 @@ exit(17) # required_version < current_version
         require 'base64'
         encoded_script = Base64.encode64(CHECK_SCRIPT).gsub(/\n/, '')
         ssh "#{ruby_path} -r base64 -e \"eval Base64.decode64(ARGV[0])\" #{encoded_script}", false
-        EXIT_STATUS[$?.exitstatus]
-      end
-
-      def install_ey_deploy!
-        ssh(Escape.shell_command(['sudo', gem_path, 'install', 'ey-deploy', '-v', EYSD_VERSION]))
-      end
-
-      def rollback!(app, extra_configuration=nil)
-        deploy_cmd = [eysd_path, 'deploy', 'rollback', '--app', app.name]
-
-        if extra_configuration
-          deploy_cmd << '--config' << extra_configuration.to_json
+        if ENV["NO_SSH"]
+          :ok
+        else
+          EXIT_STATUS[$?.exitstatus]
         end
+      end
 
-        ssh Escape.shell_command(deploy_cmd)
+      def install_ey_deploy
+        ssh(Escape.shell_command(['sudo', gem_path, 'install', 'ey-deploy', '--no-rdoc', '--no-ri', '-v', EYSD_VERSION]))
       end
 
-      def upgrade_ey_deploy!
+      def upgrade_ey_deploy
         ssh "sudo #{gem_path} uninstall -a -x ey-deploy"
-        install_ey_deploy!
+        install_ey_deploy
       end
 
     private

data/lib/engineyard/repo.rb

@@ -6,9 +6,13 @@ module EY
     end
 
     def current_branch
-      head = File.read(File.join(@path, ".git/HEAD")).chomp
-      if head.gsub!("ref: refs/heads/", "")
-        head
+      if File.directory?(File.join(@path, ".git"))
+        head = File.read(File.join(@path, ".git/HEAD")).chomp
+        if head.gsub!("ref: refs/heads/", "")
+          head
+        else
+          nil
+        end
       else
         nil
       end

data/lib/engineyard/thor.rb

@@ -9,17 +9,56 @@ module EY
     end
 
     no_tasks do
-      def subcommand_args
-        @@original_args[1..-1]
+      def self.subcommands
+        @@subcommands ||= {}
       end
 
       def self.subcommand(subcommand, subcommand_class)
+        subcommand = subcommand.to_s
+        subcommands[subcommand] = subcommand_class
+        subcommand_class.subcommand_help subcommand
         define_method(subcommand) { |*_| subcommand_class.start(subcommand_args) }
       end
+
+      def self.subcommand_help(cmd)
+        desc "help #{cmd} [SUBCOMMAND]", "Describe all subcommands or one specific subcommand."
+
+        class_eval <<-RUBY
+def help(*args)
+  super
+  if args.empty?
+    banner = "See '" + self.class.send(:banner_base) + " help #{cmd} [SUBCOMMAND]' "
+    text = "for more information on a specific subcommand."
+    EY.ui.say  banner + text
+  end
+end
+        RUBY
+      end
+
+      def subcommand_args
+        @@original_args[1..-1]
+      end
+
+      def self.printable_tasks(all=true)
+        (all ? all_tasks : tasks).map do |_, task|
+          item = []
+          item << banner(task)
+          item << (task.description ? "# #{task.description.gsub(/\n.*/,'')}" : "")
+          item
+        end
+      end
     end
 
     protected
 
+    def self.handle_no_task_error(task)
+      if self.banner_base == "thor"
+        raise UndefinedTaskError, "Could not find command #{task.inspect} in #{namespace.inspect} namespace."
+      else
+        raise UndefinedTaskError, "Could not find command #{task.inspect}."
+      end
+    end
+
     def self.exit_on_failure?
       true
     end
@@ -32,6 +71,20 @@ module EY
       @repo ||= EY::Repo.new
     end
 
+    def loudly_check_eysd(environment)
+      environment.ensure_eysd_present do |action|
+        case action
+        when :installing
+          EY.ui.warn "Instance does not have server-side component installed"
+          EY.ui.info "Installing server-side component..."
+        when :upgrading
+          EY.ui.info "Upgrading server-side component..."
+        else
+          # nothing slow is happening, so there's nothing to say
+        end
+      end
+    end
+
     # if an app is supplied, it is used as a constraint for implied environment lookup
     def fetch_environment(env_name, app = nil)
       env_name ||= EY.config.default_environment

data/spec/engineyard/api_spec.rb

@@ -8,7 +8,7 @@ describe EY::API do
 
   context "fetching the token from EY cloud" do
     before(:each) do
-      FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :body => %|{"api_token": "asdf"}|)
+      FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :body => %|{"api_token": "asdf"}|, :content_type => 'application/json')
       @token = EY::API.fetch_token("a@b.com", "foo")
     end
 
@@ -46,7 +46,7 @@ describe EY::API do
   end
 
   it "raises InvalidCredentials when the credentials are invalid" do
-    FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :status => 401)
+    FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :status => 401, :content_type => 'application/json')
 
     lambda {
       EY::API.fetch_token("a@b.com", "foo")

data/spec/engineyard/cli/api_spec.rb

@@ -20,7 +20,7 @@ describe EY::CLI::API do
 
   context "without saved api token" do
     before(:each) do
-      FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :body => %|{"api_token": "asdf"}|)
+      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

data/spec/engineyard/model/environment_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "EY::Model::Environment#rebuild" do
-  it_should_behave_like "it has an api"
+  given "it has an api"
 
   it "hits the rebuild action in the API" do
     env = EY::Model::Environment.from_hash({
@@ -22,7 +22,7 @@ describe "EY::Model::Environment#rebuild" do
 end
 
 describe "EY::Model::Environment#run_custom_recipes" do
-  it_should_behave_like "it has an api"
+  given "it has an api"
 
   it "hits the rebuild action in the API" do
     env = EY::Model::Environment.from_hash({
@@ -33,7 +33,8 @@ describe "EY::Model::Environment#run_custom_recipes" do
     FakeWeb.register_uri(
       :put,
       "https://cloud.engineyard.com/api/v2/environments/#{env.id}/run_custom_recipes",
-      :body => ''
+      :body => '',
+      :content_type => 'application/json'
     )
 
     env.run_custom_recipes
@@ -56,7 +57,7 @@ describe "EY::Model::Environment.from_array" do
 end
 
 describe "EY::Model::Environment#instances" do
-  it_should_behave_like "it has an api"
+  given "it has an api"
 
   it "returns instances" do
     env = EY::Model::Environment.from_hash({
@@ -72,8 +73,9 @@ describe "EY::Model::Environment#instances" do
     }
     FakeWeb.register_uri(:get,
       "https://cloud.engineyard.com/api/v2/environments/#{env.id}/instances",
-      :body => {"instances" => [instance_data]}.to_json)
-
+      :body => {"instances" => [instance_data]}.to_json,
+      :content_type => 'application/json'
+    )
 
     env.should have(1).instances
     env.instances.first.should == EY::Model::Instance.from_hash(instance_data.merge(:environment => env))

data/spec/ey/deploy_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "ey deploy without an eyrc file" do
 
-  it_should_behave_like "an integration test without an eyrc file"
+  given "integration without an eyrc file"
 
   before(:each) do
     FileUtils.rm_rf(ENV['EYRC'])
@@ -22,8 +22,27 @@ describe "ey deploy without an eyrc file" do
   end
 end
 
+
 describe "ey deploy" do
-  it_should_behave_like "an integration test"
+  given "integration"
+
+  def command_to_run(options)
+    cmd = "deploy"
+    cmd << " -e #{options[:env]}" if options[:env]
+    cmd
+  end
+
+  def verify_ran(scenario)
+    @out.should match(/Running deploy for '#{scenario[:environment]}'/)
+  end
+
+  # common behavior
+  it_should_behave_like "it takes an environment name"
+  it_should_behave_like "it invokes eysd"
+end
+
+describe "ey deploy" do
+  given "integration"
 
   context "with invalid input" do
     it "complains when there is no app" do
@@ -32,15 +51,9 @@ describe "ey deploy" do
       @err.should include(%|no application configured|)
     end
 
-    it "complains when you specify a nonexistent environment" do
-      api_scenario "one app, one environment"
-      ey "deploy typo-happens-here master", :expect_failure => true
-      @err.should match(/no environment named 'typo-happens-here'/i)
-    end
-
     it "complains when the specified environment does not contain the app" do
       api_scenario "one app, one environment, not linked"
-      ey "deploy giblets master", :expect_failure => true
+      ey "deploy -e giblets -r master", :expect_failure => true
       @err.should match(/does not run this application/i)
     end
 
@@ -52,19 +65,12 @@ describe "ey deploy" do
 
     it "complains when the app master is in a non-running state" do
       api_scenario "one app, one environment, app master red"
-      ey "deploy giblets master", :expect_failure => true
+      ey "deploy --environment giblets --ref master", :expect_failure => true
       @err.should_not match(/No running instances/i)
       @err.should match(/running.*\(green\)/)
     end
   end
 
-  it "runs when environment is known" do
-    api_scenario "one app, one environment"
-    ey "deploy", :hide_err => true
-    @out.should match(/running deploy/i)
-    @err.should be_empty
-  end
-
   context "migration command" do
     before(:each) do
       api_scenario "one app, one environment"
@@ -86,11 +92,6 @@ describe "ey deploy" do
       @ssh_commands.last.should =~ /eysd deploy/
       @ssh_commands.last.should_not =~ /--migrate/
     end
-
-    it "can be disabled with --no-migrate in the middle of the command line" do
-      ey "deploy --no-migrate giblets master"
-      @ssh_commands.last.should_not =~ /--migrate/
-    end
   end
 
   context "choosing something to deploy" do
@@ -120,14 +121,24 @@ describe "ey deploy" do
       end
 
       it "deploys another branch if given" do
-        ey "deploy giblets master"
+        ey "deploy --ref master"
         @ssh_commands.last.should =~ /--branch master/
       end
 
       it "deploys a tag if given" do
-        ey "deploy giblets v1"
+        ey "deploy --ref v1"
         @ssh_commands.last.should =~ /--branch v1/
       end
+
+      it "allows using --branch to specify a branch" do
+        ey "deploy --branch master"
+        @ssh_commands.last.should match(/--branch master/)
+      end
+
+      it "allows using --tag to specify the tag" do
+        ey "deploy --tag v1"
+        @ssh_commands.last.should match(/--branch v1/)
+      end
     end
 
     context "when there is extra configuration" do
@@ -160,12 +171,12 @@ describe "ey deploy" do
       end
 
       it "complains about a non-default branch without --force" do
-        ey "deploy giblets current-branch", :expect_failure => true
+        ey "deploy -r current-branch", :expect_failure => true
         @err.should =~ /deploy branch is set to "master"/
       end
 
       it "deploys a non-default branch with --force" do
-        ey "deploy giblets current-branch --force"
+        ey "deploy -r current-branch --force"
         @ssh_commands.last.should =~ /--branch current-branch/
       end
     end
@@ -176,72 +187,26 @@ describe "ey deploy" do
       api_scenario "one app, many similarly-named environments"
     end
 
-    it "lets you choose by unambiguous substring" do
-      ey "deploy prod"
-      @out.should match(/Running deploy for 'railsapp_production'/)
-    end
-
     it "lets you choose by complete name even if the complete name is ambiguous" do
-      ey "deploy railsapp_staging"
+      ey "deploy --environment railsapp_staging"
       @out.should match(/Running deploy for 'railsapp_staging'/)
     end
-
-    it "complains when given an ambiguous substring" do
-      # NB: there's railsapp_staging and railsapp_staging_2
-      ey "deploy staging", :hide_err => true, :expect_failure => true
-      @err.should match(/'staging' is ambiguous/)
-    end
   end
 
-  context "eysd install" do
+  context "specifying the application" do
     before(:all) do
       api_scenario "one app, one environment"
+      Dir.chdir(File.expand_path("~"))
     end
 
-    before(:each) do
-      ENV.delete "NO_SSH"
-    end
-
-    after(:each) do
-      ENV['NO_SSH'] = "true"
-    end
-
-    def exiting_ssh(exit_code)
-      "#!/usr/bin/env ruby\n exit!(#{exit_code}) if ARGV.to_s =~ /Base64.decode64/"
-    end
-
-    it "raises an error if SSH fails" do
-      ey "deploy", :prepend_to_path => {'ssh' => exiting_ssh(255)}, :expect_failure => true
-      @err.should =~ /SSH connection to \S+ failed/
-    end
-
-    it "installs ey-deploy if it's missing" do
-      ey "deploy", :prepend_to_path => {'ssh' => exiting_ssh(104)}
-
-      gem_install_command = @ssh_commands.find do |command|
-        command =~ /gem install ey-deploy/
-      end
-      gem_install_command.should =~ %r{/usr/local/ey_resin/ruby/bin/gem install}
-    end
-
-    it "upgrades ey-deploy if it's too old" do
-      ey "deploy", :prepend_to_path => {'ssh' => exiting_ssh(70)}
-      @ssh_commands.should have_command_like(/gem uninstall -a -x ey-deploy/)
-      @ssh_commands.should have_command_like(/gem install ey-deploy/)
-    end
-
-    it "raises an error if ey-deploy is too new" do
-      ey "deploy", :prepend_to_path => {'ssh' => exiting_ssh(17)}, :expect_failure => true
-      @ssh_commands.should_not have_command_like(/gem install ey-deploy/)
-      @ssh_commands.should_not have_command_like(/eysd deploy/)
-      @err.should match(/too new/i)
+    it "allows you to specify an app when not in a directory" do
+      ey "deploy --app rails232app --ref master"
+      @ssh_commands.last.should match(/deploy --app rails232app --branch master --migrate 'rake db:migrate'/)
     end
 
-    it "does not change ey-deploy if its version is satisfactory" do
-      ey "deploy", :prepend_to_path => {'ssh' => exiting_ssh(0)}
-      @ssh_commands.should_not have_command_like(/gem install ey-deploy/)
-      @ssh_commands.should_not have_command_like(/gem uninstall.* ey-deploy/)
-      @ssh_commands.should have_command_like(/eysd deploy/)
+    it "requires that you specify a ref when specifying the application" do
+      ey "deploy --app rails232app", :expect_failure => true
+      @err.should match(/you must also specify the ref to deploy/)
     end
   end
 end