engineyard 0.3.1 → 0.3.2

data/lib/engineyard/{account → model}/log.rb

@@ -1,5 +1,5 @@
 module EY
-  class Account
+  module Model
     class Log < ApiStruct.new(:id, :role, :main, :custom)
       def instance_name
         "#{role} #{id}"

data/lib/engineyard/repo.rb

@@ -15,9 +15,9 @@ module EY
     end
 
     def urls
-      `git config -f #{@path}/.git/config --get-regexp 'remote.*.url'`.split(/\n/).map do |c|
-        c.split.last
-      end
+      lines = `git config -f #{@path}/.git/config --get-regexp 'remote.*.url'`.split(/\n/)
+      raise NoRemotesError.new(@path) if lines.empty?
+      lines.map { |c| c.split.last }
     end
 
   end # Repo

data/spec/engineyard/{account → model}/api_struct_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
-describe EY::Account::ApiStruct do
-  class Foo < EY::Account::ApiStruct.new(:fruit); end
-  class FooWithAccount < EY::Account::ApiStruct.new(:fruit, :account); end
+describe EY::Model::ApiStruct do
+  class Foo < EY::Model::ApiStruct.new(:fruit, :veggie); end
 
   it "acts like a normal struct" do
     f = Foo.new("banana")
@@ -28,10 +27,15 @@ describe EY::Account::ApiStruct do
       f.should == [Foo.new("banana")]
     end
 
-    it "handles an account as the second argument" do
-      f = FooWithAccount.from_array([:fruit => "banana"], "account")
-      f.should == [FooWithAccount.new("banana", "account")]
+    it "handles a common-arguments hash as the second argument" do
+      foos = Foo.from_array(
+        [{:fruit => "banana"}, {:fruit => 'apple'}],
+        :veggie => 'kale')
+      foos.should == [
+        Foo.new("banana", "kale"),
+        Foo.new("apple", "kale"),
+      ]
     end
   end
 
-end
+end

data/spec/engineyard/model/environment_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe "EY::Model::Environment#rebuild" 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}/rebuild",
+      :body => {}.to_json)
+
+    env.rebuild
+
+    FakeWeb.should have_requested(:put, "https://cloud.engineyard.com/api/v2/environments/#{env.id}/rebuild")
+  end
+end
+
+describe "EY::Model::Environment#instances" do
+  it_should_behave_like "it has an api"
+
+  it "returns instances" do
+    env = EY::Model::Environment.from_hash({
+        "id" => 10291,
+        "api" => @api,
+      })
+
+    instance_data = {
+      "id" => "1",
+      "role" => "app_master",
+      "amazon_id" => "i-likebeer",
+      "public_hostname" => "banana_master"
+    }
+    FakeWeb.register_uri(:get,
+      "https://cloud.engineyard.com/api/v2/environments/#{env.id}/instances",
+      :body => {"instances" => [instance_data]}.to_json)
+
+
+    env.should have(1).instances
+    env.instances.first.should == EY::Model::Instance.from_hash(instance_data.merge(:environment => env))
+  end
+end

