engineyard-serverside 2.3.6 → 2.3.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzdhZDE2MmQwZjdiZjc5ODQzNDgyOTMwNTUzNTEzYjgwMmJiYzg2Zg==
+    YjZmMjM2NmI3Y2U2MjM2MjdhOGI4MGE3OWQ5YTk1NmZiYzQwNjA3Zg==
   data.tar.gz: !binary |-
-    YzNlNTE5YjdkNDU0NGVkMGM5ZmYwNWJiNzkyYThmMTIwNTY4YmU3Yw==
+    ZTJjZjRkZGY1NmYzZjdlNGRhNzVkZDRkZDk0MGQ3YWI4YzllZGY3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MzZhNWEzNzI1YzJhNGI5MjZlNzBmNzdlMWYzMzA3Y2ZlMTU1YmU3YjVlYjM2
-    NjYzZmY1ZDJhYjFmNjBjMmEzNWJiZTFlZDYyZmI0NjkxNTk3MWZkYjYxOGMy
-    NmE5Zjg4MTA1OGUwMjU4MThlNWVmM2RlODRmN2QzYzg4NGM3YzE=
+    ZjlmZWRiNjVhN2Q3NDNmNDNlZGY1OWNhNjY4MTI1MDdhN2QzZTA5NjJjMjUw
+    MDFjYjk0MzZlZWVkM2Q2ZjBmNzQ4NzVmMDMxY2ZhYzAzN2JmNTYwYTBjOTM5
+    ODNmMzA3YmQxODU0ZjJlNTc2MTA4N2FjZThhNjUxMGY0YTczZjM=
   data.tar.gz: !binary |-
-    NWQ3MDAxN2IxNWEzY2YxN2NhOGRlZWM5YzI4MDYzNDNkN2I3YzdmMDNiNGU1
-    ZTEwNjZhMWI0N2Q1YzQ0MDBjOGFlZDNjMzZkZTVhNWU3ODUyYWRlMGFlYjFk
-    MTc2ZDE5ZWMwOTgyYzEyNDMwZjVkODA2Y2RjYzUyNmUyM2IwYzc=
+    MTViNGYwNTRlZjI2NjQ4ZDIwOTg1ZWVjMTkwYzg4MDA1MDM2MGQzN2MyOGNi
+    MzIxNTQ3NDllMTQ4MDFjZjQxMWU4ZTBmZDU1M2VjMWIyNDJmMTg1NjMzMWQ4
+    ZDRmYjk5ZjQwMDQ0MTIyOGYwNjgzMTdlMjFlNGFmMGViZGM0ZTI=

data/lib/engineyard-serverside/configuration.rb

@@ -106,6 +106,7 @@ module EY
       def_boolean_option :gc,                              false
       def_boolean_option :precompile_unchanged_assets,     false
       def_boolean_option :ignore_database_adapter_warning, false
+      def_boolean_option :ignore_gemfile_lock_warning,     false
       def_boolean_option :eydeploy_rb,                     true
       def_boolean_option :maintenance_on_migrate,          true
       def_boolean_option(:maintenance_on_restart)          { required_downtime_stack? }

data/lib/engineyard-serverside/dependency_manager/bundler.rb

@@ -34,7 +34,7 @@ adding ignore_database_adapter_warning: true to the application's ey.yml file
 under the defaults: top level key and committing the file to the repository.
               WARN
             end
-          else
+          elsif ! config.ignore_gemfile_lock_warning
             shell.warning <<-WARN
 Gemfile found but Gemfile.lock is missing!
 You can get different versions of gems in production than what you tested with.

data/lib/engineyard-serverside/source/git.rb

@@ -45,9 +45,9 @@ class EY::Serverside::Source::Git < EY::Serverside::Source
   # Returns .
   def checkout
     shell.status "Deploying revision #{short_log_message(to_checkout)}"
-    q = opts[:verbose] ? '' : '-q'
+    q = opts[:verbose] ? '' : '--quiet'
     in_source_cache do
-      (run_and_success?("git checkout -f #{q} '#{to_checkout}'") ||
+      (run_and_success?("git checkout --force #{q} '#{to_checkout}'") ||
         run_and_success?("git reset --hard #{q} '#{to_checkout}'")) &&
         run_and_success?("git submodule sync") &&
         run_and_success?("git submodule update --init") &&
@@ -69,7 +69,8 @@ class EY::Serverside::Source::Git < EY::Serverside::Source
 
   def fetch_command
     if usable_repository?
-      "#{git} fetch --tags --prune --quiet origin 2>&1"
+      q = opts[:verbose] ? '' : '--quiet'
+      "#{git} fetch --force --prune --update-head-ok #{q} origin 'refs/heads/*:refs/remotes/origin/*' '+refs/tags/*:refs/tags/*' 2>&1"
     else
       "rm -rf #{repository_cache} && git clone -q #{uri} #{repository_cache} 2>&1"
     end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.3.6'
+    VERSION = '2.3.7'
   end
 end

data/spec/bundler_deploy_spec.rb

@@ -101,6 +101,25 @@ describe "Deploying an application that uses Bundler" do
       deploy_dir.join('shared', 'bundled_gems', 'RUBY_VERSION').should exist
       deploy_dir.join('shared', 'bundled_gems', 'SYSTEM_VERSION').should exist
     end
+
+    it "warns that using a lockfile is idiomatic" do
+      out = read_output
+      out.should =~ %r(WARNING: Gemfile found but Gemfile.lock is missing!)
+    end
+  end
+
+  context "without a Gemfile.lock and ignoring the warning" do
+    before(:all) do
+      deploy_test_application('no_gemfile_lock', 'config' => {'ignore_gemfile_lock_warning' => true})
+      @config.ignore_gemfile_lock_warning.should be_true
+      @install_bundler_command = @deployer.commands.grep(/gem install bundler/).first
+      @bundle_install_command  = @deployer.commands.grep(/bundle _#{version_pattern}_ install/).first
+    end
+
+    it "should not warn" do
+      out = read_output
+      out.should_not =~ %r(WARNING)
+    end
   end
 
   context "with a failing Gemfile" do

data/spec/configuration_spec.rb

@@ -29,6 +29,7 @@ describe EY::Serverside::Deploy::Configuration do
       @config.verbose.should == false
       @config.copy_exclude.should == []
       @config.ignore_database_adapter_warning.should == false
+      @config.ignore_gemfile_lock_warning.should == false
       @config.bundle_without.should == %w[test development]
       @config.extra_bundle_install_options.should == %w[--without test development]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.7
 platform: ruby
 authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec