FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix bug with gem_excludes not being used on bundler gems by fzakaria · Pull Request #468 · jruby/warbler · GitHub

/ warbler Public

Fix bug with gem_excludes not being used on bundler gems #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fzakaria wants to merge 1 commit into from
Conversation 5 Commits 1 Checks 0 Files changed
Closed

Fix bug with gem_excludes not being used on bundler gems #468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .rb  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
4 changes: 1 addition & 3 deletions lib/warbler/traits/bundler.rb
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,8 @@ def add_bundler_files(jar)
filenames = []
gem_relative_path.each_filename { |f| filenames << f }

exclude_gems = true
unless filenames.empty?
full_gem_path = Pathname.new(::Bundler.install_path) + filenames.first
exclude_gems = false
end

if spec.groups.include?(:warbler_excluded)
Expand All @@ -122,7 +120,7 @@ def add_bundler_files(jar)

FileList[pattern].each do |src|
f = Pathname.new(src).relative_path_from(full_gem_path).to_s
next if exclude_gems && config.gem_excludes && config.gem_excludes.any? {|rx| f =~ rx }
next if config.gem_excludes && config.gem_excludes.any? {|rx| f =~ rx }
jar.files[apply_pathmaps(config, File.join(full_gem_path.basename, f), :git)] = src
end
end
Expand Down
Back | FazBrowse Home | New Git URL