engineyard 1.4.0 → 1.4.1

data/spec/support/matchers.rb

@@ -0,0 +1,44 @@
+require 'rspec/matchers'
+
+RSpec::Matchers.define :have_command_like do |regex|
+  match do |command_list|
+    @found = command_list.find{|c| c =~ regex }
+    !!@found
+  end
+
+  failure_message_for_should do |command_list|
+    "Didn't find a command matching #{regex} in commands:\n\n" + command_list.join("\n\n")
+  end
+
+  failure_message_for_should_not do |command_list|
+    "Found unwanted command:\n\n#{@found}\n\n(matches regex #{regex})"
+  end
+end
+
+RSpec::Matchers.define :have_app_code do
+  match { |instance| instance.has_app_code? }
+
+  failure_message_for_should do |instance|
+    "Expected #has_app_code? to be true on instance: #{instance.inspect}"
+  end
+
+  failure_message_for_should_not do |instance|
+    "Expected #has_app_code? to be false on instance: #{instance.inspect}"
+  end
+end
+
+RSpec::Matchers.define :resolve_to do |expected|
+  match do |pair|
+    app, env = *pair
+    app.name == expected[:app_name] && env.name == expected[:environment_name]
+  end
+
+  failure_message_for_should do |pair|
+    app, env = *pair
+    "Expected: #{expected[:app_name]}, #{expected[:environment_name]}; Got: #{app.name}, #{env.name}"
+  end
+
+  failure_message_for_should_not do |pair|
+    "Expected to not match: #{expected[:app_name]}, #{expected[:environment_name]}"
+  end
+end

data/spec/support/shared_behavior.rb

@@ -1,29 +1,6 @@
-module Spec
-  module Helpers
-    module SharedIntegrationTestUtils
-
-      def run_ey(command_options, ey_options={})
-        if respond_to?(:extra_ey_options)   # needed for ssh tests
-          ey_options.merge!(extra_ey_options)
-        end
-
-        ey(command_to_run(command_options), ey_options)
-      end
-
-      def make_scenario(hash)
-        # since nil will silently turn to empty string when interpolated,
-        # and there's a lot of string matching involved in integration
-        # testing, it would be nice to have early notification of typos.
-        scenario = Hash.new { |h,k| raise "Tried to get key #{k.inspect}, but it's missing!" }
-        scenario.merge!(hash)
-      end
-
-    end
-  end
-end
+require 'ostruct'
 
 shared_examples_for "it has an ambiguous git repo" do
-  include Spec::Helpers::SharedIntegrationTestUtils
 
   define_git_repo('dup test') do
     system("git remote add dup git://github.com/engineyard/dup.git")
@@ -37,7 +14,7 @@ shared_examples_for "it has an ambiguous git repo" do
 end
 
 shared_examples_for "it requires an unambiguous git repo" do
-  it_should_behave_like "it has an ambiguous git repo"
+  include_examples "it has an ambiguous git repo"
 
   it "lists disambiguating environments to choose from" do
     run_ey({}, {:expect_failure => true})
@@ -49,8 +26,8 @@ shared_examples_for "it requires an unambiguous git repo" do
 end
 
 shared_examples_for "it takes an environment name and an app name and an account name" do
-  it_should_behave_like "it takes an app name"
-  it_should_behave_like "it takes an environment name"
+  include_examples "it takes an app name"
+  include_examples "it takes an environment name"
 
   context "when multiple accounts with collaboration" do
     before :all do
@@ -77,7 +54,7 @@ shared_examples_for "it takes an environment name and an app name and an account
 end
 
 shared_examples_for "it takes an environment name and an account name" do
-  it_should_behave_like "it takes an environment name"
+  include_examples "it takes an environment name"
 
   context "when multiple accounts with collaboration" do
     before :all do
@@ -119,8 +96,6 @@ shared_examples_for "it takes an environment name and an account name" do
 end
 
 shared_examples_for "it takes an environment name" do
-  include Spec::Helpers::SharedIntegrationTestUtils
-
   it "operates on the current environment by default" do
     api_scenario "one app, one environment"
     run_ey({:environment => nil}, {:debug => true})
@@ -194,7 +169,6 @@ shared_examples_for "it takes an environment name" do
 end
 
 shared_examples_for "it takes an app name" do
-  include Spec::Helpers::SharedIntegrationTestUtils
   before { @takes_app_name = true }
 
   it "allows you to specify a valid app" do
@@ -233,8 +207,6 @@ shared_examples_for "it takes an app name" do
 end
 
 shared_examples_for "it invokes engineyard-serverside" do
-  include Spec::Helpers::SharedIntegrationTestUtils
-
   context "with arguments" do
     before(:all) do
       api_scenario "one app, one environment"
@@ -296,7 +268,7 @@ shared_examples_for "model collections" do
     it "returns nil when it can't find anything" do
       @collection.match_one("dev-and-production").should be_nil
     end
- end
+  end
 
   describe "#match_one!" do
     it "works when given an unambiguous substring" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 -07:00
+date: 2011-10-18 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,12 +105,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 1
         - 5
-        - 0
-        version: 1.5.0
+        - 2
+        version: 1.5.2
   requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -151,14 +151,13 @@ dependencies:
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        version: "2.0"
   requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -239,12 +238,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
-        - 1
-        - 6
-        version: 0.1.6
+        - 2
+        - 2
+        version: 0.2.2
   requirement: *id015
 - !ruby/object:Gem::Dependency 
   name: open4
@@ -330,10 +329,11 @@ files:
 - spec/ey/whoami_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey
+- spec/support/fake_awsm.rb
 - spec/support/fake_awsm.ru
 - spec/support/fixture_recipes.tgz
-- spec/support/git_repo.rb
 - spec/support/helpers.rb
+- spec/support/matchers.rb
 - spec/support/ruby_ext.rb
 - spec/support/scenarios.rb
 - spec/support/shared_behavior.rb
@@ -412,10 +412,11 @@ test_files:
 - spec/ey/whoami_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey
+- spec/support/fake_awsm.rb
 - spec/support/fake_awsm.ru
 - spec/support/fixture_recipes.tgz
-- spec/support/git_repo.rb
 - spec/support/helpers.rb
+- spec/support/matchers.rb
 - spec/support/ruby_ext.rb
 - spec/support/scenarios.rb
 - spec/support/shared_behavior.rb

data/spec/support/git_repo.rb

@@ -1,36 +0,0 @@
-module Spec
-  module GitRepo
-    module ClassMethods
-
-      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)
-        FakeFS.without { EY.define_git_repo(name, &setup) }
-      end
-
-      def use_git_repo(repo_name)
-        before(:all) do
-          FakeFS.without do
-            @_original_wd ||= []
-            @_original_wd << Dir.getwd
-            Dir.chdir(EY.git_repo_dir(repo_name))
-          end
-        end
-
-        after(:all) do
-          FakeFS.without { Dir.chdir(@_original_wd.pop) }
-        end
-      end
-
-    end # ClassMethods
-
-    def refresh_git_repo(name)
-      EY.refresh_git_repo(name)
-    end
-
-    def self.included(other)
-      other.extend ClassMethods
-    end
-
-  end
-end