summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel E. Giddins <segiddins@segiddins.me>2015-07-15 20:49:52 -0700
committerSamuel E. Giddins <segiddins@segiddins.me>2015-07-15 20:49:52 -0700
commitc85c0c9c642dcdccb7d769d7d9a56d51ad314915 (patch)
tree0e840f4678f8763885a0b94c2987401a8436d665
parentcc5294531a5f23935029094d165c7311b8d97483 (diff)
downloadbundler-c85c0c9c642dcdccb7d769d7d9a56d51ad314915.tar.gz
[RuboCop] Enable Style/EmptyLines
-rw-r--r--.rubocop_todo.yml22
-rw-r--r--lib/bundler.rb1
-rw-r--r--lib/bundler/cli/binstubs.rb1
-rw-r--r--lib/bundler/cli/cache.rb1
-rw-r--r--lib/bundler/cli/check.rb1
-rw-r--r--lib/bundler/cli/clean.rb1
-rw-r--r--lib/bundler/cli/config.rb1
-rw-r--r--lib/bundler/cli/console.rb1
-rw-r--r--lib/bundler/cli/exec.rb1
-rw-r--r--lib/bundler/cli/gem.rb1
-rw-r--r--lib/bundler/cli/init.rb1
-rw-r--r--lib/bundler/cli/inject.rb1
-rw-r--r--lib/bundler/cli/install.rb1
-rw-r--r--lib/bundler/cli/lock.rb1
-rw-r--r--lib/bundler/cli/open.rb1
-rw-r--r--lib/bundler/cli/outdated.rb1
-rw-r--r--lib/bundler/cli/platform.rb1
-rw-r--r--lib/bundler/cli/update.rb1
-rw-r--r--lib/bundler/cli/viz.rb1
-rw-r--r--lib/bundler/current_ruby.rb1
-rw-r--r--lib/bundler/definition.rb2
-rw-r--r--lib/bundler/dep_proxy.rb2
-rw-r--r--lib/bundler/dsl.rb1
-rw-r--r--lib/bundler/env.rb2
-rw-r--r--lib/bundler/environment.rb1
-rw-r--r--lib/bundler/fetcher.rb1
-rw-r--r--lib/bundler/fetcher/base.rb1
-rw-r--r--lib/bundler/fetcher/dependency.rb1
-rw-r--r--lib/bundler/fetcher/downloader.rb1
-rw-r--r--lib/bundler/gem_helper.rb1
-rw-r--r--lib/bundler/index.rb1
-rw-r--r--lib/bundler/injector.rb2
-rw-r--r--lib/bundler/installer.rb3
-rw-r--r--lib/bundler/installer/parallel_installer.rb3
-rw-r--r--lib/bundler/lazy_specification.rb1
-rw-r--r--lib/bundler/lockfile_parser.rb1
-rw-r--r--lib/bundler/resolver.rb3
-rw-r--r--lib/bundler/retry.rb1
-rw-r--r--lib/bundler/rubygems_ext.rb1
-rw-r--r--lib/bundler/rubygems_integration.rb1
-rw-r--r--lib/bundler/runtime.rb1
-rw-r--r--lib/bundler/settings.rb2
-rw-r--r--lib/bundler/similarity_detector.rb3
-rw-r--r--lib/bundler/source.rb1
-rw-r--r--lib/bundler/source/git.rb3
-rw-r--r--lib/bundler/source/git/git_proxy.rb3
-rw-r--r--lib/bundler/source/path.rb1
-rw-r--r--lib/bundler/source/path/installer.rb2
-rw-r--r--lib/bundler/source/rubygems.rb1
-rw-r--r--lib/bundler/source/rubygems/remote.rb1
-rw-r--r--lib/bundler/ssl_certs/certificate_manager.rb1
-rw-r--r--lib/bundler/worker.rb1
-rw-r--r--spec/bundler/bundler_spec.rb1
-rw-r--r--spec/bundler/dsl_spec.rb1
-rw-r--r--spec/bundler/source/rubygems_spec.rb1
-rw-r--r--spec/bundler/source_list_spec.rb1
-rw-r--r--spec/cache/gems_spec.rb3
-rw-r--r--spec/cache/git_spec.rb1
-rw-r--r--spec/commands/check_spec.rb1
-rw-r--r--spec/commands/install_spec.rb1
-rw-r--r--spec/commands/newgem_spec.rb3
-rw-r--r--spec/install/binstubs_spec.rb2
-rw-r--r--spec/install/bundler_spec.rb3
-rw-r--r--spec/install/force_spec.rb1
-rw-r--r--spec/install/gemfile/gemspec_spec.rb2
-rw-r--r--spec/install/gemfile/git_spec.rb1
-rw-r--r--spec/install/gemfile/path_spec.rb1
-rw-r--r--spec/install/gemfile_spec.rb2
-rw-r--r--spec/install/gems/dependency_api_spec.rb1
-rw-r--r--spec/install/gems/flex_spec.rb1
-rw-r--r--spec/install/gems/groups_spec.rb4
-rw-r--r--spec/install/gems/resolving_spec.rb1
-rw-r--r--spec/install/gems/sources_spec.rb1
-rw-r--r--spec/install/gems/sudo_spec.rb2
-rw-r--r--spec/install/gemspecs_spec.rb2
-rw-r--r--spec/install/parallel/spec_installation_spec.rb2
-rw-r--r--spec/install/path_spec.rb2
-rw-r--r--spec/install/prereleases_spec.rb2
-rw-r--r--spec/install/security_policy_spec.rb1
-rw-r--r--spec/install/upgrade_spec.rb1
-rw-r--r--spec/lock/lockfile_spec.rb7
-rw-r--r--spec/resolver/basic_spec.rb2
-rw-r--r--spec/resolver/platform_spec.rb1
-rw-r--r--spec/runtime/load_spec.rb2
-rw-r--r--spec/runtime/setup_spec.rb1
-rw-r--r--spec/runtime/with_clean_env_spec.rb4
-rw-r--r--spec/support/artifice/endpoint.rb1
-rw-r--r--spec/support/builders.rb2
-rw-r--r--spec/support/indexes.rb1
-rw-r--r--spec/update/git_spec.rb1
90 files changed, 4 insertions, 154 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a3d0776a27..f63e112095 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -185,28 +185,6 @@ Style/Documentation:
Style/EmptyElse:
Enabled: false
-# Offense count: 14
-# Cop supports --auto-correct.
-Style/EmptyLines:
- Enabled: false
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/EmptyLinesAroundAccessModifier:
- Enabled: false
-
-# Offense count: 57
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundBlockBody:
- Enabled: false
-
-# Offense count: 61
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundClassBody:
- Enabled: false
-
# Offense count: 1
# Cop supports --auto-correct.
Style/EmptyLinesAroundMethodBody:
diff --git a/lib/bundler.rb b/lib/bundler.rb
index c1ca528010..496047f67a 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -460,6 +460,5 @@ module Bundler
lockfile.rmtree
end
end
-
end
end
diff --git a/lib/bundler/cli/binstubs.rb b/lib/bundler/cli/binstubs.rb
index d5ff5b681a..7c67b7d75c 100644
--- a/lib/bundler/cli/binstubs.rb
+++ b/lib/bundler/cli/binstubs.rb
@@ -33,6 +33,5 @@ module Bundler
end
end
end
-
end
end
diff --git a/lib/bundler/cli/cache.rb b/lib/bundler/cli/cache.rb
index 751cb80149..8bc876baea 100644
--- a/lib/bundler/cli/cache.rb
+++ b/lib/bundler/cli/cache.rb
@@ -30,6 +30,5 @@ module Bundler
"on Bundler 2.0."
end
end
-
end
end
diff --git a/lib/bundler/cli/check.rb b/lib/bundler/cli/check.rb
index e8abaf5533..22fea6e4a9 100644
--- a/lib/bundler/cli/check.rb
+++ b/lib/bundler/cli/check.rb
@@ -33,6 +33,5 @@ module Bundler
Bundler.ui.info "The Gemfile's dependencies are satisfied"
end
end
-
end
end
diff --git a/lib/bundler/cli/clean.rb b/lib/bundler/cli/clean.rb
index 99508820e2..d70a5b9b89 100644
--- a/lib/bundler/cli/clean.rb
+++ b/lib/bundler/cli/clean.rb
@@ -21,6 +21,5 @@ module Bundler
exit 1
end
end
-
end
end
diff --git a/lib/bundler/cli/config.rb b/lib/bundler/cli/config.rb
index 436255844e..7dcdea3f1c 100644
--- a/lib/bundler/cli/config.rb
+++ b/lib/bundler/cli/config.rb
@@ -82,6 +82,5 @@ module Bundler
exit 1
end
end
-
end
end
diff --git a/lib/bundler/cli/console.rb b/lib/bundler/cli/console.rb
index bc4f377d25..eee3baba76 100644
--- a/lib/bundler/cli/console.rb
+++ b/lib/bundler/cli/console.rb
@@ -33,6 +33,5 @@ module Bundler
Bundler.ui.error "Could not find constant #{const_name}"
exit 1
end
-
end
end
diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb
index 7803ae5500..aee7960c4d 100644
--- a/lib/bundler/cli/exec.rb
+++ b/lib/bundler/cli/exec.rb
@@ -47,6 +47,5 @@ module Bundler
Bundler.ui.error "bundler: exec needs a command to run"
exit 128
end
-
end
end
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index a7eceec41d..4890e2f707 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -196,6 +196,5 @@ module Bundler
exit 1
end
end
-
end
end
diff --git a/lib/bundler/cli/init.rb b/lib/bundler/cli/init.rb
index fbf17424c4..31299bb21e 100644
--- a/lib/bundler/cli/init.rb
+++ b/lib/bundler/cli/init.rb
@@ -28,6 +28,5 @@ module Bundler
FileUtils.cp(File.expand_path('../../templates/Gemfile', __FILE__), 'Gemfile')
end
end
-
end
end
diff --git a/lib/bundler/cli/inject.rb b/lib/bundler/cli/inject.rb
index 004e0a542c..e4660b3716 100644
--- a/lib/bundler/cli/inject.rb
+++ b/lib/bundler/cli/inject.rb
@@ -28,6 +28,5 @@ module Bundler
Bundler.ui.confirm "All injected gems were already present in the Gemfile"
end
end
-
end
end
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index 9ce670e094..8b9d8ebb24 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -184,6 +184,5 @@ module Bundler
Bundler.ui.confirm "Post-install message from #{name}:"
Bundler.ui.info msg
end
-
end
end
diff --git a/lib/bundler/cli/lock.rb b/lib/bundler/cli/lock.rb
index 543deb5945..14c4203774 100644
--- a/lib/bundler/cli/lock.rb
+++ b/lib/bundler/cli/lock.rb
@@ -31,6 +31,5 @@ module Bundler
Bundler.ui = ui
end
-
end
end
diff --git a/lib/bundler/cli/open.rb b/lib/bundler/cli/open.rb
index c6c6179489..474eec433b 100644
--- a/lib/bundler/cli/open.rb
+++ b/lib/bundler/cli/open.rb
@@ -18,6 +18,5 @@ module Bundler
system(*command) || Bundler.ui.info("Could not run '#{command.join(' ')}'")
end
end
-
end
end
diff --git a/lib/bundler/cli/outdated.rb b/lib/bundler/cli/outdated.rb
index 08bcbde609..1612adf897 100644
--- a/lib/bundler/cli/outdated.rb
+++ b/lib/bundler/cli/outdated.rb
@@ -82,6 +82,5 @@ module Bundler
exit 1
end
end
-
end
end
diff --git a/lib/bundler/cli/platform.rb b/lib/bundler/cli/platform.rb
index bc947cf870..8a3855370b 100644
--- a/lib/bundler/cli/platform.rb
+++ b/lib/bundler/cli/platform.rb
@@ -38,6 +38,5 @@ module Bundler
Bundler.ui.info output.join("\n\n")
end
-
end
end
diff --git a/lib/bundler/cli/update.rb b/lib/bundler/cli/update.rb
index 6ed38f2c3a..5bcc89bab3 100644
--- a/lib/bundler/cli/update.rb
+++ b/lib/bundler/cli/update.rb
@@ -68,6 +68,5 @@ module Bundler
Bundler.ui.confirm Bundler::CLI::Common.without_groups_message
end
end
-
end
end
diff --git a/lib/bundler/cli/viz.rb b/lib/bundler/cli/viz.rb
index 09557e599c..06f3deb245 100644
--- a/lib/bundler/cli/viz.rb
+++ b/lib/bundler/cli/viz.rb
@@ -22,6 +22,5 @@ module Bundler
raise
end
end
-
end
end
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb
index 58674800ed..532f587f28 100644
--- a/lib/bundler/current_ruby.rb
+++ b/lib/bundler/current_ruby.rb
@@ -186,6 +186,5 @@ module Bundler
def x64_mingw_22?
x64_mingw? && on_22?
end
-
end
end
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 997258c309..40781f4155 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -26,7 +26,6 @@ module Bundler
Dsl.evaluate(gemfile, lockfile, unlock)
end
-
#
# How does the new system work?
#
@@ -666,6 +665,5 @@ module Bundler
current == proposed
end
end
-
end
end
diff --git a/lib/bundler/dep_proxy.rb b/lib/bundler/dep_proxy.rb
index ef98a35128..47de296810 100644
--- a/lib/bundler/dep_proxy.rb
+++ b/lib/bundler/dep_proxy.rb
@@ -1,6 +1,5 @@
module Bundler
class DepProxy
-
attr_reader :__platform, :dep
def initialize(dep, platform)
@@ -38,6 +37,5 @@ module Bundler
def method_missing(*args)
@dep.send(*args)
end
-
end
end
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index e5432fa467..31f82a5145 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -465,7 +465,6 @@ module Bundler
[trace_line, description]
end
end
-
end
end
diff --git a/lib/bundler/env.rb b/lib/bundler/env.rb
index 2c02330846..f52764310b 100644
--- a/lib/bundler/env.rb
+++ b/lib/bundler/env.rb
@@ -3,7 +3,6 @@ require 'bundler/source/git/git_proxy'
module Bundler
class Env
-
def write(io)
io.write report(:print_gemfile => true)
end
@@ -70,6 +69,5 @@ module Bundler
rescue Bundler::Source::Git::GitNotInstalledError
"not installed"
end
-
end
end
diff --git a/lib/bundler/environment.rb b/lib/bundler/environment.rb
index 4b006c9c84..837c4db009 100644
--- a/lib/bundler/environment.rb
+++ b/lib/bundler/environment.rb
@@ -37,6 +37,5 @@ module Bundler
def update(*gems)
# Nothing
end
-
end
end
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb
index 0b0c409dd7..d2f7551ee1 100644
--- a/lib/bundler/fetcher.rb
+++ b/lib/bundler/fetcher.rb
@@ -273,6 +273,5 @@ module Bundler
def downloader
@downloader ||= Downloader.new(connection, self.class.redirect_limit)
end
-
end
end
diff --git a/lib/bundler/fetcher/base.rb b/lib/bundler/fetcher/base.rb
index 31d6f8a09b..729be04fb5 100644
--- a/lib/bundler/fetcher/base.rb
+++ b/lib/bundler/fetcher/base.rb
@@ -21,7 +21,6 @@ module Bundler
def api_fetcher?
false
end
-
end
end
end
diff --git a/lib/bundler/fetcher/dependency.rb b/lib/bundler/fetcher/dependency.rb
index ca36dcb53f..e495c7fd30 100644
--- a/lib/bundler/fetcher/dependency.rb
+++ b/lib/bundler/fetcher/dependency.rb
@@ -82,7 +82,6 @@ module Bundler
"gemspec. \nPlease ask the gem author to yank the bad version to fix " \
"this issue. For more information, see http://bit.ly/syck-defaultkey."
end
-
end
end
end
diff --git a/lib/bundler/fetcher/downloader.rb b/lib/bundler/fetcher/downloader.rb
index 55657195de..8efeb14461 100644
--- a/lib/bundler/fetcher/downloader.rb
+++ b/lib/bundler/fetcher/downloader.rb
@@ -55,7 +55,6 @@ module Bundler
raise HTTPError, "Network error while fetching #{uri}"
end
end
-
end
end
end
diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb
index 4189a602f3..2d8684b750 100644
--- a/lib/bundler/gem_helper.rb
+++ b/lib/bundler/gem_helper.rb
@@ -89,6 +89,7 @@ module Bundler
end
protected
+
def rubygem_push(path)
if Pathname.new("~/.gem/credentials").expand_path.exist?
sh("gem push '#{path}'")
diff --git a/lib/bundler/index.rb b/lib/bundler/index.rb
index ea1edaca21..acd3a7b9be 100644
--- a/lib/bundler/index.rb
+++ b/lib/bundler/index.rb
@@ -192,6 +192,5 @@ module Bundler
return false unless dep.name == spec.name
dep.requirement.satisfied_by?(spec.version)
end
-
end
end
diff --git a/lib/bundler/injector.rb b/lib/bundler/injector.rb
index 79350b5e66..5bac0c8e6d 100644
--- a/lib/bundler/injector.rb
+++ b/lib/bundler/injector.rb
@@ -58,7 +58,5 @@ module Bundler
f.puts new_gem_lines
end
end
-
-
end
end
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 9f1dfe81c8..fc6249dc23 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -70,7 +70,6 @@ module Bundler
generate_standalone(options[:standalone]) if options[:standalone]
end
-
def install_gem_from_spec(spec, standalone = false, worker = 0, force = false)
# Fetch the build settings, if there are any
settings = Bundler.settings["build.#{spec.name}"]
@@ -237,7 +236,6 @@ module Bundler
end
end
-
File.open File.join(bundler_path, "setup.rb"), "w" do |file|
file.puts "require 'rbconfig'"
file.puts "# ruby 1.8.7 doesn't define RUBY_ENGINE"
@@ -285,6 +283,5 @@ module Bundler
options["local"] ? @definition.resolve_with_cache! : @definition.resolve_remotely!
end
end
-
end
end
diff --git a/lib/bundler/installer/parallel_installer.rb b/lib/bundler/installer/parallel_installer.rb
index 6e05f73cb9..c0d858aad2 100644
--- a/lib/bundler/installer/parallel_installer.rb
+++ b/lib/bundler/installer/parallel_installer.rb
@@ -1,10 +1,7 @@
require 'bundler/worker'
-
class ParallelInstaller
-
class SpecInstallation
-
attr_accessor :spec, :name, :post_install_message, :state
def initialize(spec)
@spec, @name = spec, spec.name
diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb
index 1119bdeed8..e8f73095cf 100644
--- a/lib/bundler/lazy_specification.rb
+++ b/lib/bundler/lazy_specification.rb
@@ -78,6 +78,5 @@ module Bundler
@specification.send(method, *args, &blk)
end
-
end
end
diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb
index 241a78c6de..aff5f9a9de 100644
--- a/lib/bundler/lockfile_parser.rb
+++ b/lib/bundler/lockfile_parser.rb
@@ -190,6 +190,5 @@ module Bundler
@bundler_version = Gem::Version.create(line)
end
end
-
end
end
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 49ce913e3a..2acf746e48 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -8,7 +8,6 @@ require 'set'
module Bundler
class Resolver
-
require 'bundler/vendored_molinillo'
class Molinillo::VersionConflict
@@ -183,7 +182,6 @@ module Bundler
SpecSet.new(result)
end
-
def initialize(index, source_requirements, base)
@index = index
@source_requirements = source_requirements
@@ -348,6 +346,5 @@ module Bundler
end
end
end
-
end
end
diff --git a/lib/bundler/retry.rb b/lib/bundler/retry.rb
index 585888f8e1..753650700e 100644
--- a/lib/bundler/retry.rb
+++ b/lib/bundler/retry.rb
@@ -33,6 +33,7 @@ module Bundler
alias :attempts :attempt
private
+
def run(&block)
@failed = false
@current_run += 1
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index bf1b3cb35a..f423f4a6f6 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -102,7 +102,6 @@ module Gem
end
gemfile
end
-
end
class Dependency
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 42811022d1..ac5e6d629c 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -646,7 +646,6 @@ module Bundler
end
end
end
-
end
if RubygemsIntegration.provides?(">= 2.1.0")
diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb
index 8915bea64a..1364f670ea 100644
--- a/lib/bundler/runtime.rb
+++ b/lib/bundler/runtime.rb
@@ -284,6 +284,5 @@ module Bundler
).uniq.join(File::PATH_SEPARATOR)
end
end
-
end
end
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index 7b2c1a7083..c2f3ab6a28 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -159,6 +159,7 @@ module Bundler
end
private
+
def key_for(key)
if key.is_a?(String) && /https?:/ =~ key
key = normalize_uri(key).to_s
@@ -255,6 +256,5 @@ module Bundler
end
uri
end
-
end
end
diff --git a/lib/bundler/similarity_detector.rb b/lib/bundler/similarity_detector.rb
index 9bb1e8dd47..66f1044c84 100644
--- a/lib/bundler/similarity_detector.rb
+++ b/lib/bundler/similarity_detector.rb
@@ -24,8 +24,8 @@ module Bundler
end
end
-
protected
+
# http://www.informit.com/articles/article.aspx?p=683059&seqNum=36
def levenshtein_distance(this, that, ins=2, del=2, sub=1)
# ins, del, sub are weighted costs
@@ -58,6 +58,5 @@ module Bundler
# The last value in matrix is the Levenshtein distance between the strings
dm[that.length][this.length]
end
-
end
end
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index 869931a1f0..d715b78f93 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -31,6 +31,5 @@ module Bundler
def include?(other)
other == self
end
-
end
end
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb
index 59deb58a76..5bc2086bf7 100644
--- a/lib/bundler/source/git.rb
+++ b/lib/bundler/source/git.rb
@@ -4,7 +4,6 @@ require 'digest/sha1'
module Bundler
class Source
-
class Git < Path
autoload :GitProxy, 'bundler/source/git/git_proxy'
@@ -286,8 +285,6 @@ module Bundler
def git_proxy
@git_proxy ||= GitProxy.new(cache_path, uri, ref, cached_revision, self)
end
-
end
-
end
end
diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb
index ca8fbfdedf..d406b11e49 100644
--- a/lib/bundler/source/git/git_proxy.rb
+++ b/lib/bundler/source/git/git_proxy.rb
@@ -1,7 +1,6 @@
module Bundler
class Source
class Git < Path
-
class GitNotInstalledError < GitError
def initialize
msg = "You need to install git to be able to use gems from git repositories. "
@@ -162,9 +161,7 @@ module Bundler
return in_path { yield } if allow?
raise GitError, "The git source #{uri} is not yet checked out. Please run `bundle install` before trying to start your application"
end
-
end
-
end
end
end
diff --git a/lib/bundler/source/path.rb b/lib/bundler/source/path.rb
index a3f6370c91..a7aa989978 100644
--- a/lib/bundler/source/path.rb
+++ b/lib/bundler/source/path.rb
@@ -219,7 +219,6 @@ module Bundler
end
end
end
-
end
end
end
diff --git a/lib/bundler/source/path/installer.rb b/lib/bundler/source/path/installer.rb
index ef9faa9cbe..a4a2461ed8 100644
--- a/lib/bundler/source/path/installer.rb
+++ b/lib/bundler/source/path/installer.rb
@@ -1,7 +1,6 @@
module Bundler
class Source
class Path
-
class Installer < Bundler::GemInstaller
attr_reader :spec
@@ -37,7 +36,6 @@ module Bundler
Bundler.rm_rf(@tmp_dir) if Bundler.requires_sudo?
end
end
-
end
end
end
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index 92d14774ab..2cc613136f 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -417,7 +417,6 @@ module Bundler
def installed?(spec)
installed_specs[spec].any?
end
-
end
end
end
diff --git a/lib/bundler/source/rubygems/remote.rb b/lib/bundler/source/rubygems/remote.rb
index 82ce1a4f9e..da52128a72 100644
--- a/lib/bundler/source/rubygems/remote.rb
+++ b/lib/bundler/source/rubygems/remote.rb
@@ -32,7 +32,6 @@ module Bundler
uri
end
-
end
end
end
diff --git a/lib/bundler/ssl_certs/certificate_manager.rb b/lib/bundler/ssl_certs/certificate_manager.rb
index 22872cc770..0148736b7a 100644
--- a/lib/bundler/ssl_certs/certificate_manager.rb
+++ b/lib/bundler/ssl_certs/certificate_manager.rb
@@ -59,7 +59,6 @@ module Bundler
store
end
end
-
end
end
end
diff --git a/lib/bundler/worker.rb b/lib/bundler/worker.rb
index 4961588377..d5d3b19508 100644
--- a/lib/bundler/worker.rb
+++ b/lib/bundler/worker.rb
@@ -68,6 +68,5 @@ module Bundler
@threads.each {|i| i.exit }
exit 1
end
-
end
end
diff --git a/spec/bundler/bundler_spec.rb b/spec/bundler/bundler_spec.rb
index fa226002cc..5f3515da00 100644
--- a/spec/bundler/bundler_spec.rb
+++ b/spec/bundler/bundler_spec.rb
@@ -68,6 +68,5 @@ describe Bundler do
$VERBOSE = verbose
end
end
-
end
end
diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb
index f5bffee779..182df4ea7c 100644
--- a/spec/bundler/dsl_spec.rb
+++ b/spec/bundler/dsl_spec.rb
@@ -187,5 +187,4 @@ describe Bundler::Dsl do
to raise_error(Bundler::GemfileError, /There was an error parsing `Gemfile`: can't modify frozen String. Bundler cannot continue./i)
end
end
-
end
diff --git a/spec/bundler/source/rubygems_spec.rb b/spec/bundler/source/rubygems_spec.rb
index 6bcde3d328..68fc6c6ed4 100644
--- a/spec/bundler/source/rubygems_spec.rb
+++ b/spec/bundler/source/rubygems_spec.rb
@@ -22,5 +22,4 @@ describe Bundler::Source::Rubygems do
end
end
end
-
end
diff --git a/spec/bundler/source_list_spec.rb b/spec/bundler/source_list_spec.rb
index f5a8575ae8..2ce41832ca 100644
--- a/spec/bundler/source_list_spec.rb
+++ b/spec/bundler/source_list_spec.rb
@@ -344,5 +344,4 @@ describe Bundler::SourceList do
source_list.remote!
end
end
-
end
diff --git a/spec/cache/gems_spec.rb b/spec/cache/gems_spec.rb
index b70f62743a..dd7d9c0e5f 100644
--- a/spec/cache/gems_spec.rb
+++ b/spec/cache/gems_spec.rb
@@ -1,7 +1,6 @@
require "spec_helper"
describe "bundle cache" do
-
describe "when there are only gemsources" do
before :each do
gemfile <<-G
@@ -211,7 +210,6 @@ describe "bundle cache" do
expect(cached_gem("activesupport-2.3.2")).to exist
end
-
it "doesn't remove gems that are for another platform" do
simulate_platform "java" do
install_gemfile <<-G
@@ -280,5 +278,4 @@ describe "bundle cache" do
should_be_installed "foo-bundler 1.0"
end
end
-
end
diff --git a/spec/cache/git_spec.rb b/spec/cache/git_spec.rb
index b369504dcb..45061e6ea9 100644
--- a/spec/cache/git_spec.rb
+++ b/spec/cache/git_spec.rb
@@ -183,6 +183,5 @@ end
gemspec = bundled_app("vendor/cache/foo-1.0-#{ref}/foo.gemspec").read
expect(gemspec).to_not match("`echo bob`")
end
-
end
end
diff --git a/spec/commands/check_spec.rb b/spec/commands/check_spec.rb
index afc2cef6d9..6cd2160641 100644
--- a/spec/commands/check_spec.rb
+++ b/spec/commands/check_spec.rb
@@ -344,5 +344,4 @@ describe "bundle check" do
end
end
end
-
end
diff --git a/spec/commands/install_spec.rb b/spec/commands/install_spec.rb
index 0f05588c4d..ec5df3dad3 100644
--- a/spec/commands/install_spec.rb
+++ b/spec/commands/install_spec.rb
@@ -374,5 +374,4 @@ describe "bundle install with gem sources" do
expect(out).to_not include("Your Gemfile has no gem server sources")
end
end
-
end
diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb
index e627c7d504..a35c7ffcf7 100644
--- a/spec/commands/newgem_spec.rb
+++ b/spec/commands/newgem_spec.rb
@@ -1,7 +1,6 @@
require "spec_helper"
describe "bundle gem" do
-
def reset!
super
global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false"
@@ -677,7 +676,6 @@ describe "bundle gem" do
it "asks about CoC" do
global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false"
-
bundle "gem foobar" do |input|
input.puts "yes"
end
@@ -685,5 +683,4 @@ describe "bundle gem" do
expect(bundled_app("foobar/CODE_OF_CONDUCT.md")).to exist
end
end
-
end
diff --git a/spec/install/binstubs_spec.rb b/spec/install/binstubs_spec.rb
index 9a76c52974..e35611696c 100644
--- a/spec/install/binstubs_spec.rb
+++ b/spec/install/binstubs_spec.rb
@@ -1,7 +1,6 @@
require 'spec_helper'
describe "bundle install" do
-
describe "when system_bindir is set" do
# On OS X, Gem.bindir defaults to /usr/bin, so system_bindir is useful if
# you want to avoid sudo installs for system gems with OS X's default ruby
@@ -20,5 +19,4 @@ describe "bundle install" do
expect(system_gem_path("altbin/rackup")).to exist
end
end
-
end
diff --git a/spec/install/bundler_spec.rb b/spec/install/bundler_spec.rb
index 516581b7f3..71bb1c165f 100644
--- a/spec/install/bundler_spec.rb
+++ b/spec/install/bundler_spec.rb
@@ -1,7 +1,6 @@
require 'spec_helper'
describe "bundle install" do
-
describe "with bundler dependencies" do
before(:each) do
build_repo2 do
@@ -57,7 +56,6 @@ describe "bundle install" do
gem "multiple_versioned_deps"
G
-
install_gemfile <<-G
source "file://#{gem_repo2}"
@@ -142,5 +140,4 @@ describe "bundle install" do
expect(out).to include("The Gemfile's dependencies are satisfied")
end
end
-
end
diff --git a/spec/install/force_spec.rb b/spec/install/force_spec.rb
index 737c11d923..344694ed8e 100644
--- a/spec/install/force_spec.rb
+++ b/spec/install/force_spec.rb
@@ -31,6 +31,5 @@ describe "bundle install" do
expect(out).to include "Installing rack 1.0.0"
should_be_installed "rack 1.0.0"
end
-
end
end
diff --git a/spec/install/gemfile/gemspec_spec.rb b/spec/install/gemfile/gemspec_spec.rb
index 7746e459d5..d0d982a438 100644
--- a/spec/install/gemfile/gemspec_spec.rb
+++ b/spec/install/gemfile/gemspec_spec.rb
@@ -1,7 +1,6 @@
require "spec_helper"
describe "bundle install from an existing gemspec" do
-
before(:each) do
build_gem "bar", :to_system => true
build_gem "bar-dev", :to_system => true
@@ -166,5 +165,4 @@ describe "bundle install from an existing gemspec" do
should_be_installed "rack 1.0"
end
end
-
end
diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb
index eae7452b3f..708f6f787e 100644
--- a/spec/install/gemfile/git_spec.rb
+++ b/spec/install/gemfile/git_spec.rb
@@ -112,7 +112,6 @@ describe "bundle install with git sources" do
should_be_installed "foo 1.1", "rack 1.0"
end
-
end
describe "with an empty git block" do
diff --git a/spec/install/gemfile/path_spec.rb b/spec/install/gemfile/path_spec.rb
index b07038136f..a6a5c1991a 100644
--- a/spec/install/gemfile/path_spec.rb
+++ b/spec/install/gemfile/path_spec.rb
@@ -538,5 +538,4 @@ describe "bundle install with explicit source paths" do
expect(out).to include("failed for foo-1.0")
end
end
-
end
diff --git a/spec/install/gemfile_spec.rb b/spec/install/gemfile_spec.rb
index bfe239396a..e9a7de349d 100644
--- a/spec/install/gemfile_spec.rb
+++ b/spec/install/gemfile_spec.rb
@@ -1,7 +1,6 @@
require "spec_helper"
describe "bundle install" do
-
context "with duplicated gems" do
it "will display a warning" do
install_gemfile <<-G
@@ -66,5 +65,4 @@ describe "bundle install" do
expect(out).to match(/You passed :lib as an option for gem 'rack', but it is invalid/)
end
end
-
end
diff --git a/spec/install/gems/dependency_api_spec.rb b/spec/install/gems/dependency_api_spec.rb
index 7f20039e62..40cf8ada35 100644
--- a/spec/install/gems/dependency_api_spec.rb
+++ b/spec/install/gems/dependency_api_spec.rb
@@ -665,5 +665,4 @@ describe "gemcutter's dependency API" do
expect(exitstatus).to eq(0) if exitstatus
end
end
-
end
diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb
index 6b93b9db05..43cc1776d8 100644
--- a/spec/install/gems/flex_spec.rb
+++ b/spec/install/gems/flex_spec.rb
@@ -316,5 +316,4 @@ describe "bundle flex_install" do
# out.should match(/Gemfile.lock/)
# end
# end
-
end
diff --git a/spec/install/gems/groups_spec.rb b/spec/install/gems/groups_spec.rb
index 5d0972d158..7490858526 100644
--- a/spec/install/gems/groups_spec.rb
+++ b/spec/install/gems/groups_spec.rb
@@ -1,7 +1,6 @@
require "spec_helper"
describe "bundle install with groups" do
-
describe "installing with no options" do
before :each do
install_gemfile <<-G
@@ -308,7 +307,6 @@ describe "bundle install with groups" do
bundle "install --without emo"
should_be_installed "rack 1.0.0", "activesupport 2.3.5"
end
-
end
end
@@ -337,7 +335,6 @@ describe "bundle install with groups" do
end
end
-
describe "when locked and installed with --without" do
before(:each) do
build_repo2
@@ -370,5 +367,4 @@ describe "bundle install with groups" do
expect(err).to be_empty
end
end
-
end
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb
index ef8aecf1ab..7bc4de971f 100644
--- a/spec/install/gems/resolving_spec.rb
+++ b/spec/install/gems/resolving_spec.rb
@@ -99,7 +99,6 @@ describe "bundle install with gem sources" do
expect(resolve_output).to include(" net_b (>= 0) ruby")
end
end
-
end
describe "when some gems require a different version of ruby" do
diff --git a/spec/install/gems/sources_spec.rb b/spec/install/gems/sources_spec.rb
index 731f1402e5..4d88c9f8c2 100644
--- a/spec/install/gems/sources_spec.rb
+++ b/spec/install/gems/sources_spec.rb
@@ -412,5 +412,4 @@ describe "bundle install with gems on multiple sources" do
should_be_installed("bar 0.1")
end
end
-
end
diff --git a/spec/install/gems/sudo_spec.rb b/spec/install/gems/sudo_spec.rb
index 3e833960e2..48bb813577 100644
--- a/spec/install/gems/sudo_spec.rb
+++ b/spec/install/gems/sudo_spec.rb
@@ -49,7 +49,6 @@ describe "when using sudo", :sudo => true do
expect(system_gem_path("gems/another_implicit_rake_dep-1.0")).to exist
end
-
it "installs when BUNDLE_PATH is owned by root" do
bundle_path = tmp("owned_by_root")
FileUtils.mkdir_p bundle_path
@@ -150,5 +149,4 @@ describe "when using sudo", :sudo => true do
expect(out).to include("Don't run Bundler as root.")
end
end
-
end
diff --git a/spec/install/gemspecs_spec.rb b/spec/install/gemspecs_spec.rb
index 201ba9564a..524c1651c0 100644
--- a/spec/install/gemspecs_spec.rb
+++ b/spec/install/gemspecs_spec.rb
@@ -1,7 +1,6 @@
require 'spec_helper'
describe "bundle install" do
-
describe "when a gem has a YAML gemspec" do
before :each do
build_repo2 do
@@ -46,5 +45,4 @@ describe "bundle install" do
bundle :install, :artifice => 'endpoint_marshal_fail' # force gemspec load
should_be_installed "activesupport 2.3.2"
end
-
end
diff --git a/spec/install/parallel/spec_installation_spec.rb b/spec/install/parallel/spec_installation_spec.rb
index 8cb6ea8a49..407b176a90 100644
--- a/spec/install/parallel/spec_installation_spec.rb
+++ b/spec/install/parallel/spec_installation_spec.rb
@@ -2,7 +2,6 @@ require 'spec_helper'
require 'bundler/installer/parallel_installer'
describe ParallelInstaller::SpecInstallation do
-
let!(:dep) do
a_spec = Object.new
def a_spec.name
@@ -59,5 +58,4 @@ describe ParallelInstaller::SpecInstallation do
end
end
end
-
end
diff --git a/spec/install/path_spec.rb b/spec/install/path_spec.rb
index 6c5e7e50ab..e350a44d17 100644
--- a/spec/install/path_spec.rb
+++ b/spec/install/path_spec.rb
@@ -1,7 +1,6 @@
require "spec_helper"
describe "bundle install" do
-
describe "with --path" do
before :each do
build_gem "rack", "1.0.0", :to_system => true do |s|
@@ -146,5 +145,4 @@ describe "bundle install" do
expect(out).to match(/invalid symlink/)
end
end
-
end
diff --git a/spec/install/prereleases_spec.rb b/spec/install/prereleases_spec.rb
index f4f79af47a..202b1650e5 100644
--- a/spec/install/prereleases_spec.rb
+++ b/spec/install/prereleases_spec.rb
@@ -1,7 +1,6 @@
require 'spec_helper'
describe "bundle install" do
-
describe "when prerelease gems are available" do
it "finds prereleases" do
install_gemfile <<-G
@@ -39,5 +38,4 @@ describe "bundle install" do
should_be_installed "rack 1.0"
end
end
-
end
diff --git a/spec/install/security_policy_spec.rb b/spec/install/security_policy_spec.rb
index 1f48cb9e5a..09e9507336 100644
--- a/spec/install/security_policy_spec.rb
+++ b/spec/install/security_policy_spec.rb
@@ -41,7 +41,6 @@ describe "policies with unsigned gems" do
bundle "install"
expect(exitstatus).to eq(0) if exitstatus
end
-
end
describe "policies with signed gems and no CA" do
diff --git a/spec/install/upgrade_spec.rb b/spec/install/upgrade_spec.rb
index 603c39bf11..a855e44331 100644
--- a/spec/install/upgrade_spec.rb
+++ b/spec/install/upgrade_spec.rb
@@ -22,5 +22,4 @@ describe "bundle install for the first time with v1.0" do
bundle :install
expect(bundled_app.join(".bundle/environment.rb")).not_to exist
end
-
end
diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb
index 5af98e99c2..c901957e86 100644
--- a/spec/lock/lockfile_spec.rb
+++ b/spec/lock/lockfile_spec.rb
@@ -4,7 +4,6 @@ describe "the lockfile format" do
include Bundler::GemHelpers
it "generates a simple lockfile for a single source, gem" do
-
install_gemfile <<-G
source "file://#{gem_repo1}"
@@ -115,7 +114,6 @@ describe "the lockfile format" do
end
it "updates the lockfile's bundler version if not present" do
-
lockfile <<-L
GEM
remote: file:#{gem_repo1}/
@@ -1092,7 +1090,6 @@ describe "the lockfile format" do
expect(out).to include "rack (= 1.0) and rack (= 1.1)"
end
-
it "raises if two different sources are used" do
install_gemfile <<-G
source "file://#{gem_repo1}"
@@ -1125,7 +1122,6 @@ describe "the lockfile format" do
BUNDLED WITH
#{Bundler::VERSION}
G
-
end
# Some versions of the Bundler 1.1 RC series introduced corrupted
@@ -1210,7 +1206,6 @@ describe "the lockfile format" do
File.utime(time, time, bundled_app('Gemfile.lock'))
end
before(:each) do
-
build_repo2
install_gemfile <<-G
@@ -1226,7 +1221,6 @@ describe "the lockfile format" do
end
context "during updates" do
-
it "preserves Gemfile.lock \\n line endings" do
update_repo2
@@ -1248,7 +1242,6 @@ describe "the lockfile format" do
end
context "when nothing changes" do
-
it "preserves Gemfile.lock \\n line endings" do
expect { ruby <<-RUBY
require 'rubygems'
diff --git a/spec/resolver/basic_spec.rb b/spec/resolver/basic_spec.rb
index 5b1748fbaa..998bce6064 100644
--- a/spec/resolver/basic_spec.rb
+++ b/spec/resolver/basic_spec.rb
@@ -1,7 +1,6 @@
require "spec_helper"
describe "Resolving" do
-
before :each do
@index = an_awesome_index
end
@@ -75,5 +74,4 @@ describe "Resolving" do
dep "foo", ">= 3.0.0"
should_resolve_and_include %w(foo-3.0.5)
end
-
end
diff --git a/spec/resolver/platform_spec.rb b/spec/resolver/platform_spec.rb
index 149bc921fc..47756008fe 100644
--- a/spec/resolver/platform_spec.rb
+++ b/spec/resolver/platform_spec.rb
@@ -29,7 +29,6 @@ describe "Resolving platform craziness" do
end
describe "with mingw32" do
-
before :each do
@index = build_index do
platforms "mingw32 mswin32 x64-mingw32" do |platform|
diff --git a/spec/runtime/load_spec.rb b/spec/runtime/load_spec.rb
index 358e3021e8..de4bd926e1 100644
--- a/spec/runtime/load_spec.rb
+++ b/spec/runtime/load_spec.rb
@@ -79,7 +79,6 @@ describe "Bundler.load" do
bundler_gemfile.rmtree if @remove_bundler_gemfile
end
end
-
end
describe "when called twice" do
@@ -119,5 +118,4 @@ describe "Bundler.load" do
end
end
end
-
end
diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb
index a253d4e86e..6a36e6bd4e 100644
--- a/spec/runtime/setup_spec.rb
+++ b/spec/runtime/setup_spec.rb
@@ -954,5 +954,4 @@ describe "Bundler.setup" do
end
end
end
-
end
diff --git a/spec/runtime/with_clean_env_spec.rb b/spec/runtime/with_clean_env_spec.rb
index 193a6e5b0c..d00e2c701f 100644
--- a/spec/runtime/with_clean_env_spec.rb
+++ b/spec/runtime/with_clean_env_spec.rb
@@ -1,7 +1,6 @@
require "spec_helper"
describe "Bundler.with_env helpers" do
-
shared_examples_for "Bundler.with_*_env" do
it "should reset and restore the environment" do
gem_path = ENV['GEM_PATH']
@@ -22,7 +21,6 @@ describe "Bundler.with_env helpers" do
end
describe "Bundler.with_clean_env" do
-
it_should_behave_like "Bundler.with_*_env"
it "should keep the original GEM_PATH even in sub processes" do
@@ -58,11 +56,9 @@ describe "Bundler.with_env helpers" do
it "should not change ORIGINAL_ENV" do
expect(Bundler::ORIGINAL_ENV['BUNDLE_PATH']).to eq('./Gemfile')
end
-
end
describe "Bundler.with_original_env" do
-
it_should_behave_like "Bundler.with_*_env"
it "should pass bundler environment variables set before Bundler was run" do
diff --git a/spec/support/artifice/endpoint.rb b/spec/support/artifice/endpoint.rb
index adff4a7bcd..59e80bb8f2 100644
--- a/spec/support/artifice/endpoint.rb
+++ b/spec/support/artifice/endpoint.rb
@@ -12,7 +12,6 @@ require 'artifice'
require 'sinatra/base'
class Endpoint < Sinatra::Base
-
helpers do
def dependencies_for(gem_names, gem_repo = gem_repo1)
return [] if gem_names.nil? || gem_names.empty?
diff --git a/spec/support/builders.rb b/spec/support/builders.rb
index 02e4a2a955..a76cbc21a5 100644
--- a/spec/support/builders.rb
+++ b/spec/support/builders.rb
@@ -614,11 +614,9 @@ module Spec
Dir.chdir(@path) { `git #{cmd}`.strip }
end
end
-
end
class GemBuilder < LibBuilder
-
def _build(opts)
lib_path = super(opts.merge(:path => @context.tmp(".tmp/#{@spec.full_name}"), :no_default => opts[:no_default]))
Dir.chdir(lib_path) do
diff --git a/spec/support/indexes.rb b/spec/support/indexes.rb
index 5b98bf458e..436d4bbb7c 100644
--- a/spec/support/indexes.rb
+++ b/spec/support/indexes.rb
@@ -208,7 +208,6 @@ module Spec
# Issue #3459
def a_complicated_index
build_index do
-
gem "foo", %w{3.0.0 3.0.5} do
dep "qux", ["~> 3.1"]
dep "baz", ["< 9.0", ">= 5.0"]
diff --git a/spec/update/git_spec.rb b/spec/update/git_spec.rb
index 9f5e71b3e2..bc122e2907 100644
--- a/spec/update/git_spec.rb
+++ b/spec/update/git_spec.rb
@@ -94,7 +94,6 @@ describe "bundle update" do
expect(out).to include("Bundle complete!")
end
-
it "fetches tags from the remote" do
build_git "foo"
@remote = build_git("bar", :bare => true)