Skip to content
This repository was archived by the owner on Apr 14, 2021. It is now read-only.

Fix indentation of bundler executable#6773

Merged
1 commit merged intorubygems:masterfrom
meganemura:fix-indentation
Nov 6, 2018
Merged

Fix indentation of bundler executable#6773
1 commit merged intorubygems:masterfrom
meganemura:fix-indentation

Conversation

@meganemura
Copy link
Copy Markdown
Contributor

@meganemura meganemura commented Nov 6, 2018

Thanks so much for the contribution!
To make reviewing this PR a bit easier, please fill out answers to the following questions.

What was the end-user problem that led to this PR?

bundle binstubs bundler generates the file like followings.

require "rubygems"

m = Module.new do
    module_function

  def invoked_as_script?
    File.expand_path($0) == File.expand_path(__FILE__)
  end
(snip)
end

What was your diagnosis of the problem?

My diagnosis was...

the template's module_function line is not match to other lines.

What is your fix for the problem, implemented in this PR?

I fix the template.

Why did you choose this fix out of the possible options?

no other options.

@ghost
Copy link
Copy Markdown

ghost commented Nov 6, 2018

Thanks for opening a pull request and helping make Bundler better! Someone from the Bundler team will take a look at your pull request shortly and leave any feedback. Please make sure that your pull request has tests for any changes or added functionality.

We use Travis CI to test and make sure your change works functionally and uses acceptable conventions, you can review the current progress of Travis CI in the PR status window below.

If you have any questions or concerns that you wish to ask, feel free to leave a comment in this PR or join our #bundler channel on Slack.

For more information about contributing to the Bundler project feel free to review our CONTRIBUTING guide

@segiddins
Copy link
Copy Markdown
Contributor

segiddins commented Nov 6, 2018

Thanks!

@bundlerbot r+

ghost pushed a commit that referenced this pull request Nov 6, 2018
@bundlerbot @meganemura
Merge #6773
6134d82 
6773: Fix indentation of bundler executable r=segiddins a=meganemura

Thanks so much for the contribution!
To make reviewing this PR a bit easier, please fill out answers to the following questions.

### What was the end-user problem that led to this PR?

`bundle binstubs bundler` generates the file like followings.

```ruby
require "rubygems"

m = Module.new do
    module_function

  def invoked_as_script?
    File.expand_path($0) == File.expand_path(__FILE__)
  end
(snip)
end
```

### What was your diagnosis of the problem?

My diagnosis was...

the template's `module_function` line is not match to other lines.

### What is your fix for the problem, implemented in this PR?

I fix the template.

### Why did you choose this fix out of the possible options?

no other options.

Co-authored-by: meganemura <meganemura@users.noreply.github.com>
@ghost
Copy link
Copy Markdown

ghost commented Nov 6, 2018

Build failed

@segiddins
Copy link
Copy Markdown
Contributor

segiddins commented Nov 6, 2018

@bundlerbot retry

ghost pushed a commit that referenced this pull request Nov 6, 2018
@bundlerbot @meganemura
Merge #6773
905dce4 
6773: Fix indentation of bundler executable r=segiddins a=meganemura

Thanks so much for the contribution!
To make reviewing this PR a bit easier, please fill out answers to the following questions.

### What was the end-user problem that led to this PR?

`bundle binstubs bundler` generates the file like followings.

```ruby
require "rubygems"

m = Module.new do
    module_function

  def invoked_as_script?
    File.expand_path($0) == File.expand_path(__FILE__)
  end
(snip)
end
```

### What was your diagnosis of the problem?

My diagnosis was...

the template's `module_function` line is not match to other lines.

### What is your fix for the problem, implemented in this PR?

I fix the template.

### Why did you choose this fix out of the possible options?

no other options.

Co-authored-by: meganemura <meganemura@users.noreply.github.com>
@ghost
Copy link
Copy Markdown

ghost commented Nov 6, 2018

Build succeeded

@ghost ghost merged commit 49218cc into rubygems:master Nov 6, 2018
@meganemura meganemura deleted the fix-indentation branch November 6, 2018 10:06
@colby-swandale colby-swandale modified the milestones: 1.17.4, 2.0.1 Feb 1, 2019
colby-swandale pushed a commit that referenced this pull request Mar 23, 2019
@bundlerbot @meganemura
Merge #6773
8f2548b 
6773: Fix indentation of bundler executable r=segiddins a=meganemura

