summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErick Sasse <esasse@gmail.com>2015-07-18 01:24:36 -0300
committerErick Sasse <esasse@gmail.com>2015-07-19 11:51:51 -0300
commit05cbfbad2ac487712b2a4e0d5f74624e12c4b050 (patch)
treeb819494649681449bdc0ffc096b4e38236de8cc2
parentda2e99ca795d7b20c3072dd2ca418406485220bc (diff)
downloadbundler-05cbfbad2ac487712b2a4e0d5f74624e12c4b050.tar.gz
Fix Style/Semicolon
-rw-r--r--.rubocop_todo.yml6
-rw-r--r--lib/bundler/cli/gem.rb5
-rw-r--r--lib/bundler/definition.rb5
-rw-r--r--lib/bundler/deprecate.rb4
4 files changed, 10 insertions, 10 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e783f558fe..446a2846e0 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -396,12 +396,6 @@ Style/SelfAssignment:
# Offense count: 2
# Cop supports --auto-correct.
-# Configuration parameters: AllowAsExpressionSeparator.
-Style/Semicolon:
- Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/SignalException:
Enabled: false
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index 383602d6ec..dff8ce4848 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -123,7 +123,10 @@ module Bundler
end
Bundler.ui.info "Initializing git repo in #{target}"
- Dir.chdir(target) { `git init`; `git add .` }
+ Dir.chdir(target) do
+ `git init`
+ `git add .`
+ end
if options[:edit]
# Open gemspec in editor
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index ac5ce934af..981fe95512 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -531,7 +531,10 @@ module Bundler
# and Gemfile.lock. If the Gemfile modified a dependency, but
# the gem in the Gemfile.lock still satisfies it, this is fine
# too.
- locked_deps_hash = @locked_deps.inject({}) {|hsh, dep| hsh[dep] = dep; hsh }
+ locked_deps_hash = @locked_deps.inject({}) do |hsh, dep|
+ hsh[dep] = dep
+ hsh
+ end
@dependencies.each do |dep|
locked_dep = locked_deps_hash[dep]
diff --git a/lib/bundler/deprecate.rb b/lib/bundler/deprecate.rb
index dd17b8a557..d9f6b494e7 100644
--- a/lib/bundler/deprecate.rb
+++ b/lib/bundler/deprecate.rb
@@ -9,8 +9,8 @@ module Bundler
end
unless Deprecate.respond_to?(:skip_during)
- def Deprecate.skip_during;
- yield;
+ def Deprecate.skip_during
+ yield
end
end