engineyard 1.2.1 → 1.2.2

data/spec/support/git_repo.rb

@@ -19,6 +19,5 @@ module Spec
         FakeFS.without { Dir.chdir(@_original_wd.pop) }
       end
     end
-
   end
 end

data/spec/support/helpers.rb

@@ -142,7 +142,7 @@ module EY
 
     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)
+      return if @git_repo_setup.key?(name)
       @git_repo_setup[name] = setup
     end
 
@@ -162,6 +162,5 @@ module EY
       end
       @git_repo_dir_cache[name] = git_dir
     end
-
   end
 end

data/spec/support/shared_behavior.rb

@@ -22,6 +22,27 @@ module Spec
   end
 end
 
+shared_examples_for "it requires an unambiguous git repo" do
+  include Spec::Helpers::SharedIntegrationTestUtils
+
+  define_git_repo('dup test') do
+    system("git remote add dup git://github.com/engineyard/dup.git")
+  end
+
+  use_git_repo('dup test')
+
+  before(:all) do
+    api_scenario "two apps, same git uri"
+  end
+
+  it "lists disambiguating environments to choose from" do
+    run_ey({}, {:expect_failure => true})
+    @err.should =~ /ambiguous/
+    @err.should =~ /specify one of the following environments/
+    @err.should =~ /giblets/
+    @err.should =~ /keycollector_production/
+  end
+end
 
 shared_examples_for "it takes an environment name" do
   include Spec::Helpers::SharedIntegrationTestUtils
@@ -212,7 +233,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
@@ -229,6 +250,12 @@ shared_examples_for "model collections" do
       @collection.match_one!("app_staging").name.should == "app_staging"
     end
 
+    it "raises an error when given an ambiguous exact string" do
+      lambda {
+        @collection.match_one!("app_duplicate")
+      }.should raise_error(@collection_class.ambiguous_error)
+    end
+
     it "raises an error when it can't find anything" do
       lambda {
         @collection.match_one!("dev-and-production")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,100 +15,100 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 39
         segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 0
+        - 14
+        - 0
+        version: 0.14.0
   requirement: *id001
   type: :runtime
-  name: highline
-- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 7
         segments: 
-        - 0
-        - 14
-        - 0
-        version: 0.14.0
+        - 1
+        - 4
+        version: "1.4"
   requirement: *id002
   type: :runtime
-  name: thor
-- !ruby/object:Gem::Dependency 
+  name: rest-client
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
   requirement: *id003
   type: :runtime
-  name: ruby-termios
-- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
         - 0
-        - 0
-        - 4
-        version: 0.0.4
+        version: "0"
   requirement: *id004
   type: :runtime
-  name: escape
-- !ruby/object:Gem::Dependency 
+  name: ruby-termios
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 4
-        version: "1.4"
+        - 0
+        version: "0"
   requirement: *id005
   type: :runtime
-  name: rest-client
-- !ruby/object:Gem::Dependency 
+  name: json_pure
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 4
+        version: 0.0.4
   requirement: *id006
   type: :runtime
-  name: json_pure
+  name: escape
+  prerelease: false
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.
 email: cloud@engineyard.com
 executables: 
@@ -131,6 +131,7 @@ files:
 - lib/engineyard/collection.rb
 - lib/engineyard/config.rb
 - lib/engineyard/error.rb
+- lib/engineyard/model/#api_struct.rb#
 - lib/engineyard/model/api_struct.rb
 - lib/engineyard/model/app.rb
 - lib/engineyard/model/environment.rb
@@ -145,6 +146,7 @@ files:
 - lib/engineyard.rb
 - LICENSE
 - README.rdoc
+- spec/engineyard/#resolver_spec.rb#
 - spec/engineyard/api_spec.rb
 - spec/engineyard/cli/api_spec.rb
 - spec/engineyard/cli_spec.rb
@@ -169,6 +171,7 @@ files:
 - spec/ey/web/disable_spec.rb
 - spec/ey/web/enable_spec.rb
 - spec/spec_helper.rb
+- spec/support/#shared_behavior.rb#
 - spec/support/bundled_ey
 - spec/support/fake_awsm.ru
 - spec/support/git_repo.rb
@@ -210,6 +213,7 @@ signing_key:
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud
 test_files: 
+- spec/engineyard/#resolver_spec.rb#
 - spec/engineyard/api_spec.rb
 - spec/engineyard/cli/api_spec.rb
 - spec/engineyard/cli_spec.rb
@@ -234,6 +238,7 @@ test_files:
 - spec/ey/web/disable_spec.rb
 - spec/ey/web/enable_spec.rb
 - spec/spec_helper.rb
+- spec/support/#shared_behavior.rb#
 - spec/support/bundled_ey
 - spec/support/fake_awsm.ru
 - spec/support/git_repo.rb