Skip to content

Commit

Permalink
Merge branch 'master' into revert-glob-support
Browse files Browse the repository at this point in the history
  • Loading branch information
aycabta committed Sep 16, 2016
2 parents 5123a74 + 93e55a4 commit c090e33
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 24 deletions.
3 changes: 3 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
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"
Expand Down
4 changes: 1 addition & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion lib/rake.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ module Rake; end
require "ostruct"

require "rake/ext/string"
require "rake/ext/fixnum"

require "rake/win32"

Expand Down
2 changes: 1 addition & 1 deletion lib/rake/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 0 additions & 18 deletions lib/rake/ext/fixnum.rb

This file was deleted.

12 changes: 11 additions & 1 deletion rake.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,17 @@ Gem::Specification.new do |s|
s.email = ["[email protected]".freeze, "[email protected]".freeze, "".freeze]

s.summary = "Rake is a Make-like program implemented in Ruby".freeze
s.description = "Rake is a Make-like program implemented in Ruby. Tasks and dependencies are\nspecified in standard Ruby syntax.\n\nRake has the following features:\n\n* Rakefiles (rake's version of Makefiles) are completely defined in\n standard Ruby syntax. No XML files to edit. No quirky Makefile\n syntax to worry about (is that a tab or a space?)\n\n* Users can specify tasks with prerequisites.\n\n* Rake supports rule patterns to synthesize implicit tasks.\n\n* Flexible FileLists that act like arrays but know about manipulating\n file names and paths.\n\n* Supports parallel execution of tasks.".freeze
s.description = <<-DESCRIPTION
Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
specified in standard Ruby syntax.
Rake has the following features:
* Rakefiles (rake's version of Makefiles) are completely defined in standard Ruby syntax.
No XML files to edit. No quirky Makefile syntax to worry about (is that a tab or a space?)
* Users can specify tasks with prerequisites.
* Rake supports rule patterns to synthesize implicit tasks.
* Flexible FileLists that act like arrays but know about manipulating file names and paths.
* Supports parallel execution of tasks.
DESCRIPTION
s.homepage = "https://github.com/ruby/rake".freeze
s.licenses = ["MIT".freeze]

Expand Down

0 comments on commit c090e33

Please sign in to comment.