diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-03-14 19:14:47 +0100 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-03-15 15:35:11 +0100 |
| commit | 4c6e2ae1c08153ec0d390d292ee36fecae1f6a1e (patch) | |
| tree | ee5261a8dfb594e29bc864911a0f93c0628c1e96 /lib | |
| parent | 1591215e636d68117c04158dfe8da81c8ef2b357 (diff) | |
| download | bundler-4c6e2ae1c08153ec0d390d292ee36fecae1f6a1e.tar.gz | |
Remove ruby version leftoversremove_ruby_version_leftovers
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/templates/newgem/newgem.gemspec.tt | 6 | ||||
| -rw-r--r-- | lib/bundler/templates/newgem/test/test_helper.rb.tt | 4 |
3 files changed, 1 insertions, 11 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 0416bb08f6..1c6406807d 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -545,7 +545,7 @@ EOF rescue ScriptError, StandardError => e msg = "There was an error while loading `#{path.basename}`: #{e.message}" - if e.is_a?(LoadError) && RUBY_VERSION >= "1.9" + if e.is_a?(LoadError) msg += "\nDoes it try to require a relative path? That's been removed in Ruby 1.9" end diff --git a/lib/bundler/templates/newgem/newgem.gemspec.tt b/lib/bundler/templates/newgem/newgem.gemspec.tt index 41ff8aba12..5505540b9e 100644 --- a/lib/bundler/templates/newgem/newgem.gemspec.tt +++ b/lib/bundler/templates/newgem/newgem.gemspec.tt @@ -1,10 +1,4 @@ -<%- if RUBY_VERSION < "2.0.0" -%> -# coding: utf-8 - -lib = File.expand_path("../lib", __FILE__) -<%- else -%> lib = File.expand_path("lib", __dir__) -<%- end -%> $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "<%= config[:namespaced_path] %>/version" diff --git a/lib/bundler/templates/newgem/test/test_helper.rb.tt b/lib/bundler/templates/newgem/test/test_helper.rb.tt index 335c4704ec..7d7db165ec 100644 --- a/lib/bundler/templates/newgem/test/test_helper.rb.tt +++ b/lib/bundler/templates/newgem/test/test_helper.rb.tt @@ -1,8 +1,4 @@ -<%- if RUBY_VERSION < "2.0.0" -%> -$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__) -<%- else -%> $LOAD_PATH.unshift File.expand_path("../lib", __dir__) -<%- end -%> require "<%= config[:namespaced_path] %>" require "minitest/autorun" |