engineyard 0.9.0 → 0.10.0

data/lib/engineyard/cli.rb

@@ -59,7 +59,7 @@ module EY
 
       EY.ui.info "Connecting to the server..."
 
-      loudly_check_eysd(environment)
+      loudly_check_eydeploy(environment)
 
       EY.ui.info "Beginning deploy for '#{app.name}' in '#{environment.name}' on server..."
 
@@ -132,7 +132,7 @@ module EY
       app = fetch_app(options[:app])
       env = fetch_environment(options[:environment], app)
 
-      loudly_check_eysd(env)
+      loudly_check_eydeploy(env)
 
       EY.ui.info("Rolling back '#{app.name}' in '#{env.name}'")
       if env.rollback(app, options[:verbose])
@@ -142,20 +142,45 @@ module EY
       end
     end
 
-    desc "ssh [--environment ENVIRONMENT]", "Open an ssh session."
+    desc "ssh [COMMAND] [--all] [--environment ENVIRONMENT]", "Open an ssh session, or run a command."
     long_desc <<-DESC
-      If the environment contains just one server, a session to it will be opened. For
-      environments with clusters, a session will be opened to the application master.
+      If a command is supplied, it will be run, otherwise a session will be
+      opened. The application master is used for environments with clusters.
+      Option --all requires a command to be supplied and runs it on all servers.
+
+      Note: this command is a bit picky about its ordering. To run a command with arguments on
+      all servers, like "rm -f /some/file", you need to order it like so:
+
+      $ #{banner_base} ssh "rm -f /some/file" -e my-environment --all
     DESC
     method_option :environment, :type => :string, :aliases => %w(-e),
       :desc => "Environment to ssh into"
-    def ssh
+    method_option :all, :type => :boolean, :aliases => %(-a),
+      :desc => "Run command on all servers"
+
+    def ssh(cmd=nil)
       env = fetch_environment(options[:environment])
 
-      if env.app_master
-        Kernel.exec "ssh", "#{env.username}@#{env.app_master.public_hostname}"
+      if options[:all]
+        raise NoCommandError.new unless cmd
+
+        hosts = env.instances.map do |instance|
+          instance.public_hostname
+        end
+
+        if hosts.empty?
+          raise NoInstancesError.new(env.name)
+        else
+          hosts.each do |host|
+            system "ssh #{env.username}@#{host} #{cmd}"
+          end
+        end
       else
-        raise NoAppMaster.new(env.name)
+        if env.app_master
+          system "ssh #{env.username}@#{env.app_master.public_hostname} #{cmd}"
+        else
+          raise NoAppMasterError.new(env.name)
+        end
       end
     end
 

data/lib/engineyard/cli/web.rb

@@ -12,7 +12,7 @@ module EY
       def enable
         app         = fetch_app(options[:app])
         environment = fetch_environment(options[:environment], app)
-        loudly_check_eysd(environment)
+        loudly_check_eydeploy(environment)
         EY.ui.info "Taking down maintenance page for '#{app.name}' in '#{environment.name}'"
         environment.take_down_maintenance_page(app, options[:verbose])
       end
@@ -39,7 +39,7 @@ module EY
       def disable
         app         = fetch_app(options[:app])
         environment = fetch_environment(options[:environment], app)
-        loudly_check_eysd(environment)
+        loudly_check_eydeploy(environment)
         EY.ui.info "Putting up maintenance page for '#{app.name}' in '#{environment.name}'"
         environment.put_up_maintenance_page(app, options[:verbose])
       end

data/lib/engineyard/collection/apps.rb

@@ -2,7 +2,7 @@ module EY
   module Collection
     class Apps < Abstract
       self.invalid_error = InvalidAppError
-      self.ambiguous_error = AmbiguousAppName
+      self.ambiguous_error = AmbiguousAppNameError
     end
   end
 end

data/lib/engineyard/collection/environments.rb

@@ -2,7 +2,7 @@ module EY
   module Collection
     class Environments < Abstract
       self.invalid_error = NoEnvironmentError
-      self.ambiguous_error = AmbiguousEnvironmentName
+      self.ambiguous_error = AmbiguousEnvironmentNameError
     end
   end
 end

data/lib/engineyard/error.rb

@@ -7,6 +7,12 @@ module EY
     end
   end
 
+  class NoCommandError < EY::Error
+    def initialize
+      super "Must specify a command to run via ssh"
+    end
+  end
+
   class NoRemotesError < EY::Error
     def initialize(path)
       super "fatal: No git remotes found in #{path}"
@@ -29,19 +35,25 @@ module EY
     end
   end
 
-  class AmbiguousAppName < EY::Error
+  class AmbiguousAppNameError < EY::Error
     def initialize(name, matches)
       super ambiguous("app", name, matches)
     end
   end
 
-  class NoAppMaster < EY::Error
+  class NoAppMasterError < EY::Error
     def initialize(env_name)
       super "The environment '#{env_name}' does not have a master instance."
     end
   end
 
-  class BadAppMasterStatus < EY::Error
+  class NoInstancesError < EY::Error
+    def initialize(env_name)
+      super "The environment '#{env_name}' does not have any instances."
+    end
+  end
+
+  class BadAppMasterStatusError < EY::Error
     def initialize(master_status)
       super "Application master's status is not \"running\" (green); it is \"#{master_status}\"."
     end
@@ -50,7 +62,7 @@ module EY
   class EnvironmentError < EY::Error
   end
 
-  class AmbiguousEnvironmentName < EY::EnvironmentError
+  class AmbiguousEnvironmentNameError < EY::EnvironmentError
     def initialize(name, matches)
       super ambiguous("environment", name, matches)
     end
@@ -75,7 +87,7 @@ module EY
     end
   end
 
-  class BranchMismatch < EY::Error
+  class BranchMismatchError < EY::Error
     def initialize(default_branch, branch)
       super %|Your deploy branch is set to "#{default_branch}".\n| +
         %|If you want to deploy branch "#{branch}", use --ignore-default_branch.|

data/lib/engineyard/model/environment.rb

@@ -24,15 +24,15 @@ module EY
       def app_master!
         master = app_master
         if master.nil?
-          raise NoAppMaster.new(name)
+          raise NoAppMasterError.new(name)
         elsif !ignore_bad_master && master.status != "running"
-          raise BadAppMasterStatus.new(master.status)
+          raise BadAppMasterStatusError.new(master.status)
         end
         master
       end
 
-      def ensure_eysd_present(&blk)
-        app_master!.ensure_eysd_present(&blk)
+      def ensure_eydeploy_present(&blk)
+        app_master!.ensure_eydeploy_present(&blk)
       end
 
       def deploy(app, ref, migration_command=nil, verbose=false)
@@ -101,7 +101,7 @@ module EY
 
       def resolve_branch(branch, allow_non_default_branch=false)
         if !allow_non_default_branch && branch && default_branch && (branch != default_branch)
-          raise BranchMismatch.new(default_branch, branch)
+          raise BranchMismatchError.new(default_branch, branch)
         end
         branch || default_branch
       end

data/lib/engineyard/model/instance.rb

@@ -3,11 +3,11 @@ require 'escape'
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment)
-      EYSD_VERSION = ENV["EY_DEPLOY_VERSION"] || "0.8.2"
+      EYDEPLOY_VERSION = ENV["EY_DEPLOY_VERSION"] || "0.9.1"
       EXIT_STATUS = Hash.new { |h,k| raise EY::Error, "ey-deploy version checker exited with unknown status code #{k}" }
       EXIT_STATUS.merge!({
         255 => :ssh_failed,
-        1   => :eysd_missing,
+        1   => :eydeploy_missing,
         0   => :ok,
       })
 
@@ -30,7 +30,7 @@ module EY
           deploy_args << "--migrate" << migration_command
         end
 
-        invoke_eysd_deploy(deploy_args, verbose)
+        invoke_ey_deploy(deploy_args, verbose)
       end
 
       def rollback(app, extra_configuration=nil, verbose=false)
@@ -43,16 +43,16 @@ module EY
           deploy_args << '--config' << extra_configuration.to_json
         end
 
-        invoke_eysd_deploy(deploy_args, verbose)
+        invoke_ey_deploy(deploy_args, verbose)
       end
 
 
       def put_up_maintenance_page(app, verbose=false)
