vondruch pushed to rubygem-heroku (master). "Update to heroku 3.30.3."
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 31 12:40:24 UTC 2015
>From 853b0c55cf62b5f7d75f5d3d95d5ec7525a28133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Tue, 31 Mar 2015 14:31:44 +0200
Subject: Update to heroku 3.30.3.
diff --git a/.gitignore b/.gitignore
index 00dc8f7..7e7ffc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ clog
/heroku-2.33.0.gem
/heroku-2.39.3.gem
/heroku-3.8.2.gem
+/heroku-3.30.3.gem
diff --git a/rubygem-heroku-3.30.3-Update-rubyzip-dependency.patch b/rubygem-heroku-3.30.3-Update-rubyzip-dependency.patch
new file mode 100644
index 0000000..72fd493
--- /dev/null
+++ b/rubygem-heroku-3.30.3-Update-rubyzip-dependency.patch
@@ -0,0 +1,27 @@
+diff --git a/lib/heroku/updater.rb b/lib/heroku/updater.rb
+index 15a14cb..ea161b6 100644
+--- a/lib/heroku/updater.rb
++++ b/lib/heroku/updater.rb
+@@ -107,7 +107,7 @@ module Heroku
+ stderr_print 'updating...'
+ wait_for_lock do
+ require "tmpdir"
+- require "zip/zip"
++ require "zip"
+
+ Dir.mktmpdir do |download_dir|
+ zip_filename = "#{download_dir}/heroku.zip"
+@@ -148,11 +148,11 @@ module Heroku
+ end
+
+ def self.extract_zip(filename, dir)
+- Zip::ZipFile.open(filename) do |zip|
++ Zip::File.open(filename) do |zip|
+ zip.each do |entry|
+ target = File.join(dir, entry.to_s)
+ FileUtils.mkdir_p File.dirname(target)
+- zip.extract(entry, target) { true }
++ entry.extract(target) { true }
+ end
+ end
+ end
diff --git a/rubygem-heroku-3.8.1-WebMock-1.11.0-compatibility-fix.patch b/rubygem-heroku-3.8.1-WebMock-1.11.0-compatibility-fix.patch
deleted file mode 100644
index 9391b43..0000000
--- a/rubygem-heroku-3.8.1-WebMock-1.11.0-compatibility-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 166638aec51784824bb07468d93bb49fc2b36aa8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
-Date: Tue, 27 May 2014 13:52:33 +0200
-Subject: [PATCH] WebMock 1.11.0+ compatibility fix.
-
-Excon mocking is disable by WebMock::HttpLibAdapters::ExconAdapter.disable!
-call since WebMock 1.11.0 by
-https://github.com/bblimke/webmock/commit/3639da1a1c8bbc067a546dc2708c5a759de9b660
-commit.
----
- spec/spec_helper.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 815a512..70790c2 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -3,7 +3,6 @@ $stdin = File.new("/dev/null")
- require "rubygems"
-
- require "excon"
--Excon.defaults[:mock] = true
-
- # ensure these are around for errors
- # as their require is generally deferred
-@@ -20,6 +19,7 @@ require "webmock/rspec"
- include WebMock::API
-
- WebMock::HttpLibAdapters::ExconAdapter.disable!
-+Excon.defaults[:mock] = true
-
- def api
- Heroku::API.new(:api_key => "pass", :mock => true)
---
-1.9.0
-
diff --git a/rubygem-heroku.spec b/rubygem-heroku.spec
index fd3b71f..dae7931 100644
--- a/rubygem-heroku.spec
+++ b/rubygem-heroku.spec
@@ -1,30 +1,33 @@
# Generated from heroku-2.0.4.gem by gem2rpm -*- rpm-spec -*-
%global gem_name heroku
-Summary: Client library and CLI to deploy Rails apps on Heroku
Name: rubygem-%{gem_name}
-Version: 3.8.2
+Version: 3.30.3
Release: 1%{?dist}
+Summary: Client library and CLI to deploy apps on Heroku
Group: Development/Languages
License: MIT
URL: http://heroku.com/
-Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
-# Fix compatibility with WebMock 1.11.0+.
-# https://github.com/heroku/heroku/pull/1120
-Patch0: rubygem-heroku-3.8.1-WebMock-1.11.0-compatibility-fix.patch
-BuildRequires: rubygems-devel
+# Fix rubyzip 1.0+ compatibility.
+# https://github.com/heroku/heroku/pull/1476
+Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
+Patch0: rubygem-heroku-3.30.3-Update-rubyzip-dependency.patch
BuildRequires: ruby(release)
-BuildRequires: git
+BuildRequires: rubygems-devel
+BuildRequires: ruby
+BuildRequires: %{_bindir}/git
+BuildRequires: %{_bindir}/hostname
+BuildRequires: %{_bindir}/openssl
+BuildRequires: rubygem(excon)
BuildRequires: rubygem(fakefs)
-BuildRequires: rubygem(heroku-api) >= 0.3.17
-BuildRequires: rubygem(heroku-api) < 0.4
-BuildRequires: rubygem(launchy) >= 0.3.2
-BuildRequires: rubygem(rest-client) >= 1.6.1
-BuildRequires: rubygem(rest-client) < 1.7.0
+BuildRequires: rubygem(heroku-api)
+BuildRequires: rubygem(launchy)
+BuildRequires: rubygem(multi_json)
+BuildRequires: rubygem(netrc)
+BuildRequires: rubygem(rest-client)
BuildRequires: rubygem(rr)
BuildRequires: rubygem(rspec)
-BuildRequires: rubygem(netrc) => 0.7.7
-BuildRequires: rubygem(netrc) < 0.8
+BuildRequires: rubygem(rubyzip)
BuildRequires: rubygem(webmock)
BuildArch: noarch
# There were attempts to remove OkJson:
@@ -34,16 +37,17 @@ BuildArch: noarch
Provides: bundled(okjson) = 20120328
%description
-Client library and command-line tool to manage and deploy Rails apps on
-Heroku.
+Client library and command-line tool to deploy and manage apps on Heroku.
+
%package doc
Summary: Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
%description doc
-This package contains documentation for %{name}.
+Documentation for %{name}.
%prep
%setup -q -c -T
@@ -53,6 +57,9 @@ pushd .%{gem_instdir}
%patch0 -p1
popd
+# Relas rubyzip dependency.
+sed -i '/rubyzip/ s/"= 0.9.9"/"~> 1.0"/' ./%{gem_spec}
+
%build
%install
@@ -73,15 +80,13 @@ rm -d %{buildroot}%{gem_instdir}/data
%check
pushd .%{gem_instdir}
+# We don't care about coverage.
+sed -i '/[Cc]overalls/ s/^/#/' spec/spec_helper.rb
# Git credentials has to be configured for several tests."
git config --global user.email "you at example.com"
git config --global user.name "Your Name"
-# Heroku::Command::Git remote test fails when .git folder is not available.
-# https://github.com/heroku/heroku/issues/1125
-git init
-
# Heroku::Client rendezvous fixup hash:
# https://github.com/heroku/heroku/issues/1119
sed -i '/it "hash" do/a \ pending' spec/heroku/client/rendezvous_spec.rb
@@ -103,6 +108,9 @@ popd
%{gem_instdir}/spec
%changelog
+* Mon Mar 30 2015 Vít Ondruch <vondruch at redhat.com> - 3.30.3-1
+- Update to heroku 3.30.3.
+
* Mon May 26 2014 Vít Ondruch <vondruch at redhat.com> - 3.8.2-1
- Update to heroku 3.8.2.
- Drop root CA certificates.
diff --git a/sources b/sources
index cf6848d..b2264b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bce800e869f1c626b9334719f93c23eb heroku-3.8.2.gem
+fed5f440b1e5bf50f75ebb76270a5e7f heroku-3.30.3.gem
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/rubygem-heroku.git/commit/?h=master&id=853b0c55cf62b5f7d75f5d3d95d5ec7525a28133
More information about the scm-commits
mailing list