From 24cafd5a48096bb526a1180d7067b472f412fc50 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 10 Sep 2016 10:51:57 +0900 Subject: [PATCH 1/5] cherry-picked 65b643209d82e7f04f5568aa1c22d3969fef3f2a --- lib/rake.rb | 1 - lib/rake/application.rb | 2 +- lib/rake/ext/fixnum.rb | 18 ------------------ 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 lib/rake/ext/fixnum.rb diff --git a/lib/rake.rb b/lib/rake.rb index a2f1b448e..2466e3992 100644 --- a/lib/rake.rb +++ b/lib/rake.rb @@ -32,7 +32,6 @@ module Rake; end require 'ostruct' require 'rake/ext/string' -require 'rake/ext/fixnum' require 'rake/win32' diff --git a/lib/rake/application.rb b/lib/rake/application.rb index fc0a786d6..8c93a8d4f 100644 --- a/lib/rake/application.rb +++ b/lib/rake/application.rb @@ -449,7 +449,7 @@ def standard_rake_options # :nodoc: "(default is number of CPU cores + 4)", lambda { |value| if value.nil? || value == '' - value = Fixnum::MAX + value = Float::INFINITY elsif value =~ /^\d+$/ value = value.to_i else diff --git a/lib/rake/ext/fixnum.rb b/lib/rake/ext/fixnum.rb deleted file mode 100644 index 56079ee6d..000000000 --- a/lib/rake/ext/fixnum.rb +++ /dev/null @@ -1,18 +0,0 @@ -#-- -# Extensions to fixnum to define some constants missing from Ruby itself - -class Fixnum - - unless constants.include? :MAX - - # future versions of Ruby may end up defining this constant - # in a more portable way, as documented by Matz himself in: - # - # https://bugs.ruby-lang.org/issues/7517 - # - # ... but until such time, we define the constant ourselves - MAX = (2**(0.size * 8 - 2) - 1) # :nodoc: - - end - -end From 050c7d4900a691215e953b1de122d1bd60d32254 Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Tue, 20 Sep 2016 16:00:35 +0900 Subject: [PATCH 2/5] History --- History.rdoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/History.rdoc b/History.rdoc index 6ff5088df..c306c2108 100644 --- a/History.rdoc +++ b/History.rdoc @@ -1,3 +1,9 @@ +=== 11.3.0 / 2016-09-20 + +Enhancements: + +* Remove to reference `Fixnum` constant. Pull request #160 by nobu + === 11.2.2 / 2016-06-12 Bug fixes: From 08576365d9acb9a76ce36a4448953be21f001b5f Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Tue, 20 Sep 2016 16:01:03 +0900 Subject: [PATCH 3/5] bump version to 11.3.0 --- lib/rake/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rake/version.rb b/lib/rake/version.rb index c9660a45e..003f0176a 100644 --- a/lib/rake/version.rb +++ b/lib/rake/version.rb @@ -1,5 +1,5 @@ module Rake - VERSION = '11.2.2' + VERSION = '11.3.0' module Version # :nodoc: all MAJOR, MINOR, BUILD, *OTHER = Rake::VERSION.split '.' From 2a15e60f3437f494754097523318af8360c5ccf9 Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Tue, 20 Sep 2016 16:04:35 +0900 Subject: [PATCH 4/5] up to date --- rake.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rake.gemspec b/rake.gemspec index 04bbd3327..6234bd553 100644 --- a/rake.gemspec +++ b/rake.gemspec @@ -5,7 +5,7 @@ require 'rake/version' Gem::Specification.new do |s| s.name = "rake".freeze s.version = Rake::VERSION - s.date = "2016-06-12" + s.date = "2016-09-20" s.authors = ["Hiroshi SHIBATA".freeze, "Eric Hodel".freeze, "Jim Weirich".freeze] s.email = ["hsbt@ruby-lang.org".freeze, "drbrain@segment7.net".freeze, "".freeze] From 477535e2e11386ae661a0a881d331f735713d48c Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Tue, 20 Sep 2016 17:19:26 +0900 Subject: [PATCH 5/5] workaround for bundler-1.13.1 --- Rakefile | 4 ++++ appveyor.yml | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index 97c22a45f..a2526132a 100644 --- a/Rakefile +++ b/Rakefile @@ -9,6 +9,10 @@ lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) + +# XXX: https://github.com/bundler/bundler/pull/4981 +require 'bundler/plugin/api/source' + require 'bundler/gem_tasks' require 'rake/testtask' require 'rdoc/task' diff --git a/appveyor.yml b/appveyor.yml index 2710426ad..62378b53a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,15 +4,13 @@ clone_depth: 10 install: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - ruby --version - - gem update --system - gem --version - - gem install minitest --no-document + - gem install minitest bundler --no-document build_script: - net user - net localgroup test_script: - ruby -Ilib exe/rake - environment: matrix: - ruby_version: "193"