engineyard 1.3.1 → 1.3.2

data/spec/ey/web/disable_spec.rb

@@ -5,8 +5,9 @@ describe "ey web disable" do
 
   def command_to_run(opts)
     cmd = "web disable"
-    cmd << " -e #{opts[:env]}" if opts[:env]
+    cmd << " -e #{opts[:environment]}" if opts[:environment]
     cmd << " -a #{opts[:app]}" if opts[:app]
+    cmd << " -c #{opts[:account]}" if opts[:account]
     cmd << " --verbose" if opts[:verbose]
     cmd
   end
@@ -15,7 +16,6 @@ describe "ey web disable" do
     @ssh_commands.should have_command_like(/engineyard-serverside.*deploy enable_maintenance_page.*--app #{scenario[:application]}/)
   end
 
-  it_should_behave_like "it takes an environment name"
-  it_should_behave_like "it takes an app name"
+  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"
 end

data/spec/ey/web/enable_spec.rb

@@ -5,8 +5,9 @@ describe "ey web enable" do
 
   def command_to_run(opts)
     cmd = "web enable"
-    cmd << " -e #{opts[:env]}" if opts[:env]
+    cmd << " -e #{opts[:environment]}" if opts[:environment]
     cmd << " -a #{opts[:app]}" if opts[:app]
+    cmd << " -c #{opts[:account]}" if opts[:account]
     cmd << " --verbose" if opts[:verbose]
     cmd
   end
@@ -15,7 +16,6 @@ describe "ey web enable" do
     @ssh_commands.should have_command_like(/engineyard-serverside.*deploy disable_maintenance_page.*--app #{scenario[:application]}/)
   end
 
-  it_should_behave_like "it takes an environment name"
-  it_should_behave_like "it takes an app name"
+  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"
 end

data/spec/spec_helper.rb

@@ -29,6 +29,9 @@ require 'json'
 $LOAD_PATH.unshift(File.join(EY_ROOT, "lib"))
 require 'engineyard'
 
+#autoload hax
+EY::Error
+
 # Spec stuff
 require 'spec/autorun'
 require 'tmpdir'
@@ -39,7 +42,7 @@ support.each{|helper| require helper }
 
 Spec::Runner.configure do |config|
   config.include Spec::Helpers
-  config.extend Spec::GitRepo
+  config.include Spec::GitRepo
   config.extend Spec::Helpers::SemanticNames
 
   config.before(:all) do

data/spec/support/fake_awsm.ru

@@ -30,6 +30,8 @@ class FakeAwsm < Sinatra::Base
                      Scenario::TwoApps
                    when "one app, one environment"
                      Scenario::LinkedApp
+                   when "two accounts, two apps, two environments, ambiguous"
+                     Scenario::MultipleAmbiguousAccounts
                    when "one app, one environment, no instances"
                      Scenario::LinkedAppNotRunning
                    when "one app, one environment, app master red"
@@ -122,22 +124,31 @@ private
 
   class CloudMock
     def initialize(initial_conditions)
-      @apps, @envs, @keys, @app_joins, @key_joins = [], [], [], [], []
+      @accounts, @apps, @envs, @keys, @app_joins, @key_joins = [], [], [], [], [], []
       @next_id = 1
 
+      initial_conditions.starting_accounts.each     {|a| add_account(a) }
       initial_conditions.starting_apps.each         {|a| add_app(a) }
       initial_conditions.starting_environments.each {|e| add_environment(e) }
       initial_conditions.starting_app_joins.each    {|(app_id, env_id)| link_app(app_id, env_id) }
     end
 
+    def add_account(acc)
+      acc["id"] ||= next_id
+      @accounts << acc
+      acc
+    end
+
     def add_app(app)
       app["id"] ||= next_id
+      app["account"] ||= @accounts.first
       @apps << app
       app
     end
 
     def add_environment(env)
       env["id"] ||= next_id
+      env["account"] ||= @accounts.first
 
       unless env.has_key?("app_master")
         master = env["instances"].find{ |i| %w[solo app_master].include?(i["role"]) }
@@ -149,8 +160,11 @@ private
     end
 
     def link_app(app_id, env_id)
-      @apps.find {|a| a["id"] == app_id } or raise "No such app id:#{app_id}"
-      @envs.find {|e| e["id"] == env_id } or raise "No such environment id:#{env_id}"
+      app = @apps.find {|a| a["id"] == app_id } or raise "No such app id:#{app_id}"
+      env = @envs.find {|e| e["id"] == env_id } or raise "No such environment id:#{env_id}"
+      if app["account"]["id"] != env["account"]["id"]
+        raise "App #{app_id} in account #{app["account"]["id"]} cannot be attached to environment #{env_id} in account #{env["account"]["id"]}"
+      end
       @app_joins << [app_id, env_id]
       @app_joins.uniq!
     end
@@ -213,6 +227,7 @@ private
         self.git_remote = git_remote
       end
 
+      def starting_accounts()     [{"name" => "main"}] end
       def starting_apps()         [] end
       def starting_environments() [] end
       def starting_app_joins()    [] end
@@ -298,6 +313,35 @@ private
 
     end  # LinkedApp
 
+    class MultipleAmbiguousAccounts < LinkedApp
+      def starting_accounts
+        super + [{"name" => "account_2", "id" => 256}]
+      end
+
+      def starting_apps
+        apps = super
+        new_app = apps.first.dup
+        new_app["id"] += 1000
+        new_app["account"] = starting_accounts.last
+        apps + [new_app]
+      end
+
+      def starting_environments
+        envs = super
+        new_env = envs.first.dup
+        new_env["id"] += 1000
+        new_env["account"] = starting_accounts.last
+        envs + [new_env]
+      end
+
+      def starting_app_joins
+        joins = super
+        new_join = [joins.first[0] + 1000, 
+                    joins.first[1] + 1000]
+        joins + [new_join]
+      end
+    end
+
     class UnlinkedApp < Base
       def starting_apps
         [{

data/spec/support/git_repo.rb

@@ -1,23 +1,36 @@
 module Spec
   module GitRepo
-    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
+    module ClassMethods
 
-    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
+      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
 
-      after(:all) do
-        FakeFS.without { Dir.chdir(@_original_wd.pop) }
+      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

data/spec/support/helpers.rb

@@ -146,6 +146,11 @@ module EY
       @git_repo_setup[name] = setup
     end
 
+    def refresh_git_repo(name)
+      @git_repo_dir_cache ||= {}
+      @git_repo_dir_cache.delete name
+    end
+
     def git_repo_dir(name)
       @git_repo_dir_cache ||= {}
       return @git_repo_dir_cache[name] if @git_repo_dir_cache.has_key?(name)

data/spec/support/shared_behavior.rb

@@ -43,8 +43,63 @@ shared_examples_for "it requires an unambiguous git repo" do
     run_ey({}, {:expect_failure => true})
     @err.should =~ /ambiguous/
     @err.should =~ /specify one of the following environments/
-    @err.should =~ /giblets/
-    @err.should =~ /keycollector_production/
+    @err.should =~ /giblets \(main\)/
+    @err.should =~ /keycollector_production \(main\)/
+  end
+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"
+
+  context "when multiple accounts with collaboration" do
+    before :all do
+      api_scenario "two accounts, two apps, two environments, ambiguous"
+    end
+
+    it "fails when the app and environment are ambiguous across accounts" do
+      run_ey({:environment => "giblets", :app => "rails232app", :ref => 'master'}, {:expect_failure => true})
+      @err.should match(/Multiple app deployments possible/i)
+      @err.should match(/ey \S+ --environment='giblets' --app='rails232app' --account='account_2'/i)
+      @err.should match(/ey \S+ --environment='giblets' --app='rails232app' --account='main'/i)
+    end
+
+    it "runs when specifying the account disambiguates the app to deploy" do
+      run_ey({:environment => "giblets", :app => "rails232app", :account => "main", :ref => 'master'})
+      verify_ran(make_scenario({
+          :environment      => 'giblets',
+          :application      => 'rails232app',
+          :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
+          :ssh_username     => 'turkey',
+        }))
+    end
+  end
+end
+
+shared_examples_for "it takes an environment name and an account name" do
+  it_should_behave_like "it takes an environment name"
+
+  context "when multiple accounts with collaboration" do
+    before :all do
+      api_scenario "two accounts, two apps, two environments, ambiguous"
+    end
+
+    it "fails when the app and environment are ambiguous across accounts" do
+      run_ey({:environment => "giblets"}, {:expect_failure => true})
+      @err.should match(/multiple environments possible/i)
+      @err.should match(/ey \S+ --environment='giblets' --account='account_2'/i)
+      @err.should match(/ey \S+ --environment='giblets' --account='main'/i)
+    end
+
+    it "runs when specifying the account disambiguates the app to deploy" do
+      run_ey({:environment => "giblets", :account => "main"})
+      verify_ran(make_scenario({
+          :environment      => 'giblets',
+          :application      => 'rails232app',
+          :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
+          :ssh_username     => 'turkey',
+        }))
+    end
   end
 end
 
@@ -53,7 +108,7 @@ shared_examples_for "it takes an environment name" do
 
   it "operates on the current environment by default" do
     api_scenario "one app, one environment"
-    run_ey({:env => nil}, {:debug => true})
+    run_ey({:environment => nil}, {:debug => true})
     verify_ran(make_scenario({
           :environment      => 'giblets',
           :application      => 'rails232app',
@@ -64,23 +119,47 @@ shared_examples_for "it takes an environment name" do
 
   it "complains when you specify a nonexistent environment" do
     api_scenario "one app, one environment"
-    run_ey({:env => 'typo-happens-here'}, {:expect_failure => true})
+    run_ey({:environment => 'typo-happens-here'}, {:expect_failure => true})
     @err.should match(/no environment named 'typo-happens-here'/i)
   end
 
+  context "outside a git repo" do
+    define_git_repo("not actually a git repo") do |git_dir|
+      # in case we screw up and are not in a freshly-generated test
+      # git repository, don't blow away the thing we're developing
+      system("rm -rf .git") if `git remote -v`.include?("path/to/repo.git")
+      git_dir.join("cookbooks").mkdir
+    end
+
+    use_git_repo("not actually a git repo")
+
+    before :all do
+      api_scenario "one app, one environment"
+    end
+
+    it "works (and does not complain about git remotes)" do
+      run_ey({:environment => 'giblets'}) unless @takes_app_name
+    end
+
+  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/)
+      run_ey({:environment => 'staging'}, {:expect_failure => true})
+      if @takes_app_name
+        @err.should match(/multiple app deployments possible/i)
+      else
+        @err.should match(/multiple environments possible/i)
+      end
     end
 
     it "works when the substring is unambiguous" do
       api_scenario "one app, many similarly-named environments"
-      run_ey({:env => 'prod'}, {:debug => true})
+      run_ey({:environment => 'prod'}, {:debug => true})
       verify_ran(make_scenario({
             :environment      => 'railsapp_production',
             :application      => 'rails232app',
@@ -92,18 +171,19 @@ shared_examples_for "it takes an environment name" do
 
   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
+    run_ey({:environment => nil}, {:expect_failure => true})
+    @err.should match(/there is no application configured/i)
   end
 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
     api_scenario "one app, one environment"
     Dir.chdir(Dir.tmpdir) do
-      run_ey({:env => 'giblets', :app => 'rails232app', :ref => 'master'}, {})
+      run_ey({:environment => 'giblets', :app => 'rails232app', :ref => 'master'}, {})
       verify_ran(make_scenario({
             :environment      => 'giblets',
             :application      => 'rails232app',
@@ -128,7 +208,7 @@ shared_examples_for "it takes an app name" do
 
   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'},
+    run_ey({:environment => 'giblets', :app => 'P-time-SAT-solver', :ref => 'master'},
       {:expect_failure => true})
     @err.should =~ /no app.*P-time-SAT-solver/i
   end
@@ -141,7 +221,7 @@ shared_examples_for "it invokes engineyard-serverside" do
   context "with arguments" do
     before(:all) do
       api_scenario "one app, one environment"
-      run_ey({:env => 'giblets', :verbose => true})
+      run_ey({:environment => 'giblets', :verbose => true})
     end
 
     it "passes --verbose to engineyard-serverside" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -07:00
+date: 2010-10-15 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +24,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 33
         segments: 
         - 0
         - 14
-        - 0
-        version: 0.14.0
+        - 3
+        version: 0.14.3
   requirement: *id001
   type: :runtime
   name: thor
@@ -77,24 +77,10 @@ dependencies:
         version: "0"
   requirement: *id004
   type: :runtime
-  name: ruby-termios
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-  type: :runtime
   name: json_pure
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,23 +91,23 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
-  requirement: *id006
+  requirement: *id005
   type: :runtime
   name: escape
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 17
         segments: 
         - 1
         - 3
-        - 3
-        version: 1.3.3
-  requirement: *id007
+        - 5
+        version: 1.3.5
+  requirement: *id006
   type: :runtime
   name: engineyard-serverside-adapter
   prerelease: false
@@ -147,6 +133,7 @@ files:
 - lib/engineyard/collection.rb
 - lib/engineyard/config.rb
 - lib/engineyard/error.rb
+- lib/engineyard/model/account.rb
 - lib/engineyard/model/api_struct.rb
 - lib/engineyard/model/app.rb
 - lib/engineyard/model/environment.rb
@@ -154,6 +141,7 @@ files:
 - lib/engineyard/model/log.rb
 - lib/engineyard/model.rb
 - lib/engineyard/repo.rb
+- lib/engineyard/resolver.rb
 - lib/engineyard/ruby_ext.rb
 - lib/engineyard/thor.rb
 - lib/engineyard/version.rb
@@ -170,6 +158,7 @@ files:
 - spec/engineyard/model/environment_spec.rb
 - spec/engineyard/model/instance_spec.rb
 - spec/engineyard/repo_spec.rb
+- spec/engineyard/resolver_spec.rb
 - spec/engineyard_spec.rb
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
@@ -235,6 +224,7 @@ test_files:
 - spec/engineyard/model/environment_spec.rb
 - spec/engineyard/model/instance_spec.rb
 - spec/engineyard/repo_spec.rb
+- spec/engineyard/resolver_spec.rb
 - spec/engineyard_spec.rb
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb