Skip to content

Commit e317318

Browse files
author
Michael Bleigh
committed
Changing build.
1 parent 90004eb commit e317318

File tree

4 files changed

+49
-13
lines changed

4 files changed

+49
-13
lines changed

Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ gem 'rack-jsonp'
44

55
gem 'activesupport', '>= 3.0.0.rc2'
66

7+
group :development do
8+
gem 'rake'
9+
gem 'jeweler'
10+
end
11+
712
group :test do
813
gem 'rspec', '>= 2.0.0.beta.19'
914
gem 'rack-test'

Gemfile.lock

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,22 @@ GEM
99
json_pure (~> 1.4.3)
1010
term-ansicolor (~> 1.0.4)
1111
diff-lcs (1.1.2)
12+
gemcutter (0.6.1)
1213
gherkin (2.1.5)
1314
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)
1420
json_pure (1.4.3)
1521
rack (1.2.1)
1622
rack-jsonp (1.0.0)
1723
rack-mount (0.6.9)
1824
rack (>= 1.0.0)
1925
rack-test (0.5.4)
2026
rack (>= 1.0)
27+
rake (0.8.7)
2128
rspec (2.0.0.beta.19)
2229
rspec-core (= 2.0.0.beta.19)
2330
rspec-expectations (= 2.0.0.beta.19)
@@ -26,6 +33,8 @@ GEM
2633
rspec-expectations (2.0.0.beta.19)
2734
diff-lcs (>= 1.1.2)
2835
rspec-mocks (2.0.0.beta.19)
36+
rubyforge (2.0.4)
37+
json_pure (>= 1.1.7)
2938
term-ansicolor (1.0.5)
3039
trollop (1.16.2)
3140

@@ -35,8 +44,10 @@ PLATFORMS
3544
DEPENDENCIES
3645
activesupport (>= 3.0.0.rc2)
3746
cucumber (>= 0.8.5)
47+
jeweler
3848
rack
3949
rack-jsonp
4050
rack-mount
4151
rack-test
52+
rake
4253
rspec (>= 2.0.0.beta.19)

Rakefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
require 'rubygems'
2-
require 'rake'
2+
require 'bundler'
3+
4+
Bundler.setup :default, :test, :development
35

46
begin
57
require 'jeweler'
@@ -10,10 +12,7 @@ begin
1012
gem.email = "[email protected]"
1113
gem.homepage = "http://github.com/intridea/grape"
1214
gem.authors = ["Michael Bleigh"]
13-
gem.add_dependency 'rack'
14-
gem.add_dependency 'multi_json'
15-
gem.add_development_dependency "rspec", ">= 1.2.9"
16-
gem.add_development_dependency "cucumber", ">= 0"
15+
gem.add_bundler_dependencies
1716
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
1817
end
1918
Jeweler::GemcutterTasks.new

grape.gemspec

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
99

1010
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
1111
s.authors = ["Michael Bleigh"]
12-
s.date = %q{2010-08-02}
12+
s.date = %q{2010-08-27}
1313
s.description = %q{TODO: longer description of your gem}
1414
s.email = %q{[email protected]}
1515
s.extra_rdoc_files = [
@@ -30,10 +30,16 @@ Gem::Specification.new do |s|
3030
"autotest/discover.rb",
3131
"grape.gemspec",
3232
"lib/grape.rb",
33+
"lib/grape/middleware/auth/oauth2.rb",
3334
"lib/grape/middleware/base.rb",
35+
"lib/grape/middleware/error.rb",
36+
"lib/grape/middleware/formatter.rb",
3437
"lib/grape/middleware/prefixer.rb",
3538
"lib/grape/middleware/versioner.rb",
39+
"spec/grape/middleware/auth/oauth2_spec.rb",
3640
"spec/grape/middleware/base_spec.rb",
41+
"spec/grape/middleware/error_spec.rb",
42+
"spec/grape/middleware/formatter_spec.rb",
3743
"spec/grape/middleware/prefixer_spec.rb",
3844
"spec/grape/middleware/versioner_spec.rb",
3945
"spec/grape_spec.rb",
@@ -45,7 +51,10 @@ Gem::Specification.new do |s|
4551
s.rubygems_version = %q{1.3.7}
4652
s.summary = %q{TODO: one-line summary of your gem}
4753
s.test_files = [
48-
"spec/grape/middleware/base_spec.rb",
54+
"spec/grape/middleware/auth/oauth2_spec.rb",
55+
"spec/grape/middleware/base_spec.rb",
56+
"spec/grape/middleware/error_spec.rb",
57+
"spec/grape/middleware/formatter_spec.rb",
4958
"spec/grape/middleware/prefixer_spec.rb",
5059
"spec/grape/middleware/versioner_spec.rb",
5160
"spec/grape_spec.rb",
@@ -57,15 +66,27 @@ Gem::Specification.new do |s|
5766
s.specification_version = 3
5867

5968
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
60-
s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
61-
s.add_development_dependency(%q<cucumber>, [">= 0"])
69+
s.add_runtime_dependency(%q<rack>, [">= 0"])
70+
s.add_runtime_dependency(%q<rack-mount>, [">= 0"])
71+
s.add_runtime_dependency(%q<rack-jsonp>, [">= 0"])
72+
s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.rc2"])
73+
s.add_development_dependency(%q<rake>, [">= 0"])
74+
s.add_development_dependency(%q<jeweler>, [">= 0"])
6275
else
63-
s.add_dependency(%q<rspec>, [">= 1.2.9"])
64-
s.add_dependency(%q<cucumber>, [">= 0"])
76+
s.add_dependency(%q<rack>, [">= 0"])
77+
s.add_dependency(%q<rack-mount>, [">= 0"])
78+
s.add_dependency(%q<rack-jsonp>, [">= 0"])
79+
s.add_dependency(%q<activesupport>, [">= 3.0.0.rc2"])
80+
s.add_dependency(%q<rake>, [">= 0"])
81+
s.add_dependency(%q<jeweler>, [">= 0"])
6582
end
6683
else
67-
s.add_dependency(%q<rspec>, [">= 1.2.9"])
68-
s.add_dependency(%q<cucumber>, [">= 0"])
84+
s.add_dependency(%q<rack>, [">= 0"])
85+
s.add_dependency(%q<rack-mount>, [">= 0"])
86+
s.add_dependency(%q<rack-jsonp>, [">= 0"])
87+
s.add_dependency(%q<activesupport>, [">= 3.0.0.rc2"])
88+
s.add_dependency(%q<rake>, [">= 0"])
89+
s.add_dependency(%q<jeweler>, [">= 0"])
6990
end
7091
end
7192

0 commit comments

Comments
 (0)