Thanks so much for the contribution!
To make reviewing this PR a bit easier, please fill out answers to the following questions.

### What was the end-user problem that led to this PR?

`bundle binstubs bundler` generates the file like followings.

```ruby
require "rubygems"

m = Module.new do
    module_function

  def invoked_as_script?
    File.expand_path($0) == File.expand_path(__FILE__)
  end
(snip)
end
```

### What was your diagnosis of the problem?

My diagnosis was...

the template's `module_function` line is not match to other lines.

### What is your fix for the problem, implemented in this PR?

I fix the template.

### Why did you choose this fix out of the possible options?

no other options.

Co-authored-by: meganemura <meganemura@users.noreply.github.com>
(cherry picked from commit 905dce4)
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Sep 18, 2019
misc/ruby-bundler: update to 2.0.2
e53ff40 
## 2.0.2 (2019-05-13)

Changes:

  - Fixes for Bundler integration with ruby-src ([#6941](rubygems/bundler#6941), [#6973](rubygems/bundler#6973), [#6977](rubygems/bundler#6977), [#6315](rubygems/bundler#6315), [#7061](rubygems/bundler#7061))
  - Use `__dir__` instead of `__FILE__` when generating a gem with `bundle gem` ([#6503](rubygems/bundler#6503))
  - Use `https` on externals links in the Bundler gemspec ([#6721](rubygems/bundler#6721))
  - Removed duplicate gem names from the suggested `did you mean` list for gem typos ([#6739](rubygems/bundler#6739))
  - Removed Ruby 1.x compatibility code ([#6764](rubygems/bundler#6764), [#6806](rubygems/bundler#6806))
  - Fixed an issue where `bundle remove` would crash with certain Gemfiles ([#6768](rubygems/bundler#6769))
  - Fixed indentation in the Bundler executable template ([#6773](rubygems/bundler#6773))
  - Fixed an issue where plugins could register for the same Bundler hook multiple times ([#6775](rubygems/bundler#6775))
  - Changed the "multiple sources" message in `bundle install` to be a warning instead of an error ([#6790](rubygems/bundler#6790))
  - Fixed a bug where path gems would break when using `only_update_to_newer_versions` ([#6774](rubygems/bundler#6774))
  - Fixed a bug where installing plugins with the `--delpoyment` setting would fail ([#6805](rubygems/bundler#6805))
  - Fixed an issue where `bundle update` couldn't update & install a gem when `no_install` was set (a `bundle package` config) ([#7078](rubygems/bundler#7078))
  - Fixed an issue where users could not run `bundle exec` on default gems ([#6963](rubygems/bundler#6963))
  - Updated vendor libraries to their latest version ([#7076](rubygems/bundler#7067), [#7068](rubygems/bundler#7068))
  - Fixed an issue where the `github` source was not using `https` by default that we mentioned in the 2.0 release ([#7182](rubygems/bundler#7182))
  - Fixed an issue where `rake release` was not outputting the message to users asking for a 2fa token ([#7199](rubygems/bundler#7199))

Documentation:

  - Fix incorrect documented `BUNDLE_PATH_RELATIVE_TO_CWD` env var ([#6751](rubygems/bundler#6751))
  - Update URLs in Bundler's documentation to use `https` ([#6935](rubygems/bundler#6935))

## 2.0.1 (2019-01-04)

Changes:

  - Relaxed RubyGems requirement to `>= 2.5.0` ([#6867](rubygems/bundler#6867))

## 2.0.0 (2019-01-03)

No new changes

## 2.0.0.pre.3 (2018-12-30)

Breaking Changes:

  - Bundler 2 now requires RubyGems 3.0.0 at minimum

Changes:

  - Ruby 2.6 compatibility fixes (@segiddins)
  - Import changes from Bundler 1.17.3 release

Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`

## 2.0.0.pre.2 (2018-11-27)

Breaking Changes:

  - `:github` source in the Gemfile now defaults to using HTTPS

Changes

  - Add compatibility for Bundler merge into ruby-src

Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`

## 2.0.0.pre.1 (2018-11-09)

Breaking Changes:

  - Dropped support for versions of Ruby < 2.3
  - Dropped support for version of RubyGems < 2.5
  - Moved error messages from STDOUT to STDERR

Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.0.2

Development

Successfully merging this pull request may close these issues.

3 participants

@meganemura @segiddins @colby-swandale