engineyard 1.2.2 → 1.2.3

data/lib/engineyard/api.rb

@@ -30,8 +30,12 @@ module EY
       @apps ||= EY::Model::App.from_array(request('/apps')["apps"], :api => self)
     end
 
+    def apps_for_repo(repo)
+      apps.find_all {|a| repo.urls.include?(a.repository_uri) }
+    end
+
     def app_for_repo(repo)
-      candidates = apps.find_all {|a| repo.urls.include?(a.repository_uri) }
+      candidates = apps_for_repo(repo)
       if candidates.size > 1
         raise EY::AmbiguousGitUriError.new(repo.urls, candidates.map{|x| x.name})
       end

data/lib/engineyard/cli.rb

@@ -102,6 +102,12 @@ module EY
         end
       else
         apps = get_apps(options[:all])
+        if !options[:all] && apps.size > 1
+          message = "This git repo matches multiple Applications in AppCloud:\n"
+          apps.each { |app| message << "\t#{app.name}\n" }
+          message << "The following environments contain those applications:\n\n"
+          EY.ui.warn(message)
+        end
         EY.ui.warn(NoAppError.new(repo).message) unless apps.any? || options[:all]
         EY.ui.print_envs(apps, EY.config.default_environment, options[:simple])
       end

data/lib/engineyard/thor.rb

@@ -53,11 +53,7 @@ module EY
       if all_apps
         api.apps
       else
-        begin
-          [api.app_for_repo(repo)].compact
-        rescue EY::AmbiguousGitUriError
-          raise EY::AmbiguousEnvironmentGitUriError.new(api.environments)
-        end
+        api.apps_for_repo(repo)
       end
     end
 

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/spec/ey/list_environments_spec.rb

@@ -42,6 +42,12 @@ end
 
 describe "ey environments with an ambiguous git repo" do
   given "integration"
-  def command_to_run(_) "ssh environments" end
-  it_should_behave_like "it requires an unambiguous git repo"
+  it_should_behave_like "it has an ambiguous git repo"
+
+  it "lists environments from all apps using the git repo" do
+    ey "environments"
+    @out.should =~ /git repo matches multiple/i
+    @out.should include("giblets")
+    @out.should include("keycollector_production")
+  end
 end

data/spec/support/shared_behavior.rb

@@ -22,7 +22,7 @@ module Spec
   end
 end
 
-shared_examples_for "it requires an unambiguous git repo" do
+shared_examples_for "it has an ambiguous git repo" do
   include Spec::Helpers::SharedIntegrationTestUtils
 
   define_git_repo('dup test') do
@@ -34,6 +34,10 @@ shared_examples_for "it requires an unambiguous git repo" do
   before(:all) do
     api_scenario "two apps, same git uri"
   end
+end
+
+shared_examples_for "it requires an unambiguous git repo" do
+  it_should_behave_like "it has an ambiguous git repo"
 
   it "lists disambiguating environments to choose from" do
     run_ey({}, {:expect_failure => true})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -19,96 +19,96 @@ 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: 39
+        hash: 7
         segments: 
-        - 0
-        - 14
-        - 0
-        version: 0.14.0
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
   requirement: *id001
   type: :runtime
-  name: thor
-  prerelease: false
+  name: highline
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 39
         segments: 
-        - 1
-        - 4
-        version: "1.4"
+        - 0
+        - 14
+        - 0
+        version: 0.14.0
   requirement: *id002
   type: :runtime
-  name: rest-client
-  prerelease: false
+  name: thor
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 0
+        version: "0"
   requirement: *id003
   type: :runtime
-  name: highline
-  prerelease: false
+  name: ruby-termios
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id004 !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: *id004
   type: :runtime
-  name: ruby-termios
-  prerelease: false
+  name: escape
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        version: "1.4"
   requirement: *id005
   type: :runtime
-  name: json_pure
-  prerelease: false
+  name: rest-client
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id006 !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: *id006
   type: :runtime
-  name: escape
-  prerelease: false
+  name: json_pure
 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,7 +131,6 @@ 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
@@ -146,7 +145,6 @@ 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
@@ -171,7 +169,6 @@ 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
@@ -213,7 +210,6 @@ 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
@@ -238,7 +234,6 @@ 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

data/lib/engineyard/model/#api_struct.rb#

