engineyard 0.5.5 → 0.7.0

data/lib/engineyard/cli.rb

@@ -41,7 +41,7 @@ module EY
     method_option :app, :type => :string, :aliases => %w(-a),
       :desc => "Name of the application to deploy"
     def deploy
-      app         = api.fetch_app!(options[:app]) || api.app_for_repo!(repo)
+      app         = fetch_app(options[:app])
       environment = fetch_environment(options[:environment], app)
       deploy_ref  = if options[:app]
                       environment.resolve_branch(options[:ref], options[:force]) ||
@@ -108,11 +108,14 @@ module EY
       Uses code from previous deploy in the "/data/APP_NAME/releases" directory on
       remote server(s) to restart application servers.
     DESC
+
     method_option :environment, :type => :string, :aliases => %w(-e),
-      :desc => "Environment in which to roll back the current application"
+      :desc => "Environment in which to roll back the application"
+    method_option :app, :type => :string, :aliases => %w(-a),
+      :desc => "Name of the application to roll back"
     def rollback
-      app = api.app_for_repo!(repo)
-      env = fetch_environment(options[:environment])
+      app = fetch_app(options[:app])
+      env = fetch_environment(options[:environment], app)
 
       loudly_check_eysd(env)
 

data/lib/engineyard/cli/web.rb

@@ -4,9 +4,11 @@ module EY
       desc "enable [--environment/-e ENVIRONMENT]",
         "Remove the maintenance page for this application in the given environment."
       method_option :environment, :type => :string, :aliases => %w(-e),
-        :desc => "Environment on which to put up the maintenance page"
+        :desc => "Environment on which to take down the maintenance page"
+      method_option :app, :type => :string, :aliases => %w(-a),
+        :desc => "Name of the application whose maintenance page will be removed"
       def enable
-        app         = api.app_for_repo!(repo)
+        app         = fetch_app(options[:app])
         environment = fetch_environment(options[:environment], app)
         loudly_check_eysd(environment)
         EY.ui.info "Taking down maintenance page for #{environment.name}"
@@ -27,9 +29,11 @@ module EY
         * public/system/maintenance.html.default
       DESC
       method_option :environment, :type => :string, :aliases => %w(-e),
-        :desc => "Environment on which to take down the maintenance page"
+        :desc => "Environment on which to put up the maintenance page"
+      method_option :app, :type => :string, :aliases => %w(-a),
+        :desc => "Name of the application whose maintenance page will be put up"
       def disable
-        app         = api.app_for_repo!(repo)
+        app         = fetch_app(options[:app])
         environment = fetch_environment(options[:environment], app)
         loudly_check_eysd(environment)
         EY.ui.info "Putting up maintenance page for #{environment.name}"

data/lib/engineyard/model/instance.rb

@@ -3,27 +3,11 @@ require 'escape'
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment)
-      EYSD_VERSION = "~>0.6.1"
-      CHECK_SCRIPT = <<-SCRIPT
-require "rubygems"
-requirement = Gem::Requirement.new("#{EYSD_VERSION}")
-required_version = requirement.requirements.last.last # thanks thanks rubygems rubygems
-
-# this will be a ["name-version", Gem::Specification] two-element array if present, nil otherwise
-ey_deploy_geminfo = Gem.source_index.find{ |(name,_)| name =~ /^ey-deploy-\\\d/ }
-exit(104) unless ey_deploy_geminfo
-
-current_version = ey_deploy_geminfo.last.version
-exit(0) if requirement.satisfied_by?(current_version)
-exit(70) if required_version > current_version
-exit(17) # required_version < current_version
-      SCRIPT
+      EYSD_VERSION = ENV["EY_DEPLOY_VERSION"] || "0.7.0"
       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,
-        104 => :eysd_missing,
-        70  => :too_old,
-        17  => :too_new,
+        1   => :eysd_missing,
         0   => :ok,
       })
 
@@ -79,11 +63,6 @@ exit(17) # required_version < current_version
         when :eysd_missing
           yield :installing if block_given?
           install_ey_deploy
-        when :too_new
-          raise EnvironmentError, "server-side component too new; please upgrade your copy of the engineyard gem."
-        when :too_old
-          yield :upgrading if block_given?
-          upgrade_ey_deploy
         when :ok
           # no action needed
         else
@@ -92,12 +71,12 @@ exit(17) # required_version < current_version
       end
 
       def ey_deploy_check
-        require 'base64'
-        encoded_script = Base64.encode64(CHECK_SCRIPT).gsub(/\n/, '')
-        ssh "#{ruby_path} -r base64 -e \"eval Base64.decode64(ARGV[0])\" #{encoded_script}", false
+        escaped_eysd_version = EYSD_VERSION.gsub(/\./, '\.')
+
         if ENV["NO_SSH"]
           :ok
         else
