Skip to content

Commit 5ed8fb5

Browse files
committed
Remove jeweler dependency
Use Bundler::GemHelper.install_tasks instead for building and releasing.
1 parent 4b59f06 commit 5ed8fb5

File tree

6 files changed

+37
-123
lines changed

6 files changed

+37
-123
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pkg/*

Gemfile

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
source :rubygems
1+
source 'https://rubygems.org'
22

3-
gem 'sinatra', '~> 1.1'
4-
gem 'geoip'
5-
gem 'i18n'
6-
gem 'multi_json'
7-
gem 'newrelic_rpm'
8-
9-
group :development, :test do
10-
gem 'jeweler'
11-
gem 'rake'
12-
gem 'shoulda'
13-
gem 'rack-test'
14-
end
3+
gemspec

Gemfile.lock

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1+
PATH
2+
remote: .
3+
specs:
4+
geoip_server (1.2.0)
5+
geoip (~> 1.1)
6+
i18n (~> 0.6)
7+
multi_json (~> 1.3)
8+
newrelic_rpm (~> 3.4)
9+
sinatra (~> 1.1)
10+
111
GEM
2-
remote: http://rubygems.org/
12+
remote: https://rubygems.org/
313
specs:
414
activesupport (3.2.8)
515
i18n (~> 0.6)
616
multi_json (~> 1.0)
717
geoip (1.1.2)
8-
git (1.2.5)
918
i18n (0.6.1)
10-
jeweler (1.8.4)
11-
bundler (~> 1.0)
12-
git (>= 1.2.5)
13-
rake
14-
rdoc
15-
json (1.7.5)
1619
multi_json (1.3.6)
1720
newrelic_rpm (3.4.2.1)
1821
rack (1.4.1)
@@ -21,8 +24,6 @@ GEM
2124
rack-test (0.6.1)
2225
rack (>= 1.0)
2326
rake (0.9.2.2)
24-
rdoc (3.12)
25-
json (~> 1.4)
2627
shoulda (3.1.1)
2728
shoulda-context (~> 1.0)
2829
shoulda-matchers (~> 1.2)
@@ -39,12 +40,7 @@ PLATFORMS
3940
ruby
4041

4142
DEPENDENCIES
42-
geoip
43-
i18n
44-
jeweler
45-
multi_json
46-
newrelic_rpm
43+
geoip_server!
4744
rack-test
4845
rake
4946
shoulda
50-
sinatra (~> 1.1)

Rakefile

+3-25
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
1-
begin
2-
require 'jeweler'
3-
Jeweler::Tasks.new do |gem|
4-
gem.name = "geoip_server"
5-
gem.summary = %Q{Query the MaxMind GeoIP data records via a web service}
6-
gem.description = %Q{Query the MaxMind GeoIP data records via a web service}
7-
gem.email = "[email protected]"
8-
gem.homepage = "http://github.com/JackDanger/geoip_server"
9-
gem.authors = ["Jack Danger Canty"]
10-
gem.add_dependency "sinatra", ">= 1.0.0"
11-
gem.add_dependency "active_support", ">= 0"
12-
gem.add_dependency "geoip", ">= 0"
13-
gem.add_development_dependency "shoulda", ">= 0"
14-
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
15-
end
16-
Jeweler::GemcutterTasks.new
17-
rescue LoadError
18-
puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
19-
end
20-
21-
1+
require 'bundler'
2+
Bundler::GemHelper.install_tasks
223

234
task :default => :test
245

@@ -29,9 +10,6 @@ Rake::TestTask.new(:test) do |test|
2910
test.verbose = true
3011
end
3112

32-
33-
34-
3513
namespace :geoip do
3614
desc "Update GeoIP City data file"
3715
task :update_city_lite => :vendor do
@@ -46,4 +24,4 @@ namespace :geoip do
4624
task :vendor do
4725
%x{mkdir -p vendor}
4826
end
49-
end
27+
end

VERSION

-1
This file was deleted.

geoip_server.gemspec

+19-68
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,21 @@
1-
# Generated by jeweler
2-
# DO NOT EDIT THIS FILE DIRECTLY
3-
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4-
# -*- encoding: utf-8 -*-
5-
61
Gem::Specification.new do |s|
7-
s.name = %q{geoip_server}
8-
s.version = File.read('VERSION').chomp
9-
10-
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11-
s.authors = ["Jack Danger Canty", "Fabien Allanic"]
12-
s.date = %q{2011-04-10}
13-
s.description = %q{Query the MaxMind GeoIP data records via a web service}
14-
15-
s.extra_rdoc_files = [
16-
"README.markdown"
17-
]
18-
s.files = [
19-
"Gemfile",
20-
"Gemfile.lock",
21-
"README.markdown",
22-
"Rakefile",
23-
"VERSION",
24-
"config.ru",
25-
"geoip_server.gemspec",
26-
"lib/geoip_server.rb",
27-
"test.rb"
28-
]
29-
s.homepage = %q{http://github.com/JackDanger/geoip_server}
30-
s.require_paths = ["lib"]
31-
s.rubygems_version = %q{1.4.2}
32-
s.summary = %q{Query the MaxMind GeoIP data records via a web service}
33-
34-
if s.respond_to? :specification_version then
35-
s.specification_version = 3
36-
37-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
38-
s.add_runtime_dependency(%q<sinatra>, [">= 0"])
39-
s.add_runtime_dependency(%q<activesupport>, [">= 0"])
40-
s.add_runtime_dependency(%q<geoip>, [">= 0"])
41-
s.add_runtime_dependency(%q<i18n>, [">= 0"])
42-
s.add_runtime_dependency(%q<newrelic_rpm>, [">= 0"])
43-
s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
44-
s.add_runtime_dependency(%q<active_support>, [">= 0"])
45-
s.add_runtime_dependency(%q<geoip>, [">= 0"])
46-
s.add_development_dependency(%q<shoulda>, [">= 0"])
47-
else
48-
s.add_dependency(%q<sinatra>, [">= 0"])
49-
s.add_dependency(%q<activesupport>, [">= 0"])
50-
s.add_dependency(%q<geoip>, [">= 0"])
51-
s.add_dependency(%q<i18n>, [">= 0"])
52-
s.add_dependency(%q<newrelic_rpm>, [">= 0"])
53-
s.add_dependency(%q<sinatra>, [">= 1.0.0"])
54-
s.add_dependency(%q<active_support>, [">= 0"])
55-
s.add_dependency(%q<geoip>, [">= 0"])
56-
s.add_dependency(%q<shoulda>, [">= 0"])
57-
end
58-
else
59-
s.add_dependency(%q<sinatra>, [">= 0"])
60-
s.add_dependency(%q<activesupport>, [">= 0"])
61-
s.add_dependency(%q<geoip>, [">= 0"])
62-
s.add_dependency(%q<i18n>, [">= 0"])
63-
s.add_dependency(%q<newrelic_rpm>, [">= 0"])
64-
s.add_dependency(%q<sinatra>, [">= 1.0.0"])
65-
s.add_dependency(%q<active_support>, [">= 0"])
66-
s.add_dependency(%q<geoip>, [">= 0"])
67-
s.add_dependency(%q<shoulda>, [">= 0"])
68-
end
2+
s.name = 'geoip_server'
3+
s.version = '1.2.0'
4+
s.authors = ["Jack Danger Canty"]
5+
s.description = 'Query the MaxMind GeoIP data records via a web service'
6+
s.email = '[email protected]'
7+
s.files = %w(Gemfile Gemfile.lock README.markdown Rakefile config.ru geoip_server.gemspec test.rb)
8+
s.files += Dir.glob('lib/**/*.rb')
9+
s.test_files = %w(test.rb)
10+
s.homepage = 'http://github.com/JackDanger/geoip_server'
11+
s.require_paths = ['lib']
12+
s.summary = s.description
13+
s.add_dependency 'sinatra', '~> 1.1'
14+
s.add_dependency 'geoip', '~> 1.1'
15+
s.add_dependency 'i18n', '~> 0.6'
16+
s.add_dependency 'multi_json', '~> 1.3'
17+
s.add_dependency 'newrelic_rpm', '~> 3.4'
18+
s.add_development_dependency 'rake'
19+
s.add_development_dependency 'shoulda'
20+
s.add_development_dependency 'rack-test'
6921
end
70-

0 commit comments

Comments
 (0)