[DRE-commits] [ruby-fog-aws] 02/02: Upload 0.6.0-1 to unstable
Miguel Landaeta
nomadium at moszumanska.debian.org
Fri Jul 3 16:14:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository ruby-fog-aws.
commit 41de7c8274d69686bdb15c073206457b61b9b4e0
Author: Miguel Landaeta <nomadium at debian.org>
Date: Fri Jul 3 12:46:56 2015 -0300
Upload 0.6.0-1 to unstable
---
debian/changelog | 13 +++++++
debian/compat | 2 +-
debian/control | 13 +++++--
.../01-dont-use-rubygems-to-run-tests.patch | 33 +++++++++++++++++
.../02-use-rubyzip-1.0-apis-for-tests.patch | 27 ++++++++++++++
...pe-lambda-function-names-in-requests-path.patch | 42 ++++++++++++++++++++++
debian/patches/series | 3 ++
debian/rules | 3 ++
8 files changed, 133 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ced4123..fe65a45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ruby-fog-aws (0.6.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Team upload.
+ * Add myself to Uploaders.
+ * Bump DH compat level to 9.
+ * Enable unit tests.
+ - Update Build-Depends.
+ - Add patch 01-dont-use-rubygems-to-run-tests.patch.
+ - Add patch 02-use-rubyzip-1.0-apis-for-tests.patch.
+
+ -- Miguel Landaeta <nomadium at debian.org> Fri, 03 Jul 2015 12:42:31 -0300
+
ruby-fog-aws (0.1.2-2) unstable; urgency=medium
* Re-upload to unstable
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 94e7611..c575447 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,17 @@ Source: ruby-fog-aws
Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Pirate Praveen <praveen at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb
+Uploaders: Pirate Praveen <praveen at debian.org>,
+ Miguel Landaeta <nomadium at debian.org>
+Build-Depends: debhelper (>= 9~),
+ gem2deb,
+ rake,
+ ruby-shindo,
+ ruby-zip (>= 1.0~),
+ ruby-fog-core (>= 1.27~),
+ ruby-fog-json (>= 1.0~),
+ ruby-fog-xml (>= 0.1~),
+ ruby-ipaddress (>= 0.8~)
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-fog-aws.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-fog-aws.git;a=summary
diff --git a/debian/patches/01-dont-use-rubygems-to-run-tests.patch b/debian/patches/01-dont-use-rubygems-to-run-tests.patch
new file mode 100644
index 0000000..dfc4758
--- /dev/null
+++ b/debian/patches/01-dont-use-rubygems-to-run-tests.patch
@@ -0,0 +1,33 @@
+From: Miguel Landaeta <nomadium at debian.org>
+Date: Fri, 03 Jul 2015 12:22:52 -0300
+Subject: Don't use rubygems/bundler to run tests
+Forwarded: no
+
+diff --git a/Rakefile b/Rakefile
+index 645547a..1f81302 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,8 +1,8 @@
+-require "bundler/gem_tasks"
++#require "bundler/gem_tasks"
+
+ task :default => :test
+
+ mock = ENV['FOG_MOCK'] || 'true'
+ task :test do
+- sh("export FOG_MOCK=#{mock} && bundle exec shindont")
++ sh("export FOG_MOCK=#{mock} && shindont")
+ end
+diff --git a/tests/helper.rb b/tests/helper.rb
+index 22faa9f..60d4f07 100644
+--- a/tests/helper.rb
++++ b/tests/helper.rb
+@@ -7,7 +7,7 @@ end
+
+ require File.expand_path('../../lib/fog/aws', __FILE__)
+
+-Bundler.require(:test)
++#Bundler.require(:test)
+
+ Excon.defaults.merge!(:debug_request => true, :debug_response => true)
+
diff --git a/debian/patches/02-use-rubyzip-1.0-apis-for-tests.patch b/debian/patches/02-use-rubyzip-1.0-apis-for-tests.patch
new file mode 100644
index 0000000..75e57d8
--- /dev/null
+++ b/debian/patches/02-use-rubyzip-1.0-apis-for-tests.patch
@@ -0,0 +1,27 @@
+From: Miguel Landaeta <nomadium at debian.org>
+Date: Fri, 03 Jul 2015 11:53:58 -0300
+Subject: Use rubyzip 1.0 APIs for tests
+Forwarded: no
+
+diff --git a/tests/requests/lambda/helper.rb b/tests/requests/lambda/helper.rb
+index 3b0dfc9..733714c 100644
+--- a/tests/requests/lambda/helper.rb
++++ b/tests/requests/lambda/helper.rb
+@@ -1,7 +1,7 @@
+ class AWS
+ class Lambda
+ module Formats
+- require 'zip/zip'
++ require 'zip'
+
+ GET_FUNCTION_CONFIGURATION = {
+ 'CodeSize' => Integer,
+@@ -65,7 +65,7 @@ class AWS
+ DELETE_EVENT_SOURCE_MAPPING = GET_EVENT_SOURCE_MAPPING
+
+ def self.zip(data, filename='index.js')
+- data_io = Zip::ZipOutputStream.write_buffer do |zio|
++ data_io = Zip::OutputStream.write_buffer do |zio|
+ zio.put_next_entry(filename)
+ zio.write(data)
+ end
diff --git a/debian/patches/03-escape-lambda-function-names-in-requests-path.patch b/debian/patches/03-escape-lambda-function-names-in-requests-path.patch
new file mode 100644
index 0000000..a44b4a1
--- /dev/null
+++ b/debian/patches/03-escape-lambda-function-names-in-requests-path.patch
@@ -0,0 +1,42 @@
+From: Miguel Landaeta <nomadium at debian.org>
+Date: Fri, 03 Jul 2015 11:43:53 -0300
+Subject: Escape Lambda function name in request paths
+Forwarded: yes, https://github.com/fog/fog-aws/pull/140
+
+diff --git a/lib/fog/aws/lambda.rb b/lib/fog/aws/lambda.rb
+index 198f796..bbe4240 100644
+--- a/lib/fog/aws/lambda.rb
++++ b/lib/fog/aws/lambda.rb
+@@ -124,7 +124,8 @@ def request(params)
+
+ idempotent = params.delete(:idempotent)
+ parser = params.delete(:parser)
+- request_path = "/#{@version}#{params.delete(:path)}"
++ path = params.delete(:path)
++ request_path = "/#{@version}#{path}"
+ query = params.delete(:query) || {}
+ method = params.delete(:method) || 'POST'
+ expects = params.delete(:expects) || 200
+@@ -132,6 +133,13 @@ def request(params)
+
+ headers.merge!(params[:headers] || {})
+
++ request_path_to_sign = case path
++ when %r{^/functions/([0-9a-zA-Z\:\-\_]+)(/.+)?$}
++ "/#{@version}/functions/#{Fog::AWS.escape($~[1])}#{$~[2]}"
++ else
++ request_path
++ end
++
+ body, headers = AWS.signed_params_v4(
+ params,
+ headers,
+@@ -140,7 +148,7 @@ def request(params)
+ :aws_session_token => @aws_session_token,
+ :signer => @signer,
+ :host => @host,
+- :path => request_path,
++ :path => request_path_to_sign,
+ :port => @port,
+ :query => query,
+ :body => params[:body]
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ffefb73
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-dont-use-rubygems-to-run-tests.patch
+02-use-rubyzip-1.0-apis-for-tests.patch
+03-escape-lambda-function-names-in-requests-path.patch
diff --git a/debian/rules b/debian/rules
index d81794d..d979123 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,6 @@
%:
dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_test:
+ rake test
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-fog-aws.git
More information about the Pkg-ruby-extras-commits
mailing list