engineyard 0.3.3 → 0.4.0

data/lib/engineyard.rb

@@ -1,7 +1,7 @@
 module EY
   require 'engineyard/ruby_ext'
 
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 
   autoload :API,        'engineyard/api'
   autoload :Collection, 'engineyard/collection'

data/lib/engineyard/api.rb

@@ -34,6 +34,10 @@ module EY
       apps.find{|a| repo.urls.include?(a.repository_uri) }
     end
 
+    def app_for_repo!(repo)
+      app_for_repo(repo) || raise(NoAppError.new(repo))
+    end
+
     class InvalidCredentials < EY::Error; end
     class RequestFailed < EY::Error; end
 
@@ -69,8 +73,8 @@ module EY
         raise RequestFailed, "SSL is misconfigured on your cloud"
       end
 
-      if resp.code == 204
-        data = nil
+      if resp.body.empty?
+        data = ''
       else
         begin
           data = JSON.parse(resp.body)

data/lib/engineyard/cli.rb

@@ -21,11 +21,39 @@ module EY
     method_option :migrate, :type => :string, :aliases => %w(-m),
       :default => 'rake db:migrate',
       :desc => "Run migrations via [MIGRATE], defaults to 'rake db:migrate'; use --no-migrate to avoid running migrations"
-    method_option :install_eysd, :type => :boolean, :aliases => %(-s),
-      :desc => "Force remote install of eysd"
     def deploy(env_name = nil, branch = nil)
-      require 'engineyard/cli/action/deploy'
-      EY::CLI::Action::Deploy.call(env_name, branch, options)
+      app           = api.app_for_repo!(repo)
+      environment   = fetch_environment(env_name, app)
+      deploy_branch = environment.resolve_branch(branch, options[:force]) ||
+        repo.current_branch ||
+        raise(DeployArgumentError)
+
+      EY.ui.info "Connecting to the server..."
+
+      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
+
+      EY.ui.info "Running deploy for '#{environment.name}' on server..."
+
+      if environment.deploy!(app, deploy_branch, options[:migrate])
+        EY.ui.info "Deploy complete"
+      else
+        raise EY::Error, "Deploy failed"
+      end
+
+    rescue NoEnvironmentError => e
+      # Give better feedback about why we couldn't find the environment.
+      exists = api.environments.named(env_name)
+      raise exists ? EnvironmentUnlinkedError.new(env_name) : e
     end
 
     desc "environments [--all]", "List cloud environments for this app, or all environments"
@@ -37,14 +65,31 @@ module EY
     end
     map "envs" => :environments
 
-    desc "rebuild [ENV]", "Rebuild environment (ensure configuration is up-to-date)"
+    desc "rebuild [ENVIRONMENT]", "Rebuild environment (ensure configuration is up-to-date)"
     def rebuild(name = nil)
       env = fetch_environment(name)
       EY.ui.debug("Rebuilding #{env.name}")
       env.rebuild
     end
 
-    desc "ssh [ENV]", "Open an ssh session to the environment's application server"
+    desc "rollback [ENVIRONMENT]", "Rollback to the previous deploy"
+    def rollback(name = nil)
+      app    = api.app_for_repo!(repo)
+      env    = fetch_environment(name)
+
+      if env.app_master
+        EY.ui.info("Rolling back #{env.name}")
+        if env.rollback!(app)
+          EY.ui.info "Rollback complete"
+        else
+          raise EY::Error, "Rollback failed"
+        end
+      else
+        raise NoAppMaster.new(env.name)
+      end
+    end
+
+    desc "ssh [ENVIRONMENT]", "Open an ssh session to the environment's application server"
     def ssh(name = nil)
       env = fetch_environment(name)
 
@@ -55,7 +100,7 @@ module EY
       end
     end
 
-    desc "logs [ENV]", "Retrieve the latest logs for an environment"
+    desc "logs [ENVIRONMENT]", "Retrieve the latest logs for an environment"
     def logs(name = nil)
       fetch_environment(name).logs.each do |log|
         EY.ui.info log.instance_name

data/lib/engineyard/cli/api.rb

@@ -23,10 +23,6 @@ module EY
         @token = self.class.fetch_token
       end
 
-      def fetch_app_for_repo(repo)
-        app_for_repo(repo) || raise(NoAppError.new(repo))
-      end
-
       def self.fetch_token
         EY.ui.warn("The engineyard gem is prerelease software. Please do not use")
         EY.ui.warn("this tool to deploy to mission-critical environments, yet.")

data/lib/engineyard/cli/recipes.rb

