Skip to content

Commit e3a46f3

Browse files
committed
Remove jeweler dependency.
1 parent 0d15d37 commit e3a46f3

9 files changed

+44
-133
lines changed

Gemfile

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
source 'https://rubygems.org'
22

33
gemspec
4-
5-
group :test do
6-
gem 'rsolr'
7-
gem 'mocha'
8-
end

Rakefile

+7-26
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,16 @@
1-
require 'rubygems'
1+
require 'bundler'
2+
Bundler::GemHelper.install_tasks
3+
24
require 'rake'
35
require 'rake/extensiontask'
46

57
Rake::ExtensionTask.new do |ext|
6-
ext.name = 'parser'
8+
ext.name = 'parser'
79
ext.ext_dir = 'ext/java_bin/ext'
810
ext.lib_dir = 'lib/java_bin/ext'
911
ext.tmp_dir = 'tmp'
1012
end
1113

12-
begin
13-
require 'jeweler'
14-
Jeweler::Tasks.new do |gem|
15-
gem.name = "java_bin"
16-
gem.summary = %Q{Apache Solr JavaBin format implementation for Ruby.}
17-
gem.description = %Q{Apache Solr JavaBin format (binary format) implementation for Ruby.}
18-
gem.email = "[email protected]"
19-
gem.homepage = "http://github.com/kennyj/java_bin"
20-
gem.authors = ["kennyj"]
21-
gem.require_paths = ["lib", "ext"]
22-
gem.add_development_dependency 'jeweler'
23-
gem.add_development_dependency 'rake-compiler'
24-
gem.add_development_dependency 'json'
25-
gem.files.exclude 'Gemfile.lock'
26-
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
27-
end
28-
Jeweler::RubygemsDotOrgTasks.new
29-
rescue LoadError
30-
puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
31-
end
32-
3314
require 'rake/testtask'
3415
Rake::TestTask.new(:test) do |test|
3516
test.libs << 'test' << 'ext'
@@ -76,10 +57,10 @@ end
7657

7758
require 'rdoc/task'
7859
Rake::RDocTask.new do |rdoc|
79-
version = File.exist?('VERSION') ? File.read('VERSION') : ""
60+
require 'java_bin/version'
8061

8162
rdoc.rdoc_dir = 'rdoc'
82-
rdoc.title = "java_bin #{version}"
63+
rdoc.title = "java_bin #{JavaBin::VERSION}"
8364
rdoc.rdoc_files.include('README*')
8465
rdoc.rdoc_files.include('lib/**/*.rb')
85-
end
66+
end

VERSION

-1
This file was deleted.

java_bin.gemspec

+20-86
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,29 @@
1-
# Generated by jeweler
2-
# DO NOT EDIT THIS FILE DIRECTLY
3-
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
41
# -*- encoding: utf-8 -*-
2+
lib = File.expand_path('../lib', __FILE__)
3+
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4+
require 'java_bin/version'
55

66
Gem::Specification.new do |s|
7-
s.name = "java_bin"
8-
s.version = "0.4.1"
9-
10-
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11-
s.authors = ["kennyj"]
12-
s.date = "2012-10-09"
7+
s.date = "2012-10-10"
8+
s.name = "java_bin"
9+
s.version = JavaBin::VERSION
10+
s.authors = ["kennyj"]
11+
s.email = ["[email protected]"]
1312
s.description = "Apache Solr JavaBin format (binary format) implementation for Ruby."
14-
s.email = "[email protected]"
13+
s.summary = "Apache Solr JavaBin format implementation for Ruby."
14+
s.homepage = "http://github.com/kennyj/java_bin"
15+
16+
s.files = `git ls-files`.split($/)
17+
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
18+
1519
s.extensions = ["ext/java_bin/ext/extconf.rb"]
16-
s.extra_rdoc_files = [
17-
"LICENSE",
18-
"README.rdoc"
19-
]
20-
s.files = [
21-
".document",
22-
".travis.yml",
23-
"CHANGELOG",
24-
"Gemfile",
25-
"LICENSE",
26-
"README.rdoc",
27-
"Rakefile",
28-
"VERSION",
29-
"ext/java_bin/ext/byteswap.h",
30-
"ext/java_bin/ext/extconf.rb",
31-
"ext/java_bin/ext/parser.c",
32-
"ext/java_bin/ext/parser.h",
33-
"fixtures/fixtures_for_solr3.1/javabin_all.dat",
34-
"fixtures/fixtures_for_solr3.1/javabin_software.dat",
35-
"fixtures/fixtures_for_solr3.1/json_all.dat",
36-
"fixtures/fixtures_for_solr3.1/json_software.dat",
37-
"fixtures/fixtures_for_solr3.1/ruby_all.dat",
38-
"fixtures/fixtures_for_solr3.1/ruby_software.dat",
39-
"fixtures/javabin.dat",
40-
"fixtures/javabin2.dat",
41-
"fixtures/json.dat",
42-
"fixtures/json2.dat",
43-
"fixtures/ruby.dat",
44-
"fixtures/ruby2.dat",
45-
"how_to_release.txt",
46-
"java_bin.gemspec",
47-
"lib/java_bin.rb",
48-
"lib/java_bin/ext.rb",
49-
"lib/java_bin/ext/.keep",
50-
"lib/java_bin/pure.rb",
51-
"lib/java_bin/pure/parser.rb",
52-
"lib/java_bin/version.rb",
53-
"lib/rsolr_support.rb",
54-
"lib/solr_ruby_support.rb",
55-
"test/helper.rb",
56-
"test/test_java_bin_parser.rb",
57-
"test/test_rsolr_support.rb",
58-
"test/xxx_performance.rb"
59-
]
60-
s.homepage = "http://github.com/kennyj/java_bin"
20+
s.extra_rdoc_files = [ "LICENSE", "README.rdoc" ]
6121
s.require_paths = ["lib", "ext"]
62-
s.rubygems_version = "1.8.24"
63-
s.summary = "Apache Solr JavaBin format implementation for Ruby."
64-
65-
if s.respond_to? :specification_version then
66-
s.specification_version = 3
6722

