engineyard-serverside 1.5.10 → 1.5.12

data/lib/engineyard-serverside/configuration.rb

@@ -54,6 +54,10 @@ module EY
         EY::Serverside.node
       end
 
+      def app
+        configuration['app'].to_s
+      end
+
       def revision
         IO.read(File.join(latest_release, 'REVISION'))
       end

data/lib/engineyard-serverside/deploy.rb

@@ -4,6 +4,13 @@ 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
@@ -29,6 +36,7 @@ module EY
         with_failed_release_cleanup do
           create_revision_file
           run_with_callbacks(:bundle)
+          fetch_configs
           symlink_configs
           conditionally_enable_maintenance_page
           run_with_callbacks(:migrate)
@@ -259,6 +267,24 @@ WRAP
         run create_revision_file_command
       end
 
+      def services_fetcher
+        EY::InstanceAPIClient::Services.new
+      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
+      rescue StandardError => e
+        warning <<-WARNING
+External services configuration not updated. Using previous version.
+Deploy again if your services configuration appears incomplete or out of date.
+#{e}
+        WARNING
+      end
+
       def symlink_configs(release_to_link=c.release_path)
         info "~> Preparing shared resources for release."
         symlink_tasks(release_to_link).each do |what, cmd|
@@ -320,7 +346,7 @@ WRAP
 
       def base_callback_command_for(what)
         [serverside_bin, 'hook', what.to_s,
-          '--app', config.app.to_s,
+          '--app', config.app,
           '--release-path', config.release_path.to_s,
           '--framework-env', c.environment.to_s,
         ].compact

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -2,7 +2,7 @@ require 'yaml'
 module EY
   module Serverside
     class LockfileParser
-      DEFAULT = "1.0.10"
+      DEFAULT = "1.0.21"
 
       def self.default_version
         DEFAULT

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.10'
+    VERSION = '1.5.12'
   end
 end

data/spec/basic_deploy_spec.rb

@@ -4,7 +4,7 @@ describe "Deploying an application without Bundler" do
   before(:all) do
     $DISABLE_GEMFILE = true # Don't generate Gemfile/Gemfile.lock
     $DISABLE_LOCKFILE = true
-    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset
@@ -13,7 +13,7 @@ describe "Deploying an application without Bundler" do
     # run a deploy
     config = EY::Serverside::Deploy::Configuration.new({
         "strategy"      => "IntegrationSpec",
-        "deploy_to"     => @deploy_dir,
+        "deploy_to"     => @deploy_dir.to_s,
         "group"         => `id -gn`.strip,
         "stack"         => 'nginx_passenger',
         "migrate"       => nil,
@@ -26,24 +26,39 @@ describe "Deploying an application without Bundler" do
     @deployer.deploy
   end
 
+  def exist
+    be_exist
+  end
+
   it "creates a REVISION file" do
-    File.exist?(File.join(@deploy_dir, 'current', 'REVISION')).should be_true
+    @deploy_dir.join('current', 'REVISION').should exist
   end
 
   it "restarts the app servers" do
-    File.exist?(File.join(@deploy_dir, 'current', 'restart')).should be_true
+    @deploy_dir.join('current', 'restart').should exist
   end
 
   it "runs all the hooks" do
-    File.exist?(File.join(@deploy_dir, 'current', 'before_bundle.ran' )).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'after_bundle.ran'  )).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'before_migrate.ran')).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'after_migrate.ran' )).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'before_compile_assets.ran')).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'after_compile_assets.ran' )).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'before_symlink.ran')).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'after_symlink.ran' )).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'before_restart.ran')).should be_true
-    File.exist?(File.join(@deploy_dir, 'current', 'after_restart.ran' )).should be_true
+    @deploy_dir.join('current', 'before_bundle.ran' ).should exist
+    @deploy_dir.join('current', 'after_bundle.ran'  ).should exist
+    @deploy_dir.join('current', 'before_migrate.ran').should exist
+    @deploy_dir.join('current', 'after_migrate.ran' ).should exist
+    @deploy_dir.join('current', 'before_compile_assets.ran').should exist
+    @deploy_dir.join('current', 'after_compile_assets.ran' ).should exist
+    @deploy_dir.join('current', 'before_symlink.ran').should exist
+    @deploy_dir.join('current', 'after_symlink.ran' ).should exist
+    @deploy_dir.join('current', 'before_restart.ran').should exist
+    @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/bundler_deploy_spec.rb

@@ -96,7 +96,7 @@ describe "Deploying an application that uses Bundler" do
     end
 
     it "installs the proper Bundler version" do
-      @bundler_version.should == "1.0.10" # Something should break when the default changes.
+      @bundler_version.should == "1.0.21" # Something should break when the default changes.
       install_bundler_command_ran = @deployer.commands.detect{ |command| command.index("install_bundler") }
       install_bundler_command_ran.should_not be_nil
       install_bundler_command_ran.should include("#{@binpath} install_bundler #{@bundler_version}")

data/spec/lockfile_parser_spec.rb

