Skip to content

Commit 75bec76

Browse files
author
Austin Ziegler
committed
Cleanup of infrastructure before release.
* Removing Gemfile and Gemfile.lock; not appropriate for library gems. * Removing old-style packaging with archive-tar-minitar (I'll miss you even if no one else does). * Updated the manifest and the committed gemspec.
1 parent af6c595 commit 75bec76

File tree

5 files changed

+24
-112
lines changed

5 files changed

+24
-112
lines changed

Gemfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

Gemfile.lock

Lines changed: 0 additions & 32 deletions
This file was deleted.

Manifest.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ lib/net/ldap.rb
1919
lib/net/ldap/dataset.rb
2020
lib/net/ldap/entry.rb
2121
lib/net/ldap/filter.rb
22+
lib/net/ldap/password.rb
2223
lib/net/ldap/pdu.rb
23-
lib/net/ldap/psw.rb
2424
lib/net/ldif.rb
2525
lib/net/snmp.rb
2626
spec/integration/ssl_ber_spec.rb
@@ -32,11 +32,12 @@ spec/unit/ldap/entry_spec.rb
3232
spec/unit/ldap/filter_spec.rb
3333
spec/unit/ldap_spec.rb
3434
test/common.rb
35-
test/test_ber.rb
3635
test/test_entry.rb
3736
test/test_filter.rb
37+
test/test_ldap_connection.rb
3838
test/test_ldif.rb
3939
test/test_password.rb
40+
test/test_rename.rb
4041
test/test_snmp.rb
4142
test/testdata.ldif
4243
testserver/ldapserver.rb

Rakefile

Lines changed: 7 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
require "rubygems"
2-
# require 'hanna/rdoctask'
32
require 'hoe'
43

54
$LOAD_PATH.unshift('lib')
@@ -9,7 +8,6 @@ require 'net/ldap'
98
PKG_NAME = 'net-ldap'
109
PKG_VERSION = Net::LDAP::VERSION
1110
PKG_DIST = "#{PKG_NAME}-#{PKG_VERSION}"
12-
PKG_TAR = "pkg/#{PKG_DIST}.tar.gz"
1311
MANIFEST = File.read("Manifest.txt").split
1412
MINRUBY = "1.8.7"
1513

@@ -29,76 +27,28 @@ Hoe.spec PKG_NAME do
2927
self.remote_rdoc_dir = ''
3028
rsync_args << ' --exclude=statsvn/'
3129

32-
self.url = %W(http://net-ldap.rubyforge.org/ http://github.com/RoryO/ruby-net-ldap)
30+
self.url = %W(http://net-ldap.rubyforge.org/ https://github.com/RoryO/ruby-net-ldap)
3331

3432
self.summary = "Pure Ruby LDAP support library with most client features and some server features."
3533
self.changes = paragraphs_of(self.history_file, 0..1).join("\n\n")
3634
self.description = paragraphs_of(self.readme_file, 2..2).join("\n\n")
3735

3836
extra_rdoc_files << "Hacking.rdoc"
3937

40-
extra_dev_deps << [ "archive-tar-minitar", "~>0.5.1" ]
41-
extra_dev_deps << [ "hanna", "~>0.1.2" ]
42-
extra_dev_deps << [ "hoe-git", "~>1" ]
43-
extra_dev_deps << [ "metaid", "~>1" ]
38+
extra_dev_deps << [ "hoe-git", "~> 1" ]
39+
extra_dev_deps << [ "hoe-gemspec", "~> 1" ]
40+
extra_dev_deps << [ "metaid", "~> 1" ]
41+
extra_dev_deps << [ "flexmock", "~> 0.9.0" ]
42+
extra_dev_deps << [ "rspec", "~> 2.0" ]
4443
clean_globs << "coverage"
4544

4645
spec_extras[:required_ruby_version] = ">= #{MINRUBY}"
4746
multiruby_skip << "1.8.6"
4847
multiruby_skip << "1_8_6"
4948

50-
# This is a lie because I will continue to use Archive::Tar::Minitar.
51-
self.need_tar = false
49+
self.need_tar = true
5250
end
5351

54-
desc "Build a Net-LDAP .tar.gz distribution."
55-
task :tar => [ PKG_TAR ]
56-
file PKG_TAR => [ :test ] do |t|
57-
require 'archive/tar/minitar'
58-
require 'zlib'
59-
files = MANIFEST.map { |f|
60-
fn = File.join(PKG_DIST, f)
61-
tm = File.stat(f).mtime
62-
63-
if File.directory?(f)
64-
{ :name => fn, :mode => 0755, :dir => true, :mtime => tm }
65-
else
66-
mode = if f =~ %r{^bin}
67-
0755
68-
else
69-
0644
70-
end
71-
data = File.read(f)
72-
{ :name => fn, :mode => mode, :data => data, :size => data.size,
73-
:mtime => tm }
74-
end
75-
}
76-
77-
begin
78-
unless File.directory?(File.dirname(t.name))
79-
require 'fileutils'
80-
File.mkdir_p File.dirname(t.name)
81-
end
82-
tf = File.open(t.name, 'wb')
83-
gz = Zlib::GzipWriter.new(tf)
84-
tw = Archive::Tar::Minitar::Writer.new(gz)
85-
86-
files.each do |entry|
87-
if entry[:dir]
88-
tw.mkdir(entry[:name], entry)
89-
else
90-
tw.add_file_simple(entry[:name], entry) { |os|
91-
os.write(entry[:data])
92-
}
93-
end
94-
end
95-
ensure
96-
tw.close if tw
97-
gz.close if gz
98-
end
99-
end
100-
task :package => [ PKG_TAR ]
101-
10252
desc "Build the manifest file from the current set of files."
10353
task :build_manifest do |t|
10454
require 'find'

net-ldap.gemspec

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,49 @@
22

33
Gem::Specification.new do |s|
44
s.name = %q{net-ldap}
5-
s.version = "0.1.1.20110316141115"
5+
s.version = "0.1.1.20110316193103"
66

77
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
88
s.authors = ["Francis Cianfrocca", "Emiel van de Laar", "Rory O'Connell", "Kaspar Schiess", "Austin Ziegler"]
99
s.date = %q{2011-03-16}
1010
s.description = %q{Pure Ruby LDAP library.}
1111
1212
s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "Hacking.rdoc"]
13-
s.files = ["COPYING", "Hacking.rdoc", "History.txt", "LICENSE", "Manifest.txt", "README.txt", "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/entry.rb", "lib/net/ldap/filter.rb", "lib/net/ldap/pdu.rb", "lib/net/ldap/psw.rb", "lib/net/ldif.rb", "lib/net/snmp.rb", "spec/integration/ssl_ber_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/unit/ber/ber_spec.rb", "spec/unit/ber/core_ext/string_spec.rb", "spec/unit/ldap/entry_spec.rb", "spec/unit/ldap/filter_spec.rb", "spec/unit/ldap_spec.rb", "test/common.rb", "test/test_ber.rb", "test/test_entry.rb", "test/test_filter.rb", "test/test_ldif.rb", "test/test_password.rb", "test/test_snmp.rb", "test/testdata.ldif", "testserver/ldapserver.rb", "testserver/testdata.ldif", "test/test_rename.rb"]
13+
s.files = ["COPYING", "Hacking.rdoc", "History.txt", "LICENSE", "Manifest.txt", "README.txt", "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/entry.rb", "lib/net/ldap/filter.rb", "lib/net/ldap/password.rb", "lib/net/ldap/pdu.rb", "lib/net/ldif.rb", "lib/net/snmp.rb", "spec/integration/ssl_ber_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/unit/ber/ber_spec.rb", "spec/unit/ber/core_ext/string_spec.rb", "spec/unit/ldap/entry_spec.rb", "spec/unit/ldap/filter_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"]
1414
s.homepage = %q{http://net-ldap.rubyforge.org/}
1515
s.rdoc_options = ["--main", "README.txt"]
1616
s.require_paths = ["lib"]
1717
s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
1818
s.rubyforge_project = %q{net-ldap}
19-
s.rubygems_version = %q{1.6.2}
19+
s.rubygems_version = %q{1.3.7}
2020
s.summary = %q{Pure Ruby LDAP support library with most client features and some server features.}
21-
s.test_files = ["test/test_entry.rb", "test/test_filter.rb", "test/test_ldif.rb", "test/test_password.rb", "test/test_rename.rb", "test/test_snmp.rb"]
21+
s.test_files = ["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"]
2222

2323
if s.respond_to? :specification_version then
24+
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
2425
s.specification_version = 3
2526

2627
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
27-
s.add_development_dependency(%q<archive-tar-minitar>, ["~> 0.5.1"])
28-
s.add_development_dependency(%q<hanna>, ["~> 0.1.2"])
2928
s.add_development_dependency(%q<hoe-git>, ["~> 1"])
29+
s.add_development_dependency(%q<hoe-gemspec>, ["~> 1"])
3030
s.add_development_dependency(%q<metaid>, ["~> 1"])
31+
s.add_development_dependency(%q<flexmock>, ["~> 0.9.0"])
32+
s.add_development_dependency(%q<rspec>, ["~> 2.0"])
3133
s.add_development_dependency(%q<hoe>, [">= 2.8.0"])
3234
else
33-
s.add_dependency(%q<archive-tar-minitar>, ["~> 0.5.1"])
34-
s.add_dependency(%q<hanna>, ["~> 0.1.2"])
3535
s.add_dependency(%q<hoe-git>, ["~> 1"])
36+
s.add_dependency(%q<hoe-gemspec>, ["~> 1"])
3637
s.add_dependency(%q<metaid>, ["~> 1"])
38+
s.add_dependency(%q<flexmock>, ["~> 0.9.0"])
39+
s.add_dependency(%q<rspec>, ["~> 2.0"])
3740
s.add_dependency(%q<hoe>, [">= 2.8.0"])
3841
end
3942
else
40-
s.add_dependency(%q<archive-tar-minitar>, ["~> 0.5.1"])
41-
s.add_dependency(%q<hanna>, ["~> 0.1.2"])
4243
s.add_dependency(%q<hoe-git>, ["~> 1"])
44+
s.add_dependency(%q<hoe-gemspec>, ["~> 1"])
4345
s.add_dependency(%q<metaid>, ["~> 1"])
46+
s.add_dependency(%q<flexmock>, ["~> 0.9.0"])
47+
s.add_dependency(%q<rspec>, ["~> 2.0"])
4448
s.add_dependency(%q<hoe>, [">= 2.8.0"])
4549
end
4650
end

0 commit comments

Comments
 (0)