+          ssh "#{gem_path} list ey-deploy | grep \"ey-deploy \" | egrep -q '#{escaped_eysd_version}[,)]'"
           EXIT_STATUS[$?.exitstatus]
         end
       end
@@ -111,12 +90,7 @@ exit(17) # required_version < current_version
               #
               # 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}'"]))
-      end
-
-      def upgrade_ey_deploy
-        ssh "sudo #{gem_path} uninstall -a -x ey-deploy"
-        install_ey_deploy
+              "cd `mktemp -d` && #{gem_path} install ey-deploy --no-rdoc --no-ri -v #{EYSD_VERSION}"]))
       end
 
     private
@@ -135,7 +109,7 @@ exit(17) # required_version < current_version
       end
 
       def invoke_eysd_deploy(deploy_args)
-        start = [eysd_path, 'deploy']
+        start = [eysd_path, "_#{EYSD_VERSION}_", 'deploy']
         instance_args = environment.instances.inject(['--instances']) do |command, inst|
           instance_tuple = [inst.public_hostname, inst.role]
           instance_tuple << inst.name if inst.name

data/lib/engineyard/thor.rb

@@ -101,6 +101,10 @@ module EY
       end
     end
 
+    def fetch_app(app_name = nil)
+      api.fetch_app!(app_name) || api.app_for_repo!(repo)
+    end
+
     def get_apps(all_apps = false)
       if all_apps
         api.apps

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.5.5'
+  VERSION = '0.7.0'
 end

data/spec/ey/deploy_spec.rb

@@ -28,17 +28,20 @@ describe "ey deploy" do
 
   def command_to_run(options)
     cmd = "deploy"
-    cmd << " -e #{options[:env]}" if options[:env]
+    cmd << " --environment #{options[:env]}" if options[:env]
+    cmd << " --app #{options[:app]}" if options[:app]
+    cmd << " --ref #{options[:ref]}" if options[:ref]
     cmd
   end
 
   def verify_ran(scenario)
     @out.should match(/Running deploy for '#{scenario[:environment]}'/)
-    @ssh_commands.should have_command_like(/eysd deploy/)
+    @ssh_commands.should have_command_like(/eysd.*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"
 end
 
@@ -84,13 +87,13 @@ describe "ey deploy" do
 
     it "defaults to 'rake db:migrate'" do
       ey "deploy"
-      @ssh_commands.last.should =~ /eysd deploy/
+      @ssh_commands.last.should =~ /eysd.*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 =~ /eysd.*deploy/
       @ssh_commands.last.should_not =~ /--migrate/
     end
   end
@@ -215,8 +218,10 @@ describe "ey deploy" do
     end
 
     it "requires that you specify a ref when specifying the application" do
-      ey "deploy --app rails232app", :expect_failure => true
-      @err.should match(/you must also specify the ref to deploy/)
+      Dir.chdir(File.expand_path("~")) do
+        ey "deploy --app rails232app", :expect_failure => true
+        @err.should match(/you must also specify the ref to deploy/)
+      end
     end
   end
 
@@ -226,7 +231,7 @@ 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 =~ /eysd.*deploy/ }
     end
 
     it "passes along the repository URL to eysd" do

data/spec/ey/rollback_spec.rb

@@ -6,16 +6,18 @@ describe "ey rollback" do
   def command_to_run(opts)
     cmd = "rollback"
     cmd << " -e #{opts[:env]}" if opts[:env]
