From 2bc0254e6faab012780ff5410596d0e8d5346fd7 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Sat, 19 Jun 2010 12:34:34 +0000 Subject: Version bump, new ebuild needs multi_json (and a fixed one) and is further fixed. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-ruby/oauth2/ChangeLog | 9 +++- dev-ruby/oauth2/Manifest | 11 +++-- dev-ruby/oauth2/files/oauth2-0.0.9-gentoo.patch | 65 +++++++++++++++++++++++++ dev-ruby/oauth2/oauth2-0.0.9.ebuild | 28 +++++++++++ 4 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 dev-ruby/oauth2/files/oauth2-0.0.9-gentoo.patch create mode 100644 dev-ruby/oauth2/oauth2-0.0.9.ebuild (limited to 'dev-ruby/oauth2') diff --git a/dev-ruby/oauth2/ChangeLog b/dev-ruby/oauth2/ChangeLog index bcc9d0617f32..3227e84cd7fd 100644 --- a/dev-ruby/oauth2/ChangeLog +++ b/dev-ruby/oauth2/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-ruby/oauth2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth2/ChangeLog,v 1.4 2010/05/18 18:45:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth2/ChangeLog,v 1.5 2010/06/19 12:34:34 flameeyes Exp $ + +*oauth2-0.0.9 (19 Jun 2010) + + 19 Jun 2010; Diego E. Pettenò + +oauth2-0.0.9.ebuild, +files/oauth2-0.0.9-gentoo.patch: + Version bump, new ebuild needs multi_json (and a fixed one) and is further + fixed. 18 May 2010; Diego E. Pettenò oauth2-0.0.8.ebuild: Add ~x86, tested on development container. diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest index 3283749dc7f4..33133acb646b 100644 --- a/dev-ruby/oauth2/Manifest +++ b/dev-ruby/oauth2/Manifest @@ -2,14 +2,17 @@ Hash: SHA1 AUX oauth2-0.0.8-gentoo.patch 840 RMD160 87ac5f69a73fa5d17cddce4d51015ba07e9b1862 SHA1 1df44f9e5b467b6834c4af8662885f7c75b6156d SHA256 519e317d4ea76568ff284ad366c064325cbc0c2ec647e24990391b0785bcdb08 +AUX oauth2-0.0.9-gentoo.patch 2372 RMD160 0e9eb8ad7b33384c189a8d836f719bd532ec1a89 SHA1 4ec53cc0d0fbdfecf6f89ebbe7b9b269cb501a5b SHA256 4a416c15e79c24c22e40e133b2d5fcf457ad2b9838a45382f50c53ae345db67f DIST oauth2-0.0.8.gem 10752 RMD160 343cbfb44fe8484b0941746cdfcca43eca78c2d7 SHA1 30108e2d9f47034992fc9df4ae9fb566b643a707 SHA256 d12a459e71d015707218f923c22aa654fcd2972e3f73d006a6b3710c0560cfcc +DIST oauth2-0.0.9.gem 11264 RMD160 0a1534e5111a776eb6c949b9855fac0b439c73a6 SHA1 6aa4482dd8a2c94e0787648689acac7248fae84e SHA256 bf210a707ce83665083d573657dfaa60ef055e10d9353f3875fc68656fd8e350 EBUILD oauth2-0.0.8.ebuild 789 RMD160 0de981d7d2ee1d3d3f1932cfbb3900d66e4bbcac SHA1 d4d74a51f66928b4bf2ea84f8fecad899b845805 SHA256 ffdec7c5ffd1ebe68fc004b465ca941592572e7d9e8fb6bb17e3afd513bbb701 -MISC ChangeLog 803 RMD160 ce7b46393932dd902d9c80035167070c5e84d0e6 SHA1 eebb054dc9904aa89b353551e1afb867ec5a3d63 SHA256 936e2053be9d3f50ebae4f348d0d8f2e858ee5a82fea973b24bae9ba05690d91 +EBUILD oauth2-0.0.9.ebuild 806 RMD160 545922ad9628a8b9d9b7c48f3c6b6df4409ea5dc SHA1 ef2dc867f24a18d846071153bf9f44abecda91c6 SHA256 46759243eae8af2fea949515baadfad9f80e3d649f21899b3a1f02db4d46cd19 +MISC ChangeLog 1033 RMD160 aee0c8524683309df937a0d1320510fbafd5ea9f SHA1 c6309a05b340e55d7bd14b7d820123227a0d7793 SHA256 988f22c49dde83d1af06c0bceadc060185f5ec726f4629b922d2abe6920f4e6b MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvy4EgACgkQAiZjviIA2XgYOACgkRfHMmg83dmrB/cmpzDN/oP5 -sUAAoLWWsOzVxpDYKkrGJIg8n1UIwCG1 -=h8CL +iEYEARECAAYFAkwcuMYACgkQAiZjviIA2XhbowCgz2q2taSHYgQmyB+b+ezzgBT8 +9UEAnR4d2zreABOUOt421j2KMNGoiIJF +=1GCr -----END PGP SIGNATURE----- diff --git a/dev-ruby/oauth2/files/oauth2-0.0.9-gentoo.patch b/dev-ruby/oauth2/files/oauth2-0.0.9-gentoo.patch new file mode 100644 index 000000000000..fb27f0371530 --- /dev/null +++ b/dev-ruby/oauth2/files/oauth2-0.0.9-gentoo.patch @@ -0,0 +1,65 @@ +diff --git a/Rakefile b/Rakefile +index e4b0361..983d568 100644 +--- a/Rakefile ++++ b/Rakefile +@@ -16,10 +16,13 @@ begin + # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings + end + Jeweler::GemcutterTasks.new ++ ++ task :spec => :check_dependencies + rescue LoadError + puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler" + end + ++begin + require 'spec/rake/spectask' + Spec::Rake::SpecTask.new(:spec) do |spec| + spec.libs << 'lib' << 'spec' +@@ -32,9 +35,10 @@ Spec::Rake::SpecTask.new(:rcov) do |spec| + spec.rcov = true + end + +-task :spec => :check_dependencies +- + task :default => :spec ++rescue LoadError ++ puts "RSpec (or a dependency) not available. Install it with: gem install rspec" ++end + + require 'rake/rdoctask' + Rake::RDocTask.new do |rdoc| +diff --git a/lib/oauth2/strategy/web_server.rb b/lib/oauth2/strategy/web_server.rb +index f8aa562..25bd5a9 100644 +--- a/lib/oauth2/strategy/web_server.rb ++++ b/lib/oauth2/strategy/web_server.rb +@@ -13,7 +13,14 @@ module OAuth2 + # endpoints. + def get_access_token(code, options = {}) + response = @client.request(:post, @client.access_token_url, access_token_params(code, options)) +- params = MultiJson.decode(response) rescue Rack::Utils.parse_query(response) ++ ++ params = MultiJson.decode(response) rescue nil ++ # the ActiveSupport JSON parser won't cause an exception when ++ # given a formencoded string, so make sure that it was ++ # actually parsed in an Hash. This covers even the case where ++ # it caused an exception since it'll still be nil. ++ params = Rack::Utils.parse_query(response) unless params.is_a? Hash ++ + access = params['access_token'] + refresh = params['refresh_token'] + expires_in = params['expires_in'] +diff --git a/spec/oauth2/strategy/web_server_spec.rb b/spec/oauth2/strategy/web_server_spec.rb +index aee0b76..14c5008 100644 +--- a/spec/oauth2/strategy/web_server_spec.rb ++++ b/spec/oauth2/strategy/web_server_spec.rb +@@ -34,8 +34,8 @@ describe OAuth2::Strategy::WebServer do + end + end + +- describe "#get_access_token" do + %w(json formencoded).each do |mode| ++ describe "#get_access_token (#{mode})" do + before do + @mode = mode + @access = subject.get_access_token('sushi') diff --git a/dev-ruby/oauth2/oauth2-0.0.9.ebuild b/dev-ruby/oauth2/oauth2-0.0.9.ebuild new file mode 100644 index 000000000000..3397f2dbc5d1 --- /dev/null +++ b/dev-ruby/oauth2/oauth2-0.0.9.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth2/oauth2-0.0.9.ebuild,v 1.1 2010/06/19 12:34:34 flameeyes Exp $ + +EAPI="2" + +USE_RUBY="ruby18 ruby19 jruby" + +RUBY_FAKEGEM_TASK_TEST="spec" +RUBY_FAKEGEM_TASK_DOC="rerdoc" + +RUBY_FAKEGEM_DOCDIR="rdoc" +RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG.rdoc" + +inherit ruby-fakegem eutils + +DESCRIPTION="Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem." +HOMEPAGE="http://github.com/intridea/oauth2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +ruby_add_rdepend "dev-ruby/faraday >=dev-ruby/multi_json-0.0.3-r1" +ruby_add_bdepend test ">=dev-ruby/rspec-1.2.9" + +RUBY_PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -- cgit v1.2.3-65-gdbad