engineyard 1.4.29 → 1.7.0.pre2

data/spec/engineyard/eyrc_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'engineyard/eyrc'
 
 describe EY::EYRC do
+  before { clean_eyrc }
+
   describe ".load" do
     it "looks for .eyrc in $EYRC if set" do
       EY::EYRC.load.path.should == Pathname.new(ENV['EYRC'])

data/spec/engineyard/repo_spec.rb

@@ -1,60 +1,83 @@
 require 'spec_helper'
 
 describe EY::Repo do
+  let(:path) { p = Pathname.new(Dir.tmpdir).join('ey-test'); p.mkpath; p }
+
   before(:each) do
-    @path = Pathname.new("/tmp/ey-test/.git/")
-    @path.mkpath
-    @r = EY::Repo.new("/tmp/ey-test")
+    Dir.chdir(path) { `git init -q` }
+    ENV['GIT_DIR'] = path.join('.git').to_s
   end
 
   after(:each) do
-    clear_urls
+    path.rmtree
+    ENV.delete('GIT_DIR')
   end
 
   def set_head(head)
-    @path.join("HEAD").open('w') {|f| f.write(head) }
-  end
-
-  def config_path
-    @path.join("config")
+    path.join('.git','HEAD').open('w') {|f| f.write(head) }
   end
 
   def set_url(url, remote)
-    system("mkdir -p #{@path} && cd #{@path} && git init -q")
-    system("git config -f #{config_path} remote.#{remote}.url #{url}")
+    `git remote add #{remote} #{url}`
   end
 
-  def clear_urls
-    system("rm -rf #{config_path}")
+  describe ".new" do
+    it "creates a working repo object in a repo" do
+      EY::Repo.new.remotes.should be_empty
+    end
+
+    it "doesn't raise if created outside a repository until trying to do something" do
+      ENV['GIT_DIR'] = nil
+      Dir.chdir('/tmp') do
+        repo = EY::Repo.new
+        lambda { repo.remotes }.should raise_error(EY::Repo::NotAGitRepository)
+      end
+    end
   end
 
-  describe "current_branch method" do
-    it "returns the name of the current branch" do
-      set_head "ref: refs/heads/master"
-      @r.current_branch.should == "master"
+  describe ".exist?" do
+    it "is true when env vars are set to a repo" do
+      EY::Repo.should be_exist
     end
 
-    it "returns nil if there is no current branch" do
-      set_head "20bf478ab6a91ec5771130aa4c8cfd3d150c4146"
-      @r.current_branch.should be_nil
+    it "is true when pwd is a repo" do
+      Dir.chdir(File.dirname(ENV['GIT_DIR'])) do
+        ENV['GIT_DIR'] = nil
+        EY::Repo.should be_exist
+      end
     end
-  end # current_branch
 
-  describe "#fail_on_no_remotes!" do
-    it "raises when there are no remotes" do
-      lambda { @r.fail_on_no_remotes! }.should raise_error(EY::NoRemotesError)
+    it "is false when outside of any repo" do
+      ENV['GIT_DIR'] = nil
+      Dir.chdir('/tmp') do
+        EY::Repo.should_not be_exist
+      end
     end
   end
 
-  describe "#has_remote?" do
-    it "returns the urls of the remotes" do
-      origin_url = "git://github.com/engineyard/engineyard.git"
-      other_url = "git@github.com:engineyard/engineyard.git"
-      set_url origin_url, "origin"
-      set_url other_url,  "other"
-      @r.should have_remote(origin_url)
-      @r.should have_remote(other_url)
+  context "in a repository dir" do
+
+    before(:each) do
+      @repo = EY::Repo.new
+    end
+
+    describe "current_branch method" do
+      it "returns the name of the current branch" do
+        set_head "ref: refs/heads/master"
+        @repo.current_branch.should == "master"
+      end
+
+      it "returns nil if there is no current branch" do
+        set_head "20bf478ab6a91ec5771130aa4c8cfd3d150c4146"
+        @repo.current_branch.should be_nil
+      end
+    end # current_branch
+
+    describe "#fail_on_no_remotes!" do
+      it "raises when there are no remotes" do
+        lambda { @repo.fail_on_no_remotes! }.should raise_error(EY::Repo::NoRemotesError)
+      end
     end
-  end # url
 
-end # EY::Repo
+  end
+end

data/spec/ey/deploy_spec.rb

@@ -1,23 +1,22 @@
 require 'spec_helper'
 
 describe "ey deploy without an eyrc file" do
+  given "integration"
 
