[DRE-commits] [ruby-spring] 02/08: Merge tag 'upstream/1.3.6'

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-spring.

commit c7fafd16a0bcb6b513f1727e8bdb1bef116cee63
Merge: fd7ef4f 5c1f9b5
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 14 09:05:50 2015 -0300

    Merge tag 'upstream/1.3.6'
    
    Upstream version 1.3.6
    
    # gpg: Signature made Sex 14 Ago 2015 09:05:47 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 .gitignore                                         |   1 +
 .travis.yml                                        |   5 +-
 CHANGELOG.md                                       |  54 ++++
 CONTRIBUTING.md                                    |   5 +
 Gemfile                                            |   2 -
 README.md                                          |  45 +--
 Rakefile                                           |   2 +-
 checksums.yaml.gz                                  | Bin 270 -> 0 bytes
 lib/spring/application.rb                          |   7 +-
 lib/spring/client/binstub.rb                       |  13 +-
 lib/spring/client/rails.rb                         |   5 +-
 lib/spring/client/run.rb                           |  62 +++-
 lib/spring/client/status.rb                        |   4 +-
 lib/spring/client/stop.rb                          |  27 +-
 lib/spring/command_wrapper.rb                      |   4 -
 lib/spring/commands.rb                             |  13 +-
 lib/spring/commands/rails.rb                       |  35 ++-
 lib/spring/env.rb                                  |  29 +-
 lib/spring/sid.rb                                  |   2 +-
 lib/spring/test.rb                                 |  18 ++
 lib/spring/test/acceptance_test.rb                 | 346 +++++++++++++++++++++
 .../helper.rb => lib/spring/test/application.rb    | 129 +-------
 lib/spring/test/application_generator.rb           | 121 +++++++
 lib/spring/test/rails_version.rb                   |  40 +++
 lib/spring/test/watcher_test.rb                    | 167 ++++++++++
 lib/spring/version.rb                              |   2 +-
 lib/spring/watcher.rb                              |  12 +-
 lib/spring/watcher/listen.rb                       |  52 ----
 lib/spring/watcher/polling.rb                      |   2 +
 metadata.yml                                       | 131 --------
 spring.gemspec                                     |   5 +-
 test/acceptance/app_test.rb                        | 334 --------------------
 test/acceptance_test.rb                            |   4 +
 test/helper.rb                                     |   4 +-
 test/unit/commands_test.rb                         |  27 +-
 test/unit/watcher_test.rb                          | 190 +----------
 36 files changed, 974 insertions(+), 925 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-spring.git