@@ -80,7 +80,7 @@ describe "the bundler version retrieved from the lockfile" do
     end
 
     it "uses the default version when we get a pessimistic qualifier and is lower than the default version" do
-      subject.fetch_version('1.0.1', '~>').should == '1.0.10'
+      subject.fetch_version('1.0.1', '~>').should == '1.0.21'
     end
 
     it "uses the given version when we get a pessimistic qualifier that doesn't match the default version" do

data/spec/services_deploy_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+
+describe "Deploying an application with services" do
+  before(:each) do
+    #$DISABLE_GEMFILE = true # Don't generate Gemfile/Gemfile.lock
+    #$DISABLE_LOCKFILE = true
+    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
+
+    # set up EY::Serverside::Server like we're on a solo
+    EY::Serverside::Server.reset
+    EY::Serverside::Server.add(:hostname => 'localhost', :roles => %w[solo])
+  end
+
+  def setup_deploy
+    # run a deploy
+    config = EY::Serverside::Deploy::Configuration.new({
+        "strategy"      => "IntegrationSpec",
+        "deploy_to"     => @deploy_dir.to_s,
+        "group"         => `id -gn`.strip,
+        "stack"         => 'nginx_passenger',
+        "migrate"       => nil,
+        'app'           => 'foo',
+        'framework_env' => 'staging'
+      })
+
+    EY::Serverside::LoggedOutput.verbose = true
+    @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
+    FullTestDeploy.new(config)
+  end
+
+  def exist
+    be_exist
+  end
+
+  describe "a succesful deploy" do
+    before 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 = setup_deploy
+      @deployer.set_services_fetcher_value({"a_service" => {"b_key" => "c_value"}})
+      @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"}})
+
+      @symlinked_services_file.should exist
+      @symlinked_services_file.should be_symlink
+      @shared_services_file.read.should == YAML.dump({"a_service" => {"b_key" => "c_value"}})
+
+      @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+    end
+
+    describe "followed by a deploy that fails to fetch services" do
+      before do
+        @deployer = setup_deploy
+        @deployer.services_fetcher_breaks!
+        @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"}})
+
+        @symlinked_services_file.should exist
+        @symlinked_services_file.should be_symlink
+        @shared_services_file.read.should == YAML.dump({"a_service" => {"b_key" => "c_value"}})
+
+        @deployer.infos.should be_any { |info| info =~ /WARNING: External services configuration not updated/ }
+      end
+
+    end
+
+    describe "followed by another successfull deploy" do
+      before do
+        @deployer = setup_deploy
+        @deployer.set_services_fetcher_value({"other_service" => nil})
+        @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 })
+
+        @symlinked_services_file.should exist
+        @symlinked_services_file.should be_symlink
+        @shared_services_file.read.should == YAML.dump({"other_service" => nil})
+
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+      end
+
+    end
+
+  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,11 +10,13 @@ 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
 
@@ -63,16 +65,32 @@ class FullTestDeploy < EY::Serverside::Deploy
     result
   end
 
-  def get_bundler_installer
-    installer = super
-    installer.options << ' --quiet'   # stfu already!
-    installer
-  end
-
   def deploy
     yield if block_given?
     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'}} }
+  end
+
+  def set_services_fetcher_value(value)
+    @mock_fetcher = MockFetcher.new { |app| value }
+  end
+
+  def services_fetcher_breaks!
+    @mock_fetcher = MockFetcher.new { |app| raise "Server Broken" }
+  end
 end
 
 module EY::Serverside::Strategies::IntegrationSpec
@@ -109,25 +127,28 @@ module EY::Serverside::Strategies::IntegrationSpec
 
     def gemfile_contents
       <<-EOF
-source 'http://rubygems.org'
-gem 'rake', '= 0.8.7'
-EOF
+source :rubygems
+gem 'rake'
+gem 'pg'
+      EOF
     end
 
-    # Generated using Bundler v1.0.10
+    # Generated using Bundler v1.0.21
     def lockfile_contents
       <<-EOF
 GEM
   remote: http://rubygems.org/
   specs:
-    rake (0.8.7)
+    pg (0.11.0)
+    rake (0.9.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake (= 0.8.7)
-EOF
+  pg
+  rake
+      EOF
     end
 
     def generate_gemfile_in(dir)

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
-  version: 1.5.10
+  segments: 
+  - 1
+  - 5
+  - 12
+  version: 1.5.12
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -10,31 +15,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 -07:00
-default_executable: engineyard-serverside
+date: 2011-11-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  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 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
   type: :development
-  prerelease: false
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -255,6 +283,7 @@ files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
+- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -278,9 +307,9 @@ files:
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/server_spec.rb
+- spec/services_deploy_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration.rb
-has_rdoc: true
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
 
@@ -294,7 +323,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1487870425695455343
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -303,14 +332,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1487870425695455343
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
@@ -320,6 +349,7 @@ test_files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
+- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -343,5 +373,6 @@ test_files:
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/server_spec.rb
+- spec/services_deploy_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration.rb