diff options
| -rw-r--r-- | .rubocop.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | lib/bundler/dsl.rb | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 8fd8c2c588..586ec9e319 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,6 +5,8 @@ AllCops: - tmp/**/* - lib/bundler/vendor/**/* DisplayCopNames: true + CacheRootDirectory: tmp/rubocop + MaxFilesInCache: 5000 # Bundler diff --git a/.travis.yml b/.travis.yml index 673a6ad7b5..efd4d2569a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,10 @@ branches: - /.+-dev$/ - /.+-stable$/ +cache: + directories: + - tmp/rubocop + notifications: slack: on_success: change diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index d16a50cb7e..7424a5c8a4 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -582,7 +582,7 @@ The :#{name} git source is deprecated, and will be removed in the future.#{addit description = self.description if dsl_path && description =~ /((#{Regexp.quote File.expand_path(dsl_path)}|#{Regexp.quote dsl_path.to_s}):\d+)/ trace_line = Regexp.last_match[1] - description = description.sub(/#{Regexp.quote trace_line}:\s*/, "").sub("\n", " - ") + description = description.sub(/\n.*\n(\.\.\.)? *\^~+$/, "").sub(/#{Regexp.quote trace_line}:\s*/, "").sub("\n", " - ") end [trace_line, description] end |