data/spec/engineyard/model/instance_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe "EY::Model::Instance's script for checking ey-deploy's version" do
+
+  def fake_out_no_ey_deploy
+    Gem.should_receive(:source_index).and_return(Gem::SourceIndex.new)
+  end
+
+  def fake_out_installed_ey_deploy_version(version)
+    net_sftp_gem = Gem::Specification.new do |s|
+      s.authors = ["Jamis Buck"]
+      s.autorequire = "net/sftp"
+      s.date = Time.utc(2008, 2, 24)
+      s.email = "jamis@jamisbuck.org"
+      s.files = ["doc/faq",
+        # snip
+        "test/protocol/tc_driver.rb"]
+      s.homepage = "http://net-ssh.rubyforge.org/sftp"
+      s.name = "net-sftp"
+      s.require_paths = ["lib"]
+      s.rubygems_version = "1.3.5"
+      s.specification_version = 2
+      s.summary = "Net::SFTP is a pure-Ruby implementation of the SFTP client protocol."
+      s.test_files = ["test/ALL-TESTS.rb"]
+      s.version = Gem::Version.new("1.1.1")
+    end
+
+    ey_deploy_gem = Gem::Specification.new do |s|
+      s.name = 'ey-deploy'
+      s.authors = ["EY Cloud Team"]
+      s.date = Time.utc(2010, 1, 2)
+      s.files = ['lib/engineyard/ey-deploy.rb'] # or something
+      s.specification_version = 2
+      s.version = Gem::Version.new(version)
+    end
+
+    fake_source_index = Gem::SourceIndex.new(
+      'net-sftp-1.1.1' => net_sftp_gem,
+      "ey-deploy-#{version}" => ey_deploy_gem
+      )
+    Gem.should_receive(:source_index).and_return(fake_source_index)
+  end
+
+  def script_exit_status
+    eval EY::Model::Instance::CHECK_SCRIPT
+  rescue SystemExit => e
+    return e.status
+  end
+
+  it "exits 104 if the ey-deploy gem is not installed" do
+    fake_out_no_ey_deploy
+    script_exit_status.should == 104
+  end
+
+  it "exits 70 if the installed ey-deploy is too old" do
+    fake_out_installed_ey_deploy_version('0.0.1')
+    script_exit_status.should == 70
+  end
+
+  it "exits 17 if the installed ey-deploy is too new" do
+    fake_out_installed_ey_deploy_version('1000.0.0')
+    script_exit_status.should == 17
+  end
+
+  it "exits 0 if the version number is correct" do
+    correct_version = EY::Model::Instance::EYSD_VERSION.gsub(/[^\d\.]/, '')
+    fake_out_installed_ey_deploy_version(correct_version)
+    script_exit_status.should == 0
+  end
+end

data/spec/engineyard/repo_spec.rb

@@ -26,26 +26,29 @@ describe EY::Repo 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
-      set_url other_url, "other"
+      set_url origin_url, "origin"
+      set_url other_url,  "other"
       @r.urls.should include(origin_url)
       @r.urls.should include(other_url)
     end
 
-    it "returns nil if there is no origin remote" do
-      set_url nil
-      @r.urls.should be_empty
+    it "raises EY::NoRemotesError if there is no origin remote" do
+      clear_urls
+      lambda { @r.urls }.should raise_error(EY::NoRemotesError)
     end
 
-    def set_url(url, remote="origin")
-      @config_path = @path+"config"
-      # This has to all shell out because FakeFS is enabled
-      if url
-        system("mkdir -p #{@path} && cd #{@path} && git init -q")
-        system("git config -f #{@config_path} remote.#{remote}.url #{url}")
-      else
-        system("rm -rf #{@config_path}")
-      end
+    def config_path
+      @path+"config"
+    end
+
+    # This has to all shell out because FakeFS is enabled
+    def set_url(url, remote)
+      system("mkdir -p #{@path} && cd #{@path} && git init -q")
+      system("git config -f #{config_path} remote.#{remote}.url #{url}")
+    end
+
+    def clear_urls
+      system("rm -rf #{config_path}")
     end
   end # url
 

data/spec/ey/deploy_spec.rb

@@ -1,38 +1,24 @@
 require 'spec_helper'
 
-describe "ey deploy" do
-  # like the "an integration test" setup, but without the ~/.eyrc file
-  # so we can test creating it
-  before(:all) do
-    FakeFS.deactivate!
-    ENV['EYRC'] = "/tmp/eyrc"
-    ENV['CLOUD_URL'] = EY.fake_awsm
-    FakeWeb.allow_net_connect = true
-  end
+describe "ey deploy without an eyrc file" do
 
-  after(:all) do
-    ENV['CLOUD_URL'] = nil
-    FakeFS.activate!
-    FakeWeb.allow_net_connect = false
+  it_should_behave_like "an integration test without an eyrc file"
+
+  before(:each) do
+    FileUtils.rm_rf(ENV['EYRC'])
+    api_scenario "one app, one environment"
   end
 
-  describe "without an eyrc file" do
-    before(:each) do
-      FileUtils.rm_rf(ENV['EYRC'])
-      api_scenario "one app, one environment"
+  it "prompts for authentication before continuing" do
+    ey("deploy", :hide_err => true) do |input|
+      input.puts("test@test.test")
+      input.puts("test")
     end
 
-    it "prompts for authentication before continuing" do
-      ey("deploy", :hide_err => true) do |input|
-        input.puts("test@test.test")
-        input.puts("test")
-      end
-
-      @out.should include("We need to fetch your API token, please login")
-      @out.should include("Email:")
-      @out.should include("Password:")
-      @ssh_commands.should_not be_empty
-    end
+    @out.should include("We need to fetch your API token, please login")
+    @out.should include("Email:")
+    @out.should include("Password:")
+    @ssh_commands.should_not be_empty
   end
 end
 
