Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
hsbt committed Nov 1, 2016
2 parents fe9c12d + ea67f73 commit 3325b91
Show file tree
Hide file tree
Showing 128 changed files with 1,672 additions and 4,087 deletions.
66 changes: 48 additions & 18 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,57 @@
StringLiterals:
Enabled: false
AllCops:
TargetRubyVersion: 2.3
DisabledByDefault: true
Exclude:
- doc/**/*.rb
- rake.gemspec

Style/LineLength:
Enabled: true
Max: 120

Style/HashSyntax:
Enabled: true

Style/StringLiterals:
Enabled: true
EnforcedStyle: double_quotes

Style/IndentationWidth:
Enabled: true

Style/Tab:
Enabled: true

Style/EmptyLines:
Enabled: true

MultilineBlocks:
Enabled: false
Style/TrailingBlankLines:
Enabled: true

SingleLineBlocks:
Enabled: false
Style/TrailingWhitespace:
Enabled: true

NewLambdaLiteral:
Enabled: false
Style/SpaceBeforeBlockBraces:
Enabled: true

SpaceAroundEqualsInParameterDefault:
Enabled: false
Style/SpaceInsideBlockBraces:
Enabled: true

HashSyntax:
Enabled: false
Style/SpaceInsideHashLiteralBraces:
Enabled: true

LineLength:
Style/CaseIndentation:
Enabled: true
Max: 90

WhileUntilModifier:
Enabled: false
Style/MultilineIfThen:
Enabled: true

IfUnlessModifier:
Enabled: false
Style/MethodDefParentheses:
Enabled: true

Style/BracesAroundHashParameters:
Enabled: true

Lint/EndAlignment:
Enabled: true
AlignWith: variable
12 changes: 2 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,13 @@ rvm:
- 2.3.1
- ruby-head
- jruby-1.7.20
- jruby-9.0.5.0
- jruby-9.1.0.0
- jruby-9.1.5.0
- jruby-head
- rbx-2
- rbx
before_install:
- gem update bundler --no-document
- gem install bundler --no-document -v '~> 1.13.3'
before_script:
- unset JRUBY_OPTS
script: ruby -Ilib exe/rake
matrix:
allow_failures:
- rvm: jruby-head
- rvm: rbx-2
- rvm: rbx
notifications:
email:
- [email protected]
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source 'https://rubygems.org'
source "https://rubygems.org"

gemspec
90 changes: 64 additions & 26 deletions History.rdoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,46 @@
=== 11.2.0(dev) / 2016-
=== 12.0.0(dev)

Enhancements:
==== Compatibility Changes

* Remove arguments on clear #157 by Jesse Bowes
* Removed `rake/contrib` packages. These are extracted to `rake-contrib` gem.
* Removed to deprecated warnings for `last\_comment`.

==== Enhancements:

* Re-use trace option on `cleanup` task. #164 by Brian Henderson

=== 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

* Fix unexpected behavior with multiple dependencies on Rake::TestTask

=== 11.2.1 / 2016-06-12

==== Bug fixes

* Fix regression of dependencies handling on Rake::TestTask. Report #139

=== 11.2.0 / 2016-06-11

==== Bug fixes

* Fix unexpected cut-out behavior on task description using triple dots
and exclamation. Report #106 from Stephan Kämper and Pull request #134 by Lee
* Fix empty argument assignment with `with_defaults` option. Pull request #135
by bakunyo
* Ignore to use `hwprefs` on Darwin platform. Use sysctl now. Report #128

==== Enhancements

* Spawn options for sh Pull equest #138 by Eric Hodel.
* Allow to specify dependencies(prerequisites) for Rake::TestTask
Pull request #117 by Tim Maslyuchenko
* Use Bundler task instead of hoe for gem release.
Expand All @@ -11,39 +50,39 @@ Enhancements:

=== 11.1.2 / 2016-03-28

Bug fixes:
==== Bug fixes

* Remove `-W` option when Rake::TestTask#verbose enabled. It's misunderstanding
specification change with Rake 11. Partly revert #67

=== 11.1.1 / 2016-03-14

Bug fixes:
==== Bug fixes

* Use `-W` instead of `--verbose` when Rake::TestTask#verbose enabled.
JRuby doesn't have `--verbose` option.

=== 11.1.0 / 2016-03-11

Compatibility Changes:
==== Compatibility Changes

* Revert to remove `last\_comment`. It will remove Rake 12.

=== 11.0.1 / 2016-03-09

Bug fixes:
==== Bug fixes

* Fixed packaging manifest.

=== 11.0.0 / 2016-03-09

Bug fixes:
==== Bug fixes

* Correctly handle bad encoding in exception messages. Pull request #113
by Tomer Brisker
* Fix verbose option at TestTask. Pull request #67 by Mike Blumtritt

Enhancements:
==== Enhancements

* Make FileList#exclude more analogous to FileList#include.
* Use IO.open instead of Open3.popen3 for CPU counter.
Expand All @@ -57,7 +96,7 @@ Enhancements:
Pull request #12 by Chris Keathley
* Use ruby warnings by default. Pull request #97 by Harold Giménez

Compatibility Changes:
==== Compatibility Changes

* Removed to support Ruby 1.8.x
* Removed constant named `RAKEVERSION`
Expand All @@ -71,15 +110,15 @@ Compatibility Changes:

=== 10.5.0 / 2016-01-13

Enhancements:
==== Enhancements

