From aaa4f5244ed0499d97dbcd688841a1d7f6cceef4 Mon Sep 17 00:00:00 2001 From: Jerry Cheung Date: Fri, 31 Oct 2014 13:20:17 -0700 Subject: [PATCH 1/5] remove hoe --- Rakefile | 71 ++---------------------------------------------- net-ldap.gemspec | 3 -- 2 files changed, 2 insertions(+), 72 deletions(-) diff --git a/Rakefile b/Rakefile index 4db3f047..b6ed571a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,74 +1,7 @@ # -*- 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", "blackhedd@rubyforge.org") - spec.developer("Emiel van de Laar", "gemiel@gmail.com") - spec.developer("Rory O'Connell", "rory.ocon@gmail.com") - spec.developer("Kaspar Schiess", "kaspar.schiess@absurd.li") - spec.developer("Austin Ziegler", "austin@rubyforge.org") - spec.developer("Michael Schaarschmidt", "michael@schaaryworks.com") - - 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 - puts paths.sort.join("\n") - end end -desc "Run a full set of integration and unit tests" -task :cruise => [:test, :spec] - -# vim: syntax=ruby +task :default => :test diff --git a/net-ldap.gemspec b/net-ldap.gemspec index 83478d70..3f5d1a28 100644 --- a/net-ldap.gemspec +++ b/net-ldap.gemspec @@ -30,8 +30,5 @@ 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") end From f6b3f9c07975b0b3ea77b1371f874698a385d33a Mon Sep 17 00:00:00 2001 From: Jerry Cheung Date: Fri, 31 Oct 2014 13:20:27 -0700 Subject: [PATCH 2/5] add rake --- Rakefile | 6 ++++++ net-ldap.gemspec | 1 + 2 files changed, 7 insertions(+) diff --git a/Rakefile b/Rakefile index b6ed571a..edc8fc75 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,13 @@ +#!/usr/bin/env rake # -*- ruby encoding: utf-8 -*- # vim: syntax=ruby +require 'rake/testtask' +Rake::TestTask.new do |t| + t.libs << "test" + t.test_files = FileList['test/**/test_*.rb'] + t.verbose = true end task :default => :test diff --git a/net-ldap.gemspec b/net-ldap.gemspec index 3f5d1a28..171c2fbe 100644 --- a/net-ldap.gemspec +++ b/net-ldap.gemspec @@ -31,4 +31,5 @@ the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).} 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("flexmock", "~> 1.3") + s.add_development_dependency("rake", "~> 10.0") end From 573e0163355387708a19b9d862eba3ff6d4f29a9 Mon Sep 17 00:00:00 2001 From: Jerry Cheung Date: Fri, 31 Oct 2014 13:21:34 -0700 Subject: [PATCH 3/5] remove unused manifest. generated now --- Manifest.txt | 52 ------------------------------------------------ net-ldap.gemspec | 2 +- 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 Manifest.txt diff --git a/Manifest.txt b/Manifest.txt deleted file mode 100644 index d1cca690..00000000 --- a/Manifest.txt +++ /dev/null @@ -1,52 +0,0 @@ -.travis.yml -Contributors.rdoc -Gemfile -Hacking.rdoc -History.rdoc -License.rdoc -Manifest.txt -README.rdoc -Rakefile -lib/net-ldap.rb -lib/net/ber.rb -lib/net/ber/ber_parser.rb -lib/net/ber/core_ext.rb -lib/net/ber/core_ext/array.rb -lib/net/ber/core_ext/bignum.rb -lib/net/ber/core_ext/false_class.rb -lib/net/ber/core_ext/fixnum.rb -lib/net/ber/core_ext/string.rb -lib/net/ber/core_ext/true_class.rb -lib/net/ldap.rb -lib/net/ldap/dataset.rb -lib/net/ldap/dn.rb -lib/net/ldap/entry.rb -lib/net/ldap/filter.rb -lib/net/ldap/instrumentation.rb -lib/net/ldap/password.rb -lib/net/ldap/pdu.rb -lib/net/ldap/version.rb -lib/net/snmp.rb -net-ldap.gemspec -spec/integration/ssl_ber_spec.rb -spec/spec_helper.rb -spec/unit/ber/ber_spec.rb -spec/unit/ber/core_ext/array_spec.rb -spec/unit/ber/core_ext/string_spec.rb -spec/unit/ldap/dn_spec.rb -spec/unit/ldap/entry_spec.rb -spec/unit/ldap/filter_parser_spec.rb -spec/unit/ldap/filter_spec.rb -spec/unit/ldap/search_spec.rb -spec/unit/ldap_spec.rb -test/common.rb -test/test_entry.rb -test/test_filter.rb -test/test_ldap_connection.rb -test/test_ldif.rb -test/test_password.rb -test/test_rename.rb -test/test_snmp.rb -test/testdata.ldif -testserver/ldapserver.rb -testserver/testdata.ldif diff --git a/net-ldap.gemspec b/net-ldap.gemspec index 171c2fbe..30265064 100644 --- a/net-ldap.gemspec +++ b/net-ldap.gemspec @@ -21,7 +21,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 client compliance with the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).} s.email = ["blackhedd@rubyforge.org", "gemiel@gmail.com", "rory.ocon@gmail.com", "kaspar.schiess@absurd.li", "austin@rubyforge.org"] - 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} From e9a1b91041bc30566a90c147ca43622ad2e436e5 Mon Sep 17 00:00:00 2001 From: Jerry Cheung Date: Fri, 31 Oct 2014 13:21:50 -0700 Subject: [PATCH 4/5] ignore local bundler options --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index cedadc26..9c2842d9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ pkg/ doc/ publish/ Gemfile.lock +.bundle +bin/ From 8359578b5d6436cb5e1fc826885b051bfe1297ea Mon Sep 17 00:00:00 2001 From: Jerry Cheung Date: Fri, 31 Oct 2014 13:23:33 -0700 Subject: [PATCH 5/5] remove hoe references from Hacking.rdoc --- Hacking.rdoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hacking.rdoc b/Hacking.rdoc index 56bf73f7..4bbf4ec5 100644 --- a/Hacking.rdoc +++ b/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