Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #126 from engineyard/bundler179
Update default bundler fallback to 1.7.9
  • Loading branch information
jlindley committed Dec 29, 2014
2 parents 4ecafb4 + 78f7518 commit e2f823f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ChangeLog.md
Expand Up @@ -2,7 +2,7 @@

## NEXT

*
* Use newest bundler 1.7.9 as the default when no bundler is specified in the Gemfile.

## v2.6.1 (2014-12-18)

Expand Down
2 changes: 1 addition & 1 deletion lib/engineyard-serverside/dependency_manager/bundler.rb
Expand Up @@ -4,7 +4,7 @@ module EY
module Serverside
class DependencyManager
class Bundler < Base
DEFAULT_VERSION = "1.3.5"
DEFAULT_VERSION = "1.7.9"

def self.default_version
DEFAULT_VERSION
Expand Down
2 changes: 1 addition & 1 deletion spec/lockfile_parser_spec.rb
Expand Up @@ -99,7 +99,7 @@ def get_version(file)
end

it "uses the default version when we get a pessimistic qualifier and is lower than the default version" do
expect(subject.fetch_version('~>', '1.3.1')).to eq(EY::Serverside::DependencyManager::Bundler.default_version)
expect(subject.fetch_version('~>', '1.7.1')).to eq(EY::Serverside::DependencyManager::Bundler.default_version)
end

it "uses the given version when we get a pessimistic qualifier that doesn't match the default version" do
Expand Down

0 comments on commit e2f823f

Please sign in to comment.