Repository: buildr Updated Branches: refs/heads/master f7fab6bbc -> 72af938e8
BUILDR-694 - "buildr upload" fails: wrong number of arguments in progress bar read() in Ruby 2.1.0. Submitted By Mark Reibert. Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/72af938e Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/72af938e Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/72af938e Branch: refs/heads/master Commit: 72af938e8c23fde3e67ec6b3aa5805ad516512e4 Parents: f7fab6b Author: Peter Donald <[email protected]> Authored: Tue Jun 24 15:09:09 2014 +1000 Committer: Peter Donald <[email protected]> Committed: Tue Jun 24 15:09:09 2014 +1000 ---------------------------------------------------------------------- CHANGELOG | 2 ++ lib/buildr/core/transports.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/72af938e/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 4b90d55..a81e64e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,6 @@ 1.4.18 (2014-06-18) +* Fixed: BUILDR-694 - "buildr upload" fails: wrong number of arguments in + progress bar read() in Ruby 2.1.0. Submitted By Mark Reibert. * Change: Remove support for uploads to RubyForge.org with gem dependencies as the site no longer exists. * Change: BUILDR-664 - Update Checkstyle addon so that extra_dependencies is http://git-wip-us.apache.org/repos/asf/buildr/blob/72af938e/lib/buildr/core/transports.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/core/transports.rb b/lib/buildr/core/transports.rb index 43cc5d8..4d5d266 100644 --- a/lib/buildr/core/transports.rb +++ b/lib/buildr/core/transports.rb @@ -336,8 +336,8 @@ module URI request.content_length = content.size content.rewind stream = Object.new - class << stream ; self ;end.send :define_method, :read do |count| - bytes = content.read(count) + class << stream ; self ;end.send :define_method, :read do |*args| + bytes = content.read(*args) progress << bytes if bytes bytes end
