summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2018-02-22 20:55:29 +0000
committerThe Bundler Bot <bot@bundler.io>2018-02-22 20:55:29 +0000
commit3d8258586b0fab8899d9a6f801d301e8db4d3ba6 (patch)
tree9bde57a679809e5d0e31563814cf5371f8fc40a3
parent86e4b2a636fa2153bcd048dc084ace180cfe5c4a (diff)
parent9a8328395ad05607267e190181845a4f10db31e4 (diff)
downloadbundler-3d8258586b0fab8899d9a6f801d301e8db4d3ba6.tar.gz
Auto merge of #6304 - deivid-rodriguez:fix/new_gem_generation_crash, r=colby-swandale
Fix `bundle gem` generating unparsable ruby ### What was the end-user problem that led to this PR? The problem was that the main file in a gem generated by `bundle gem` can't be inspected via `rubocop`. ### What was your diagnosis of the problem? My diagnosis was `bundler` was generating unparsable ruby in the generated gem. ### What is your fix for the problem, implemented in this PR? My fix was to change the offending template to generate valid ruby code. ### Why did you choose this fix out of the possible options? I chose this fix because it's the only one, really.
-rw-r--r--lib/bundler/templates/newgem/lib/newgem.rb.tt2
-rw-r--r--spec/commands/newgem_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/templates/newgem/lib/newgem.rb.tt b/lib/bundler/templates/newgem/lib/newgem.rb.tt
index f441eab5f2..fae6337c3e 100644
--- a/lib/bundler/templates/newgem/lib/newgem.rb.tt
+++ b/lib/bundler/templates/newgem/lib/newgem.rb.tt
@@ -6,7 +6,7 @@ require "<%= config[:namespaced_path] %>/<%= config[:underscored_name] %>"
<%- config[:constant_array].each_with_index do |c, i| -%>
<%= " " * i %>module <%= c %>
<%- end -%>
-<%= " " * config[:constant_array].size %>class Error < StandardError; end %>
+<%= " " * config[:constant_array].size %>class Error < StandardError; end
<%= " " * config[:constant_array].size %># Your code goes here...
<%- (config[:constant_array].size-1).downto(0) do |i| -%>
<%= " " * i %>end
diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb
index f4642787cb..9f45fb665b 100644
--- a/spec/commands/newgem_spec.rb
+++ b/spec/commands/newgem_spec.rb
@@ -311,7 +311,7 @@ RSpec.describe "bundle gem" do
end
it "creates a base error class" do
- expect(bundled_app("test_gem/lib/test_gem.rb").read).to include("class Error < StandardError")
+ expect(bundled_app("test_gem/lib/test_gem.rb").read).to match(/class Error < StandardError; end$/)
end
it "runs rake without problems" do