engineyard 1.4.0 → 1.4.1

data/lib/engineyard/cli.rb

@@ -25,9 +25,10 @@ module EY
       omitted. Furthermore, if a default branch is specified but a different command
       is supplied the deploy will fail unless --ignore-default-branch is used.
 
-      Migrations are run by default with 'rake db:migrate'. A different command can be
-      specified via --migrate "ruby do_migrations.rb". Migrations can also be skipped
-      entirely by using --no-migrate.
+      Migrations are run based on the 'Migrate?' setting you define in your dashboard
+      for the application. If you want to override these settings, a different
+      command can be specified via --migrate "ruby do_migrations.rb". Migrations
+      can also be skipped entirely by using --no-migrate.
     DESC
     method_option :ignore_default_branch, :type => :boolean,
       :desc => "Force a deploy of the specified branch even if a default is set"

data/lib/engineyard/cli/ui.rb

@@ -74,8 +74,8 @@ module EY
 
       def print_envs(apps, default_env_name = nil, simple = false)
         if simple
-          envs = apps.map{ |a| a.environments }
-          puts envs.flatten.map{|x| x.name}.uniq
+          envs = apps.map{ |app| app.environments.to_a }
+          puts envs.flatten.map{|env| env.name }.uniq
         else
           apps.each do |app|
             puts "#{app.name} (#{app.account.name})"

data/lib/engineyard/collection/abstract.rb

@@ -2,14 +2,28 @@ require 'engineyard/error'
 
 module EY
   module Collection
-    class Abstract < Array
+    class Abstract
       COLLAB_MESSAGE = <<-MSG
 \nThis error is due to having access to another account's resources via the collaboration feature.
 Specify --account ACCOUNT_NAME to resolve this ambiguity.
       MSG
 
+      include Enumerable
+
+      def initialize(contents)
+        @contents = contents ? contents.dup.flatten : []
+      end
+
+      def each(&block)
+        @contents.each(&block)
+      end
+
+      def to_a
+        @contents
+      end
+
       def named(name, account_name=nil)
-        candidates = find_all do |x|
+        candidates = @contents.find_all do |x|
           if account_name
             x.name.downcase == name.downcase && x.account.name.downcase == account_name.downcase
           else
@@ -33,7 +47,7 @@ Specify --account ACCOUNT_NAME to resolve this ambiguity.
     private
 
       def find_by_unambiguous_substring(name_part)
-        candidates = find_all{|e| e.name.downcase[name_part.downcase] }
+        candidates = @contents.find_all{|e| e.name.downcase[name_part.downcase] }
         if candidates.size > 1
           raise ambiguous_error(name_part, candidates.map {|e| e.name})
         end

data/lib/engineyard/model/app.rb

@@ -10,7 +10,7 @@ module EY
       end
 
       def self.from_array(*)
-        Collection::Apps[*super]
+        Collection::Apps.new(super)
       end
 
       def sole_environment

data/lib/engineyard/model/environment.rb

@@ -18,7 +18,7 @@ module EY
       end
 
       def self.from_array(*)
-        Collection::Environments[*super]
+        Collection::Environments.new(super)
       end
 
       def logs

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/spec/engineyard/collection/apps_spec.rb

@@ -12,5 +12,5 @@ describe EY::Collection::Apps do
     ])
   end
 
-    it_should_behave_like "model collections"
+    include_examples "model collections"
 end

data/spec/engineyard/collection/environments_spec.rb

@@ -12,5 +12,5 @@ describe EY::Collection::Environments do
     ])
   end
 
-  it_should_behave_like "model collections"
+  include_examples "model collections"
 end

data/spec/engineyard/model/environment_spec.rb

@@ -1,12 +1,10 @@
 require 'spec_helper'
 
 describe "EY::Model::Environment#rebuild" do
