engineyard-serverside 1.5.24 → 1.5.25

data/lib/engineyard-serverside/deploy.rb

@@ -30,6 +30,7 @@ module EY
           create_revision_file
           run_with_callbacks(:bundle)
           setup_services
+          check_for_ey_config
           symlink_configs
           conditionally_enable_maintenance_page
           run_with_callbacks(:migrate)
@@ -52,6 +53,23 @@ module EY
         raise
       end
 
+      def parse_configured_services
+        result = YAML.load_file "#{c.shared_path}/config/ey_services_config_deploy.yml"
+        return {} unless result.is_a?(Hash)
+        result
+      rescue
+        {}
+      end
+
+      def check_for_ey_config
+        if gemfile? && lockfile
+          configured_services = parse_configured_services
+          if !configured_services.empty? && !lockfile.has_ey_config?
+            warning "Gemfile.lock does not contain ey_config. Add it to get EY::Config access to: #{configured_services.keys.join(', ')}."
+          end
+        end
+      end
+
       def check_repository
         if gemfile?
           info "~> Gemfile found."
@@ -286,6 +304,7 @@ WRAP
 
       def setup_services
         info "~> Setting up external services."
+        previously_configured_services = parse_configured_services
         begin
           sudo(services_command_check)
         rescue StandardError => e
@@ -294,11 +313,13 @@ WRAP
         end
         sudo(services_setup_command)
       rescue StandardError => e
-        warning <<-WARNING
+        unless previously_configured_services.empty?
+          warning <<-WARNING
 External services configuration not updated. Using previous version.
 Deploy again if your services configuration appears incomplete or out of date.
 #{e}
-        WARNING
+          WARNING
+        end
       end
 
       def symlink_configs(release_to_link=c.release_path)

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -15,6 +15,10 @@ module EY
         parse
       end
 
+      def has_ey_config?
+        @contents.index(/^\s+ey_config\s\([^\)]+\)$/)
+      end
+
       def any_database_adapter?
         any_ruby_adapter = %w[mysql2 mysql do_mysql pg do_postgres].any? do |type|
           @contents.index(/^\s+#{type}\s\([^\)]+\)$/)

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.24'
+    VERSION = '1.5.25'
   end
 end

data/spec/services_deploy_spec.rb

@@ -32,24 +32,98 @@ describe "Deploying an application with services" do
     be_exist
   end
 
+  describe "a deploy without ey_config" do
+    before do
+      @deployer = setup_deploy
+      @deployer.mock_gemfile_contents <<-EOF
+source :rubygems
+gem 'rake'
+gem 'pg'
+      EOF
+      @deployer.mock_lockfile_contents <<-EOF
+GEM
+  remote: http://rubygems.org/
+  specs:
+    pg (0.11.0)
+    rake (0.9.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pg
+  rake
+      EOF
+    end
+
+    describe "with services" do
+      before do
+        @shared_services_file    = @deploy_dir.join('shared',  'config', 'ey_services_config_deploy.yml')
+        @services_yml = {"servicio" => {"foo" => "bar"}}.to_yaml
+        @deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
+        @deployer.deploy
+      end
+
+      it "warns about missing ey_config" do
+        @deployer.infos.should be_any { |info| info =~ /WARNING: Gemfile.lock does not contain ey_config/ }
+      end
+
+    end
+    describe "without services" do
+      before do
+        @deployer.deploy
+      end
+
+      it "works without warnings" do
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+      end
+
+    end
+  end
+
+  describe "deploy with invalid yaml ey_services_config_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')
+      @invalid_services_yml = "42"
+
+      @deployer = setup_deploy
+      @deployer.mock_services_setup!("echo '#{@invalid_services_yml}' > #{@shared_services_file}")
+      @deployer.deploy
+    end
+
+    it "works without warning" do
+      @shared_services_file.should exist
+      @shared_services_file.should_not be_symlink
+      @shared_services_file.read.should == "#{@invalid_services_yml}\n"
+
+      @symlinked_services_file.should exist
+      @symlinked_services_file.should be_symlink
+      @shared_services_file.read.should == "#{@invalid_services_yml}\n"
+
+      @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+    end
+  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')
+      @services_yml = {"servicio" => {"foo" => "bar"}}.to_yaml
 
       @deployer = setup_deploy
-      @deployer.mock_services_setup!("echo 'somefilecontents' > #{@shared_services_file}")
+      @deployer.mock_services_setup!("echo '#{@services_yml}' > #{@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 == "somefilecontents\n"
+      @shared_services_file.read.should == "#{@services_yml}\n"
 
       @symlinked_services_file.should exist
       @symlinked_services_file.should be_symlink
-      @shared_services_file.read.should == "somefilecontents\n"
+      @shared_services_file.read.should == "#{@services_yml}\n"
 
       @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
     end
@@ -64,11 +138,11 @@ describe "Deploying an application with services" do
       it "silently fails" do
         @shared_services_file.should exist
         @shared_services_file.should_not be_symlink
-        @shared_services_file.read.should == "somefilecontents\n"
+        @shared_services_file.read.should == "#{@services_yml}\n"
 
         @symlinked_services_file.should exist
         @symlinked_services_file.should be_symlink
-        @shared_services_file.read.should == "somefilecontents\n"
+        @shared_services_file.read.should == "#{@services_yml}\n"
 
         @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end
@@ -79,38 +153,51 @@ describe "Deploying an application with services" do
       before do
         @deployer = setup_deploy
         @deployer.mock_services_setup!("notarealcommandsoitwillexitnonzero")
-        @deployer.deploy
       end
 
-      it "logs a warning and symlinks the existing config file" do
+      it "logs a warning and symlinks the existing config file when there is existing services file" do
+        @deployer.deploy
+
         @shared_services_file.should exist
         @shared_services_file.should_not be_symlink
-        @shared_services_file.read.should == "somefilecontents\n"
+        @shared_services_file.read.should == "#{@services_yml}\n"
 
         @symlinked_services_file.should exist
         @symlinked_services_file.should be_symlink
-        @shared_services_file.read.should == "somefilecontents\n"
+        @shared_services_file.read.should == "#{@services_yml}\n"
 
         @deployer.infos.should be_any { |info| info =~ /WARNING: External services configuration not updated/ }
       end
 
+      it "does not log a warning or symlink a config file when there is no existing services file" do
+        FileUtils.rm(@shared_services_file)
+        @deployer.deploy
+
+        @shared_services_file.should_not exist
+        @symlinked_services_file.should_not exist
+
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
+      end
+
     end
 
     describe "followed by another successfull deploy" do
       before do
         @deployer = setup_deploy
-        @deployer.mock_services_setup!("echo 'otherfilecontents' > #{@shared_services_file}")
+        @services_yml = {"servicio" => {"foo" => "bar2"}}.to_yaml
+
+        @deployer.mock_services_setup!("echo '#{@services_yml}' > #{@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 == "otherfilecontents\n"
+        @shared_services_file.read.should == "#{@services_yml}\n"
 
         @symlinked_services_file.should exist
         @symlinked_services_file.should be_symlink
-        @shared_services_file.read.should == "otherfilecontents\n"
+        @shared_services_file.read.should == "#{@services_yml}\n"
 
         @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end

data/spec/support/integration.rb

@@ -6,6 +6,8 @@ class FullTestDeploy < EY::Serverside::Deploy
     @infos = []
     @debugs = []
     @commands = []
+    @gemfile_contents = nil
+    @lockfile_contents = nil
   end
 
   # stfu
@@ -84,6 +86,14 @@ class FullTestDeploy < EY::Serverside::Deploy
     @mock_services_setup_command = value
   end
 
+  def mock_gemfile_contents(gemfile_contents)
+    @gemfile_contents = gemfile_contents
+  end
+
+  def mock_lockfile_contents(lockfile_contents)
+    @lockfile_contents = lockfile_contents
+  end
+
 end
 
 module EY::Serverside::Strategies::IntegrationSpec
@@ -119,21 +129,23 @@ module EY::Serverside::Strategies::IntegrationSpec
     end
 
     def gemfile_contents
-      <<-EOF
+      @gemfile_contents || <<-EOF
 source :rubygems
 gem 'rake'
 gem 'pg'
+gem 'ey_config'
       EOF
     end
 
     # Generated using Bundler v1.0.21
     def lockfile_contents
-      <<-EOF
+      @lockfile_contents || <<-EOF
 GEM
   remote: http://rubygems.org/
   specs:
     pg (0.11.0)
     rake (0.9.2.2)
+    ey_config (0.0.1)
 
 PLATFORMS
   ruby
@@ -141,6 +153,7 @@ PLATFORMS
 DEPENDENCIES
   pg
   rake
+  ey_config
       EOF
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 5
-  - 24
-  version: 1.5.24
+  - 25
+  version: 1.5.25
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-01-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -284,6 +284,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
@@ -351,6 +352,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