Merge remote-tracking branch 'origin/master' into fix-gemspec-date

Author: Jerry Cheung

.gitignore

@@ -5,3 +5,5 @@ pkg/
 doc/
 publish/
 Gemfile.lock
+.bundle
+bin/

Hacking.rdoc

@@ -55,8 +55,6 @@ 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*
 * *flexmock*
 
 == Participation

Manifest.txt

@@ -37,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

README.rdoc

@@ -1,74 +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 << [ "flexmock", ">= 1.3.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

Rakefile

@@ -20,7 +20,7 @@ earlier versions of the IETF LDAP RFCs (2251-2256, 2829-2830, 3377, and 3771).
 Our roadmap for Net::LDAP 1.0 is to gain full <em>client</em> compliance with
 the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).}
   s.email = ["[email protected]", "[email protected]", "[email protected]", "[email protected]", "[email protected]"]
-  s.extra_rdoc_files = ["Manifest.txt", "Contributors.rdoc", "Hacking.rdoc", "History.rdoc", "License.rdoc", "README.rdoc"]
+  s.extra_rdoc_files = ["Contributors.rdoc", "Hacking.rdoc", "History.rdoc", "License.rdoc", "README.rdoc"]
   s.files = `git ls-files`.split $/
   s.test_files = s.files.grep(%r{^test})
   s.homepage = %q{http://github.com/ruby-ldap/ruby-net-ldap}
@@ -29,8 +29,6 @@ the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).}
   s.required_ruby_version = ">= 1.9.3"
   s.summary = %q{Net::LDAP for Ruby (also called net-ldap) implements client access for the Lightweight Directory Access Protocol (LDAP), an IETF standard protocol for accessing distributed directory services}
 
-  s.add_development_dependency("hoe-git", "~> 1.0")
-  s.add_development_dependency("hoe-gemspec", "~> 1.0")
   s.add_development_dependency("flexmock", "~> 1.3")
-  s.add_development_dependency("hoe", "~> 2.9")
+  s.add_development_dependency("rake", "~> 10.0")
 end

net-ldap.gemspec

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Usage: script/package
+# Updates the gemspec and builds a new gem in the pkg directory.
+
+mkdir -p pkg
+gem build *.gemspec
+mv *.gem pkg

script/package

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Usage: script/release
+# Build the package, tag a commit, push it to origin, and then release the
+# package publicly.
+
+set -e
+
+version="$(script/package | grep Version: | awk '{print $2}')"
+[ -n "$version" ] || exit 1
+
+echo $version
+git commit --allow-empty -a -m "Release $version"
+git tag "v$version"
+git push origin
+git push origin "v$version"
+gem push pkg/*-${version}.gem