Skip to content

Commit dcbeb2b

Browse files
author
Michael Bleigh
committed
Moving to Bundler powered gemspec as well as moving to mg from jeweler.
1 parent dd75477 commit dcbeb2b

File tree

7 files changed

+73
-291
lines changed

7 files changed

+73
-291
lines changed

‎.travis.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
rvm:
2+
- 1.8.7
3+
- 1.9.2
4+
- ree
5+
- rbx
6+
- jruby
7+

‎Gemfile

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

3-
gem 'rack'
4-
gem 'rack-mount', '~> 0.6.13'
5-
gem 'rack-jsonp'
6-
7-
gem 'json'
8-
gem 'multi_json'
9-
gem 'multi_xml'
10-
11-
group :development do
12-
gem 'rake'
13-
gem 'jeweler'
14-
gem 'maruku'
15-
gem 'yard'
16-
end
17-
18-
group :test do
19-
gem 'rack-test'
20-
gem 'rspec', '>= 2.1.0'
21-
gem 'cucumber', '>= 0.8.5'
22-
end
3+
gemspec

‎Gemfile.lock

+28-41
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,51 @@
1+
PATH
2+
remote: .
3+
specs:
4+
grape (0.1.3)
5+
multi_json
6+
multi_xml
7+
rack
8+
rack-jsonp
9+
rack-mount
10+
111
GEM
212
remote: http://rubygems.org/
313
specs:
4-
builder (2.1.2)
5-
cucumber (0.8.5)
6-
builder (~> 2.1.2)
7-
diff-lcs (~> 1.1.2)
8-
gherkin (~> 2.1.4)
9-
json_pure (~> 1.4.3)
10-
term-ansicolor (~> 1.0.4)
1114
diff-lcs (1.1.2)
12-
gemcutter (0.6.1)
13-
gherkin (2.1.5)
14-
trollop (~> 1.16.2)
15-
git (1.2.5)
16-
jeweler (1.4.0)
17-
gemcutter (>= 0.1.0)
18-
git (>= 1.2.5)
19-
rubyforge (>= 2.0.0)
20-
json (1.4.6)
2115
json_pure (1.4.3)
2216
maruku (0.6.0)
2317
syntax (>= 1.0.0)
24-
multi_json (0.0.4)
25-
multi_xml (0.0.1)
18+
mg (0.0.8)
19+
rake
20+
multi_json (0.0.5)
21+
multi_xml (0.2.2)
2622
rack (1.2.1)
27-
rack-jsonp (1.0.0)
28-
rack-mount (0.6.13)
23+
rack-jsonp (1.1.0)
24+
rack
25+
rack-mount (0.7.1)
2926
rack (>= 1.0.0)
3027
rack-test (0.5.4)
3128
rack (>= 1.0)
3229
rake (0.8.7)
33-
rspec (2.1.0)
34-
rspec-core (~> 2.1.0)
35-
rspec-expectations (~> 2.1.0)
36-
rspec-mocks (~> 2.1.0)
37-
rspec-core (2.1.0)
38-
rspec-expectations (2.1.0)
30+
rspec (2.5.0)
31+
rspec-core (~> 2.5.0)
32+
rspec-expectations (~> 2.5.0)
33+
rspec-mocks (~> 2.5.0)
34+
rspec-core (2.5.1)
35+
rspec-expectations (2.5.0)
3936
diff-lcs (~> 1.1.2)
40-
rspec-mocks (2.1.0)
41-
rubyforge (2.0.4)
42-
json_pure (>= 1.1.7)
37+
rspec-mocks (2.5.0)
4338
syntax (1.0.0)
44-
term-ansicolor (1.0.5)
45-
trollop (1.16.2)
4639
yard (0.6.1)
4740

4841
PLATFORMS
4942
ruby
5043

5144
DEPENDENCIES
52-
cucumber (>= 0.8.5)
53-
jeweler
54-
json
45+
grape!
46+
json_pure
5547
maruku
56-
multi_json
57-
multi_xml
58-
rack
59-
rack-jsonp
60-
rack-mount (~> 0.6.13)
48+
mg
6149
rack-test
62-
rake
63-
rspec (>= 2.1.0)
50+
rspec (~> 2.5.0)
6451
yard

‎Rakefile

+4-23
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,9 @@
11
require 'rubygems'
22
require 'bundler'
3-
43
Bundler.setup :default, :test, :development
54

6-
def version
7-
@version ||= open('VERSION').read.trim
8-
end
9-
10-
begin
11-
require 'jeweler'
12-
Jeweler::Tasks.new do |gem|
13-
gem.name = "grape"
14-
gem.summary = %Q{A Ruby framework for rapid API development.}
15-
gem.description = %Q{A Ruby framework for rapid API development with great conventions.}
16-
gem.email = "michael@intridea.com"
17-
gem.homepage = "http://github.com/intridea/grape"
18-
gem.authors = ["Michael Bleigh"]
19-
gem.add_bundler_dependencies
20-
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
21-
end
22-
Jeweler::GemcutterTasks.new
23-
rescue LoadError
24-
puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
25-
end
5+
require 'mg'
6+
MG.new('grape.gemspec')
267

278
require 'rspec/core/rake_task'
289
RSpec::Core::RakeTask.new(:spec) do |spec|
@@ -34,7 +15,7 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
3415
spec.rcov = true
3516
end
3617

37-
task :spec => :check_dependencies
18+
task :spec
3819
task :default => :spec
3920

4021
begin
@@ -67,4 +48,4 @@ begin
6748
end
6849
rescue LoadError
6950
puts "You need to install YARD."
70-
end
51+
end

0 commit comments

Comments
 (0)