@@ -1,14 +1,22 @@
 module EY
   class CLI
     class Recipes < EY::Thor
+
+      desc "recipes apply [ENV]", "Apply uploaded chef recipes on ENV"
+      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 [ENV]", "Upload custom chef recipes from the current directory to ENV"
       def upload(name = nil)
-        if fetch_environment(name).upload_recipes
-          EY.ui.say "Recipes uploaded successfully"
-        else
-          EY.ui.error "Recipes upload failed"
-        end
+        environment = fetch_environment(name)
+        environment.upload_recipes
+        EY.ui.say "Recipes uploaded successfully for #{environment.name}"
       end
+
     end
   end
+
 end

data/lib/engineyard/collection/environments.rb

@@ -18,8 +18,7 @@ module EY
       end
 
       def match_one!(name_part)
-        match_one(name_part) or raise EnvironmentError,
-        "Environment containing '#{name_part}' can't be found\nYou can create it at #{EY.config.endpoint}"
+        match_one(name_part) or raise NoEnvironmentError.new(name_part)
       end
 
     private

data/lib/engineyard/error.rb

@@ -9,76 +9,65 @@ module EY
 
   class NoAppError < Error
     def initialize(repo)
-      @repo = repo
-    end
-
-    def message
       error = [%|There is no application configured for any of the following remotes:|]
