Hello community,
here is the log from the commit of package rubygem-bundler for openSUSE:Factory
checked in at 2015-05-18 22:32:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-bundler (Old)
and /work/SRC/openSUSE:Factory/.rubygem-bundler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-bundler"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-bundler/rubygem-bundler.changes
2015-04-27 13:04:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-bundler.new/rubygem-bundler.changes
2015-05-18 22:32:20.000000000 +0200
@@ -1,0 +2,19 @@
+Mon May 18 09:44:50 UTC 2015 - mrueck...@suse.de
+
+- update to 1.9.9
+ - read mirror and credential settings from older versions (#3557,
+ @Strech)
+ - fix regression in sudo mode introduced by 1.9.7 (#3642,
+ @segiddins)
+ - always clean up tmp dirs (#3277, @hone, @indirect, @segiddins)
+ - use RubyGems spec stubs if available (@segiddins)
+ - allow creating gems with names containing two dashes (#3483,
+ @janlelis)
+ - allow creating gems with names extending constants (#3603,
+ @amatsuda)
+ - respect Gemfile sources when installing a gem present in two
+ sources (#3585, @tmoore)
+- refresh gemspec_remove_pem.patch to apply cleanly again and
+ package the series file
+
+-------------------------------------------------------------------
Old:
----
bundler-1.9.4.gem
New:
----
bundler-1.9.9.gem
series
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-bundler.spec ++++++
--- /var/tmp/diff_new_pack.CxWu1J/_old 2015-05-18 22:32:21.000000000 +0200
+++ /var/tmp/diff_new_pack.CxWu1J/_new 2015-05-18 22:32:21.000000000 +0200
@@ -24,18 +24,19 @@
#
Name: rubygem-bundler
-Version: 1.9.4
+Version: 1.9.9
Release: 0
%define mod_name bundler
%define mod_full_name %{mod_name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: ruby-macros >= 5
BuildRequires: %{ruby >= 1.8.7}
BuildRequires: %{rubygem gem2rpm}
-BuildRequires: ruby-macros >= 5
BuildRequires: update-alternatives
Url: http://bundler.io
Source: http://rubygems.org/gems/%{mod_full_name}.gem
-Source1: gem2rpm.yml
+Source1: series
+Source2: gem2rpm.yml
# MANUAL
Patch0: gemspec_remove_pem.patch
# /MANUAL
++++++ bundler-1.9.4.gem -> bundler-1.9.9.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md 2015-04-14 06:10:50.000000000 +0200
+++ new/CHANGELOG.md 2015-05-17 07:43:23.000000000 +0200
@@ -1,3 +1,35 @@
+## 1.9.9 (2015-05-16)
+
+Bugfixes:
+
+ - read mirror and credential settings from older versions (#3557, @Strech)
+
+## 1.9.8 (2015-05-12)
+
+Bugfixes:
+
+ - fix regression in sudo mode introduced by 1.9.7 (#3642, @segiddins)
+
+## 1.9.7 (2015-05-11)
+
+Bugfixes:
+
+ - always clean up tmp dirs (#3277, @hone, @indirect, @segiddins)
+
+## 1.9.6 (2015-05-02)
+
+Bugfixes:
+
+ - use RubyGems spec stubs if available (@segiddins)
+ - allow creating gems with names containing two dashes (#3483, @janlelis)
+ - allow creating gems with names extending constants (#3603, @amatsuda)
+
+## 1.9.5 (2015-04-29)
+
+Bugfixes:
+
+ - respect Gemfile sources when installing a gem present in two sources
(#3585, @tmoore)
+
## 1.9.4 (2015-04-13)
Bugfixes:
@@ -57,6 +89,24 @@
- Molinillo resolver, shared with CocoaPods (@segiddins)
- updated Thor to v0.19.1 (@segiddins)
+## 1.8.9 (2015-05-02)
+
+Bugfixes:
+
+ - Use RubyGems spec stubs if available (@segiddins)
+
+## 1.8.8 (2015-04-29)
+
+Bugfixes:
+
+ - Respect Gemfile sources when installing a gem present in two sources
(#3585, @tmoore)
+
+## 1.8.7 (2015-04-07)
+
+Bugfixes:
+
+ - stop suppressing errors inside gems that get required (#3549, @indirect)
+
## 1.8.6 (2015-03-30)
Bugfixes:
@@ -163,6 +213,19 @@
- add missing Gemfile global `path` explanation (@agenteo)
+## 1.7.15 (2015-04-29)
+
+Bugfixes:
+
+ - Respect Gemfile sources when installing a gem present in two sources
(#3585, @tmoore)
+
+## 1.7.14 (2015-03-30)
+
+Bugfixes:
+
+ - Keep gems locked when updating another gem from the same source (#3250,
@indirect)
+ - Don't add extra quotes around long, quoted config values (@aroben, #3338)
+
## 1.7.13 (2015-02-07)
Bugfixes:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Rakefile new/Rakefile
--- old/Rakefile 2015-04-14 06:10:50.000000000 +0200
+++ new/Rakefile 2015-05-17 07:43:23.000000000 +0200
@@ -291,12 +291,15 @@
task :clean do
rm_rf "lib/bundler/man"
end
+
+ task(:require) { }
end
rescue LoadError
namespace :man do
- task(:build) { warn "Install the ronn gem to be able to release!" }
- task(:clean) { warn "Install the ronn gem to be able to release!" }
+ task(:require) { abort "Install the ronn gem to be able to release!" }
+ task(:build) { warn "Install the ronn gem to build the help pages" }
+ task(:clean) { }
end
end
@@ -308,6 +311,6 @@
require 'bundler/gem_tasks'
task :build => ["man:clean", "man:build"]
-task :release => ["man:clean", "man:build"]
+task :release => ["man:require", "man:clean", "man:build"]
task :default => :spec
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/cli/gem.rb new/lib/bundler/cli/gem.rb
--- old/lib/bundler/cli/gem.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/cli/gem.rb 2015-05-17 07:43:23.000000000 +0200
@@ -20,9 +20,9 @@
underscored_name = name.tr('-', '_')
namespaced_path = name.tr('-', '/')
- constant_name = name.split('_').map{|p| p[0..0].upcase + p[1..-1] unless
p.empty?}.join
- constant_name = constant_name.split('-').map{|q| q[0..0].upcase +
q[1..-1] }.join('::') if constant_name =~ /-/
+ constant_name = name.gsub(/-[_-]*(?![_-]|$)/){ '::'
}.gsub(/([_-]+|(::)|^)(.|$)/){ $2.to_s + $3.upcase }
constant_array = constant_name.split('::')
+
git_user_name = `git config user.name`.chomp
git_user_email = `git config user.email`.chomp
@@ -136,7 +136,7 @@
if choice.nil?
Bundler.ui.confirm header
- choice = (Bundler.ui.ask("#{message} y/(n):") =~ /y|yes/)
+ choice = Bundler.ui.yes? "#{message} y/(n):"
Bundler.settings.set_global("gem.#{key}", choice)
end
@@ -185,7 +185,7 @@
if name =~ /^\d/
Bundler.ui.error "Invalid gem name #{name} Please give a name which
does not start with numbers."
exit 1
- elsif Object.const_defined?(constant_array.first)
+ elsif constant_array.inject(Object) {|c, s| (c.const_defined?(s) &&
c.const_get(s)) || break }
Bundler.ui.error "Invalid gem name #{name} constant
#{constant_array.join("::")} is already in use. Please choose another gem name."
exit 1
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/cli.rb new/lib/bundler/cli.rb
--- old/lib/bundler/cli.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/cli.rb 2015-05-17 07:43:23.000000000 +0200
@@ -11,8 +11,6 @@
rescue Exception => e
Bundler.ui = UI::Shell.new
raise e
- ensure
- Bundler.cleanup
end
def initialize(*args)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/definition.rb
new/lib/bundler/definition.rb
--- old/lib/bundler/definition.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/definition.rb 2015-05-17 07:43:23.000000000 +0200
@@ -184,11 +184,10 @@
# @return [SpecSet] resolved dependencies
def resolve
@resolve ||= begin
+ last_resolve = converge_locked_specs
if Bundler.settings[:frozen] || (!@unlocking && nothing_changed?)
- @locked_specs
+ last_resolve
else
- last_resolve = converge_locked_specs
-
# Run a resolve against the locally available gems
last_resolve.merge Resolver.resolve(expanded_dependencies, index,
source_requirements, last_resolve)
end
@@ -521,7 +520,9 @@
converged = []
@locked_specs.each do |s|
- s.source = sources.get(s.source)
+ # Replace the locked dependency's source with the equivalent source
from the Gemfile
+ dep = @dependencies.find { |d| s.satisfies?(d) }
+ s.source = (dep && dep.source) || sources.get(s.source)
# Don't add a spec to the list if its source is expired. For example,
# if you change a Git gem to Rubygems.
@@ -569,7 +570,7 @@
end
def satisfies_locked_spec?(dep)
- @locked_specs.any? { |s| s.satisfies?(dep) && (!dep.source || s.source
== dep.source) }
+ @locked_specs.any? { |s| s.satisfies?(dep) && (!dep.source ||
s.source.include?(dep.source)) }
end
def expanded_dependencies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/fetcher.rb new/lib/bundler/fetcher.rb
--- old/lib/bundler/fetcher.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/fetcher.rb 2015-05-17 07:43:23.000000000 +0200
@@ -64,10 +64,12 @@
if Bundler.requires_sudo?
Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/cache"
- Bundler.sudo "mv
#{Bundler.tmp(spec.full_name)}/cache/#{spec.full_name}.gem #{gem_path}"
+ Bundler.sudo "mv #{download_path}/cache/#{spec.full_name}.gem
#{gem_path}"
end
gem_path
+ ensure
+ Bundler.rm_rf(download_path) if Bundler.requires_sudo?
end
def user_agent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/friendly_errors.rb
new/lib/bundler/friendly_errors.rb
--- old/lib/bundler/friendly_errors.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/friendly_errors.rb 2015-05-17 07:43:23.000000000 +0200
@@ -41,18 +41,27 @@
def self.request_issue_report_for(e)
Bundler.ui.info <<-EOS.gsub(/^ {6}/, '')
- #{'――― ERROR REPORT TEMPLATE
―――――――――――――――――――――――――――――――――――――――――――――――――――――――'}
+ #{'--- ERROR REPORT TEMPLATE
-------------------------------------------------------'}
- What did you do?
+
+ I ran the command `#{$PROGRAM_NAME} #{ARGV.join(' ')}`
+
- What did you expect to happen?
+
+ I expected Bundler to...
+
- What happened instead?
+ Instead, what actually happened was...
+
+
Error details
#{e.class}: #{e.message}
- #{e.backtrace.join("\n ")}
+ #{e.backtrace.join("\n ")}
#{Bundler::Env.new.report(:print_gemfile => false).gsub(/\n/, "\n
").strip}
- #{'――― TEMPLATE END
――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――'}
+ #{'--- TEMPLATE END
----------------------------------------------------------------'}
EOS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/lockfile_parser.rb
new/lib/bundler/lockfile_parser.rb
--- old/lib/bundler/lockfile_parser.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/lockfile_parser.rb 2015-05-17 07:43:23.000000000 +0200
@@ -21,12 +21,13 @@
PATH = "PATH"
SPECS = " specs:"
OPTIONS = /^ ([a-z]+): (.*)$/i
+ SOURCE = [GIT, GEM, PATH]
def initialize(lockfile)
@platforms = []
@sources = []
@dependencies = []
- @state = :source
+ @state = nil
@specs = {}
@rubygems_aggregate = Source::Rubygems.new
@@ -37,11 +38,16 @@
end
lockfile.split(/(?:\r?\n)+/).each do |line|
- if line == DEPENDENCIES
+ if SOURCE.include?(line)
+ @state = :source
+ parse_source(line)
+ elsif line == DEPENDENCIES
@state = :dependency
elsif line == PLATFORMS
@state = :platform
- else
+ elsif line =~ /^[^\s]/
+ @state = nil
+ elsif @state
send("parse_#{@state}", line)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/bundle new/lib/bundler/man/bundle
--- old/lib/bundler/man/bundle 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/man/bundle 2015-05-17 07:43:23.000000000 +0200
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE" "1" "April 2015" "" ""
+.TH "BUNDLE" "1" "May 2015" "" ""
.
.SH "NAME"
\fBbundle\fR \- Ruby Dependency Management
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/bundle-config
new/lib/bundler/man/bundle-config
--- old/lib/bundler/man/bundle-config 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/man/bundle-config 2015-05-17 07:43:23.000000000 +0200
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE\-CONFIG" "1" "April 2015" "" ""
+.TH "BUNDLE\-CONFIG" "1" "May 2015" "" ""
.
.SH "NAME"
\fBbundle\-config\fR \- Set bundler configuration options
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/bundle-config.txt
new/lib/bundler/man/bundle-config.txt
--- old/lib/bundler/man/bundle-config.txt 2015-04-14 06:10:50.000000000
+0200
+++ new/lib/bundler/man/bundle-config.txt 2015-05-17 07:43:23.000000000
+0200
@@ -226,4 +226,4 @@
- April 2015 BUNDLE-CONFIG(1)
+ May 2015 BUNDLE-CONFIG(1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/bundle-install
new/lib/bundler/man/bundle-install
--- old/lib/bundler/man/bundle-install 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/man/bundle-install 2015-05-17 07:43:23.000000000 +0200
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE\-INSTALL" "1" "April 2015" "" ""
+.TH "BUNDLE\-INSTALL" "1" "May 2015" "" ""
.
.SH "NAME"
\fBbundle\-install\fR \- Install the dependencies specified in your Gemfile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/bundle-install.txt
new/lib/bundler/man/bundle-install.txt
--- old/lib/bundler/man/bundle-install.txt 2015-04-14 06:10:50.000000000
+0200
+++ new/lib/bundler/man/bundle-install.txt 2015-05-17 07:43:23.000000000
+0200
@@ -410,4 +410,4 @@
- April 2015 BUNDLE-INSTALL(1)
+ May 2015 BUNDLE-INSTALL(1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/bundle-package
new/lib/bundler/man/bundle-package
--- old/lib/bundler/man/bundle-package 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/man/bundle-package 2015-05-17 07:43:23.000000000 +0200
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE\-PACKAGE" "1" "March 2015" "" ""
+.TH "BUNDLE\-PACKAGE" "1" "May 2015" "" ""
.
.SH "NAME"
\fBbundle\-package\fR \- Package your needed \fB\.gem\fR files into your
application
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/bundle-package.txt
new/lib/bundler/man/bundle-package.txt
--- old/lib/bundler/man/bundle-package.txt 2015-04-14 06:10:50.000000000
+0200
+++ new/lib/bundler/man/bundle-package.txt 2015-05-17 07:43:23.000000000
+0200
@@ -70,4 +70,4 @@
- March 2015 BUNDLE-PACKAGE(1)
+ May 2015 BUNDLE-PACKAGE(1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/bundle-update
new/lib/bundler/man/bundle-update
--- old/lib/bundler/man/bundle-update 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/man/bundle-update 2015-05-17 07:43:23.000000000 +0200
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE\-UPDATE" "1" "March 2015" "" ""
+.TH "BUNDLE\-UPDATE" "1" "May 2015" "" ""
.
.SH "NAME"
\fBbundle\-update\fR \- Update your gems to the latest available versions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/bundle-update.txt
new/lib/bundler/man/bundle-update.txt
--- old/lib/bundler/man/bundle-update.txt 2015-04-14 06:10:50.000000000
+0200
+++ new/lib/bundler/man/bundle-update.txt 2015-05-17 07:43:23.000000000
+0200
@@ -218,4 +218,4 @@
- March 2015 BUNDLE-UPDATE(1)
+ May 2015 BUNDLE-UPDATE(1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/bundle.txt
new/lib/bundler/man/bundle.txt
--- old/lib/bundler/man/bundle.txt 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/man/bundle.txt 2015-05-17 07:43:23.000000000 +0200
@@ -100,4 +100,4 @@
- April 2015 BUNDLE(1)
+ May 2015 BUNDLE(1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/gemfile.5
new/lib/bundler/man/gemfile.5
--- old/lib/bundler/man/gemfile.5 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/man/gemfile.5 2015-05-17 07:43:23.000000000 +0200
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "GEMFILE" "5" "April 2015" "" ""
+.TH "GEMFILE" "5" "May 2015" "" ""
.
.SH "NAME"
\fBGemfile\fR \- A format for describing gem dependencies for Ruby programs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/man/gemfile.5.txt
new/lib/bundler/man/gemfile.5.txt
--- old/lib/bundler/man/gemfile.5.txt 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/man/gemfile.5.txt 2015-05-17 07:43:23.000000000 +0200
@@ -600,4 +600,4 @@
- April 2015 GEMFILE(5)
+ May 2015 GEMFILE(5)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/rubygems_integration.rb
new/lib/bundler/rubygems_integration.rb
--- old/lib/bundler/rubygems_integration.rb 2015-04-14 06:10:50.000000000
+0200
+++ new/lib/bundler/rubygems_integration.rb 2015-05-17 07:43:23.000000000
+0200
@@ -585,6 +585,12 @@
def ext_lock
Gem::Ext::Builder::CHDIR_MONITOR
end
+
+ def find_name(name)
+ Gem::Specification.stubs.find_all do |spec|
+ spec.name == name
+ end.map(&:to_spec)
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/settings.rb new/lib/bundler/settings.rb
--- old/lib/bundler/settings.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/settings.rb 2015-05-17 07:43:23.000000000 +0200
@@ -178,7 +178,7 @@
config_regex = /^(BUNDLE_.+): (['"]?)(.*(?:\n(?!BUNDLE).+)?)\2$/
config_pairs = config_file.read.scan(config_regex).map do |m|
key, _, value = m
- [key, value.gsub(/\s+/, " ").tr('"', "'")]
+ [convert_to_backward_compatible_key(key), value.gsub(/\s+/, "
").tr('"', "'")]
end
Hash[config_pairs]
else
@@ -186,6 +186,12 @@
end
end
+ def convert_to_backward_compatible_key(key)
+ key = "#{key}/" if key =~ /https?:/i && key !~ %r[/\Z]
+ key = key.gsub(".", "__") if key.include?(".")
+ key
+ end
+
# TODO: duplicates Rubygems#normalize_uri
# TODO: is this the correct place to validate mirror URIs?
def normalize_uri(uri)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/source/path/installer.rb
new/lib/bundler/source/path/installer.rb
--- old/lib/bundler/source/path/installer.rb 2015-04-14 06:10:50.000000000
+0200
+++ new/lib/bundler/source/path/installer.rb 2015-05-17 07:43:23.000000000
+0200
@@ -7,31 +7,34 @@
def initialize(spec, options = {})
@spec = spec
- @tmp_bin_dir = "#{Bundler.tmp(spec.full_name)}/bin"
- @gem_bin_dir = "#{Bundler.rubygems.gem_dir}/bin"
- @bin_dir = Bundler.requires_sudo? ? @tmp_bin_dir :
@gem_bin_dir
@gem_dir = Bundler.rubygems.path(spec.full_gem_path)
@wrappers = options[:wrappers] || true
@env_shebang = options[:env_shebang] || true
@format_executable = options[:format_executable] || false
@build_args = options[:build_args] ||
Bundler.rubygems.build_args
+ @gem_bin_dir = "#{Bundler.rubygems.gem_dir}/bin"
+
+ if Bundler.requires_sudo?
+ @tmp_dir = Bundler.tmp(spec.full_name).to_s
+ @bin_dir = "#{@tmp_dir}/bin"
+ else
+ @bin_dir = @gem_bin_dir
+ end
end
def generate_bin
return if spec.executables.nil? || spec.executables.empty?
- if Bundler.requires_sudo?
- FileUtils.mkdir_p(@tmp_bin_dir) unless File.exist?(@tmp_bin_dir)
- end
-
super
if Bundler.requires_sudo?
Bundler.mkdir_p @gem_bin_dir
spec.executables.each do |exe|
- Bundler.sudo "cp -R #{@tmp_bin_dir}/#{exe} #{@gem_bin_dir}"
+ Bundler.sudo "cp -R #{@bin_dir}/#{exe} #{@gem_bin_dir}"
end
end
+ ensure
+ Bundler.rm_rf(@tmp_dir) if Bundler.requires_sudo?
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/source/rubygems.rb
new/lib/bundler/source/rubygems.rb
--- old/lib/bundler/source/rubygems.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/source/rubygems.rb 2015-05-17 07:43:23.000000000 +0200
@@ -145,9 +145,7 @@
spec.loaded_from = loaded_from(spec)
["Installing #{version_message(spec)}", spec.post_install_message]
ensure
- if install_path && Bundler.requires_sudo?
- FileUtils.remove_entry_secure(install_path)
- end
+ Bundler.rm_rf(install_path) if Bundler.requires_sudo?
end
def cache(spec, custom_path = nil)
@@ -208,6 +206,8 @@
remotes.map(&method(:suppress_configured_credentials))
end
+ private
+
def source_uris_for_spec(spec)
specs.search_all(spec.name).inject([]) do |uris, s|
uris << s.source_uri.without_credentials if s.source_uri
@@ -215,8 +215,6 @@
end
end
- private
-
def loaded_from(spec)
"#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/ui/shell.rb new/lib/bundler/ui/shell.rb
--- old/lib/bundler/ui/shell.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/ui/shell.rb 2015-05-17 07:43:23.000000000 +0200
@@ -46,6 +46,14 @@
@shell.ask(msg)
end
+ def yes?(msg)
+ @shell.yes?(msg)
+ end
+
+ def no?
+ @shell.no?(msg)
+ end
+
def level=(level)
raise ArgumentError unless LEVELS.include?(level.to_s)
@level = level
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/version.rb new/lib/bundler/version.rb
--- old/lib/bundler/version.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler/version.rb 2015-05-17 07:43:23.000000000 +0200
@@ -2,5 +2,5 @@
# We're doing this because we might write tests that deal
# with other versions of bundler and we are unsure how to
# handle this better.
- VERSION = "1.9.4" unless defined?(::Bundler::VERSION)
+ VERSION = "1.9.9" unless defined?(::Bundler::VERSION)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler.rb new/lib/bundler.rb
--- old/lib/bundler.rb 2015-04-14 06:10:50.000000000 +0200
+++ new/lib/bundler.rb 2015-05-17 07:43:23.000000000 +0200
@@ -212,13 +212,11 @@
end
def tmp(name = Process.pid.to_s)
- @tmp ||= Pathname.new Dir.mktmpdir("bundler")
- @tmp.join(name)
+ Pathname.new(Dir.mktmpdir(["bundler", name]))
end
- def cleanup
- FileUtils.remove_entry_secure(@tmp) if @tmp
- rescue
+ def rm_rf(path)
+ FileUtils.remove_entry_secure(path) if path && File.exist?(path)
end
def settings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2015-04-14 06:10:50.000000000 +0200
+++ new/metadata 2015-05-17 07:43:23.000000000 +0200
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: bundler
version: !ruby/object:Gem::Version
- version: 1.9.4
+ version: 1.9.9
platform: ruby
authors:
- André Arko
@@ -11,7 +11,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: mustache
++++++ gem2rpm.yml ++++++
--- /var/tmp/diff_new_pack.CxWu1J/_old 2015-05-18 22:32:21.000000000 +0200
+++ /var/tmp/diff_new_pack.CxWu1J/_new 2015-05-18 22:32:21.000000000 +0200
@@ -19,12 +19,9 @@
# BuildRequires: foobar
# Requires: foobar
# ## used by gem2rpm
- :patches:
- gemspec_remove_pem.patch: -p1
# foo.patch: -p1
# bar.patch:
# ## used by gem2rpm
-:sources:
# - foo.desktop
# - bar.desktop
# :gem_install_args: '....'
@@ -68,4 +65,8 @@
# bar
# :post: |-
# /bin/echo foo
-#
+---
+:patches:
+ gemspec_remove_pem.patch: -p1
+:sources:
+ - series
++++++ gemspec_remove_pem.patch ++++++
--- /var/tmp/diff_new_pack.CxWu1J/_old 2015-05-18 22:32:21.000000000 +0200
+++ /var/tmp/diff_new_pack.CxWu1J/_new 2015-05-18 22:32:21.000000000 +0200
@@ -1,6 +1,7 @@
-diff -Naur
a/lib/bundler/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
b/lib/bundler/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
---- a/lib/bundler/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
2014-09-14 10:25:16.000000000 +0200
-+++ b/lib/bundler/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
1970-01-01 01:00:00.000000000 +0100
+Index:
bundler-1.9.9/lib/bundler/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
+===================================================================
+---
bundler-1.9.9.orig/lib/bundler/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
++++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
@@ -16,9 +17,10 @@
-lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
-AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
------END CERTIFICATE-----
-diff -Naur a/lib/bundler/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
b/lib/bundler/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
---- a/lib/bundler/ssl_certs/DigiCertHighAssuranceEVRootCA.pem 2014-09-14
10:25:16.000000000 +0200
-+++ b/lib/bundler/ssl_certs/DigiCertHighAssuranceEVRootCA.pem 1970-01-01
01:00:00.000000000 +0100
+Index: bundler-1.9.9/lib/bundler/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
+===================================================================
+--- bundler-1.9.9.orig/lib/bundler/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
++++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
@@ -43,9 +45,10 @@
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
-+OkuE6N36B9K
------END CERTIFICATE-----
-diff -Naur
a/lib/bundler/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
b/lib/bundler/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
---- a/lib/bundler/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
2014-09-14 10:25:16.000000000 +0200
-+++ b/lib/bundler/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
1970-01-01 01:00:00.000000000 +0100
+Index:
bundler-1.9.9/lib/bundler/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
+===================================================================
+---
bundler-1.9.9.orig/lib/bundler/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
++++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
@@ -75,9 +78,10 @@
-95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
-2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
------END CERTIFICATE-----
-diff -Naur a/lib/bundler/ssl_certs/GeoTrustGlobalCA.pem
b/lib/bundler/ssl_certs/GeoTrustGlobalCA.pem
---- a/lib/bundler/ssl_certs/GeoTrustGlobalCA.pem 2014-09-14
10:25:16.000000000 +0200
-+++ b/lib/bundler/ssl_certs/GeoTrustGlobalCA.pem 1970-01-01
01:00:00.000000000 +0100
+Index: bundler-1.9.9/lib/bundler/ssl_certs/GeoTrustGlobalCA.pem
+===================================================================
+--- bundler-1.9.9.orig/lib/bundler/ssl_certs/GeoTrustGlobalCA.pem
++++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
@@ -99,10 +103,10 @@
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
-
-diff -Naur a/lib/bundler/ssl_certs/AddTrustExternalCARoot-2048.pem
b/lib/bundler/ssl_certs/AddTrustExternalCARoot-2048.pem
---- a/lib/bundler/ssl_certs/AddTrustExternalCARoot-2048.pem 2015-03-11
10:12:35.000000000 +0100
-+++ b/lib/bundler/ssl_certs/AddTrustExternalCARoot-2048.pem 1970-01-01
01:00:00.000000000 +0100
+Index: bundler-1.9.9/lib/bundler/ssl_certs/AddTrustExternalCARoot-2048.pem
+===================================================================
+--- bundler-1.9.9.orig/lib/bundler/ssl_certs/AddTrustExternalCARoot-2048.pem
++++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
@@ -129,9 +133,10 @@
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
-diff -Naur a/lib/bundler/ssl_certs/AddTrustExternalCARoot.pem
b/lib/bundler/ssl_certs/AddTrustExternalCARoot.pem
---- a/lib/bundler/ssl_certs/AddTrustExternalCARoot.pem 2015-03-11
10:12:35.000000000 +0100
-+++ b/lib/bundler/ssl_certs/AddTrustExternalCARoot.pem 1970-01-01
01:00:00.000000000 +0100
+Index: bundler-1.9.9/lib/bundler/ssl_certs/AddTrustExternalCARoot.pem
+===================================================================
+--- bundler-1.9.9.orig/lib/bundler/ssl_certs/AddTrustExternalCARoot.pem
++++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFdDCCBFygAwIBAgIQJ2buVutJ846r13Ci/ITeIjANBgkqhkiG9w0BAQwFADBv
@@ -165,9 +170,11 @@
-PUsE2JOAWVrgQSQdso8VYFhH2+9uRv0V9dlfmrPb2LjkQLPNlzmuhbsdjrzch5vR
-pu/xO28QOG8=
------END CERTIFICATE-----
---- a/bundler-1.9.4.gemspec.orig 2015-04-12 07:56:28.572149846 +0200
-+++ b/bundler-1.9.4.gemspec 2015-04-12 07:58:46.523035318 +0200
-@@ -42,5 +42,8 @@
+Index: bundler-1.9.9/bundler-1.9.9.gemspec
+===================================================================
+--- bundler-1.9.9.orig/bundler-1.9.9.gemspec
++++ bundler-1.9.9/bundler-1.9.9.gemspec
+@@ -42,5 +42,8 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rspec>, ["~> 3.0"])
s.add_dependency(%q<rake>, [">= 0"])
end
++++++ series ++++++
gemspec_remove_pem.patch
