Merge branch 'master' into bugfix/filter_parser_cannot_parse_blackets

Conflicts:
	lib/net/ldap/filter.rb
	spec/unit/ldap/filter_parser_spec.rb

Author: Tatsuya Sato

.autotest

@@ -1,12 +1,9 @@
-spec/ldap.yml
+*~
+*.swp
 .rvmrc
-*.gemspec
 pkg/
-*.swp
-html/
 doc/
 publish/
-coverage/
-coverage.info
-.rake_tasks~
 Gemfile.lock
+.bundle
+bin/

.gitignore

@@ -2,6 +2,27 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2
+  # optional
   - jruby-19mode
   - rbx-19mode
-script: bundle exec rake spec
+  - rbx-2
+
+env:
+  - INTEGRATION=openldap
+
+install:
+  - if [ "$INTEGRATION" = "openldap" ]; then ./script/install-openldap; fi
+  - bundle install
+
+script: bundle exec rake
+
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+    - rvm: rbx-19mode
+    - rvm: rbx-2
+  fast_finish: true
+
+notifications:
+  email: false

.rspec

@@ -0,0 +1,54 @@
+# Contribution guide
+
+Thank you for using net-ldap. If you'd like to help, keep these guidelines in
+mind.
+
+## Submitting a New Issue
+
+If you find a bug, or would like to propose an idea, file a [new issue][issues].
+Include as many details as possible:
+
+- Version of net-ldap gem
+- LDAP server version
+- Queries, connection information, any other input
+- output or error messages
+
+## Sending a Pull Request
+
+[Pull requests][pr] are always welcome!
+
+Check out [the project's issues list][issues] for ideas on what could be improved.
+
+Before sending, please add tests and ensure the test suite passes.
+
+To run the full suite:
+
+  `bundle exec rake`
+
+To run a specific test file:
+
+  `bundle exec ruby test/test_ldap.rb`
+
+To run a specific test:
+
+  `bundle exec ruby test/test_ldap.rb -n test_instrument_bind`
+
+Pull requests will trigger automatic continuous integration builds on
+[TravisCI][travis]. To run integration tests locally, see the `test/support`
+folder.
+
+## Styleguide
+
+```ruby
+# 1.9+ style hashes
+{key: "value"}
+
+# Multi-line arguments with `\`
+MyClass.new \
+  foo: 'bar',
+  baz: 'garply'
+```
+
+[issues]: https://github.com/ruby-net-ldap/ruby-net-ldap/issues
+[pr]: https://help.github.com/articles/using-pull-requests
+[travis]: https://travis-ci.org/ruby-ldap/ruby-net-ldap

.travis.yml

@@ -25,7 +25,7 @@ patches being accepted, we recommend that you follow the guidelines below:
 
 == Documentation
 
-* Documentation: {net-ldap}[http://net-ldap.rubyforge.org/]
+* Documentation: {net-ldap}[http://rubydoc.info/gems/net-ldap]
 
 It is very important that, if you add new methods or objects, your code is
 well-documented. The purpose of the changes should be clearly described so that
@@ -40,8 +40,8 @@ modification to +Contributors.rdoc+ to add yourself.
 
 == Tests
 
-The Net::LDAP team uses RSpec for unit testing; all changes must have rspec
-tests for any new or changed features.
+The Net::LDAP team uses [Minitest](http://docs.seattlerb.org/minitest/) for unit
+testing; all changes must have tests for any new or changed features.
 
 Your changes should have been tested against at least one real LDAP server; the
 current tests are not sufficient to find all possible bugs. It's unlikely that
@@ -55,14 +55,9 @@ us with a sample LDIF data file for importing into LDAP servers for testing.
 Net::LDAP uses several libraries during development, all of which can be
 installed using RubyGems.
 
-* *hoe*
-* *hoe-git*
-* *metaid*
-* *rspec*
 * *flexmock*
 
 == Participation
 
-* RubyForge: {net-ldap}[http://rubyforge.org/projects/net-ldap]
 * GitHub: {ruby-ldap/ruby-net-ldap}[https://github.com/ruby-ldap/ruby-net-ldap/]
 * Group: {ruby-ldap}[http://groups.google.com/group/ruby-ldap]

CONTRIBUTING.md

@@ -1,3 +1,40 @@
+=== Net::LDAP 0.9.0
+* Major changes:
+  * Dropped support for ruby 1.8.7, ruby >= 1.9.3 now required
+* Major enhancements:
+  * Add support for search time limit parameter
+  * Instrument received messages, PDU parsing
+* Minor enhancments:
+  * Add support for querying ActiveDirectory capabilities from root dse
+* Bug fixes:
+  * Fix reads for multiple concurrent requests with shared, open connections mixing up the results
+  * Fix search size option
+  * Fix BER encoding bug
+* Code clean-up:
+  * Added integration test suite
+  * Switch to minitest
+
+* Details
+  * #150 Support querying ActiveDirectory capabilities when searching root dse
+  * #142 Encode true as xFF
+  * #124, #145, #146, #152 Cleanup gemspec
+  * #138, #144 Track response messages by message id
+  * #141 Magic number/constant cleanup
+  * #119, #129, #130, #132, #133, #137 Integration tests
+  * #115 Search timeout support
+  * #140 Fix search size option
+  * #139 Cleanup and inline documentation for Net::LDAP::Connection#search
+  * #131 Instrumentation
+  * #116 Refactor Connection#write
+  * #126 Update gitignore
+  * #128 Fix whitespace
+  * #113, #121 Switch to minitest
+  * #123 Base64 encoded dn
+  * #114 Separate file for Net::LDAP::Connection
+  * #104 Parse version spec in LDIF datasets
+  * #106 ldap.modify doc fixes
+  * #111 Fix test deprecations
+
 === Net::LDAP 0.5.0 / 2013-07-22
 * Major changes:
   * Required Ruby version is >=1.9.3

Hacking.rdoc

@@ -1,4 +1,4 @@
-= Net::LDAP for Ruby {<img src="https://travis-ci.org/ruby-ldap/ruby-net-ldap.png" />}[https://travis-ci.org/ruby-ldap/ruby-net-ldap]
+= Net::LDAP for Ruby {<img src="https://travis-ci.org/github/ruby-net-ldap.png" />}[https://travis-ci.org/github/ruby-net-ldap]
 
 == Description
 
@@ -16,13 +16,8 @@ the most recent LDAP RFCs (4510–4519, plus portions of 4520–4532).
 
 == Where
 
-* {RubyForge}[http://rubyforge.org/projects/net-ldap]
 * {GitHub}[https://github.com/ruby-ldap/ruby-net-ldap]
 * {[email protected]}[http://groups.google.com/group/ruby-ldap]
-* {Documentation}[http://net-ldap.rubyforge.org/]
-
-The Net::LDAP for Ruby documentation, project description, and main downloads
-can currently be found on {RubyForge}[http://rubyforge.org/projects/net-ldap].
 
 == Synopsis
 
@@ -42,6 +37,14 @@ sources.
 
 Simply require either 'net-ldap' or 'net/ldap'.
 
+== Release
+
+This section is for gem maintainers to cut a new version of the gem.
+
+* Update lib/html/pipeline/version.rb to next version number X.X.X following {semver}(http://semver.org/).
+* Update CHANGELOG.md. Get latest changes with `git log --oneline vLAST_RELEASE..HEAD | grep Merge`
+* On the master branch, run `script/release`
+
 :include: Contributors.rdoc
 
 :include: License.rdoc

History.rdoc

@@ -1,76 +1,13 @@
+#!/usr/bin/env rake
 # -*- ruby encoding: utf-8 -*-
+# vim: syntax=ruby
 
-require "rubygems"
-require 'hoe'
-
-Hoe.plugin :doofus
-Hoe.plugin :git
-Hoe.plugin :gemspec
-
-Hoe.spec 'net-ldap' do |spec|
-  # spec.rubyforge_name = spec.name
-
-  spec.developer("Francis Cianfrocca", "[email protected]")
-  spec.developer("Emiel van de Laar", "[email protected]")
-  spec.developer("Rory O'Connell", "[email protected]")
-  spec.developer("Kaspar Schiess", "[email protected]")
-  spec.developer("Austin Ziegler", "[email protected]")
-  spec.developer("Michael Schaarschmidt", "[email protected]")
-
-  spec.remote_rdoc_dir = ''
-  spec.rsync_args << ' --exclude=statsvn/'
-
-  spec.urls = %w(http://rubyldap.com/' 'https://github.com/ruby-ldap/ruby-net-ldap)
-  spec.licenses = ['MIT']
-
-  spec.history_file = 'History.rdoc'
-  spec.readme_file = 'README.rdoc'
-
-  spec.extra_rdoc_files = FileList["*.rdoc"].to_a
-
-  spec.extra_dev_deps << [ "hoe-git", "~> 1" ]
-  spec.extra_dev_deps << [ "hoe-gemspec", "~> 1" ]
-  spec.extra_dev_deps << [ "metaid", "~> 1" ]
-  spec.extra_dev_deps << [ "flexmock", ">= 1.3.0" ]
-  spec.extra_dev_deps << [ "rspec", "~> 2.0" ]
-
-  spec.clean_globs << "coverage"
-
-  spec.spec_extras[:required_ruby_version] = ">= 1.8.7"
-  spec.multiruby_skip << "1.8.6"
-  spec.multiruby_skip << "1_8_6"
-
-  spec.need_tar = true
-end
-
-# I'm not quite ready to get rid of this, but I think "rake git:manifest" is
-# sufficient.
-namespace :old do
-  desc "Build the manifest file from the current set of files."
-  task :build_manifest do |t|
-    require 'find'
-
-    paths = []
-    Find.find(".") do |path|
-      next if File.directory?(path)
-      next if path =~ /\.svn/
-        next if path =~ /\.git/
-        next if path =~ /\.hoerc/
-        next if path =~ /\.swp$/
-        next if path =~ %r{coverage/}
-      next if path =~ /~$/
-        paths << path.sub(%r{^\./}, '')
-    end
-
-    File.open("Manifest.txt", "w") do |f|
-      f.puts paths.sort.join("\n")
-    end
+require 'rake/testtask'
 
-    puts paths.sort.join("\n")
-  end
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/test_*.rb']
+  t.verbose = true
 end
 
-desc "Run a full set of integration and unit tests" 
-task :cruise => [:test, :spec]
-
-# vim: syntax=ruby
+task :default => :test