-      @repo.urls.each{|url| error << %|\t#{url}| }
+      repo.urls.each{|url| error << %|\t#{url}| }
       error << %|You can add this application at #{EY.config.endpoint}|
-        error.join("\n")
+      super error.join("\n")
     end
   end
 
   class NoAppMaster < EY::Error
     def initialize(env_name)
-      @env_name = env_name
+      super "The environment '#{env_name}' does not have a master instance."
     end
+  end
 
-    def message
-      "The environment '#{@env_name}' does not have a master instance."
+  class BadAppMasterStatus < EY::Error
+    def initialize(master_status)
+      super "Application master's status is not \"running\" (green); it is \"#{master_status}\"."
     end
   end
 
   class EnvironmentError < EY::Error
   end
 
-  class AmbiguousEnvironmentName < EY::Error
+  class AmbiguousEnvironmentName < EY::EnvironmentError
     def initialize(name, matches)
-      @name, @matches = name, matches
-    end
-
-    def message
-      pretty_names = @matches.map {|x| "'#{x}'"}.join(', ')
-      "The name '#{@name}' is ambiguous; it matches all of the following environment names: #{pretty_names}.\nPlease use a longer, unambiguous substring or the entire environment name."
+      pretty_names = matches.map {|x| "'#{x}'"}.join(', ')
+      super "The name '#{name}' is ambiguous; it matches all of the following environment names: #{pretty_names}.\n" +
+      "Please use a longer, unambiguous substring or the entire environment name."
     end
   end
 
-  class NoSingleEnvironmentError < EY::Error
+  class NoSingleEnvironmentError < EY::EnvironmentError
     def initialize(app)
-      @envs = app.environments
-    end
-
-    def message
-      "Unable to determine a single environment for the current application (found #{@envs.size} environments)"
+      size = app.environments.size
+      super "Unable to determine a single environment for the current application (found #{size} environments)"
     end
   end
 
-  class NoEnvironmentError < EY::Error
+  class NoEnvironmentError < EY::EnvironmentError
     def initialize(env_name=nil)
-      @env_name = env_name
+      super "No environment named '#{env_name}'\nYou can create one at #{EY.config.endpoint}"
     end
+  end
 
-    def message
-      "No environment named '#{@env_name}'\nYou can create one at #{EY.config.endpoint}"
+  class EnvironmentUnlinkedError < EY::Error
+    def initialize(env_name)
+      super "Environment '#{env_name}' exists but does not run this application."
     end
   end
 
   class BranchMismatch < EY::Error
     def initialize(default_branch, branch)
-      super(nil)
-      @default_branch, @branch = default_branch, branch
-    end
-
-    def message
-      %|Your deploy branch is set to "#{@default_branch}".\n| +
-        %|If you want to deploy branch "#{@branch}", use --force.|
+      super %|Your deploy branch is set to "#{default_branch}".\n| +
+        %|If you want to deploy branch "#{branch}", use --force.|
     end
   end
 
   class DeployArgumentError < EY::Error
-    def message
-      %|"deploy" was called incorrectly. Call as "deploy [ENVIRONMENT] [BRANCH]"\n| +
+    def initialize
+      super %|"deploy" was called incorrectly. Call as "deploy [ENVIRONMENT] [BRANCH]"\n| +
         %|You can set default environments and branches in ey.yml|
     end
   end

data/lib/engineyard/model/environment.rb

@@ -21,10 +21,36 @@ module EY
         Instance.from_array(api_get("/environments/#{id}/instances")["instances"], :environment => self)
       end
 
+      def app_master!
+        master = app_master
+        if master.nil?
+          raise NoAppMaster.new(name)
+        elsif master.status != "running"
+          raise BadAppMasterStatus.new(master.status)
+        end
+        master
+      end
+
+      def ensure_eysd_present!(&blk)
+        app_master!.ensure_eysd_present!(&blk)
+      end
+
+      def deploy!(app, ref, migration_command=nil)
+        app_master!.deploy!(app, ref, migration_command, config)
+      end
+
+      def rollback!(app)
+        app_master!.rollback!(app, config)
+      end
+
       def rebuild
         api.request("/environments/#{id}/rebuild", :method => :put)
       end
 
+      def run_custom_recipes
+        api.request("/environments/#{id}/run_custom_recipes", :method => :put)
+      end
+
       def upload_recipes(file_to_upload = recipe_file)
         api.request("/environments/#{id}/recipes",
           :method => :post,
@@ -39,7 +65,7 @@ module EY
         end
 
         tmp = Tempfile.new("recipes")
-        cmd = "git archive --format=tar HEAD cookbooks | gzip > #{tmp.path}"
+        cmd = "tar czf '#{tmp.path}' cookbooks/"
 
         unless system(cmd)
           raise EY::Error, "Could not archive recipes.\nCommand `#{cmd}` exited with an error."
@@ -48,11 +74,22 @@ module EY
         tmp
       end
 
+      def resolve_branch(branch, allow_non_default_branch=false)
+        if !allow_non_default_branch && branch && default_branch && (branch != default_branch)
+          raise BranchMismatch.new(default_branch, branch)
+        end
+        branch || default_branch
+      end
+
       def configuration
         EY.config.environments[self.name]
       end
       alias_method :config, :configuration
 
+      def default_branch
+        EY.config.default_branch(name)
+      end
+
       def shorten_name_for(app)
         name.gsub(/^#{Regexp.quote(app.name)}_/, '')
       end

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.3.3"
+      EYSD_VERSION = "~>0.4.0"
       CHECK_SCRIPT = <<-SCRIPT
 require "rubygems"
 requirement = Gem::Requirement.new("#{EYSD_VERSION}")
@@ -43,6 +43,25 @@ exit(17) # required_version < current_version
         ssh Escape.shell_command(deploy_cmd)
       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!
+        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!
+        when :ok
+          # no action needed
+        else
+          raise EY::Error, "Internal error: Unexpected status from Instance#ey_deploy_check; got #{eysd_status.inspect}"
+        end
+      end
+
       def ey_deploy_check
         require 'base64'
         encoded_script = Base64.encode64(CHECK_SCRIPT).gsub(/\n/, '')
@@ -54,6 +73,16 @@ exit(17) # required_version < current_version
         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
+        end
+
+        ssh Escape.shell_command(deploy_cmd)
+      end
+
       def upgrade_ey_deploy!
         ssh "sudo #{gem_path} uninstall -a -x ey-deploy"
         install_ey_deploy!

data/lib/engineyard/thor.rb

@@ -20,6 +20,10 @@ module EY
 
     protected
 
+    def self.exit_on_failure?
+      true
+    end
+
     def api
       @api ||= EY::CLI::API.new
     end
@@ -28,11 +32,13 @@ module EY
       @repo ||= EY::Repo.new
     end
 
-    def fetch_environment(env_name)
-      if env_name.nil?
-        api.fetch_app_for_repo(repo).sole_environment!
+    # 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
+      if env_name
+        (app || api).environments.match_one!(env_name)
       else
-        api.environments.match_one!(env_name)
+        (app || api.app_for_repo!(repo)).sole_environment!
       end
     end
 

data/spec/engineyard/model/environment_spec.rb

@@ -9,9 +9,11 @@ describe "EY::Model::Environment#rebuild" do
         "api" => @api,
       })
 
-    FakeWeb.register_uri(:put,
+    FakeWeb.register_uri(
+      :put,
       "https://cloud.engineyard.com/api/v2/environments/#{env.id}/rebuild",
-      :body => {}.to_json)
+      :body => ''
+    )
 
     env.rebuild
 
@@ -19,6 +21,27 @@ describe "EY::Model::Environment#rebuild" do
   end
 end
 
+describe "EY::Model::Environment#run_custom_recipes" do
+  it_should_behave_like "it has an api"
+
+  it "hits the rebuild action in the API" do
+    env = EY::Model::Environment.from_hash({
+        "id" => 46534,
+        "api" => @api,
+      })
+
+    FakeWeb.register_uri(
+      :put,
+      "https://cloud.engineyard.com/api/v2/environments/#{env.id}/run_custom_recipes",
+      :body => ''
+    )
+
+    env.run_custom_recipes
+
+    FakeWeb.should have_requested(:put, "https://cloud.engineyard.com/api/v2/environments/#{env.id}/run_custom_recipes")
+  end
+end
+
 describe "EY::Model::Environment.from_array" do
   it "returns a smart collection, not just a dumb array" do
     api_data = [
@@ -57,6 +80,45 @@ describe "EY::Model::Environment#instances" do
   end
 end
 
+describe "EY::Model::Environment#app_master!" do
+  def make_env_with_master(app_master)
+    if app_master
+      app_master = {
+        "id" => 44206,
+        "role" => "solo",
+      }.merge(app_master)
+    end
+
+    EY::Model::Environment.from_hash({
+        "id" => 11830,
+        "name" => "guinea-pigs-are-delicious",
+        "app_master" => app_master,
+        "instances" => [app_master],
+      })
+  end
+
+
+  it "returns the app master if it's present and running" do
+    env = make_env_with_master("status" => "running")
+    env.app_master!.should_not be_nil
+    env.app_master!.id.should == 44206
+  end
+
+  it "raises an error if the app master is in a non-running state" do
+    env = make_env_with_master("status" => "error")
+    lambda {
+      env.app_master!
+    }.should raise_error(EY::BadAppMasterStatus)
+  end
+
+  it "raises an error if the app master is absent" do
+    env = make_env_with_master(nil)
+    lambda {
+      env.app_master!
+    }.should raise_error(EY::NoAppMaster)
+  end
+end
+
 describe "EY::Model::Environment#shorten_name_for(app)" do
   def short(environment_name, app_name)
     env = EY::Model::Environment.from_hash({:name => environment_name})

data/spec/ey/deploy_spec.rb

@@ -41,13 +41,13 @@ describe "ey deploy" do
     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
-      @err.should match(/doesn't run this application/i)
+      @err.should match(/does not run this application/i)
     end
 
-    it "complains when environment is ambiguous" do
+    it "complains when environment is not specified and app is in >1 environment" do
       api_scenario "one app, two environments"
       ey "deploy", :expect_failure => true
-      @err.should match(/was called incorrectly/i)
+      @err.should match(/single environment.*2/i)
     end
 
     it "complains when the app master is in a non-running state" do
@@ -94,48 +94,23 @@ describe "ey deploy" do
   end
 
   context "choosing something to deploy" do
-    before(:all) do
-      api_scenario "one app, one environment", "user@git.host/path/to/repo.git"
-    end
+    define_git_repo('deploy test') do
+      # we'll have one commit on master
+      system("echo 'source :gemcutter' > Gemfile")
+      system("git add Gemfile")
+      system("git commit -m 'initial commit' >/dev/null 2>&1")
 
-    before(:all) do
-      @local_git_dir = File.join(
-        Dir.tmpdir,
-        "ey_test_git_#{Time.now.tv_sec}_#{Time.now.tv_usec}_#{$$}")
-
-      Dir.mkdir(@local_git_dir)
-
-      Dir.chdir(@local_git_dir) do
-        [
-          # initial repo setup
-          'git init >/dev/null 2>&1',
-          'git config user.email deploy@spec.test',
-          'git config user.name "Deploy Spec"',
-          'git remote add origin "user@git.host/path/to/repo.git"',
-
-          # we'll have one commit on master
-          "echo 'source :gemcutter' > Gemfile",
-          "git add Gemfile",
-          "git commit -m 'initial commit' >/dev/null 2>&1",
-
-          # and a tag
-          "git tag -a -m 'version one' v1",
-
-          # and we need a non-master branch
-          "git checkout -b current-branch >/dev/null 2>&1",
-        ].each do |cmd|
-          system("#{cmd}") or raise "#{cmd} failed"
-        end
-      end
-    end
+      # and a tag
+      system("git tag -a -m 'version one' v1")
 
-    before(:each) do
-      @original_dir = Dir.getwd
-      Dir.chdir(@local_git_dir)
+      # and we need a non-master branch
+      system("git checkout -b current-branch >/dev/null 2>&1")
     end
 
-    after(:each) do
-      Dir.chdir(@original_dir)
+    use_git_repo('deploy test')
+
+    before(:all) do
+      api_scenario "one app, one environment", "user@git.host:path/to/repo.git"
     end
 
     context "without a configured default branch" do
@@ -156,13 +131,12 @@ describe "ey deploy" do
     end
 
     context "when there is extra configuration" do
-      before(:all) do
-        write_yaml({"environments" => {"giblets" => {"bert" => "ernie"}}},
-          File.join(@local_git_dir, "ey.yml"))
+      before(:each) do
+        write_yaml({"environments" => {"giblets" => {"bert" => "ernie"}}})
       end
 
-      after(:all) do
-        File.unlink(File.join(@local_git_dir, "ey.yml"))
+      after(:each) do
+        File.unlink("ey.yml")
       end
 
       it "gets passed along to eysd" do
@@ -172,13 +146,12 @@ describe "ey deploy" do
     end
 
     context "with a configured default branch" do
-      before(:all) do
-        write_yaml({"environments" => {"giblets" => {"branch" => "master"}}},
-          File.join(@local_git_dir, "ey.yml"))
+      before(:each) do
+        write_yaml({"environments" => {"giblets" => {"branch" => "master"}}})
       end
 
-      after(:all) do
-        File.unlink(File.join(@local_git_dir, "ey.yml"))
+      after(:each) do
+        File.unlink "ey.yml"
       end
 
       it "deploys the default branch by default" do

data/spec/ey/ey_spec.rb

@@ -9,7 +9,7 @@ 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", :hide_err => true
+      ey "foobarbaz", :expect_failure => true
       @err.should include("Could not find task")
     end
   end

data/spec/ey/recipes/apply_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe "ey recipes apply" do
+  it_should_behave_like "an integration test"
+
+  before(:all) do
+    api_scenario "one app, one environment"
+  end
+
+  it "works when the environment name is valid" do
+    ey "recipes apply giblets", :debug => true
+    @out.should =~ /Uploaded recipes started for giblets/i
+  end
+
+  it "runs recipes for the current environment by default" do
+    ey "recipes apply", :debug => true
+    @out.should =~ /Uploaded recipes started for giblets/i
+  end
+
+  it "fails when the environment name is bogus" do
+    ey "recipes apply typo", :expect_failure => true
+    @err.should match(/'typo'/)
+  end
+end
+
+describe "ey recipes apply ENV" do
+  it_should_behave_like "an integration test"
+
+  before(:all) do
+    api_scenario "one app, many similarly-named environments"
+  end
+
+  it "works when given an unambiguous substring" do
+    ey "recipes apply prod", :debug => true
+    @out.should =~ /Uploaded recipes started for railsapp_production/
+  end
+
+  it "complains when given an ambiguous substring" do
+    ey "recipes apply staging", :hide_err => true, :expect_failure => true
+    @err.should =~ /'staging' is ambiguous/
+  end
+end

data/spec/ey/recipes/upload_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "ey recipes upload" do
+  it_should_behave_like "an integration test"
+
+  define_git_repo('+cookbooks') do |git_dir|
+    git_dir.join("cookbooks").mkdir
+    File.open(git_dir.join("cookbooks/file"), "w"){|f| f << "boo" }
+  end
+
+  use_git_repo('+cookbooks')
+
+  it "posts the recipes to the correct url" do
+    api_scenario "one app, one environment"
+    ey "recipes upload giblets", :debug => true
+
+    @out.should =~ /Recipes uploaded successfully for giblets/i
+  end
+
+  it "errors correctly on bogus env name" do
+    api_scenario "one app, one environment"
+    ey "recipes upload bogusenv", :expect_failure => true
+
+    @err.should =~ /No environment named 'bogusenv'/
+  end
+
+  it "can infer the environment from the current application" do
+    api_scenario "one app, one environment"
+
+    ey "recipes upload", :debug => true
+    @out.should =~ /Recipes uploaded successfully for giblets/i
+  end
+
+  it "complains when it can't infer the environment from the current application" do
+    api_scenario "one app, one environment, not linked"
+
+    ey "recipes upload", :debug => true, :expect_failure => true
+    @err.should =~ /single environment/i
+  end
+end

data/spec/ey/rollback_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe "ey rollback" do
+  it_should_behave_like "an integration test"
+
+  before(:all) do
+    api_scenario "one app, one environment"
+  end
+
+  it "works when the environment name is valid" do
+    ey "rollback giblets", :debug => true
+    @out.should match(/rolling back giblets/i)
+    @err.should be_empty
+    @ssh_commands.last.should match(/eysd deploy rollback --app rails232app/)
+  end
+
+  it "rollback the current environment by default" do
+    ey "rollback", :debug => true
+    @out.should match(/rolling back giblets/i)
+    @err.should be_empty
+    @ssh_commands.last.should match(/eysd deploy rollback --app rails232app/)
+  end
+
+  it "fails when the environment name is bogus" do
+    ey "rollback typo", :expect_failure => true
+    @err.should match(/'typo'/)
+    @ssh_commands.should be_empty
+  end
+end
+
+describe "ey rollback ENV" do
+  it_should_behave_like "an integration test"
+
+  before(:all) do
+    api_scenario "one app, many similarly-named environments"
+  end
+
+  it "works when given an unambiguous substring" do
+    ey "rollback prod", :debug => true
+    @out.should match(/Rolling back railsapp_production/i)
+    @err.should be_empty
+    @ssh_commands.last.should match(/eysd deploy rollback --app rails232app/)
+  end
+
+  it "complains when given an ambiguous substring" do
+    ey "rollback staging", :hide_err => true, :expect_failure => true
+    @err.should =~ /'staging' is ambiguous/
+    @ssh_commands.should be_empty
+  end
+end

data/spec/ey/ssh_spec.rb

@@ -52,12 +52,17 @@ describe "ey ssh ENV" do
   end
 
   it "works when given an unambiguous substring" do
-    print_my_args = "#!/bin/sh\necho ssh $*"
-
-    ey "ssh prod", :prepend_to_path => {'ssh' => print_my_args}
+    ey "ssh prod", :prepend_to_path => {'ssh' => print_my_args_ssh}
     @raw_ssh_commands.should == ["ssh turkey@174.129.198.124"]
   end
 
+  it "doesn't require you to be in any app's directory if the name is unambiguous" do
+    Dir.chdir(Dir.tmpdir) do
+      ey "ssh prod", :prepend_to_path => {'ssh' => print_my_args_ssh}
+      @raw_ssh_commands.should == ["ssh turkey@174.129.198.124"]
+    end
+  end
+
   it "complains when given an ambiguous substring" do
     ey "ssh staging", :hide_err => true, :expect_failure => true
     @err.should match(/'staging' is ambiguous/)

data/spec/spec_helper.rb

@@ -29,6 +29,7 @@ support.each{|helper| require helper }
 
 Spec::Runner.configure do |config|
   config.include Spec::Helpers
+  config.extend Spec::GitRepo
 
   config.before(:all) do
     FakeWeb.allow_net_connect = false
@@ -58,7 +59,15 @@ Spec::Matchers.define :have_command_like do |regex|
   end
 end
 
+EY.define_git_repo("default") do |git_dir|
+  system("echo 'source :gemcutter' > Gemfile")
+  system("git add Gemfile")
+  system("git commit -m 'initial commit' >/dev/null 2>&1")
+end
+
 shared_examples_for "an integration test without an eyrc file" do
+  use_git_repo('default')
+
   before(:all) do
     FakeFS.deactivate!
     ENV['EYRC'] = "/tmp/eyrc"

data/spec/support/fake_awsm.ru

@@ -55,11 +55,28 @@ class FakeAwsm < Sinatra::Base
   end
 
   post "/api/v2/environments/:env_id/recipes" do
-    {}.to_json
+    if params[:file][:tempfile]
+      files = `tar --list -z -f "#{params[:file][:tempfile].path}"`.split(/\n/)
+      if files.empty?
+        status(400)
+        "No files in uploaded tarball"
+      else
+        status(204)
+        ""
+      end
+    else
+      status(400)
+      "Recipe file not uploaded"
+    end
   end
 
   put "/api/v2/environments/:env_id/rebuild" do
-    status(204)
+    status(202)
+    ""
+  end
+
+  put "/api/v2/environments/:env_id/run_custom_recipes" do
+    status(202)
     ""
   end
 

data/spec/support/git_repo.rb

@@ -0,0 +1,21 @@
+module Spec
+  module GitRepo
+    def define_git_repo(name, &setup)
+      # EY's ivars don't get cleared between examples, so we can keep
+      # a git repo around longer (and thus make our tests faster)
+      EY.define_git_repo(name, &setup)
+    end
+
+    def use_git_repo(repo_name)
+      before(:each) do
+        @_original_wd ||= []
+        @_original_wd << Dir.getwd
+        Dir.chdir(EY.git_repo_dir(repo_name))
+      end
+
+      after(:each) do
+        Dir.chdir(@_original_wd.pop)
+      end
+    end
+  end
+end

data/spec/support/helpers.rb

@@ -17,7 +17,6 @@ module Spec
     ZeroExitStatus = Class.new(UnexpectedExit)
 
     def ey(cmd = nil, options = {}, &block)
-      require "open3"
       hide_err = options.has_key?(:hide_err) ? options[:hide_err] : options[:expect_failure]
       path_prepends = options[:prepend_to_path]
 
@@ -75,23 +74,11 @@ module Spec
       @out
     end
 
-    def api_scenario(scenario, remote = local_git_remote)
+    def api_scenario(scenario, remote = "user@git.host:path/to/repo.git")
       response = ::RestClient.put(EY.fake_awsm + '/scenario', {"scenario" => scenario, "remote" => remote}, {})
       raise "Setting scenario failed: #{response.inspect}" unless response.code == 200
     end
 
-    def local_git_remote
-      remotes = []
-      `git remote -v`.each_line do |line|
-        parts = line.split(/\t/)
-        # the remote will look like
-        # "git@github.com:engineyard/engineyard.git (fetch)\n"
-        # so we need to chop it up a bit
-        remotes << parts[1].gsub(/\s.*$/, "") if parts[1]
-      end
-      remotes.first
-    end
-
     def read_yaml(file="ey.yml")
       YAML.load_file(File.expand_path(file))
     end
@@ -137,5 +124,29 @@ module EY
       end
     end
     alias_method :start_fake_awsm, :fake_awsm
+
+    def define_git_repo(name, &setup)
+      @git_repo_setup ||= {}
+      raise "Attempted to redefine git repo #{name}; don't do that!" if @git_repo_setup.has_key?(name)
+      @git_repo_setup[name] = setup
+    end
+
+    def git_repo_dir(name)
+      @git_repo_dir_cache ||= {}
+      return @git_repo_dir_cache[name] if @git_repo_dir_cache.has_key?(name)
+      raise ArgumentError, "No definition for git repo #{name}" unless @git_repo_setup[name]
+
+      git_dir = Pathname.new("/tmp/engineyard_test_repo_#{Time.now.tv_sec}_#{Time.now.tv_usec}_#{$$}")
+      git_dir.mkdir
+      Dir.chdir(git_dir) do
+        system("git init -q")
+        system('git config user.email ey@spec.test')
+        system('git config user.name "EY Specs"')
+        system("git remote add testremote user@git.host:path/to/repo.git")
+        @git_repo_setup[name].call(git_dir)
+      end
+      @git_repo_dir_cache[name] = git_dir
+    end
+
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -07:00
+date: 2010-06-11 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,7 +109,6 @@ extra_rdoc_files: []
 files: 
 - bin/ey
 - lib/engineyard/api.rb
-- lib/engineyard/cli/action/deploy.rb
 - lib/engineyard/cli/api.rb
 - lib/engineyard/cli/recipes.rb
 - lib/engineyard/cli/thor_fixes.rb
@@ -177,10 +176,13 @@ test_files:
 - spec/ey/list_environments_spec.rb
 - spec/ey/logs_spec.rb
 - spec/ey/rebuild_spec.rb
+- spec/ey/recipes/apply_spec.rb
+- spec/ey/recipes/upload_spec.rb
+- spec/ey/rollback_spec.rb
 - spec/ey/ssh_spec.rb
-- spec/ey/upload_recipes_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey
 - spec/support/fake_awsm.ru
+- spec/support/git_repo.rb
 - spec/support/helpers.rb
 - spec/support/ruby_ext.rb

data/lib/engineyard/cli/action/deploy.rb

@@ -1,120 +0,0 @@
-module EY
-  class CLI
-    module Action
-      class Deploy
-
-        EYSD_VERSION = "~>0.3.0"
-
-        def self.call(env_name, branch, options)
-          env_name ||= EY.config.default_environment
-
-          app    = fetch_app
-          env    = fetch_environment(env_name, app)
-          branch = fetch_branch(env.name, branch, options[:force])
-          master = fetch_app_master(env)
-
-          EY.ui.info "Connecting to the server..."
-          ensure_eysd_present(master, options[:install_eysd])
-
-          EY.ui.info "Running deploy for '#{env.name}' on server..."
-          deployed = master.deploy!(app, branch, options[:migrate], env.config)
-
-          if deployed
-            EY.ui.info "Deploy complete"
-          else
-            raise EY::Error, "Deploy failed"
-          end
-        end
-
-        private
-
-        def self.fetch_app_master(env)
-          master = env.app_master
-
-          if !master
-            raise EnvironmentError, "No running instances for environment #{env.name}\nStart one at #{EY.config.endpoint}"
-          elsif master.status != "running"
-            raise EnvironmentError, "Cannot deploy: application master's status is not \"running\" (green); it is \"#{master.status}\"."
-          end
-
-          master
-        end
-
-        def self.api
-          @api ||= EY::CLI::API.new
-        end
-
-        def self.repo
-          @repo ||= EY::Repo.new
-        end
-
-        def self.fetch_app
-          app = api.app_for_repo(repo)
-          raise NoAppError.new(repo) unless app
-          app
-        end
-
-        def self.fetch_environment(env_name, app)
-          # if the name's not specified and there's not exactly one
-          # environment, we can't figure out which environment to deploy
-          raise DeployArgumentError if !env_name && app.environments.size != 1
-
-          env = if env_name
-                  app.environments.match_one(env_name)
-                else
-                  app.environments.first
-                end
-
-          # the environment exists, but doesn't have this app
-          if !env && api.environments.named(env_name)
-            raise EnvironmentError, "Environment '#{env_name}' doesn't run this application\nYou can add it at #{EY.config.endpoint}"
-          end
-
-          if !env
-            raise NoEnvironmentError.new(env_name)
-          end
-
-          env
-        end
-
-        def self.fetch_branch(env_name, user_specified_branch, force)
-          default_branch = EY.config.default_branch(env_name)
-
-          branch = if user_specified_branch
-                     if default_branch && (user_specified_branch != default_branch) && !force
-                       raise BranchMismatch.new(default_branch, user_specified_branch)
-                     end
-                     user_specified_branch
-                   else
-                     default_branch || repo.current_branch
-                   end
-
-          raise DeployArgumentError unless branch
-          branch
-        end
-
-        def self.ensure_eysd_present(instance, install_eysd)
-          eysd_status = instance.ey_deploy_check
-          case eysd_status
-          when :ssh_failed
-            raise EnvironmentError, "SSH connection to #{instance.hostname} failed"
-          when :eysd_missing
-            EY.ui.warn "Instance does not have server-side component installed"
-            EY.ui.info "Installing server-side component..."
-            instance.install_ey_deploy!
-          when :too_new
-            raise EnvironmentError, "server-side component too new; please upgrade your copy of the engineyard gem."
-          when :too_old
-            EY.ui.info "Upgrading server-side component..."
-            instance.upgrade_ey_deploy!
-          when :ok
-            # no action needed
-          else
-            raise EY::Error, "Internal error: Unexpected status from Instance#ey_deploy_check; got #{eysd_status.inspect}"
-          end
-        end
-
-      end
-    end
-  end
-end

data/spec/ey/upload_recipes_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe "ey recipes upload" do
-  it_should_behave_like "an integration test"
-
-  before(:all) do
-    @recipe_dir = Pathname.new("/tmp/#{$$}")
-    @recipe_dir.mkdir
-    Dir.chdir(@recipe_dir) do
-      @recipe_dir.join("cookbooks").mkdir
-      File.open(@recipe_dir.join("cookbooks/file"), "w"){|f| f << "boo" }
-      `git init`
-      `git add .`
-      `git commit -m "OMG"`
-      `git remote add testremote user@host.tld:path/to/repo.git`
-    end
-  end
-
-  it "posts the recipes to the correct url" do
-    api_scenario "one app, one environment"
-    Dir.chdir(@recipe_dir) do
-      ey "recipes upload giblets", :debug => true
-    end
-
-    @out.should =~ /recipes uploaded successfully/i
-  end
-
-  it "errors correctly on bogus env name" do
-    api_scenario "one app, one environment"
-    ey "recipes upload bogusenv", :expect_failure => true
-
-    @err.should =~ /can't be found/i
-  end
-
-  it "can infer the environment from the current application" do
-    api_scenario "one app, one environment", "user@host.tld:path/to/repo.git"
-
-    Dir.chdir(@recipe_dir) do
-      ey "recipes upload", :debug => true
-    end
-
-    @out.should =~ /recipes uploaded successfully/i
-  end
-
-  it "complains when it can't infer the environment from the current application" do
-    api_scenario "one app, one environment, not linked", "user@host.tld:path/to/repo.git"
-
-    Dir.chdir(@recipe_dir) do
-      ey "recipes upload", :debug => true, :expect_failure => true
-    end
-
-    @err.should =~ /single environment/i
-  end
-end