@@ -1,31 +0,0 @@
-module EY
-  module Model
-    class ApiStruct < Struct
-
-      def self.new(*args, &block)
-        super(*args) do |*block_args|
-          block.call(*block_args) if block
-
-          def self.from_array(array, common_values = {})
-            array.map do |values|
-              from_hash(values.merge(common_values))
-            end if array
-          end
-
-          def self.from_hash(hash)
-            return nil unless hash
-            members = new.members
-            values = members.map{|a| hash.has_key?(a.to_sym) ? hash[a.to_sym] : hash[a] }
-            new(*values)
-          end
-
-        end
-      end
-
-      def api_get(uri, options = {})
-        api.request(uri, options.merge(:method => :get))
-      end
-
-    end
-  end
-end

data/spec/engineyard/#resolver_spec.rb#

@@ -1,41 +0,0 @@
-require 'spec_helper'
-require 'engineyard/cli'
-
-describe EY::Resolver do
-
-  let(:repo) { 'git://engineyard/ey-cloud.git' }
-
-  let(:ey) do
-    EY::Deployment.new(:account => 'ey',
-                       :repo => repo,
-                       :app => 'ey-cloud',
-                       :environment => 'production')
-  end
-
-  let(:me) do
-    EY::Deployment.new(:account => 'me',
-                       :repo => repo,
-                       :app => 'my-app',
-                       :environment => 'production')
-  end
-
-  context "ambiguous account" do
-    it do
-      resolver = EY::Resolver.new([one, two], :repo => repo)
-      resolver.resolve.should be_nil
-      resolver.optoins.should == []
-    end
-
-    it do
-      EY::Resolver.new([one, two], :repo => repo, :account => 'me').resolve.should == me
-    end
-
-  end
-
-end
-
-deployments = EY::Deployment::Collection.new(get_deployments)
-matched_deps = deployments.resolve(params)
-
-matched_deps.message.should == "no matches"
-

data/spec/support/#shared_behavior.rb#

