Version bump. Specs are now run as well.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 108 insertions, 5 deletions

diff --git a/dev-ruby/webmock/ChangeLog b/dev-ruby/webmock/ChangeLog
index d206f1a94df1..c4e7e0ddae7f 100644
--- a/dev-ruby/webmock/ChangeLog
+++ b/dev-ruby/webmock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/webmock
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/ChangeLog,v 1.11 2010/10/09 07:43:08 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/ChangeLog,v 1.12 2010/10/18 19:01:37 graaff Exp $
+
+*webmock-1.4.0 (18 Oct 2010)
+
+  18 Oct 2010; Hans de Graaff <graaff@gentoo.org> +webmock-1.4.0.ebuild,
+  +files/webmock-1.4.0-network-specs.patch,
+  +files/webmock-1.4.0-tmpdir.patch:
+  Version bump. Specs are now run as well.
 
   09 Oct 2010; Hans de Graaff <graaff@gentoo.org> webmock-0.9.1.ebuild:
   Depend on rspec-1.
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 200f6b1fc2bf..3e2930db7154 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX webmock-1.4.0-network-specs.patch 1068 RMD160 f900aa2db5802948b7b64489cf27625c117d5132 SHA1 8461744583d1fe1ced3ce2fff145c20e2945df6d SHA256 e07445986dd7743bfebd3e0cfd5ee254f7c196273f5dae6a93ac56bc2e96eb82
+AUX webmock-1.4.0-tmpdir.patch 482 RMD160 3bc203468128930c74eb4b9847863687afe93431 SHA1 be1b77a5b134edac214b7ee35cca73685ea9140f SHA256 429e27a3a7fb0b74ae164973296c1cc8c1ac1415dedc7e55f198522f32d1cfa2
 DIST webmock-0.9.1.gem 62976 RMD160 489f3cd2cc01f5b7261b583db8bbfb22fc3aee04 SHA1 f97e2e414889d46d716344d6f5426c90ceee892a SHA256 a245fe16213b487ea5b17188c312dd274b1669358ee4e76b0e6689a307ad6540
 DIST webmock-1.3.5.gem 64512 RMD160 097f9213c624c3971e348c4fbbafb3d0a061dc65 SHA1 05d0ceb5fa6ad401411fd8847a03125938eabd12 SHA256 05736e7672215c370731db18ca56aeda439c68ef50311b48ad8d2bd94bd62b25
+DIST webmock-1.4.0.gem 68608 RMD160 d885b1cdfa3d99c08e8e772a9697a99817b33632 SHA1 6ea2e954c37c3ffd6a81c3fff429eae04db107e4 SHA256 2edfcfa64cfe0aa2f84b133e2e25732b58b5c8cb1a15da5c2154eb9a301f5305
 EBUILD webmock-0.9.1.ebuild 896 RMD160 847f60f0e9859f0934e96357d6ba95b501ade0e4 SHA1 6b7a9cab4480fd6c62a91ff9de3aacdccd6fdf76 SHA256 bab89d2a209eb84c66eaa183acfbab20c0ec453921a13c92a78a2dadd90b6404
 EBUILD webmock-1.3.5.ebuild 1152 RMD160 df29e4659b0224569e131a5bdab6ed5cde6c7957 SHA1 2b39e1d820fbcb57a2d6e8c34e6ce4ea501ccd01 SHA256 237f2095c1345bd1def63df780927f06df06cbaf9f97b4e86c51545359f5587c
