From 03eb1e38a4e9d7541c44d9fe876aa213e6d606ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Tue, 22 Jun 2010 21:35:43 +0000 Subject: [PATCH] Finally bump to bundler 0.9, add a patch with a number of fixes for both test and code itself, already merged upstream. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-ruby/bundler/ChangeLog | 9 ++- dev-ruby/bundler/Manifest | 11 ++-- dev-ruby/bundler/bundler-0.9.26.ebuild | 41 ++++++++++++ .../bundler/files/bundler-0.9.26-gentoo.patch | 62 +++++++++++++++++++ 4 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 dev-ruby/bundler/bundler-0.9.26.ebuild create mode 100644 dev-ruby/bundler/files/bundler-0.9.26-gentoo.patch diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog index 563b5b995f7a..b2ecca1fac89 100644 --- a/dev-ruby/bundler/ChangeLog +++ b/dev-ruby/bundler/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-ruby/bundler # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.3 2010/05/01 00:40:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.4 2010/06/22 21:35:43 flameeyes Exp $ + +*bundler-0.9.26 (22 Jun 2010) + + 22 Jun 2010; Diego E. Pettenò + +bundler-0.9.26.ebuild, +files/bundler-0.9.26-gentoo.patch: + Finally bump to bundler 0.9, add a patch with a number of fixes for both + test and code itself, already merged upstream. 01 May 2010; Diego E. Pettenò bundler-0.8.1.ebuild: diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest index 7d230b28df49..8c8785446d7b 100644 --- a/dev-ruby/bundler/Manifest +++ b/dev-ruby/bundler/Manifest @@ -1,14 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX bundler-0.9.26-gentoo.patch 2227 RMD160 d3df1628921499a9237d66afbfb83dc35e1c63a6 SHA1 bf61fe9ef235dd9c054dd50b9d7586a8ed254453 SHA256 cfeb392734886cf8325b3bb73e644f6bd2f44703d05debe87e805a8fa5861cba DIST bundler-git-0.8.1.tgz 37199 RMD160 e71626e8e497d6e523a35ef871ddac21a051e0cf SHA1 0dd30a1b23ebf17ef3aac5de6c65248114dfd286 SHA256 caae41d8b6f722e164e1120faba6d366ca4bb857120e1a4d3a28b22d53db2c70 +DIST bundler-git-0.9.26.tgz 70159 RMD160 4d23c32337597645d29b8b7a47920eb9de21a989 SHA1 6fd5c1e323d90b73943a70b72bbae5854358f573 SHA256 74aa8c73700cb2e496cf904de45085d7613819675ef80af280da832c6e00babb EBUILD bundler-0.8.1.ebuild 993 RMD160 85425f86d42fd82c4955cf733f61b3bd0832081d SHA1 875b22abd9e2dbc698545387e128b24b8ed84aa8 SHA256 3c9b85ae5eb5f90f2ea1f65b7b0629f8b634d0ae530481a2c07d806ad213c6f8 -MISC ChangeLog 681 RMD160 756b650974bdc8d28ef39411b17174688e8d15a5 SHA1 216e12133f0c3c43b1c95e7b4d9eab06d86c35f9 SHA256 72e307eb5dedaaeec87d50e38b7971b74249217fc3fdfa5f8e48dee0131bc349 +EBUILD bundler-0.9.26.ebuild 1074 RMD160 17946ee9680bad4ed433d28c0959b97faaebd695 SHA1 7054cb8a8eb18d2caf1165f0e30ee5b303f56461 SHA256 44caf2d90811e7e747ad41d4b8b0f2101aec5c0996dfdc1de3dd836e2f876495 +MISC ChangeLog 955 RMD160 84d6d844882d94f8e7d713b1ce7aab05672b625c SHA1 42c75ad089bd8dbede5d08e512cec8d9c9f0a7c7 SHA256 e73a2f9c5dc69b16100ba56314bac497f82e9094872ed0a6f8e1634afd6ba7e4 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvbeFUACgkQAiZjviIA2XiJcACeJqh9QHy6+GPt0AFo6sTCiyLC -qWYAoK0xt/sNpqSnFZ1pbN3Ia0raz5N4 -=raoF +iEYEARECAAYFAkwhK/UACgkQAiZjviIA2Xi/pACg3Rudfk32X4ebSUBIoVGA8/RL +fAAAnAiYQNfaCutM58QpPpXeag9KK+Br +=xVde -----END PGP SIGNATURE----- diff --git a/dev-ruby/bundler/bundler-0.9.26.ebuild b/dev-ruby/bundler/bundler-0.9.26.ebuild new file mode 100644 index 000000000000..5d2e7fe10763 --- /dev/null +++ b/dev-ruby/bundler/bundler-0.9.26.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-0.9.26.ebuild,v 1.1 2010/06/22 21:35:43 flameeyes Exp $ + +EAPI=2 + +# ruby19 → uncountable number of test failures +# jruby → needs to be tested because jruby-1.5.1 fails in multiple +# ways unrelated to this package +USE_RUBY="ruby18 ree18" + +RUBY_FAKEGEM_TASK_TEST="spec" + +# No documentation task +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ROADMAP.md" + +inherit ruby-fakegem + +DESCRIPTION="An easy way to vendor gem dependencies" +HOMEPAGE="http://github.com/carlhuda/bundler" + +GITHUB_USER="carlhuda" +SRC_URI="http://github.com/${GITHUB_USER}/${PN}/tarball/${PV} -> ${PN}-git-${PV}.tgz" +S="${WORKDIR}/${GITHUB_USER}-${PN}-*" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend dev-ruby/rubygems + +ruby_add_bdepend "test? ( dev-ruby/rspec )" + +RDEPEND="${RDEPEND} + dev-vcs/git" +DEPEND="${DEPEND} + test? ( dev-vcs/git )" + +RUBY_PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) diff --git a/dev-ruby/bundler/files/bundler-0.9.26-gentoo.patch b/dev-ruby/bundler/files/bundler-0.9.26-gentoo.patch new file mode 100644 index 000000000000..19d9568e9f04 --- /dev/null +++ b/dev-ruby/bundler/files/bundler-0.9.26-gentoo.patch @@ -0,0 +1,62 @@ +diff --git a/bin/bundle b/bin/bundle +index d2e5081..17db3f0 100755 +--- a/bin/bundle ++++ b/bin/bundle +@@ -1,9 +1,14 @@ + #!/usr/bin/env ruby + + # Check if an older version of bundler is installed ++mybasedir = __FILE__.gsub(/\/bin\/bundle/, '') ++ + require 'bundler' + $:.each do |path| +- if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9 ++ # ignore the directory we're running from, in the tests ++ path = path.gsub(%r"^#{mybasedir}", '') ++ ++ if path =~ %r'/bundler-0\.(\d+)' && $1.to_i < 9 + abort "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`." + end + end +diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb +index bf74a60..c800827 100644 +--- a/lib/bundler/rubygems_ext.rb ++++ b/lib/bundler/rubygems_ext.rb +@@ -26,7 +26,7 @@ module Gem + def git_version + if @loaded_from && File.exist?(File.join(full_gem_path, ".git")) + sha = Dir.chdir(full_gem_path){ `git rev-parse HEAD`.strip } +- branch = full_gem_path.split("-")[3] ++ branch = full_gem_path.match(/gems\/.*/).to_s.split("-")[3] + (branch && branch != sha) ? " #{branch}-#{sha[0...6]}" : " #{sha[0...6]}" + end + end +diff --git a/spec/install/git_spec.rb b/spec/install/git_spec.rb +index a732caa..4c1fc1a 100644 +--- a/spec/install/git_spec.rb ++++ b/spec/install/git_spec.rb +@@ -301,7 +301,7 @@ describe "bundle install with git sources" do + should_be_installed "forced 1.1" + + Dir.chdir(lib_path('forced-1.0')) do +- `git reset --hard head^` ++ `git reset --hard HEAD^` + end + bundle :install + should_be_installed "forced 1.0" +diff --git a/spec/runtime/environment_rb_spec.rb b/spec/runtime/environment_rb_spec.rb +index 73a388c..34417dc 100644 +--- a/spec/runtime/environment_rb_spec.rb ++++ b/spec/runtime/environment_rb_spec.rb +@@ -204,6 +204,11 @@ describe "environment.rb file" do + end + + it "warns you if it's from an old bundler but read-only" do ++ if Process.euid == 0 ++ pending "this test cannot succeed as root" ++ return ++ end ++ + env_file(env_file.read.gsub("by Bundler #{Bundler::VERSION}", "by Bundler 0.9.0")) + FileUtils.chmod 0444, env_file + ruby <<-R, :expect_err => true -- 2.26.2