-        invoke_eysd_deploy(['enable_maintenance_page', '--app', app.name], verbose)
+        invoke_ey_deploy(['enable_maintenance_page', '--app', app.name], verbose)
       end
 
       def take_down_maintenance_page(app, verbose=false)
-        invoke_eysd_deploy(['disable_maintenance_page', '--app', app.name], verbose)
+        invoke_ey_deploy(['disable_maintenance_page', '--app', app.name], verbose)
       end
 
 
@@ -60,27 +60,27 @@ module EY
         !["db_master", "db_slave"].include?(role.to_s)
       end
 
-      def ensure_eysd_present
-        case ey_deploy_check
+      def ensure_eydeploy_present
+        case eydeploy_status = ey_deploy_check
         when :ssh_failed
           raise EnvironmentError, "SSH connection to #{hostname} failed"
-        when :eysd_missing
+        when :eydeploy_missing
           yield :installing if block_given?
           install_ey_deploy
         when :ok
           # no action needed
         else
-          raise EY::Error, "Internal error: Unexpected status from Instance#ey_deploy_check; got #{eysd_status.inspect}"
+          raise EY::Error, "Internal error: Unexpected status from Instance#ey_deploy_check; got #{eydeploy_status.inspect}"
         end
       end
 
       def ey_deploy_check
-        escaped_eysd_version = EYSD_VERSION.gsub(/\./, '\.')
+        escaped_eydeploy_version = EYDEPLOY_VERSION.gsub(/\./, '\.')
 
         if ENV["NO_SSH"]
           :ok
         else
-          ssh "#{gem_path} list ey-deploy | grep \"ey-deploy \" | egrep -q '#{escaped_eysd_version}[,)]'", false
+          ssh "#{gem_path} list ey-deploy | grep \"ey-deploy \" | egrep -q '#{escaped_eydeploy_version}[,)]'", false
           EXIT_STATUS[$?.exitstatus]
         end
       end
@@ -94,7 +94,7 @@ module EY
               #
               # rubygems help suggests that --remote will disable this
               # behavior, but it doesn't.
-              "cd `mktemp -d` && #{gem_path} install ey-deploy --no-rdoc --no-ri -v #{EYSD_VERSION}"]))
+              "cd `mktemp -d` && #{gem_path} install ey-deploy --no-rdoc --no-ri -v #{EYDEPLOY_VERSION}"]))
       end
 
     private
@@ -112,8 +112,8 @@ module EY
         end
       end
 
-      def invoke_eysd_deploy(deploy_args, verbose=false)
-        start = [eysd_path, "_#{EYSD_VERSION}_", 'deploy']
+      def invoke_ey_deploy(deploy_args, verbose=false)
+        start = [eydeploy_path, "_#{EYDEPLOY_VERSION}_", 'deploy']
         instance_args = environment.instances.find_all do |inst|
           inst.has_app_code?
         end.inject(['--instances']) do |command, inst|
@@ -132,8 +132,8 @@ module EY
         ssh cmd
       end
 
-      def eysd_path
-        "/usr/local/ey_resin/ruby/bin/eysd"
+      def eydeploy_path
+        "/usr/local/ey_resin/ruby/bin/ey-deploy"
       end
 
       def gem_path

data/lib/engineyard/thor.rb

@@ -77,8 +77,8 @@ module EY
       @repo ||= EY::Repo.new
     end
 
-    def loudly_check_eysd(environment)
-      environment.ensure_eysd_present do |action|
+    def loudly_check_eydeploy(environment)
+      environment.ensure_eydeploy_present do |action|
         case action
         when :installing
           EY.ui.warn "Instance does not have server-side component installed"

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/spec/engineyard/cli_spec.rb

@@ -13,7 +13,7 @@ describe EY::CLI do
 
   it "provides error classes" do
     EY::EnvironmentError.should be
-    EY::BranchMismatch.should be
+    EY::BranchMismatchError.should be
     EY::DeployArgumentError.should be
   end
 

data/spec/engineyard/model/environment_spec.rb

@@ -112,7 +112,7 @@ describe "EY::Model::Environment#app_master!" do
     env = make_env_with_master("status" => "error")
     lambda {
       env.app_master!
-    }.should raise_error(EY::BadAppMasterStatus)
+    }.should raise_error(EY::BadAppMasterStatusError)
   end
 
   it "returns the app master if told to ignore the app master being in a non-running state" do