-MISC ChangeLog 1777 RMD160 58df82cdb8a6b993fbcdcb5437e98a6db4714461 SHA1 aaf2a2f5603532e390874e98652213bbd07f0523 SHA256 961ef7ebb767912e2d8dfff8e3783fe6556e7a26bd8960e8dbe08c95d84c2483
+EBUILD webmock-1.4.0.ebuild 1409 RMD160 a0f75d48daa349e605477965fffd024a81c9af6b SHA1 0513e084a7c6bf1b19ef3d9c5a3adc6f7786d127 SHA256 d35bdd73ed53c6c7af7c875eb93486cad6f451e3a98f18661c2d273d4cc69281
+MISC ChangeLog 2005 RMD160 9d76737618c792cafdc24b690cc7105fc625c899 SHA1 e8cfbabc13807a33d9441bee77f9aa712e66eff2 SHA256 2b0ca47e62251ccbf865a4bbae048dcf727c6b37aa3f067806e9769d27a725b4
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkywHRIACgkQZihJkut28SvdsgEAxDggcx4/qm64sv2PtZX7xxqD
-l735rIfrg9L++z7UzhcA+gIaFBD5wgH0eaO0LRY1ZlkM7+T2vpQTwOee01Fen4w+
-=lckR
+iF4EAREIAAYFAky8mZYACgkQZihJkut28Ss/vwD+JSZeoI6gUP0iCZtnGv7DGOHW
+Rbly16n+6bjClb0mE1oBAJ3iW0mO282Uu5ZKk12wSd6Q12dYiZafbHJygMjvNdRW
+=j7Yn
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/webmock/files/webmock-1.4.0-network-specs.patch b/dev-ruby/webmock/files/webmock-1.4.0-network-specs.patch
new file mode 100644
index 000000000000..2193ca035312
--- /dev/null
+++ b/dev-ruby/webmock/files/webmock-1.4.0-network-specs.patch
@@ -0,0 +1,26 @@
+--- spec/webmock_spec.rb.~1~	2010-10-18 19:57:09.129443550 +0200
++++ spec/webmock_spec.rb	2010-10-18 20:20:03.965569387 +0200
+@@ -31,23 +31,6 @@
+         WebMock.allow_net_connect!
+       end
+ 
+-      it "should make a real web request if request is not stubbed" do
+-        setup_expectations_for_real_example_com_request
+-        http_request(:get, "http://www.example.com/").
+-          body.should =~ /.*example.*/
+-      end
+-
+-      it "should make a real https request if request is not stubbed" do
+-        setup_expectations_for_real_example_com_request(
+-         :host => "www.paypal.com",
+-         :port => 443,
+-         :path => "/uk/cgi-bin/webscr",
+-         :response_body => "hello paypal"
+-        )
+-        http_request(:get, "https://www.paypal.com/uk/cgi-bin/webscr").
+-          body.should =~ /.*paypal.*/
+-      end
+-
+       it "should return stubbed response if request was stubbed" do
+         stub_http_request(:get, "www.example.com").to_return(:body => "abc")
+         http_request(:get, "http://www.example.com/").body.should == "abc"
diff --git a/dev-ruby/webmock/files/webmock-1.4.0-tmpdir.patch b/dev-ruby/webmock/files/webmock-1.4.0-tmpdir.patch
new file mode 100644
index 000000000000..4e83d736ac5f
--- /dev/null
+++ b/dev-ruby/webmock/files/webmock-1.4.0-tmpdir.patch
@@ -0,0 +1,13 @@
+diff --git a/spec/patron_spec.rb b/spec/patron_spec.rb
+index fc996d0..a3ebe8c 100644
+--- a/spec/patron_spec.rb
++++ b/spec/patron_spec.rb
+@@ -21,7 +21,7 @@ unless RUBY_PLATFORM =~ /java/
+       describe "file requests" do
+ 
+         before(:each) do
+-          @dir_path = Dir.tmpdir
++          @dir_path = Dir.mktmpdir('webmock-')
+           @file_path = File.join(@dir_path, "webmock_temp_test_file")
+           FileUtils.rm_rf(@file_path) if File.exists?(@file_path)
+         end
diff --git a/dev-ruby/webmock/webmock-1.4.0.ebuild b/dev-ruby/webmock/webmock-1.4.0.ebuild
new file mode 100644
index 000000000000..15790dc3ccfb
--- /dev/null
+++ b/dev-ruby/webmock/webmock-1.4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.4.0.ebuild,v 1.1 2010/10/18 19:01:37 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_TEST="test spec"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="http://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.2.2 >=dev-ruby/crack-0.1.7"
+
+ruby_add_bdepend "test? (
+	virtual/ruby-test-unit
+	>=dev-ruby/rspec-1.2.9:0
+	>=dev-ruby/httpclient-2.1.5.2
+	>=dev-ruby/patron-0.4.9-r1
+	>=dev-ruby/em-http-request-0.2.14
+	dev-ruby/json
+	)"
+
+# Remove specs that require a network connection. Note that one of
+# them fails even with network connection:
+# http://github.com/bblimke/webmock/issues/issue/53
+RUBY_PATCHES=(
+	"${FILESDIR}/${P}-network-specs.patch"
+	"${FILESDIR}/${P}-tmpdir.patch"
+)
+
+all_ruby_prepare() {
+	# Don't require check_dependencies (using Jeweler)
+	sed -i \
+		-e '/=> :check_dependencies/s:^:#:' \
+		Rakefile || die "Rakefile fix failed"
+
+	# There is now optional support for curb which we don't have in
+	# Gentoo yet.
+	sed -i -e '/curb/d' spec/spec_helper.rb || die
+	rm spec/curb_spec.rb || die
+}