[DRE-commits] [ruby-flexmock] 04/06: Merge tag 'upstream/1.3.2'

[Jonas Genannt]

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

hggh-guest pushed a commit to branch master
in repository ruby-flexmock.

commit a96657b61fc988d02d8efd3031d1ffcf35574cb3
Merge: e309995 dccb891
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Fri Jan 17 12:02:57 2014 +0100

    Merge tag 'upstream/1.3.2'
    
    Upstream version 1.3.2
    
    # gpg: Signature made Fri 17 Jan 2014 12:02:53 PM CET using RSA key ID 016CFFD0
    # gpg: Good signature from "Jonas Genannt <jonas at brachium-system.net>"
    # gpg:                 aka "Jonas Genannt <jonas.genannt at capi2name.de>"
    
    * tag 'upstream/1.3.2':
      Imported Upstream version 1.3.2

 CHANGES                                            |   31 +-
 Gemfile                                            |    7 +
 Gemfile.lock                                       |   20 +
 README.md                                          | 1192 ++++++++++++++
 README.rdoc                                        |  945 -----------
 Rakefile                                           |   81 +-
 TAGS                                               | 1677 ++++++++++++--------
 doc/GoogleExample.rdoc                             |   84 +-
 doc/examples/rspec_examples_spec.rdoc              |  245 +++
 doc/examples/test_unit_examples_test.rdoc          |  241 +++
 doc/index.rdoc                                     |   31 +
 doc/releases/flexmock-1.0.0.rdoc                   |  138 ++
 doc/releases/flexmock-1.0.3.rdoc                   |  159 ++
 doc/releases/flexmock-1.0.4.rdoc                   |  165 ++
 doc/releases/flexmock-1.1.0.rdoc                   |  144 ++
 doc/releases/flexmock-1.2.0.rdoc                   |  150 ++
 doc/releases/flexmock-1.3.0.rdoc                   |  165 ++
 doc/releases/flexmock-1.3.1.rdoc                   |  171 ++
 lib/flexmock.rb                                    |    2 +-
 lib/flexmock/argument_matchers.rb                  |   19 +-
 lib/flexmock/argument_matching.rb                  |   33 +
 lib/flexmock/argument_types.rb                     |    6 +-
 lib/flexmock/base.rb                               |    6 +-
 lib/flexmock/class_extensions.rb                   |   17 +
 lib/flexmock/composite.rb                          |    6 +-
 lib/flexmock/core.rb                               |   85 +-
 lib/flexmock/core_class_methods.rb                 |   16 +-
 lib/flexmock/default_framework_adapter.rb          |    7 +-
 lib/flexmock/deprecated_methods.rb                 |    2 +-
 lib/flexmock/errors.rb                             |    2 +-
 lib/flexmock/expectation.rb                        |   59 +-
 lib/flexmock/expectation_director.rb               |    9 +-
 lib/flexmock/explicit_needed.rb                    |   43 +
 lib/flexmock/mock_container.rb                     |   50 +-
 lib/flexmock/noop.rb                               |    2 +-
 lib/flexmock/object_extensions.rb                  |    5 +
 lib/flexmock/ordering.rb                           |    2 +-
 lib/flexmock/partial_mock.rb                       |   87 +-
 lib/flexmock/rails.rb                              |    2 +-
 lib/flexmock/recorder.rb                           |    5 +-
 lib/flexmock/rspec.rb                              |   11 +-
 lib/flexmock/rspec/configure.rb                    |   12 +
 lib/flexmock/rspec_spy_matcher.rb                  |   92 ++
 lib/flexmock/spy_describers.rb                     |   76 +
 lib/flexmock/symbol_extensions.rb                  |   17 +
 lib/flexmock/test_unit.rb                          |   45 +-
 lib/flexmock/test_unit_assert_spy_called.rb        |   34 +
 lib/flexmock/test_unit_integration.rb              |   17 +-
 lib/flexmock/undefined.rb                          |    2 +-
 lib/flexmock/validators.rb                         |   73 +-
 lib/flexmock/version.rb                            |    6 +-
 metadata.yml                                       |  104 +-
 test/aliasing_test.rb                              |   91 +-
 test/assert_spy_called_test.rb                     |  119 ++
 test/base_class_test.rb                            |   71 +
 test/based_partials_test.rb                        |   51 +
 test/container_methods_test.rb                     |    2 +-
 test/default_framework_adapter_test.rb             |   10 +-
 test/demeter_mocking_test.rb                       |    2 +-
 test/deprecated_methods_test.rb                    |    4 +-
 test/examples_from_readme_test.rb                  |    2 +-
 test/expectation_description_test.rb               |   80 +
 test/extended_should_receive_test.rb               |    2 +-
 test/naming_test.rb                                |    3 +-
 test/new_instances_test.rb                         |    6 +-
 test/object_extensions_test.rb                     |   25 +
 test/partial_mock_test.rb                          |   80 +-
 test/record_mode_test.rb                           |   14 +-
 test/rspec_integration/integration_spec.rb         |   14 +-
 test/rspec_integration/spy_example_spec.rb         |  207 +++
 test/samples_test.rb                               |    2 +-
 test/should_ignore_missing_test.rb                 |   10 +-
 test/should_receive_test.rb                        |  106 +-
 test/spys_test.rb                                  |  215 +++
 test/symbol_extensions_test.rb                     |    8 +
 test/test_class_extensions.rb                      |   34 +
 test/test_setup.rb                                 |   47 +-
 test/test_unit_integration/auto_test_unit_test.rb  |   12 +-
 .../minitest_teardown_test.rb                      |   14 +
 test/tu_integration_test.rb                        |    2 +-
 test/undefined_test.rb                             |    2 +-
 81 files changed, 5877 insertions(+), 1958 deletions(-)

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