@@ -1,275 +0,0 @@
-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
-
-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
-
-  it "operates on the current environment by default" do
-    api_scenario "one app, one environment"
-    run_ey({:env => nil}, {:debug => true})
-    verify_ran(make_scenario({
-          :environment      => 'giblets',
-          :application      => 'rails232app',
-          :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
-          :ssh_username     => 'turkey',
-        }))
-  end
-
-  it "complains when you specify a nonexistent environment" do
-    api_scenario "one app, one environment"
-    run_ey({:env => 'typo-happens-here'}, {:expect_failure => true})
-    @err.should match(/no environment named 'typo-happens-here'/i)
-  end
-
-  context "given a piece of the environment name" do
-    before(:all) do
-      api_scenario "one app, many similarly-named environments"
-    end
-
-    it "complains when the substring is ambiguous" do
-      run_ey({:env => 'staging'}, {:expect_failure => true})
-      @err.should match(/'staging' is ambiguous/)
-    end
-
-    it "works when the substring is unambiguous" do
-      api_scenario "one app, many similarly-named environments"
-      run_ey({:env => 'prod'}, {:debug => true})
-      verify_ran(make_scenario({
-            :environment      => 'railsapp_production',
-            :application      => 'rails232app',
-            :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
-            :ssh_username     => 'turkey',
-          }))
-    end
-  end
-
-  it "complains when it can't guess the environment and its name isn't specified" do
-    api_scenario "one app, one environment, not linked"
-    run_ey({:env => nil}, {:expect_failure => true})
-    @err.should =~ /single environment/i
-  end
-end
-
-shared_examples_for "it takes an app name" do
-  include Spec::Helpers::SharedIntegrationTestUtils
-
-  it "allows you to specify a valid app" do
-    api_scenario "one app, one environment"
-    Dir.chdir(Dir.tmpdir) do
-      run_ey({:env => 'giblets', :app => 'rails232app', :ref => 'master'}, {})
-      verify_ran(make_scenario({
-            :environment      => 'giblets',
-            :application      => 'rails232app',
-            :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
-            :ssh_username     => 'turkey',
-          }))
-    end
-  end
-
-  it "can guess the environment from the app" do
-    api_scenario "two apps"
-    Dir.chdir(Dir.tmpdir) do
-      run_ey({:app => 'rails232app', :ref => 'master'}, {})
-      verify_ran(make_scenario({
-            :environment      => 'giblets',
-            :application      => 'rails232app',
-            :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
-            :ssh_username     => 'turkey',
-          }))
-    end
-  end
-
-  it "complains when you specify a nonexistant app" do
-    api_scenario "one app, one environment"
-    run_ey({:env => 'giblets', :app => 'P-time-SAT-solver', :ref => 'master'},
-      {:expect_failure => true})
-    @err.should =~ /no app.*P-time-SAT-solver/i
-  end
-
-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"
-      run_ey({:env => 'giblets', :verbose => true})
-    end
-
-    it "passes --verbose to engineyard-serverside" do
-      @ssh_commands.should have_command_like(/engineyard-serverside.*deploy.*--verbose/)
-    end
-
-    it "passes along instance information to engineyard-serverside" do
-      instance_args = [
-        Regexp.quote("app_master_hostname.compute-1.amazonaws.com,app_master"),
-        Regexp.quote("app_hostname.compute-1.amazonaws.com,app"),
-        Regexp.quote("util_fluffy_hostname.compute-1.amazonaws.com,util,fluffy"),
-      ]
-
-      db_instance = Regexp.quote("db_master_hostname.compute-1.amazonaws.com,db_master")
-
-      # apps + utilities are all mentioned
-      instance_args.each do |i|
-        @ssh_commands.last.should =~ /#{i}/
-      end
-
-      # but not database instances
-      @ssh_commands.last.should_not =~ /#{db_instance}/
-
-      # and it's all after the option '--instances'
-      @ssh_commands.last.should match(/--instances (#{instance_args.join('|')})/)
-    end
-
-    it "passes the framework environment" do
-      @ssh_commands.last.should match(/--framework-env production/)
-    end
-
-  end
-
-
-  context "engineyard-serverside installation" do
-    before(:all) do
-      api_scenario "one app, one environment"
-    end
-
-    before(:each) do
-      ENV.delete "NO_SSH"
-    end
-
-    after(:each) do
-      ENV['NO_SSH'] = "true"
-    end
-
-    def exiting_ssh(exit_code)
-      "#!/usr/bin/env ruby\n exit!(#{exit_code}) if ARGV.to_s =~ /gem list engineyard-serverside/"
-    end
-
-    it "raises an error if SSH fails" do
-      run_ey({:env => 'giblets'},
-        {:prepend_to_path => {'ssh' => exiting_ssh(255)}, :expect_failure => true})
-      @err.should =~ /SSH connection to \S+ failed/
-    end
-
-    it "installs engineyard-serverside if it's missing" do
-      run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(1)}})
-
-      gem_install_command = @ssh_commands.find do |command|
-        command =~ /gem install engineyard-serverside/
-      end
-      gem_install_command.should_not be_nil
-      gem_install_command.should =~ %r{/usr/local/ey_resin/ruby/bin/gem install.*engineyard-serverside}
-    end
-
-    it "does not try to install engineyard-serverside if it's already there" do
-      run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(0)}})
-      @ssh_commands.should_not have_command_like(/gem install engineyard-serverside/)
-      ver = Regexp.quote(EY::ENGINEYARD_SERVERSIDE_VERSION)
-      @ssh_commands.should have_command_like(/engineyard-serverside _#{ver}_ deploy/)
-    end
-  end  
-end
-
-shared_examples_for "model collections" do
-  describe "#match_one" do
-    it "works when given an unambiguous substring" do
-      @collection.match_one("prod").name.should == "app_production"
-    end
-
-    it "raises an error when given an ambiguous substring" do
-      lambda {
-        @collection.match_one("staging")
-      }.should raise_error(@collection_class.ambiguous_error)
-    end
-
-    it "returns an exact match if one exists" do
-      @collection.match_one("app_staging").name.should == "app_staging"
-    end
-
-    it "returns nil when it can't find anything" do
-      @collection.match_one("dev-and-production").should be_nil
-    end
- end
-
-  describe "#match_one!" do
-    it "works when given an unambiguous substring" do
-      @collection.match_one!("prod").name.should == "app_production"
-    end
-
-    it "raises an error when given an ambiguous substring" do
-      lambda {
-        @collection.match_one!("staging")
-      }.should raise_error(@collection_class.ambiguous_error)
-    end
-
-    it "returns an exact match if one exists" 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")
-      }.should raise_error(@collection_class.invalid_error)
-    end
-  end
-
-  describe "#named" do
-    it "finds matching by name" do
-      @collection.named("app_staging").name.should == "app_staging"
-    end
-
-    it "returns nil when no name matches" do
-      @collection.named("something else").should be_nil
-    end
-  end
-end