engineyard-serverside 1.5.12 → 1.5.13.servicespike

data/lib/engineyard-serverside/deploy.rb

@@ -4,13 +4,6 @@ require 'fileutils'
 require 'json'
 require 'engineyard-serverside/rails_asset_support'
 
-begin
-  require 'ey_instance_api_client'
-rescue LoadError
-  puts "Using Ruby #{RUBY_VERSION}"
-  # engineyard-serverside SOMETIMES runs under the system ruby instead of resin ruby
-end
-
 module EY
   module Serverside
     class DeployBase < Task
@@ -36,7 +29,7 @@ module EY
         with_failed_release_cleanup do
           create_revision_file
           run_with_callbacks(:bundle)
-          fetch_configs
+          setup_services
           symlink_configs
           conditionally_enable_maintenance_page
           run_with_callbacks(:migrate)
@@ -267,16 +260,15 @@ WRAP
         run create_revision_file_command
       end
 
-      def services_fetcher
-        EY::InstanceAPIClient::Services.new
+      def services_setup_command
+        "sudo /usr/local/ey_resin/ruby/bin/ey-services-setup #{config.app}"
       end
 
-      def fetch_configs
-        info "~> Fetching configuration resources."
-        services_data = services_fetcher.get(config.app)
-        File.open("#{c.shared_path}/config/ey_services_config_deploy.yml", "w") do |f|
-          YAML.dump(services_data, f)
-        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
       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.12'
+    VERSION = '1.5.13.servicespike'
   end
 end

data/spec/services_deploy_spec.rb

@@ -38,18 +38,18 @@ describe "Deploying an application with services" do
       @symlinked_services_file = @deploy_dir.join('current', 'config', 'ey_services_config_deploy.yml')
 
       @deployer = setup_deploy
-      @deployer.set_services_fetcher_value({"a_service" => {"b_key" => "c_value"}})
+      @deployer.mock_services_setup!("echo 'somefilecontents' > #{@shared_services_file}")
       @deployer.deploy
     end
 
     it "creates and symlinks ey_services_config_deploy.yml" do
       @shared_services_file.should exist
       @shared_services_file.should_not be_symlink
-      @shared_services_file.read.should == YAML.dump({"a_service" => {"b_key" => "c_value"}})
+      @shared_services_file.read.should == "somefilecontents\n"
 
       @symlinked_services_file.should exist
       @symlinked_services_file.should be_symlink
-      @shared_services_file.read.should == YAML.dump({"a_service" => {"b_key" => "c_value"}})
+      @shared_services_file.read.should == "somefilecontents\n"
 
       @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
     end
@@ -57,18 +57,18 @@ describe "Deploying an application with services" do
     describe "followed by a deploy that fails to fetch services" do
       before do
         @deployer = setup_deploy
-        @deployer.services_fetcher_breaks!
+        @deployer.mock_services_setup_to_break!
         @deployer.deploy
       end
 
       it "logs a warning and symlinks the existing config file" do
         @shared_services_file.should exist
         @shared_services_file.should_not be_symlink
-        @shared_services_file.read.should == YAML.dump({"a_service" => {"b_key" => "c_value"}})
+        @shared_services_file.read.should == "somefilecontents\n"
 
         @symlinked_services_file.should exist
         @symlinked_services_file.should be_symlink
-        @shared_services_file.read.should == YAML.dump({"a_service" => {"b_key" => "c_value"}})
+        @shared_services_file.read.should == "somefilecontents\n"
 
         @deployer.infos.should be_any { |info| info =~ /WARNING: External services configuration not updated/ }
       end
@@ -78,18 +78,18 @@ describe "Deploying an application with services" do
     describe "followed by another successfull deploy" do
       before do
         @deployer = setup_deploy
-        @deployer.set_services_fetcher_value({"other_service" => nil})
+        @deployer.mock_services_setup!("echo 'otherfilecontents' > #{@shared_services_file}")
         @deployer.deploy
       end
 
       it "replaces the config with the new one (and symlinks)" do
         @shared_services_file.should exist
         @shared_services_file.should_not be_symlink
-        @shared_services_file.read.should == YAML.dump({"other_service" => nil })
+        @shared_services_file.read.should == "otherfilecontents\n"
 
         @symlinked_services_file.should exist
         @symlinked_services_file.should be_symlink
-        @shared_services_file.read.should == YAML.dump({"other_service" => nil})
+        @shared_services_file.read.should == "otherfilecontents\n"
 
         @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end
@@ -98,34 +98,4 @@ describe "Deploying an application with services" do
 
   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')
-#
-#    @deployer.deploy
-#
-#    shared_services_file.should exist
-#    shared_services_file.should_not be_symlink
-#
-#    symlinked_services_file.should exist
-#    symlinked_services_file.should be_symlink
-#  end
-#
-#  it "prints a warning if it couldn't access the services api" do
-#    @deployer.deploy
-#
-#    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')
-#
-#    @deployer.services_fetcher_breaks!
-#    @deployer.deploy
-#
-#
-#    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/support/integration.rb

@@ -10,13 +10,11 @@ class FullTestDeploy < EY::Serverside::Deploy
 
   # stfu
   def info(msg)
-    puts msg
     @infos << msg
   end
 
   # no really, stfu
   def debug(msg)
-    puts msg
     @debugs << msg
   end
 
@@ -70,26 +68,16 @@ class FullTestDeploy < EY::Serverside::Deploy
     super
   end
 
-  class MockFetcher
-    def initialize(&block)
-      @block = block
-    end
-
-    def get(app)
-      @block.call(app)
-    end
-  end
-
-  def services_fetcher
-    @mock_fetcher ||= MockFetcher.new { |app| {"some_service_for_#{app}" => {"some_var" => 'some_value'}} }
+  def services_setup_command
+    @mock_services_setup_command || "echo 'skipped'"
   end
 
-  def set_services_fetcher_value(value)
-    @mock_fetcher = MockFetcher.new { |app| value }
+  def mock_services_setup!(value)
+    @mock_services_setup_command = value
   end
 
-  def services_fetcher_breaks!
-    @mock_fetcher = MockFetcher.new { |app| raise "Server Broken" }
+  def mock_services_setup_to_break!
+    @mock_services_setup_command = "notarealcommandsoitwillexitnonzero"
   end
 end
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: 740994330
+  prerelease: 7
   segments: 
   - 1
   - 5
-  - 12
-  version: 1.5.12
+  - 13
+  - servicespike
+  version: 1.5.13.servicespike
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,28 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ey_instance_api_client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 1
-        - 5
-        version: 0.1.5
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -48,11 +33,11 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,7 +47,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -330,16 +315,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances