engineyard-serverside 2.3.6 → 2.3.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NzdhZDE2MmQwZjdiZjc5ODQzNDgyOTMwNTUzNTEzYjgwMmJiYzg2Zg==
4
+ YjZmMjM2NmI3Y2U2MjM2MjdhOGI4MGE3OWQ5YTk1NmZiYzQwNjA3Zg==
5
5
  data.tar.gz: !binary |-
6
- YzNlNTE5YjdkNDU0NGVkMGM5ZmYwNWJiNzkyYThmMTIwNTY4YmU3Yw==
6
+ ZTJjZjRkZGY1NmYzZjdlNGRhNzVkZDRkZDk0MGQ3YWI4YzllZGY3ZQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MzZhNWEzNzI1YzJhNGI5MjZlNzBmNzdlMWYzMzA3Y2ZlMTU1YmU3YjVlYjM2
10
- NjYzZmY1ZDJhYjFmNjBjMmEzNWJiZTFlZDYyZmI0NjkxNTk3MWZkYjYxOGMy
11
- NmE5Zjg4MTA1OGUwMjU4MThlNWVmM2RlODRmN2QzYzg4NGM3YzE=
9
+ ZjlmZWRiNjVhN2Q3NDNmNDNlZGY1OWNhNjY4MTI1MDdhN2QzZTA5NjJjMjUw
10
+ MDFjYjk0MzZlZWVkM2Q2ZjBmNzQ4NzVmMDMxY2ZhYzAzN2JmNTYwYTBjOTM5
11
+ ODNmMzA3YmQxODU0ZjJlNTc2MTA4N2FjZThhNjUxMGY0YTczZjM=
12
12
  data.tar.gz: !binary |-
13
- NWQ3MDAxN2IxNWEzY2YxN2NhOGRlZWM5YzI4MDYzNDNkN2I3YzdmMDNiNGU1
14
- ZTEwNjZhMWI0N2Q1YzQ0MDBjOGFlZDNjMzZkZTVhNWU3ODUyYWRlMGFlYjFk
15
- MTc2ZDE5ZWMwOTgyYzEyNDMwZjVkODA2Y2RjYzUyNmUyM2IwYzc=
13
+ MTViNGYwNTRlZjI2NjQ4ZDIwOTg1ZWVjMTkwYzg4MDA1MDM2MGQzN2MyOGNi
14
+ MzIxNTQ3NDllMTQ4MDFjZjQxMWU4ZTBmZDU1M2VjMWIyNDJmMTg1NjMzMWQ4
15
+ ZDRmYjk5ZjQwMDQ0MTIyOGYwNjgzMTdlMjFlNGFmMGViZGM0ZTI=
@@ -106,6 +106,7 @@ module EY
106
106
  def_boolean_option :gc, false
107
107
  def_boolean_option :precompile_unchanged_assets, false
108
108
  def_boolean_option :ignore_database_adapter_warning, false
109
+ def_boolean_option :ignore_gemfile_lock_warning, false
109
110
  def_boolean_option :eydeploy_rb, true
110
111
  def_boolean_option :maintenance_on_migrate, true
111
112
  def_boolean_option(:maintenance_on_restart) { required_downtime_stack? }
@@ -34,7 +34,7 @@ adding ignore_database_adapter_warning: true to the application's ey.yml file
34
34
  under the defaults: top level key and committing the file to the repository.
35
35
  WARN
36
36
  end
37
- else
37
+ elsif ! config.ignore_gemfile_lock_warning
38
38
  shell.warning <<-WARN
39
39
  Gemfile found but Gemfile.lock is missing!
40
40
  You can get different versions of gems in production than what you tested with.
@@ -45,9 +45,9 @@ class EY::Serverside::Source::Git < EY::Serverside::Source
45
45
  # Returns .
46
46
  def checkout
47
47
  shell.status "Deploying revision #{short_log_message(to_checkout)}"
48
- q = opts[:verbose] ? '' : '-q'
48
+ q = opts[:verbose] ? '' : '--quiet'
49
49
  in_source_cache do
50
- (run_and_success?("git checkout -f #{q} '#{to_checkout}'") ||
50
+ (run_and_success?("git checkout --force #{q} '#{to_checkout}'") ||
51
51
  run_and_success?("git reset --hard #{q} '#{to_checkout}'")) &&
52
52
  run_and_success?("git submodule sync") &&
53
53
  run_and_success?("git submodule update --init") &&
@@ -69,7 +69,8 @@ class EY::Serverside::Source::Git < EY::Serverside::Source
69
69
 
70
70
  def fetch_command
71
71
  if usable_repository?
72
- "#{git} fetch --tags --prune --quiet origin 2>&1"
72
+ q = opts[:verbose] ? '' : '--quiet'
73
+ "#{git} fetch --force --prune --update-head-ok #{q} origin 'refs/heads/*:refs/remotes/origin/*' '+refs/tags/*:refs/tags/*' 2>&1"
73
74
  else
74
75
  "rm -rf #{repository_cache} && git clone -q #{uri} #{repository_cache} 2>&1"
75
76
  end
@@ -1,5 +1,5 @@
1
1
  module EY
2
2
  module Serverside
3
- VERSION = '2.3.6'
3
+ VERSION = '2.3.7'
4
4
  end
5
5
  end
@@ -101,6 +101,25 @@ describe "Deploying an application that uses Bundler" do
101
101
  deploy_dir.join('shared', 'bundled_gems', 'RUBY_VERSION').should exist
102
102
  deploy_dir.join('shared', 'bundled_gems', 'SYSTEM_VERSION').should exist
103
103
  end
104
+
105
+ it "warns that using a lockfile is idiomatic" do
106
+ out = read_output
107
+ out.should =~ %r(WARNING: Gemfile found but Gemfile.lock is missing!)
108
+ end
109
+ end
110
+
111
+ context "without a Gemfile.lock and ignoring the warning" do
112
+ before(:all) do
113
+ deploy_test_application('no_gemfile_lock', 'config' => {'ignore_gemfile_lock_warning' => true})
114
+ @config.ignore_gemfile_lock_warning.should be_true
115
+ @install_bundler_command = @deployer.commands.grep(/gem install bundler/).first
116
+ @bundle_install_command = @deployer.commands.grep(/bundle _#{version_pattern}_ install/).first
117
+ end
118
+
119
+ it "should not warn" do
120
+ out = read_output
121
+ out.should_not =~ %r(WARNING)
122
+ end
104
123
  end
105
124
 
106
125
  context "with a failing Gemfile" do
@@ -29,6 +29,7 @@ describe EY::Serverside::Deploy::Configuration do
29
29
  @config.verbose.should == false
30
30
  @config.copy_exclude.should == []
31
31
  @config.ignore_database_adapter_warning.should == false
32
+ @config.ignore_gemfile_lock_warning.should == false
32
33
  @config.bundle_without.should == %w[test development]
33
34
  @config.extra_bundle_install_options.should == %w[--without test development]
34
35
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: engineyard-serverside
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.6
4
+ version: 2.3.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - EY Cloud Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-15 00:00:00.000000000 Z
11
+ date: 2013-11-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec