engineyard-serverside 1.5.13.servicespike → 1.5.13

data/lib/engineyard-serverside/deploy.rb

@@ -260,15 +260,23 @@ WRAP
         run create_revision_file_command
       end
 
+      def services_command_check
+        "which /usr/local/ey_resin/ruby/bin/ey-services-setup"
+      end
+
       def services_setup_command
-        "sudo /usr/local/ey_resin/ruby/bin/ey-services-setup #{config.app}"
+        "/usr/local/ey_resin/ruby/bin/ey-services-setup #{config.app}"
       end
 
       def setup_services
         info "~> Setting up external services."
-        puts "running command: " + services_setup_command.inspect
-        result = run(services_setup_command)
-        puts "command result: " + result.inspect
+        begin
+          sudo(services_command_check)
+        rescue StandardError => e
+          info "Could not setup services. Upgrade your environment to get services configuration."
+          return
+        end
+        sudo(services_setup_command)
       rescue StandardError => e
         warning <<-WARNING
 External services configuration not updated. Using previous version.

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.13.servicespike'
+    VERSION = '1.5.13'
   end
 end

data/spec/basic_deploy_spec.rb

@@ -51,14 +51,4 @@ describe "Deploying an application without Bundler" do
     @deploy_dir.join('current', 'after_restart.ran' ).should exist
   end
 
-  it "creates and symlinks ey_services_config_deploy.yml" do
-    shared_services_file    = @deploy_dir.join('shared',  'config', 'ey_services_config_deploy.yml')
-    symlinked_services_file = @deploy_dir.join('current', 'config', 'ey_services_config_deploy.yml')
-
-    shared_services_file.should exist
-    shared_services_file.should_not be_symlink
-
-    symlinked_services_file.should exist
-    symlinked_services_file.should be_symlink
-  end
 end

data/spec/custom_deploy_spec.rb

@@ -23,6 +23,7 @@ describe "the EY::Serverside::Deploy API" do
       def copy_repository_cache()                  @call_order << 'copy_repository_cache'                  end
       def create_revision_file()                   @call_order << 'create_revision_file'                   end
       def bundle()                                 @call_order << 'bundle'                                 end
+      def setup_services()                         @call_order << 'setup_services'                         end
       def symlink_configs()                        @call_order << 'symlink_configs'                        end
       def migrate()                                @call_order << 'migrate'                                end
       def compile_assets()                         @call_order << 'compile_assets'                         end
@@ -40,6 +41,7 @@ describe "the EY::Serverside::Deploy API" do
       copy_repository_cache
       create_revision_file
       bundle
+      setup_services
       symlink_configs
       conditionally_enable_maintenance_page
       migrate

data/spec/services_deploy_spec.rb

@@ -54,10 +54,31 @@ describe "Deploying an application with services" do
       @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
     end
 
+    describe "followed by a deploy that can't find the command" do
+      before do
+        @deployer = setup_deploy
+        @deployer.mock_services_command_check!("which nonexistatncommand")
+        @deployer.deploy
+      end
+
+      it "silently fails" do
+        @shared_services_file.should exist
+        @shared_services_file.should_not be_symlink
+        @shared_services_file.read.should == "somefilecontents\n"
+
+        @symlinked_services_file.should exist
+        @symlinked_services_file.should be_symlink
+        @shared_services_file.read.should == "somefilecontents\n"
+
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+      end
+
+    end
+
     describe "followed by a deploy that fails to fetch services" do
       before do
         @deployer = setup_deploy
-        @deployer.mock_services_setup_to_break!
+        @deployer.mock_services_setup!("notarealcommandsoitwillexitnonzero")
         @deployer.deploy
       end
 

data/spec/support/integration.rb

@@ -68,6 +68,14 @@ class FullTestDeploy < EY::Serverside::Deploy
     super
   end
 
+  def services_command_check
+    @mock_services_command_check || "which echo"
+  end
+
+  def mock_services_command_check!(value)
+    @mock_services_command_check = value
+  end
+
   def services_setup_command
     @mock_services_setup_command || "echo 'skipped'"
   end
@@ -76,9 +84,6 @@ class FullTestDeploy < EY::Serverside::Deploy
     @mock_services_setup_command = value
   end
 
-  def mock_services_setup_to_break!
-    @mock_services_setup_command = "notarealcommandsoitwillexitnonzero"
-  end
 end
 
 module EY::Serverside::Strategies::IntegrationSpec

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 740994330
-  prerelease: 7
+  hash: 25
+  prerelease: 
   segments: 
   - 1
   - 5
   - 13
-  - servicespike
-  version: 1.5.13.servicespike
+  version: 1.5.13
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -16,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 Z
+date: 2011-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -32,12 +29,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
+  requirement: *id001
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,8 +43,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id002
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  name: rake
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -315,14 +314,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: