engineyard 1.3.17 → 1.3.18

data/spec/support/scenarios.rb

@@ -0,0 +1,361 @@
+module Scenario
+  class Base
+    attr_accessor :git_remote
+
+    def initialize(git_remote)
+      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
+
+  end
+
+  class LinkedApp < Base
+    def _instances
+      [{
+          "id" => 27220,
+          "role" => "app_master",
+          "name" => nil,
+          "status" => "running",
+          "amazon_id" => 'i-ddbbdd92',
+          "public_hostname" => "app_master_hostname.compute-1.amazonaws.com",
+        }, {
+          "id" => 22721,
+          "name" => nil,
+          "role" => "db_master",
+          "status" => "running",
+          "amazon_id" => "i-d4cdddbf",
+          "public_hostname" => "db_master_hostname.compute-1.amazonaws.com",
+        }, {
+          "id" => 22724,
+          "name" => nil,
+          "role" => "db_slave",
+          "status" => "running",
+          "amazon_id" => "i-asdfasdfaj",
+          "public_hostname" => "db_slave_1_hostname.compute-1.amazonaws.com",
+        }, {
+          "id" => 22725,
+          "name" => nil,
+          "role" => "db_slave",
+          "status" => "running",
+          "amazon_id" => "i-asdfasdfaj",
+          "public_hostname" => "db_slave_2_hostname.compute-1.amazonaws.com",
+        }, {
+          "id" => 22722,
+          "role" => "app",
+          "name" => nil,
+          "status" => "building",
+          "amazon_id" => "i-d2e3f1b9",
+          "public_hostname" => "app_hostname.compute-1.amazonaws.com",
+        }, {
+          "id" => 22723,
+          "role" => "util",
+          "name" => "fluffy",
+          "status" => "running",
+          "amazon_id" => "i-80e3f1eb",
+          "public_hostname" => "util_fluffy_hostname.compute-1.amazonaws.com",
+        }, {
+          "id" => 22727,
+          "role" => "util",
+          "name" => "rocky",
+          "status" => "running",
+          "amazon_id" => "i-80etf1eb",
+          "public_hostname" => "util_rocky_hostname.compute-1.amazonaws.com",
+        }]
+    end
+    private :_instances
+
+    def starting_apps
+      [{
+          "id" => 1001,
+          "name" => "rails232app",
+          "repository_uri" => git_remote}]
+    end
+
+    def starting_environments
+      [{
+          "id" => 200,
+          "ssh_username" => "turkey",
+          "instances" => _instances,
+          "name" => "giblets",
+          "instances_count" => 4,
+          "stack_name" => "nginx_mongrel",
+          "framework_env" => "production"}]
+    end
+
+    def starting_app_joins
+      [[1001, 200]]
+    end
+
+  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
+      [{
+          "id" => 1001,
+          "name" => "rails232app",
+          "repository_uri" => git_remote}]
+    end
+
+    def starting_environments
+      [{
+          "ssh_username" => "turkey",
+          "instances" => [{
+              "status" => "running",
+              "id" => 27220,
+              "amazon_id" => 'i-ddbbdd92',
+              "role" => "solo",
+              "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com"}],
+          "name" => "giblets",
+          "instances_count" => 1,
+          "stack_name" => "nginx_mongrel",
+          "id" => 200,
+          "framework_env" => "production"}]
+    end
+  end # UnlinkedApp
+
+  class LinkedAppNotRunning < Base
+    def starting_apps
+      [{
+          "id" => 1001,
+          "name" => "rails232app",
+          "repository_uri" => git_remote}]
+    end
+
+    def starting_environments
+      [{
+          "ssh_username" => "turkey",
+          "instances" => [],
+          "name" => "giblets",
+          "instances_count" => 0,
+          "stack_name" => "nginx_mongrel",
+          "id" => 200,
+          "framework_env" => "production"}]
+    end
+
+    def starting_app_joins
+      [[1001, 200]]
+    end
+  end # LinkedAppNotRunning
+
+  class LinkedAppRedMaster < LinkedApp
+    def starting_environments
+      envs = super
+      envs[0]["instances"][0]["status"] = "error"
+      envs
+    end
+  end
+
+  class OneAppManyEnvs < Base
+    def starting_apps
+      [{
+          "id" => 1001,
+          "name" => "rails232app",
+          "repository_uri" => git_remote}]
+    end
+
+    def starting_app_joins
+      [
+        [1001, 200],
+        [1001, 202],
+      ]
+    end
+
+    def starting_environments
+      [{
+          "ssh_username" => "turkey",
+          "instances" => [{
+              "status" => "running",
+              "id" => 27220,
+              "amazon_id" => 'i-ddbbdd92',
+              "role" => "solo",
+              "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}],
+          "name" => "giblets",
+          "instances_count" => 1,
+          "stack_name" => "nginx_mongrel",
+          "id" => 200,
+          "framework_env" => "production",
+        }, {
+          "ssh_username" => "ham",
+          "instances" => [],
+          "name" => "bakon",
+          "instances_count" => 0,
+          "stack_name" => "nginx_passenger",
+          "id" => 202,
+        }, {
+          "ssh_username" => "hamburger",
+          "instances" => [],
+          "name" => "beef",
+          "instances_count" => 0,
+          "stack_name" => "nginx_passenger",
+          "id" => 206,
+        }]
+    end
+  end # OneAppTwoEnvs
+
+  class TwoApps < Base
+    def railsapp_master
+      {
+        "status" => "running",
+        "name" => nil,
+        "role" => "solo",
+        "public_hostname" => "ec2-174-129-7-113.compute-1.amazonaws.com",
+        "id" => 35707,
+        "amazon_id" => "i-0911f063",
+      }
+    end
+    private :railsapp_master
+
+    def keycollector_master
+      {
+        "status" => "running",
+        "name" => nil,
+        "role" => "solo",
+        "public_hostname" => "app_master_hostname.compute-1.amazonaws.com",
+        "id" => 75428,
+        "amazon_id" => "i-051195b9",
+      }
+    end
+    private :keycollector_master
+
+    def starting_apps
+      [{
+          "id" => 3202,
+          "name" => "keycollector",
+          "repository_uri" => "git@github.com:smerritt/keycollector.git",
+        }, {
+          "id" => 6125,
+          "name" => "rails232app",
+          "repository_uri" => "git://github.com/smerritt/rails232app.git"}]
+    end
+
+    def starting_app_joins
+      [
+        [6125, 200],
+        [3202, 439],
+      ]
+    end
+
+    def starting_environments
+      [{
+          "id" => 200,
+          "name" => "giblets",
+          "framework_env" => "staging",
+          "ssh_username" => "turkey",
+          "instances_count" => 1,
+          "instances" => [railsapp_master],
+          "stack_name" => "nginx_unicorn",
+        }, {
+          "id" => 439,
+          "framework_env" => "production",
+          "name" => "keycollector_production",
+          "ssh_username" => "deploy",
+          "stack_name" => "nginx_mongrel",
+          "instances_count" => 1,
+          "instances" => [keycollector_master],
+        }]
+    end
+  end # TwoApps
+
+  class TwoAppsSameGitUri < TwoApps
+    def starting_apps
+      apps = super
+      apps.each do |app|
+        app["repository_uri"] = "git://github.com/engineyard/dup.git"
+      end
+      apps
+    end
+  end # TwoAppsSameGitUri
+
+  class OneAppManySimilarlyNamedEnvs < Base
+    def starting_apps
+      [{
+          "id" => 1001,
+          "name" => "rails232app",
+          "repository_uri" => git_remote}]
+    end
+
+    def starting_environments
+      [{
+          "id" => 200,
+          "ssh_username" => "turkey",
+          "instances" => [{
+              "status" => "running",
+              "id" => 27220,
+              "amazon_id" => 'i-ddbbdd92',
+              "role" => "solo",
+              "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}],
+          "name" => "railsapp_production",
+          "instances_count" => 1,
+          "stack_name" => "nginx_mongrel",
+          "framework_env" => "production",
+        }, {
+          "id" => 202,
+          "ssh_username" => "ham",
+          "instances" => [{
+              "public_hostname" => '127.3.2.1',
+              "status" => "running",
+              "id" => 63066,
+              "role" => "solo",
+            }],
+          "name" => "railsapp_staging",
+          "instances_count" => 1,
+          "stack_name" => "nginx_passenger",
+          "framework_env" => "production",
+        }, {
+          "ssh_username" => "ham",
+          "instances" => [{
+              "status" => "running",
+              "id" => 59395,
+              "role" => "solo",
+              "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com",
+            }],
+          "name" => "railsapp_staging_2",
+          "instances_count" => 1,
+          "stack_name" => "nginx_passenger",
+          "id" => 204,
+          "framework_env" => "production",
+        }]
+    end
+
+    def starting_app_joins
+      [
+        [1001, 200],
+        [1001, 202],
+        [1001, 204],
+      ]
+    end
+  end  # OneAppManySimilarlyNamedEnvs
+end

data/spec/support/shared_behavior.rb

@@ -139,11 +139,13 @@ shared_examples_for "it takes an environment name" do
   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
+      link_recipes_tgz(git_dir)
     end
 
     use_git_repo("not actually a git repo")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 1
   - 3
-  - 17
-  version: 1.3.17
+  - 18
+  version: 1.3.18
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,10 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -08:00
+date: 2011-05-08 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +33,11 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
-  type: :runtime
   requirement: *id001
-  name: thor
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +49,11 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  type: :runtime
   requirement: *id002
-  name: rest-client
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +65,11 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  type: :runtime
   requirement: *id003
-  name: highline
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  type: :runtime
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,11 +79,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id004
-  name: json_pure
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: escape
+  prerelease: false
+  type: :runtime
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,11 +95,11 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
-  type: :runtime
   requirement: *id005
-  name: escape
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: engineyard-serverside-adapter
+  prerelease: false
+  type: :runtime
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -108,11 +111,11 @@ dependencies:
         - 4
         - 1
         version: 1.4.1
-  type: :runtime
   requirement: *id006
-  name: engineyard-serverside-adapter
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: net-ssh
+  prerelease: false
+  type: :runtime
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -124,11 +127,11 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  type: :runtime
   requirement: *id007
-  name: net-ssh
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -140,11 +143,11 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :development
   requirement: *id008
-  name: rspec
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -154,11 +157,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id009
-  name: rake
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  type: :development
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -168,11 +171,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id010
-  name: fakeweb
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: fakeweb-matcher
+  prerelease: false
+  type: :development
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -182,11 +185,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id011
-  name: fakeweb-matcher
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: fakefs
+  prerelease: false
+  type: :development
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -196,11 +199,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id012
-  name: fakefs
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  type: :development
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -212,11 +215,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
   requirement: *id013
-  name: bundler
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  type: :development
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -226,11 +229,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id014
-  name: sinatra
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: realweb
+  prerelease: false
+  type: :development
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -242,11 +245,11 @@ dependencies:
         - 1
         - 6
         version: 0.1.6
-  type: :development
   requirement: *id015
-  name: realweb
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  type: :development
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -258,10 +261,7 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  type: :development
   requirement: *id016
-  name: open4
-  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: 
@@ -327,9 +327,11 @@ files:
 - spec/spec_helper.rb
 - spec/support/bundled_ey
 - spec/support/fake_awsm.ru
+- spec/support/fixture_recipes.tgz
 - spec/support/git_repo.rb
 - spec/support/helpers.rb
 - spec/support/ruby_ext.rb
+- spec/support/scenarios.rb
 - spec/support/shared_behavior.rb
 has_rdoc: true
 homepage: http://github.com/engineyard/engineyard
@@ -373,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud
@@ -405,7 +407,9 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/bundled_ey
 - spec/support/fake_awsm.ru
+- spec/support/fixture_recipes.tgz
 - spec/support/git_repo.rb
 - spec/support/helpers.rb
 - spec/support/ruby_ext.rb
+- spec/support/scenarios.rb
 - spec/support/shared_behavior.rb