-  given "it has an api"
-
   it "hits the rebuild action in the API" do
     env = EY::Model::Environment.from_hash({
         "id" => 46534,
-        "api" => @api,
+        "api" => ey_api,
       })
 
     FakeWeb.register_uri(
@@ -22,12 +20,10 @@ describe "EY::Model::Environment#rebuild" do
 end
 
 describe "EY::Model::Environment#run_custom_recipes" do
-  given "it has an api"
-
   it "hits the rebuild action in the API" do
     env = EY::Model::Environment.from_hash({
         "id" => 46534,
-        "api" => @api,
+        "api" => ey_api,
       })
 
     FakeWeb.register_uri(
@@ -51,14 +47,12 @@ describe "EY::Model::Environment.from_array" do
     ]
 
     collection = EY::Model::Environment.from_array(api_data)
-    collection.should be_kind_of(Array)
+    collection.should respond_to(:each)
     collection.should respond_to(:match_one)
   end
 end
 
 describe "EY::Model::Environment#instances" do
-  given "it has an api"
-
   it "returns instances" do
     instance_data = {
       "id" => "1",
@@ -69,7 +63,7 @@ describe "EY::Model::Environment#instances" do
 
     env = EY::Model::Environment.from_hash({
         "id" => 10291,
-        "api" => @api,
+        "api" => ey_api,
         "instances" => [instance_data],
       })
 
@@ -159,14 +153,14 @@ describe "EY::Model::Environment#migration_command" do
     @app = EY::Model::App.from_hash({:name => 'fake'})
     @migrate = EY::Model::Environment.from_hash({
         "id" => 10291,
-        "api" => @api,
+        "api" => ey_api,
         'name' => 'migrate',
         'deployment_configurations' => {'fake' => {'migrate' => {'command' => 'fake db:migrate', 'perform' => true}}}
     })
 
     @no_migrate = EY::Model::Environment.from_hash({
         "id" => 10291,
-        "api" => @api,
+        "api" => ey_api,
         'name' => 'no_migrate',
         'deployment_configurations' => {'fake' => {'migrate' => {'command' => 'fake db:migrate', 'perform' => false}}}
     })

data/spec/engineyard/model/instance_spec.rb

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
 describe "EY::Model::Instance#has_app_code?" do
-
-  def have_app_code
-    simple_matcher("has app code") { |given| given.has_app_code? }
-  end
-
   it "is true for solos" do
     EY::Model::Instance.from_hash("role" => "solo").should have_app_code
   end

data/spec/engineyard/repo_spec.rb

@@ -1,14 +1,17 @@
 require 'spec_helper'
 
 describe EY::Repo do
-  before(:all) do
+  before(:each) do
     FakeFS.deactivate!
     @path = Pathname.new("/tmp/ey-test/.git/")
     @path.mkpath
     @r = EY::Repo.new("/tmp/ey-test")
   end
-  after(:all) { FakeFS.activate! }
-  after(:each) { clear_urls }
+
+  after(:each) do
+    clear_urls
+    FakeFS.activate!
+  end
 
   def set_head(head)
     @path.join("HEAD").open('w') {|f| f.write(head) }
@@ -51,8 +54,8 @@ describe EY::Repo do
       other_url = "git@github.com:engineyard/engineyard.git"
       set_url origin_url, "origin"
       set_url other_url,  "other"
-      @r.should be_has_remote(origin_url)
-      @r.should be_has_remote(other_url)
+      @r.should have_remote(origin_url)
+      @r.should have_remote(other_url)
     end
   end # url
 

data/spec/engineyard/resolver_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe EY::Resolver do
-  def api
-    return @api if @api
+  def mock_api
+    return @mock_api if @mock_api
     apps = Object.new
     def apps.named(name, *args)
       result = EY::Model::App.from_hash(:name => name)
@@ -15,11 +15,11 @@ describe EY::Resolver do
       result.stub!(:apps => [])
       result
     end
-    @api = mock("api", :apps => apps, :environments => environments)
+    @mock_api = mock("api", :apps => apps, :environments => environments)
   end
 
   def resolver
-    @resolver ||= EY::Resolver.new(api).tap do |r|
+    @resolver ||= EY::Resolver.new(mock_api).tap do |r|
       r.instance_variable_set("@app_deployments", [])
     end
   end
@@ -45,13 +45,6 @@ describe EY::Resolver do
     r
   end
 
-  def resolve_to(expected)
-    simple_matcher "resolve to" do |(app,environment), _|
-      app.name.should == expected[:app_name]
-      environment.name.should == expected[:environment_name]
-    end
-  end
-
   describe "#fetch" do
     it "raises argument error if the conditions are empty" do
       lambda { resolver.app_and_environment({}) }.should raise_error(ArgumentError)

data/spec/ey/deploy_spec.rb

@@ -43,8 +43,8 @@ describe "ey deploy" do
   end
 
   # common behavior
-  it_should_behave_like "it takes an environment name and an app name and an account name"
-  it_should_behave_like "it invokes engineyard-serverside"
+  include_examples "it takes an environment name and an app name and an account name"
+  include_examples "it invokes engineyard-serverside"
 end
 
 describe "ey deploy" do

data/spec/ey/list_environments_spec.rb

@@ -55,7 +55,7 @@ end
 
 describe "ey environments with an ambiguous git repo" do
   given "integration"
-  it_should_behave_like "it has an ambiguous git repo"
+  include_examples "it has an ambiguous git repo"
 
   it "lists environments from all apps using the git repo" do
     ey %w[environments]

data/spec/ey/logs_spec.rb

@@ -32,5 +32,5 @@ describe "ey logs" do
     @out.should match(/Main logs for #{scenario[:environment]}/)
   end
 
-  it_should_behave_like "it takes an environment name and an account name"
+  include_examples "it takes an environment name and an account name"
 end

data/spec/ey/rebuild_spec.rb

@@ -14,5 +14,5 @@ describe "ey rebuild" do
     @out.should =~ /Rebuilding #{scenario[:environment]}/
   end
 
-  it_should_behave_like "it takes an environment name and an account name"
+  include_examples "it takes an environment name and an account name"
 end

data/spec/ey/recipes/apply_spec.rb

@@ -14,7 +14,7 @@ describe "ey recipes apply" do
     @out.should =~ /Uploaded recipes started for #{scenario[:environment]}/
   end
 
-  it_should_behave_like "it takes an environment name and an account name"
+  include_examples "it takes an environment name and an account name"
 
   it "fails when given a bad option" do
     ey %w[web enable --lots --of --bogus --options], :expect_failure => true
@@ -25,5 +25,5 @@ end
 describe "ey recipes apply with an ambiguous git repo" do
   given "integration"
   def command_to_run(_) %w[recipes apply] end
-  it_should_behave_like "it requires an unambiguous git repo"
+  include_examples "it requires an unambiguous git repo"
 end

data/spec/ey/recipes/download_spec.rb

@@ -11,7 +11,7 @@ describe "ey recipes download" do
   after(:each) do
     # This test creates + destroys the cookbooks/ directory, thus
     # rendering the git repo unsuitable for reuse.
-    refresh_git_repo('default')
+    EY.refresh_git_repo('default')
   end
 
   def command_to_run(opts)
@@ -26,7 +26,7 @@ describe "ey recipes download" do
     File.read('cookbooks/README').should == "Remove this file to clone an upstream git repository of cookbooks\n"
   end
 
-  it_should_behave_like "it takes an environment name and an account name"
+  include_examples "it takes an environment name and an account name"
 
   it "fails when cookbooks/ already exists" do
     api_scenario "one app, one environment"
@@ -39,5 +39,5 @@ end
 describe "ey recipes download with an ambiguous git repo" do
   given "integration"
   def command_to_run(_) %w[recipes download] end
-  it_should_behave_like "it requires an unambiguous git repo"
+  include_examples "it requires an unambiguous git repo"
 end

data/spec/ey/recipes/upload_spec.rb

@@ -20,7 +20,7 @@ describe "ey recipes upload" do
     @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"
+  include_examples "it takes an environment name and an account name"
 end
 
 describe "ey recipes upload -f recipes.tgz" do
@@ -43,7 +43,7 @@ describe "ey recipes upload -f recipes.tgz" do
     @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"
+  include_examples "it takes an environment name and an account name"
 end
 
 describe "ey recipes upload -f with a missing filenamen" do
@@ -66,7 +66,7 @@ end
 describe "ey recipes upload with an ambiguous git repo" do
   given "integration"
   def command_to_run(_) %w[recipes upload] end
-  it_should_behave_like "it requires an unambiguous git repo"
+  include_examples "it requires an unambiguous git repo"
 end
 
 describe "ey recipes upload from a separate cookbooks directory" do

data/spec/ey/rollback_spec.rb

@@ -18,8 +18,8 @@ describe "ey rollback" do
     @ssh_commands.last.should match(/engineyard-serverside.*deploy rollback.*--app #{scenario[:application]}/)
   end
 
-  it_should_behave_like "it takes an environment name and an app name and an account name"
-  it_should_behave_like "it invokes engineyard-serverside"
+  include_examples "it takes an environment name and an app name and an account name"
+  include_examples "it invokes engineyard-serverside"
 
   it "passes along the web server stack to engineyard-serverside" do
     api_scenario "one app, one environment"

data/spec/ey/ssh_spec.rb

@@ -4,7 +4,6 @@ print_my_args_ssh = "#!/bin/sh\necho ssh $*"
 
 shared_examples_for "running ey ssh" do
   given "integration"
-  include Spec::Helpers::SharedIntegrationTestUtils
 
   def extra_ey_options
     ssh_cmd = <<-RUBY
@@ -19,7 +18,6 @@ end
 
 shared_examples_for "running ey ssh for select role" do
   given "integration"
-  include Spec::Helpers::SharedIntegrationTestUtils
 
   def extra_ey_options
     {:prepend_to_path => {'ssh' => "#!/bin/sh\necho ssh $*"}}
@@ -58,7 +56,7 @@ shared_examples_for "running ey ssh for select role" do
 end
 
 describe "ey ssh" do
-  it_should_behave_like "running ey ssh"
+  include_examples "running ey ssh"
 
   before(:all) do
     api_scenario "one app, many environments"
@@ -72,13 +70,13 @@ describe "ey ssh" do
 end
 
 describe "ey ssh with an ambiguous git repo" do
-  it_should_behave_like "running ey ssh"
+  include_examples "running ey ssh"
   def command_to_run(_) %w[ssh ls] end
-  it_should_behave_like "it requires an unambiguous git repo"
+  include_examples "it requires an unambiguous git repo"
 end
 
 describe "ey ssh without a command" do
-  it_should_behave_like "running ey ssh"
+  include_examples "running ey ssh"
 
   def command_to_run(opts)
     cmd = ["ssh"]
@@ -92,11 +90,11 @@ describe "ey ssh without a command" do
     @raw_ssh_commands.should == ["ssh #{ssh_target}"]
   end
 
-  it_should_behave_like "it takes an environment name and an account name"
+  include_examples "it takes an environment name and an account name"
 end
 
 describe "ey ssh with a command" do
-  it_should_behave_like "running ey ssh"
+  include_examples "running ey ssh"
 
   def command_to_run(opts)
     cmd = %w[ssh ls]
@@ -110,11 +108,11 @@ describe "ey ssh with a command" do
     @raw_ssh_commands.should == ["ssh #{ssh_target} ls"]
   end
 
-  it_should_behave_like "it takes an environment name and an account name"
+  include_examples "it takes an environment name and an account name"
 end
 
 describe "ey ssh with a multi-part command" do
-  it_should_behave_like "running ey ssh"
+  include_examples "running ey ssh"
 
   def command_to_run(opts)
     cmd = ['ssh', 'echo "echo"']
@@ -128,7 +126,7 @@ describe "ey ssh with a multi-part command" do
     @raw_ssh_commands.should == ["ssh #{ssh_target} 'echo \"echo\"'"]
   end
 
-  it_should_behave_like "it takes an environment name and an account name"
+  include_examples "it takes an environment name and an account name"
 end
 
 describe "ey ssh --all" do
@@ -143,8 +141,8 @@ describe "ey ssh --all" do
                 db_slave_2_hostname)
   end
 
-  it_should_behave_like "running ey ssh"
-  it_should_behave_like "running ey ssh for select role"
+  include_examples "running ey ssh"
+  include_examples "running ey ssh for select role"
 end
 
 describe "ey ssh --app-servers" do
@@ -153,8 +151,8 @@ describe "ey ssh --app-servers" do
     @hosts = %w(app_hostname app_master_hostname)
   end
 
-  it_should_behave_like "running ey ssh"
-  it_should_behave_like "running ey ssh for select role"
+  include_examples "running ey ssh"
+  include_examples "running ey ssh for select role"
 end
 
 describe "ey ssh --db-master" do
@@ -163,8 +161,8 @@ describe "ey ssh --db-master" do
     @hosts = %w(db_master_hostname)
   end
 
-  it_should_behave_like "running ey ssh"
-  it_should_behave_like "running ey ssh for select role"
+  include_examples "running ey ssh"
+  include_examples "running ey ssh for select role"
 end
 
 describe "ey ssh --db-slaves" do
@@ -173,8 +171,8 @@ describe "ey ssh --db-slaves" do
     @hosts = %w(db_slave_1_hostname db_slave_2_hostname)
   end
 
-  it_should_behave_like "running ey ssh"
-  it_should_behave_like "running ey ssh for select role"
+  include_examples "running ey ssh"
+  include_examples "running ey ssh for select role"
 end
 
 describe "ey ssh --db-servers" do
@@ -183,8 +181,8 @@ describe "ey ssh --db-servers" do
     @hosts = %w(db_master_hostname db_slave_1_hostname db_slave_2_hostname)
   end
 
-  it_should_behave_like "running ey ssh"
-  it_should_behave_like "running ey ssh for select role"
+  include_examples "running ey ssh"
+  include_examples "running ey ssh for select role"
 end
 
 describe "ey ssh --utilities" do
@@ -193,8 +191,8 @@ describe "ey ssh --utilities" do
     @hosts = %w(util_fluffy_hostname util_rocky_hostname)
   end
 
-  it_should_behave_like "running ey ssh"
-  it_should_behave_like "running ey ssh for select role"
+  include_examples "running ey ssh"
+  include_examples "running ey ssh for select role"
 end
 
 describe "ey ssh --utilities fluffy" do
@@ -203,8 +201,8 @@ describe "ey ssh --utilities fluffy" do
     @hosts = %w(util_fluffy_hostname)
   end
 
-  it_should_behave_like "running ey ssh"
-  it_should_behave_like "running ey ssh for select role"
+  include_examples "running ey ssh"
+  include_examples "running ey ssh for select role"
 end
 
 describe "ey ssh --utilities fluffy rocky" do
@@ -213,7 +211,7 @@ describe "ey ssh --utilities fluffy rocky" do
     @hosts = %w(util_fluffy_hostname util_rocky_hostname)
   end
 
-  it_should_behave_like "running ey ssh"
-  it_should_behave_like "running ey ssh for select role"
+  include_examples "running ey ssh"
+  include_examples "running ey ssh for select role"
 end