68-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
69-
s.add_runtime_dependency(%q<java_bin>, [">= 0"])
70-
s.add_development_dependency(%q<jeweler>, [">= 0"])
71-
s.add_development_dependency(%q<rake-compiler>, [">= 0"])
72-
s.add_development_dependency(%q<json>, [">= 0"])
73-
s.add_development_dependency(%q<jeweler>, [">= 0"])
74-
s.add_development_dependency(%q<rake-compiler>, [">= 0"])
75-
s.add_development_dependency(%q<json>, [">= 0"])
76-
else
77-
s.add_dependency(%q<java_bin>, [">= 0"])
78-
s.add_dependency(%q<jeweler>, [">= 0"])
79-
s.add_dependency(%q<rake-compiler>, [">= 0"])
80-
s.add_dependency(%q<json>, [">= 0"])
81-
s.add_dependency(%q<jeweler>, [">= 0"])
82-
s.add_dependency(%q<rake-compiler>, [">= 0"])
83-
s.add_dependency(%q<json>, [">= 0"])
84-
end
85-
else
86-
s.add_dependency(%q<java_bin>, [">= 0"])
87-
s.add_dependency(%q<jeweler>, [">= 0"])
88-
s.add_dependency(%q<rake-compiler>, [">= 0"])
89-
s.add_dependency(%q<json>, [">= 0"])
90-
s.add_dependency(%q<jeweler>, [">= 0"])
91-
s.add_dependency(%q<rake-compiler>, [">= 0"])
92-
s.add_dependency(%q<json>, [">= 0"])
93-
end
23+
s.rubygems_version = "1.8.24"
24+
s.add_development_dependency(%q<rake-compiler>, [">= 0.8.1"])
25+
s.add_development_dependency(%q<json>, [">= 1.7.5"])
26+
s.add_development_dependency(%q<rsolr>, [">= 1.0.8"])
27+
s.add_development_dependency(%q<mocha>, [">= 0.12.6"])
9428
end
9529

lib/java_bin.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# vim:fileencoding=utf-8
2+
require 'java_bin/version'
3+
24
module JavaBin
35
def self.parser=(value)
46
@parser = value
@@ -7,13 +9,11 @@ def self.parser
79
@parser
810
end
911

10-
require 'java_bin/version'
1112
begin
1213
require 'java_bin/ext'
1314
rescue LoadError => e
1415
require 'java_bin/pure'
1516
end
16-
1717
end
1818

1919
# monkey patching

lib/java_bin/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# vim:fileencoding=utf-8
22
module JavaBin
33
# JavaBin version
4-
VERSION = '0.4.1'
4+
VERSION = '0.4.2'
55
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
66
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
77
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:

test/helper.rb

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
# vim:fileencoding=utf-8
2-
require 'rubygems'
3-
require 'bundler'
4-
require 'test/unit'
5-
6-
ENV['TZ']='JST-9'
7-
$LOAD_PATH.unshift(File.dirname(__FILE__))
82
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
3+
$LOAD_PATH.unshift(File.dirname(__FILE__))
94

10-
Bundler.require(:test)
11-
12-
require 'java_bin'
5+
require 'test/unit'
136

147
class Test::Unit::TestCase
158
READ_UTF8 = (RUBY_VERSION >= '1.9' ? 'rb:utf-8' : 'rb')
169
READ_ASCII = (RUBY_VERSION >= '1.9' ? 'rb:ascii' : 'rb')
1710
end
11+
12+
require 'rsolr'
13+
require 'mocha'
14+
15+
require 'bundler'
16+
Bundler.require
17+
18+
ENV['TZ']='JST-9'
19+
20+

test/test_java_bin_parser.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# vim:fileencoding=utf-8
2-
2+
require File.dirname(__FILE__) + '/helper'
33
require 'stringio'
4-
require 'helper'
54
require 'time'
65

76
case ENV['JavaBin']

test/test_rsolr_support.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ def test_queries_are_performed_with_javabin
2727
"version" => "2.2",
2828
"rows" => "100"}}, rsolr.select(:q => 'whatever')['responseHeader'])
2929
end
30-
end
30+
end

0 commit comments

Comments
 (0)