* Removed monkey patching for Ruby 1.8. Pull request #46 by Pablo Herrero.
* Inheritance class of Rake::FileList returns always self class.
Pull request #74 by Thomas Scholz

=== 10.4.2 / 2014-12-02

Bug fixes:
==== Bug fixes

* Rake no longer edits ARGV. This allows you to re-exec rake from a rake
task. Pull requset #9 by Matt Palmer.
Expand All @@ -90,14 +129,14 @@ Bug fixes:

=== 10.4.1 / 2014-12-01

Bug fixes:
==== Bug fixes

* Reverted fix for #277 as it caused numerous issues for rake users.
rails/spring issue #366 by Gustavo Dutra.

=== 10.4.0 / 2014-11-22

Enhancements:
==== Enhancements

* Upgraded to minitest 5. Pull request #292 by Teo Ljungberg.
* Added support for Pathname in rake tasks. Pull request #271 by Randy
Expand All @@ -108,7 +147,7 @@ Enhancements:
task. Issue #277 by Matt Palmer.
* Etc.nprocessors is used for counting the number of CPUs.

Bug fixes:
==== Bug fixes

* Updated rake manpage. Issue #283 by Nathan Long, pull request #291 by
skittleys.
Expand All @@ -121,29 +160,29 @@ Bug fixes:

=== 10.3.2 / 2014-05-15

Bug fixes:
==== Bug fixes

* Rake no longer infinitely loops when showing exception causes that refer to
each other. Bug #272 by Chris Bandy.
* Fixed documentation typos. Bug #275 by Jake Worth.

=== 10.3.1 / 2014-04-17

Bug fixes:
==== Bug fixes

* Really stop reporting an error when cleaning already-deleted files. Pull
request #269 by Randy Coulman
* Fixed infinite loop when cleaning already-deleted files on windows.

=== 10.3 / 2014-04-15

Enhancements:
==== Enhancements

* Added --build-all option to rake which treats all file prerequisites as
out-of-date. Pull request #254 by Andrew Gilbert.
* Added Rake::NameSpace#scope. Issue #263 by Jon San Miguel.

Bug fixes:
==== Bug fixes

* Suppress org.jruby package files in rake error messages for JRuby users.
Issue #213 by Charles Nutter.
Expand All @@ -155,13 +194,13 @@ Bug fixes:

=== 10.2.2 / 2014-03-27

Bug fixes:
==== Bug fixes

* Restored Ruby 1.8.7 compatibility

=== 10.2.1 / 2014-03-25

Bug fixes:
==== Bug fixes

* File tasks including a ':' are now top-level tasks again. Issue #262 by
Josh Holtrop.
Expand All @@ -170,7 +209,7 @@ Bug fixes:

=== 10.2.0 / 2014-03-24

Enhancements:
==== Enhancements

* Rake now requires Ruby 1.9 or newer. For me, this is a breaking change, but
it seems that Jim planned to release it with Rake 10.2. See also pull
Expand All @@ -188,7 +227,7 @@ Enhancements:
Filip Hrbek.
* Rake now prints the exception class on errors. Patch #251 by David Cornu.

Bug fixes:
==== Bug fixes

* Fixed typos. Pull request #256 by Valera Rozuvan, #250 via Jake Worth, #260
by Zachary Scott.
Expand All @@ -200,11 +239,10 @@ Bug fixes:
* Fixed bug in can\_detect\_signals? in test. Patch from #243 by Alexey
Borzenkov.

=== 10.1.1 and earlier
=== 10.1.1

Additions to the old CHANGES file were not made consistently so some
versions are missing from this file. These changes are usually described in
the individual release notes files.
* Use http://github.com/jimweirich/rake instead of http://rake.rubyforge.org for
canonical project url.

=== 10.1.0

Expand Down
9 changes: 4 additions & 5 deletions README.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

home :: https://github.com/ruby/rake
bugs :: https://github.com/ruby/rake/issues
docs :: http://docs.seattlerb.org/rake/
docs :: https://ruby.github.io/rake
build status :: {<img src="https://travis-ci.org/ruby/rake.svg?branch=master" alt="travis-ci">}[https://travis-ci.org/ruby/rake] {<img src="https://ci.appveyor.com/api/projects/status/github/ruby/rake?branch=master&svg=true" alt="appveyor">}[https://ci.appveyor.com/project/ruby/rake]

== Description
Expand All @@ -24,9 +24,9 @@ Rake has the following features:
file names and paths.

* A library of prepackaged tasks to make building rakefiles easier. For example,
tasks for building tarballs and publishing to FTP or SSH sites. (Formerly
tasks for building RDoc and Gems were included in rake but they're now
available in RDoc and RubyGems respectively.)
tasks for building tarballs. (Formerly
tasks for building RDoc, Gems and publishing to FTP were included in rake but they're now
available in RDoc, RubyGems and respectively.)

* Supports parallel execution of tasks.

Expand Down Expand Up @@ -101,7 +101,6 @@ other projects with similar (and not so similar) goals.
* http://directory.fsf.org/wiki/Bras -- Bras, one of earliest
implementations of "make in a scripting language".
* http://www.a-a-p.org -- Make in Python
* http://www.aromatic.com/tools/jam.txt -- JAM, Java Automated Make
* http://ant.apache.org -- The Ant project
* http://search.cpan.org/search?query=PerlBuildSystem -- The Perl Build System
* http://www.rubydoc.info/gems/rant/0.5.7/frames -- Rant, another Ruby make tool.
Expand Down
Loading

0 comments on commit 3325b91

Please sign in to comment.