@@ -42,25 +28,25 @@ describe "ey deploy" do
   context "with invalid input" do
     it "complains when there is no app" do
       api_scenario "empty"
-      ey "deploy", :hide_err => true, :expect_failure => true
+      ey "deploy", :expect_failure => true
       @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", :hide_err => true, :expect_failure => true
+      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", :hide_err => true, :expect_failure => true
+      ey "deploy giblets master", :expect_failure => true
       @err.should match(/doesn't run this application/i)
     end
 
     it "complains when environment is ambiguous" do
       api_scenario "one app, two environments"
-      ey "deploy", :hide_err => true, :expect_failure => true
+      ey "deploy", :expect_failure => true
       @err.should match(/was called incorrectly/i)
     end
   end
@@ -85,7 +71,7 @@ describe "ey deploy" do
     it "defaults to 'rake db:migrate'" do
       ey "deploy"
       @ssh_commands.last.should =~ /eysd deploy/
-      @ssh_commands.last.should =~ /--migrate='rake db:migrate'/
+      @ssh_commands.last.should =~ /--migrate 'rake db:migrate'/
     end
 
     it "can be disabled with --no-migrate" do
@@ -98,12 +84,6 @@ describe "ey deploy" do
       ey "deploy --no-migrate giblets master"
       @ssh_commands.last.should_not =~ /--migrate/
     end
-
-    it "can be disabled with --no-migrate" do
-      ey "deploy --no-migrate"
-      @ssh_commands.last.should =~ /eysd deploy/
-      @ssh_commands.last.should_not =~ /--migrate/
-    end
   end
 
   context "choosing something to deploy" do
@@ -127,6 +107,8 @@ describe "ey deploy" 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
@@ -171,6 +153,22 @@ describe "ey deploy" do
       end
     end
 
+    context "when there is extra configuration" do
+      before(:all) do
+        write_yaml({"environments" => {"giblets" => {"bert" => "ernie"}}},
+          File.join(@local_git_dir, "ey.yml"))
+      end
+
+      after(:all) do
+        File.unlink(File.join(@local_git_dir, "ey.yml"))
+      end
+
+      it "gets passed along to eysd" do
+        ey "deploy"
+        @ssh_commands.last.should =~ /--config '\{\"bert\":\"ernie\"\}'/
+      end
+    end
+
     context "with a configured default branch" do
       before(:all) do
         write_yaml({"environments" => {"giblets" => {"branch" => "master"}}},
@@ -187,7 +185,7 @@ describe "ey deploy" do
       end
 
       it "complains about a non-default branch without --force" do
-        ey "deploy giblets current-branch", :hide_err => true, :expect_failure => true
+        ey "deploy giblets current-branch", :expect_failure => true
         @err.should =~ /deploy branch is set to "master"/
       end
 
@@ -198,25 +196,77 @@ describe "ey deploy" do
     end
   end
 
+  context "specifying an environment" do
+    before(:all) 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"
+      @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
     before(:all) do
       api_scenario "one app, one environment"
     end
 
-    after(:all) do
+    before(:each) do
+      ENV.delete "NO_SSH"
+    end
+
+    after(:each) do
       ENV['NO_SSH'] = "true"
     end
 
-    it "installs eysd if 'eysd check' fails" do
-      ENV.delete('NO_SSH')
-      fake_ssh_no_eysd = "#!/usr/bin/env ruby\n exit!(127) if ARGV.last =~ /eysd check/"
+    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
 
-      ey "deploy", :prepend_to_path => {'ssh' => fake_ssh_no_eysd}
+    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)
+    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/)
+    end
   end
 end

data/spec/ey/list_environments_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe "ey environments" do
+
   it_should_behave_like "an integration test"
 
   before(:all) do
@@ -10,7 +11,16 @@ describe "ey environments" do
   it "lists the environments your app is in" do
     ey "environments"
     @out.should =~ /giblets/
-    @out.should =~ /ham/
+    @out.should =~ /bakon/
+  end
+
+  it "reports failure to find a git repo when not in one" do
+    api_git_remote('dontcare')
+    Dir.chdir("/tmp") do
+      ey "environments", :expect_failure => true
+      @err.should =~ /fatal: No git remotes found in .*\/tmp/
+      @out.should_not =~ /no application configured/
+    end
   end
 
 end