-  given "integration without an eyrc file"
-
-  before(:each) do
+  it "prompts for authentication before continuing" do
     api_scenario "one app, one environment"
-  end
 
-  it "prompts for authentication before continuing" do
-    ey(%w[deploy], :hide_err => true) do |input|
-      input.puts("test@test.test")
-      input.puts("test")
+    ey(%w[deploy --no-migrate], :hide_err => true) do |input|
+      input.puts(scenario_email)
+      input.puts(scenario_password)
     end
 
     @out.should include("We need to fetch your API token; please log in.")
     @out.should include("Email:")
     @out.should include("Password:")
     @ssh_commands.should_not be_empty
+
+    read_eyrc.should == {"api_token" => scenario_api_token}
   end
 end
 
@@ -31,12 +30,17 @@ describe "ey deploy" do
     cmd << "--app"         << opts[:app]         if opts[:app]
     cmd << "--account"     << opts[:account]     if opts[:account]
     cmd << "--ref"         << opts[:ref]         if opts[:ref]
+    cmd << "--migrate"                           if opts[:migrate]
+    cmd                    << opts[:migrate]     if opts[:migrate].respond_to?(:str)
+    cmd << "--no-migrate"                        if opts[:migrate] == nil
     cmd << "--verbose"                           if opts[:verbose]
     cmd
   end
 
   def verify_ran(scenario)