+    cmd << " -a #{opts[:app]}" if opts[:app]
     cmd
   end
 
   def verify_ran(scenario)
     @out.should match(/Rolling back #{scenario[:environment]}/)
     @err.should be_empty
-    @ssh_commands.last.should match(/eysd deploy rollback --app #{scenario[:application]}/)
+    @ssh_commands.last.should match(/eysd.*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 "passes along the web server stack to eysd" do

data/spec/ey/web/disable_spec.rb

@@ -6,13 +6,15 @@ describe "ey web disable" do
   def command_to_run(opts)
     cmd = "web disable"
     cmd << " -e #{opts[:env]}" if opts[:env]
+    cmd << " -a #{opts[:app]}" if opts[:app]
     cmd
   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(/eysd.*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"
 end

data/spec/ey/web/enable_spec.rb

@@ -6,13 +6,15 @@ describe "ey web enable" do
   def command_to_run(opts)
     cmd = "web enable"
     cmd << " -e #{opts[:env]}" if opts[:env]
+    cmd << " -a #{opts[:app]}" if opts[:app]
     cmd
   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(/eysd.*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"
 end

data/spec/support/fake_awsm.ru

@@ -26,6 +26,8 @@ class FakeAwsm < Sinatra::Base
                      Scenario::Empty
                    when "one app, one environment, not linked"
                      Scenario::UnlinkedApp
+                   when "two apps"
+                     Scenario::TwoApps
                    when "one app, one environment"
                      Scenario::LinkedApp
                    when "one app, one environment, app master red"
@@ -194,6 +196,7 @@ private
             "public_hostname" => "ec2-184-73-116-228.compute-1.amazonaws.com",
           }]
       end
+      private :_instances
 
       def apps
         [{"name" => "rails232app",
@@ -326,6 +329,96 @@ private
       end
     end # OneAppTwoEnvs
 
+    class TwoApps < Empty
+      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" => "ec2-174-129-198-124.compute-1.amazonaws.com",
+          "id" => 75428,
+          "amazon_id" => "i-051195b9",
+        }
+      end
+      private :keycollector_master
+
+      def apps
+        [{
+            "id" => 3202,
+            "name" => "keycollector",
+            "repository_uri" => "git@github.com:smerritt/keycollector.git",
+            "instances_count" => 0,
+            "ssh_username" => "deploy",
+            "environments" => [{
+                "apps" => [{
+                    "name" => "keycollector",
+                    "repository_uri" => "git@github.com:smerritt/keycollector.git",
+                    "id" => 3202}],
+                "name" => "keycollector_production",
+                "app_master" => keycollector_master,
+                "instances" => [keycollector_master],
+                "id" => 4359,
+                "stack_name" => "nginx_mongrel"}],
+          }, {
+            "name" => "rails232app",
+            "repository_uri" => "git://github.com/smerritt/rails232app.git",
+            "id" => 6125,
+            "environments" => [{
+                "apps" => [{
+                    "name" => "rails232app",
+                    "repository_uri" => "git://github.com/smerritt/rails232app.git",
+                    "id" => 6125}],
+                "instances_count" => 1,
+                "ssh_username" => "turkey",
+                "name" => "giblets",
+                "app_master" => railsapp_master,
+                "instances" => [railsapp_master],
+                "id" => 200,
+                "stack_name" => "nginx_unicorn"}],
+          }]
+      end
+
+      def environments
+        [{
+            "id" => 200,
+            "name" => "giblets",
+            "ssh_username" => "turkey",
+            "instances_count" => 1,
+            "instances" => [railsapp_master],
+            "app_master" => railsapp_master,
+            "stack_name" => "nginx_unicorn",
+            "apps" => [{
+                "name" => "rails232app",
+                "repository_uri" => "git://github.com/smerritt/rails232app.git",
+                "id" => 6125}],
+          }, {
+            "id" => 4359,
+            "name" => "keycollector_production",
+            "ssh_username" => "deploy",
+            "stack_name" => "nginx_mongrel",
+            "instances_count" => 1,
+            "instances" => [keycollector_master],
+            "app_master" => keycollector_master,
+            "apps" => [{
+                "name" => "keycollector",
+                "repository_uri" => "git@github.com:smerritt/keycollector.git",
+                "id" => 3202}],
+          }]
+      end
+    end # TwoApps
+
     class OneAppManySimilarlyNamedEnvs < Empty
       def apps
         apps = [{

data/spec/support/shared_behavior.rb

@@ -72,6 +72,44 @@ shared_examples_for "it takes an environment name" do
   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  => 'ec2-174-129-198-124.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  => 'ec2-174-129-198-124.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 eysd" do
   include Spec::Helpers::SharedIntegrationTestUtils
 
@@ -95,7 +133,7 @@ shared_examples_for "it invokes eysd" do
     @ssh_commands.last.should match(/--instances (#{instance_args.join('|')})/)
   end
 
-  context "eysd install" do
+  context "eysd installation" do
     before(:all) do
       api_scenario "one app, one environment"
     end
@@ -109,7 +147,7 @@ shared_examples_for "it invokes eysd" do
     end
 
     def exiting_ssh(exit_code)
-      "#!/usr/bin/env ruby\n exit!(#{exit_code}) if ARGV.to_s =~ /Base64.decode64/"
+      "#!/usr/bin/env ruby\n exit!(#{exit_code}) if ARGV.to_s =~ /gem list ey-deploy/"
     end
 
     it "raises an error if SSH fails" do
@@ -119,7 +157,7 @@ shared_examples_for "it invokes eysd" do
     end
 
     it "installs ey-deploy if it's missing" do
-      run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(104)}})
+      run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(1)}})
 
       gem_install_command = @ssh_commands.find do |command|
         command =~ /gem install ey-deploy/
@@ -128,25 +166,11 @@ shared_examples_for "it invokes eysd" do
       gem_install_command.should =~ %r{/usr/local/ey_resin/ruby/bin/gem install.*ey-deploy}
     end
 
-    it "upgrades ey-deploy if it's too old" do
-      run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(70)}})
-      @ssh_commands.should have_command_like(/gem uninstall -a -x ey-deploy/)
-      @ssh_commands.should have_command_like(/gem install ey-deploy/)
-    end
-
-    it "raises an error if ey-deploy is too new" do
-      run_ey({:env => 'giblets'},
-        {:prepend_to_path => {'ssh' => exiting_ssh(17)}, :expect_failure => true})
-      @ssh_commands.should_not have_command_like(/gem install ey-deploy/)
-      @ssh_commands.should_not have_command_like(/eysd deploy/)
-      @err.should match(/too new/i)
-    end
-
-    it "does not change ey-deploy if its version is satisfactory" 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/)
-      @ssh_commands.should_not have_command_like(/gem uninstall.* ey-deploy/)
-      @ssh_commands.should have_command_like(/eysd deploy/)
+      ver = Regexp.quote(EY::Model::Instance::EYSD_VERSION)
+      @ssh_commands.should have_command_like(/eysd _#{ver}_ deploy/)
     end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 5
-  version: 0.5.5
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -07:00
+date: 2010-06-25 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -196,7 +196,6 @@ test_files:
 - spec/engineyard/config_spec.rb
 - spec/engineyard/model/api_struct_spec.rb
 - spec/engineyard/model/environment_spec.rb
-- spec/engineyard/model/instance_spec.rb
 - spec/engineyard/repo_spec.rb
 - spec/engineyard_spec.rb
 - spec/ey/deploy_spec.rb

data/spec/engineyard/model/instance_spec.rb

@@ -1,70 +0,0 @@
-require 'spec_helper'
-
-describe "EY::Model::Instance's script for checking ey-deploy's version" do
-
-  def fake_out_no_ey_deploy
-    Gem.should_receive(:source_index).and_return(Gem::SourceIndex.new)
-  end
-
-  def fake_out_installed_ey_deploy_version(version)
-    net_sftp_gem = Gem::Specification.new do |s|
-      s.authors = ["Jamis Buck"]
-      s.autorequire = "net/sftp"
-      s.date = Time.utc(2008, 2, 24)
-      s.email = "jamis@jamisbuck.org"
-      s.files = ["doc/faq",
-        # snip
-        "test/protocol/tc_driver.rb"]
-      s.homepage = "http://net-ssh.rubyforge.org/sftp"
-      s.name = "net-sftp"
-      s.require_paths = ["lib"]
-      s.rubygems_version = "1.3.5"
-      s.specification_version = 2
-      s.summary = "Net::SFTP is a pure-Ruby implementation of the SFTP client protocol."
-      s.test_files = ["test/ALL-TESTS.rb"]
-      s.version = Gem::Version.new("1.1.1")
-    end
-
-    ey_deploy_gem = Gem::Specification.new do |s|
-      s.name = 'ey-deploy'
-      s.authors = ["EY Cloud Team"]
-      s.date = Time.utc(2010, 1, 2)
-      s.files = ['lib/engineyard/ey-deploy.rb'] # or something
-      s.specification_version = 2
-      s.version = Gem::Version.new(version)
-    end
-
-    fake_source_index = Gem::SourceIndex.new(
-      'net-sftp-1.1.1' => net_sftp_gem,
-      "ey-deploy-#{version}" => ey_deploy_gem
-      )
-    Gem.should_receive(:source_index).and_return(fake_source_index)
-  end
-
-  def script_exit_status
-    eval EY::Model::Instance::CHECK_SCRIPT
-  rescue SystemExit => e
-    return e.status
-  end
-
-  it "exits 104 if the ey-deploy gem is not installed" do
-    fake_out_no_ey_deploy
-    script_exit_status.should == 104
-  end
-
-  it "exits 70 if the installed ey-deploy is too old" do
-    fake_out_installed_ey_deploy_version('0.0.1')
-    script_exit_status.should == 70
-  end
-
-  it "exits 17 if the installed ey-deploy is too new" do
-    fake_out_installed_ey_deploy_version('1000.0.0')
-    script_exit_status.should == 17
-  end
-
-  it "exits 0 if the version number is correct" do
-    correct_version = EY::Model::Instance::EYSD_VERSION.gsub(/[^\d\.]/, '')
-    fake_out_installed_ey_deploy_version(correct_version)
-    script_exit_status.should == 0
-  end
-end