@@ -126,7 +126,7 @@ describe "EY::Model::Environment#app_master!" do
     env = make_env_with_master(nil)
     lambda {
       env.app_master!
-    }.should raise_error(EY::NoAppMaster)
+    }.should raise_error(EY::NoAppMasterError)
   end
 end
 

data/spec/ey/deploy_spec.rb

@@ -37,13 +37,13 @@ describe "ey deploy" do
 
   def verify_ran(scenario)
     @out.should match(/Beginning deploy for.*#{scenario[:application]}.*#{scenario[:environment]}/)
-    @ssh_commands.should have_command_like(/eysd.*deploy.*--app #{scenario[:application]}/)
+    @ssh_commands.should have_command_like(/ey-deploy.*deploy.*--app #{scenario[:application]}/)
   end
 
   # common behavior
   it_should_behave_like "it takes an environment name"
   it_should_behave_like "it takes an app name"
-  it_should_behave_like "it invokes eysd"
+  it_should_behave_like "it invokes ey-deploy"
 end
 
 describe "ey deploy" do
@@ -81,20 +81,20 @@ describe "ey deploy" do
       api_scenario "one app, one environment"
     end
 
-    it "finds eysd despite its being buried in the filesystem" do
+    it "finds ey-deploy despite its being buried in the filesystem" do
       ey "deploy"
-      @ssh_commands.last.should =~ %r{/usr/local/ey_resin/ruby/bin/eysd}
+      @ssh_commands.last.should =~ %r{/usr/local/ey_resin/ruby/bin/ey-deploy}
     end
 
     it "defaults to 'rake db:migrate'" do
       ey "deploy"
-      @ssh_commands.last.should =~ /eysd.*deploy/
+      @ssh_commands.last.should =~ /ey-deploy.*deploy/
       @ssh_commands.last.should =~ /--migrate 'rake db:migrate'/
     end
 
     it "can be disabled with --no-migrate" do
       ey "deploy --no-migrate"
-      @ssh_commands.last.should =~ /eysd.*deploy/
+      @ssh_commands.last.should =~ /ey-deploy.*deploy/
       @ssh_commands.last.should_not =~ /--migrate/
     end
   end
@@ -155,7 +155,7 @@ describe "ey deploy" do
         File.unlink("ey.yml")
       end
 
-      it "gets passed along to eysd" do
+      it "gets passed along to ey-deploy" do
         ey "deploy"
         @ssh_commands.last.should =~ /--config '\{\"bert\":\"ernie\"\}'/
       end
@@ -232,14 +232,14 @@ describe "ey deploy" do
     before(:all) do
       api_scenario "one app, one environment", "user@git.host:path/to/repo.git"
       ey "deploy"
-      @deploy_command = @ssh_commands.find {|c| c =~ /eysd.*deploy/ }
+      @deploy_command = @ssh_commands.find {|c| c =~ /ey-deploy.*deploy/ }
     end
 
-    it "passes along the repository URL to eysd" do
+    it "passes along the repository URL to ey-deploy" do
       @deploy_command.should =~ /--repo user@git.host:path\/to\/repo.git/
     end
 
-    it "passes along the web server stack to eysd" do
+    it "passes along the web server stack to ey-deploy" do
       @deploy_command.should =~ /--stack nginx_mongrel/
     end
   end

data/spec/ey/rollback_spec.rb

@@ -14,14 +14,14 @@ describe "ey rollback" do
   def verify_ran(scenario)
     @out.should match(/Rolling back.*#{scenario[:application]}.*#{scenario[:environment]}/)
     @err.should be_empty
-    @ssh_commands.last.should match(/eysd.*deploy rollback.*--app #{scenario[:application]}/)
+    @ssh_commands.last.should match(/ey-deploy.*deploy rollback.*--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 invokes eysd"
+  it_should_behave_like "it invokes ey-deploy"
 
-  it "passes along the web server stack to eysd" do
+  it "passes along the web server stack to ey-deploy" do
     api_scenario "one app, one environment"
     ey "rollback"
     @ssh_commands.last.should =~ /--stack nginx_mongrel/

data/spec/ey/ssh_spec.rb

@@ -2,8 +2,17 @@ require 'spec_helper'
 
 print_my_args_ssh = "#!/bin/sh\necho ssh $*"
 
-describe "ey ssh" do
+shared_examples_for "running ey ssh" do
   given "integration"
+  include Spec::Helpers::SharedIntegrationTestUtils
+
+  def extra_ey_options
+    {:prepend_to_path => {'ssh' => "#!/bin/sh\necho ssh $*"}}
+  end
+end
+
+describe "ey ssh" do
+  it_should_behave_like "running ey ssh"
 
   before(:all) do
     api_scenario "one app, many environments"
@@ -16,12 +25,8 @@ describe "ey ssh" do
 
 end
 
-describe "ey ssh" do
-  given "integration"
-
-  def extra_ey_options
-    {:prepend_to_path => {'ssh' => "#!/bin/sh\necho ssh $*"}}
-  end
+describe "ey ssh without a command" do
+  it_should_behave_like "running ey ssh"
 
   def command_to_run(opts)
     cmd = "ssh"
@@ -36,3 +41,74 @@ describe "ey ssh" do
 
   it_should_behave_like "it takes an environment name"
 end
+
+describe "ey ssh with a command" do
+  it_should_behave_like "running ey ssh"
+
+  def command_to_run(opts)
+    cmd = "ssh ls"
+    cmd << " --environment #{opts[:env]}" if opts[:env]
+    cmd
+  end
+
+  def verify_ran(scenario)
+    ssh_target = scenario[:ssh_username] + '@' + scenario[:master_hostname]
+    @raw_ssh_commands.should == ["ssh #{ssh_target} ls"]
+  end
+
+  it_should_behave_like "it takes an environment name"
+end
+
+
+describe "ey ssh --all with a command" do
+  it_should_behave_like "running ey ssh"
+
+  def command_to_run(opts)
+    cmd = "ssh ls"
+    cmd << " --all"
+    cmd << " --environment #{opts[:env]}" if opts[:env]
+    cmd
+  end
+
+  it "runs the command on all servers" do
+    api_scenario "one app, one environment"
+    run_ey(:env => 'giblets', :verbose => true)
+    @raw_ssh_commands.count do |command|
+      command =~ /^ssh turkey@.+ ls$/
+    end.should == 4
+  end
+end
+
+describe "ey ssh --all without a command" do
+  it_should_behave_like "running ey ssh"
+
+  def command_to_run(opts)
+    cmd = "ssh"
+    cmd << " --all"
+    cmd << " --environment #{opts[:env]}" if opts[:env]
+    cmd
+  end
+
+  it "raises an error" do
+    api_scenario "one app, one environment"
+    run_ey({:env => 'giblets', :verbose => true}, :expect_failure => true)
+    @err.grep(/NoCommandError/)
+  end
+end
+
+describe "ey ssh --all without servers" do
+  it_should_behave_like "running ey ssh"
+
+  def command_to_run(opts)
+    cmd = "ssh ls"
+    cmd << " --all"
+    cmd << " --environment #{opts[:env]}" if opts[:env]
+    cmd
+  end
+
+  it "raises an error" do
+    api_scenario "one app, one environment, no instances"
+    run_ey({:env => 'giblets', :verbose => true}, :expect_failure => true)
+    @err.grep(/NoInstancesError/)
+  end
+end

data/spec/ey/web/disable_spec.rb

@@ -12,10 +12,10 @@ describe "ey web disable" do
   end
 
   def verify_ran(scenario)
-    @ssh_commands.should have_command_like(/eysd.*deploy enable_maintenance_page.*--app #{scenario[:application]}/)
+    @ssh_commands.should have_command_like(/ey-deploy.*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 invokes eysd"
+  it_should_behave_like "it invokes ey-deploy"
 end

data/spec/ey/web/enable_spec.rb

@@ -12,10 +12,10 @@ describe "ey web enable" do
   end
 
   def verify_ran(scenario)
-    @ssh_commands.should have_command_like(/eysd.*deploy disable_maintenance_page.*--app #{scenario[:application]}/)
+    @ssh_commands.should have_command_like(/ey-deploy.*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 invokes eysd"
+  it_should_behave_like "it invokes ey-deploy"
 end

data/spec/support/fake_awsm.ru

@@ -30,6 +30,8 @@ class FakeAwsm < Sinatra::Base
                      Scenario::TwoApps
                    when "one app, one environment"
                      Scenario::LinkedApp
+                   when "one app, one environment, no instances"
+                     Scenario::LinkedAppNotRunning
                    when "one app, one environment, app master red"
                      Scenario::LinkedAppRedMaster
                    when "one app, many environments"
@@ -239,6 +241,42 @@ private
       end
     end # LinkedApp
 
+    class LinkedAppNotRunning < Empty
+      def apps
+        [{"name" => "rails232app",
+            "environments" => [{"ssh_username" => "turkey",
+                "instances" => [],
+                "name" => "giblets",
+                "apps" => [{"name" => "rails232app",
+                    "repository_uri" => git_remote}],
+                "instances_count" => 0,
+                "stack_name" => "nginx_mongrel",
+                "id" => 200,
+                "framework_env" => "production",
+                "app_master" => {}}],
+            "repository_uri" => git_remote}]
+      end
+
+      def environments
+        [{
+            "ssh_username" => "turkey",
+            "instances" => [],
+            "name" => "giblets",
+            "apps" => [{
+                "name" => "rails232app",
+                "repository_uri" => git_remote}],
+            "instances_count" => 0,
+            "stack_name" => "nginx_mongrel",
+            "id" => 200,
+           "framework_env" => "production",
+           "app_master" => {}}]
+      end
+
+      def logs(env_id)
+        []
+      end
+    end # LinkedAppNotRunning
+
     class LinkedAppRedMaster < LinkedApp
       def apps
         apps = super

data/spec/support/shared_behavior.rb

@@ -110,7 +110,7 @@ shared_examples_for "it takes an app name" do
 
 end
 
-shared_examples_for "it invokes eysd" do
+shared_examples_for "it invokes ey-deploy" do
   include Spec::Helpers::SharedIntegrationTestUtils
 
   context "with arguments" do
@@ -119,11 +119,11 @@ shared_examples_for "it invokes eysd" do
       run_ey({:env => 'giblets', :verbose => true})
     end
 
-    it "passes --verbose to eysd" do
-      @ssh_commands.should have_command_like(/eysd.*deploy.*--verbose/)
+    it "passes --verbose to ey-deploy" do
+      @ssh_commands.should have_command_like(/ey-deploy.*deploy.*--verbose/)
     end
 
-    it "passes along instance information to eysd" do
+    it "passes along instance information to ey-deploy" do
       instance_args = [
         Regexp.quote("ec2-174-129-198-124.compute-1.amazonaws.com,app_master"),
         Regexp.quote("ec2-72-44-46-66.compute-1.amazonaws.com,app"),
@@ -151,7 +151,7 @@ shared_examples_for "it invokes eysd" do
   end
 
 
-  context "eysd installation" do
+  context "ey-deploy installation" do
     before(:all) do
       api_scenario "one app, one environment"
     end
@@ -187,8 +187,8 @@ shared_examples_for "it invokes eysd" do
     it "does not try to install ey-deploy 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 ey-deploy/)
-      ver = Regexp.quote(EY::Model::Instance::EYSD_VERSION)
-      @ssh_commands.should have_command_like(/eysd _#{ver}_ deploy/)
+      ver = Regexp.quote(EY::Model::Instance::EYDEPLOY_VERSION)
+      @ssh_commands.should have_command_like(/ey-deploy _#{ver}_ deploy/)
     end
   end  
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -07:00
+date: 2010-07-13 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -194,8 +194,8 @@ test_files:
 - spec/engineyard/api_spec.rb
 - spec/engineyard/cli/api_spec.rb
 - spec/engineyard/cli_spec.rb
-- spec/engineyard/collection/apps.rb
-- spec/engineyard/collection/environments.rb
+- spec/engineyard/collection/apps_spec.rb
+- spec/engineyard/collection/environments_spec.rb
 - spec/engineyard/config_spec.rb
 - spec/engineyard/model/api_struct_spec.rb
 - spec/engineyard/model/environment_spec.rb