-    @out.should match(/Beginning deploy of ref '[^']+' for '#{scenario[:application]}' in '#{scenario[:environment]}'/)
+    @out.should match(/Beginning deploy.../)
+    @out.should match(/Application:\s+#{scenario[:application]}/)
+    @out.should match(/Environment:\s+#{scenario[:environment]}/)
     @out.should match(/deployment recorded/i)
     @ssh_commands.should have_command_like(/engineyard-serverside.*deploy.*--app #{scenario[:application]}/)
   end
@@ -51,7 +55,7 @@ describe "ey deploy" do
 
   context "without ssh keys (with ssh enabled)" do
     before do
-      ENV['NO_SSH'] = nil
+      ENV.delete('NO_SSH')
       Net::SSH.stub!(:start).and_raise(Net::SSH::AuthenticationFailed.new("no key"))
     end
 
@@ -60,34 +64,34 @@ describe "ey deploy" do
     end
 
     it "tells you that you need to add an appropriate ssh key" do
-      api_scenario "one app, one environment"
-      fast_failing_ey ["deploy"]
+      login_scenario "one app, one environment"
+      fast_failing_ey %w[deploy --no-migrate]
       @err.should include("Authentication Failed")
     end
   end
 
   context "with invalid input" do
     it "complains when there is no app" do
-      api_scenario "empty"
+      login_scenario "empty"
       fast_failing_ey ["deploy"]
-      @err.should include(%|no application configured|)
+      @err.should include(%|No application found|)
     end
 
     it "complains when the specified environment does not contain the app" do
-      api_scenario "one app, one environment, not linked"
+      login_scenario "one app, one environment, not linked"
       fast_failing_ey %w[deploy -e giblets -r master]
-      @err.should match(/there is no application configured/i)
+      @err.should match(/Application "rails232app" and environment "giblets" are not associated./)
     end
 
     it "complains when environment is not specified and app is in >1 environment" do
-      api_scenario "one app, many environments"
-      fast_failing_ey %w[deploy]
-      @err.should match(/multiple app deployments possible/i)
+      login_scenario "one app, many environments"
+      fast_failing_ey %w[deploy --ref master --no-migrate]
+      @err.should match(/Multiple application environments possible/i)
     end
 
     it "complains when the app master is in a non-running state" do
-      api_scenario "one app, one environment, app master red"
-      fast_failing_ey %w[deploy --environment giblets --ref master]
+      login_scenario "one app, one environment, app master red"
+      fast_failing_ey %w[deploy --environment giblets --ref master --no-migrate]
       @err.should_not match(/No running instances/i)
       @err.should match(/running.*\(green\)/)
     end
@@ -95,18 +99,52 @@ describe "ey deploy" do
 
   context "migration command" do
     before(:each) do
-      api_scenario "one app, one environment"
+      login_scenario "one app, one environment"
     end
 
     it "finds engineyard-serverside despite its being buried in the filesystem" do
-      fast_ey %w[deploy]
+      fast_ey %w[deploy --no-migrate]
       @ssh_commands.last.should =~ %r{/usr/local/ey_resin/ruby/bin/engineyard-serverside}
     end
 
-    it "defaults to 'rake db:migrate'" do
-      fast_ey %w[deploy]
-      @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
-      @ssh_commands.last.should =~ /--migrate 'rake db:migrate'/
+    context "without migrate sepecified interactively reads migration command" do
+      after  { File.unlink 'config/ey.yml' }
+
+      it "defaults to yes, and then rake db:migrate" do
+        File.exist?('config/ey.yml').should be_false
+        ey(%w[deploy]) do |input|
+          input.puts('')
+          input.puts('')
+        end
+        @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
+        @ssh_commands.last.should =~ /--migrate 'rake db:migrate'/
+        env_conf = read_yaml('config/ey.yml')['environments']['giblets']
+        env_conf['migrate'].should == true
+        env_conf['migration_command'].should == 'rake db:migrate'
+      end
+
+      it "accepts new commands" do
+        File.exist?('config/ey.yml').should be_false
+        ey(%w[deploy], :hide_err => true) do |input|
+          input.puts("y")
+          input.puts("ruby migrate")
+        end
+        @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
+        @ssh_commands.last.should =~ /--migrate 'ruby migrate'/
+        env_conf = read_yaml('config/ey.yml')['environments']['giblets']
+        env_conf['migrate'].should == true
+        env_conf['migration_command'].should == 'ruby migrate'
+      end
+
+      it "doesn't ask for the command if you say no" do
+        File.exist?('config/ey.yml').should be_false
+        ey(%w[deploy], :hide_err => true) do |input|
+          input.puts("no")
+        end
+        @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
+        @ssh_commands.last.should_not =~ /--migrate/
+        read_yaml('config/ey.yml')['environments']['giblets']['migrate'].should == false
+      end
     end
 
     it "can be disabled with --no-migrate" do
@@ -124,9 +162,10 @@ describe "ey deploy" do
       before { write_yaml({"environments" => {"giblets" => { "migration_command" => 'thor fancy:migrate' }}}, 'ey.yml') }
       after  { File.unlink 'ey.yml' }
 
-      it "migrates with the custom command by default" do
+      it "migrates with the custom command by default (and fixes ey.yml to reflect the previous default behavior)" do
         fast_ey %w[deploy]
         @ssh_commands.last.should =~ /--migrate 'thor fancy:migrate'/
+        read_yaml('ey.yml')['environments']['giblets']['migrate'].should == true
       end
     end
 
@@ -155,9 +194,10 @@ describe "ey deploy" do
       before { write_yaml({"environments" => {"giblets" => {"migrate" => true}}}, 'ey.yml') }
       after  { File.unlink 'ey.yml' }
 
-      it "migrates with the default" do
+      it "migrates with the default (and writes the default to ey.yml)" do
         fast_ey %w[deploy]
         @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
+        read_yaml('ey.yml')['environments']['giblets']['migration_command'].should == 'rake db:migrate'
       end
     end
 
@@ -179,11 +219,11 @@ describe "ey deploy" do
 
   context "the --framework-env option" do
     before(:each) do
-      api_scenario "one app, one environment"
+      login_scenario "one app, one environment"
     end
 
     it "passes the framework environment" do
-      fast_ey %w[deploy]
+      fast_ey %w[deploy --no-migrate]
       @ssh_commands.last.should match(/--framework-env production/)
     end
   end
@@ -205,32 +245,32 @@ describe "ey deploy" do
     use_git_repo('deploy test')
 
     before(:all) do
-      api_scenario "one app, one environment", "user@git.host:path/to/repo.git"
+      login_scenario "one app, one environment"
     end
 
     context "without a configured default branch" do
       it "defaults to the checked-out local branch" do
-        fast_ey %w[deploy]
+        fast_ey %w[deploy --no-migrate]
         @ssh_commands.last.should =~ /--ref resolved-current-branch/
       end
 
       it "deploys another branch if given" do
-        fast_ey %w[deploy --ref master]
+        fast_ey %w[deploy --ref master --no-migrate]
         @ssh_commands.last.should =~ /--ref resolved-master/
       end
 
       it "deploys a tag if given" do
-        fast_ey %w[deploy --ref v1]
+        fast_ey %w[deploy --ref v1 --no-migrate]
         @ssh_commands.last.should =~ /--ref resolved-v1/
       end
 
       it "allows using --branch to specify a branch" do
-        fast_ey %w[deploy --branch master]
+        fast_ey %w[deploy --branch master --no-migrate]
         @ssh_commands.last.should match(/--ref resolved-master/)
       end
 
       it "allows using --tag to specify the tag" do
-        fast_ey %w[deploy --tag v1]
+        fast_ey %w[deploy --tag v1 --no-migrate]
         @ssh_commands.last.should match(/--ref resolved-v1/)
       end
     end
@@ -245,14 +285,14 @@ describe "ey deploy" do
       end
 
       it "gets passed along to engineyard-serverside" do
-        fast_ey %w[deploy]
+        fast_ey %w[deploy --no-migrate]
         @ssh_commands.last.should =~ /--config '{.*"bert":"ernie".*}'/
       end
     end
 
     context "with a configured default branch" do
       before(:each) do
-        write_yaml({"environments" => {"giblets" => {"branch" => "master"}}}, 'ey.yml')
+        write_yaml({"environments" => {"giblets" => {"branch" => "master", "migrate" => false}}}, 'ey.yml')
       end
 
       after(:each) do
@@ -266,7 +306,7 @@ describe "ey deploy" 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"/
+        @err.should =~ /default branch is set to "master"/
       end
 
       it "deploys a non-default branch with --ignore-default-branch" do
@@ -283,18 +323,20 @@ describe "ey deploy" do
 
   context "specifying an environment" do
     before(:all) do
-      api_scenario "one app, many similarly-named environments"
+      login_scenario "one app, many similarly-named environments"
     end
 
     it "lets you choose by complete name even if the complete name is ambiguous" do
-      fast_ey %w[deploy --environment railsapp_staging]
-      @out.should match(/Beginning deploy of ref 'master' for '[\w]+' in 'railsapp_staging'/)
+      fast_ey %w[deploy --environment railsapp_staging --no-migrate]
+      @out.should match(/Beginning deploy.../)
+      @out.should match(/Ref:\s+master/)
+      @out.should match(/Environment:\s+railsapp_staging/)
     end
   end
 
   context "--extra-deploy-hook-options" do
     before(:all) do
-      api_scenario "one app, one environment"
+      login_scenario "one app, one environment"
     end
 
     def extra_deploy_hook_options
@@ -306,7 +348,7 @@ describe "ey deploy" do
     end
 
     it "passes the extra configuration to engineyard-serverside" do
-      ey %w[deploy --extra-deploy-hook-options some:stuff more:crap]
+      ey %w[deploy --extra-deploy-hook-options some:stuff more:crap --no-migrate]
       extra_deploy_hook_options.should_not be_nil
       extra_deploy_hook_options['some'].should == 'stuff'
       extra_deploy_hook_options['more'].should == 'crap'
@@ -314,7 +356,7 @@ describe "ey deploy" do
 
     context "when ey.yml is present" do
       before do
-        write_yaml({"environments" => {"giblets" => {"beer" => "stout"}}}, 'ey.yml')
+        write_yaml({"environments" => {"giblets" => {"beer" => "stout", "migrate" => true}}}, 'ey.yml')
       end
 
       after { File.unlink("ey.yml") }
@@ -328,7 +370,7 @@ describe "ey deploy" do
 
   context "specifying the application" do
     before(:all) do
-      api_scenario "one app, one environment"
+      login_scenario "one app, one environment"
     end
 
     before(:each) do
@@ -341,15 +383,23 @@ describe "ey deploy" do
     end
 
     it "allows you to specify an app when not in a directory" do
-      fast_ey %w[deploy --app rails232app --ref master]
+      fast_ey %w[deploy --app rails232app --ref master --migrate]
       @ssh_commands.last.should match(/--app rails232app/)
       @ssh_commands.last.should match(/--ref resolved-master/)
+      @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
     end
 
     it "requires that you specify a ref when specifying the application" do
       Dir.chdir(File.expand_path("~")) do
-        fast_failing_ey %w[deploy --app rails232app]
-        @err.should match(/you must also specify the ref to deploy/)
+        fast_failing_ey %w[deploy --app rails232app --no-migrate]
+        @err.should match(/you must also specify the --ref/)
+      end
+    end
+
+    it "requires that you specify a migrate option when specifying the application" do
+      Dir.chdir(File.expand_path("~")) do
+        fast_failing_ey %w[deploy --app rails232app --ref master]
+        @err.should match(/you must also specify .* --migrate or --no-migrate/)
       end
     end
   end
@@ -358,8 +408,8 @@ describe "ey deploy" do
     use_git_repo("deploy test")
 
     before(:all) do
-      api_scenario "one app, one environment", "user@git.host:path/to/repo.git"
-      fast_ey ["deploy"]
+      login_scenario "one app, one environment"
+      fast_ey %w[deploy --no-migrate]
       @deploy_command = @ssh_commands.find {|c| c =~ /engineyard-serverside.*deploy/ }
     end