Skip to content

Commit 6f4d8ae

Browse files
committed
goodbye jweler
1 parent 4ae5c1a commit 6f4d8ae

File tree

7 files changed

+68
-136
lines changed

7 files changed

+68
-136
lines changed

.rspec

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
--colour
2-
--format
3-
documentation
1+
--color
2+
--format=documentation

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gemspec

Gemfile.lock

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
PATH
2+
remote: .
3+
specs:
4+
rack-oauth2 (0.2.1)
5+
activesupport (>= 2.3)
6+
i18n
7+
json (= 1.4.3)
8+
rack (= 1.1)
9+
10+
GEM
11+
specs:
12+
activesupport (3.0.1)
13+
diff-lcs (1.1.2)
14+
i18n (0.4.2)
15+
json (1.4.3)
16+
rack (1.1.0)
17+
rake (0.8.7)
18+
rcov (0.9.9)
19+
rspec (2.0.0)
20+
rspec-core (= 2.0.0)
21+
rspec-expectations (= 2.0.0)
22+
rspec-mocks (= 2.0.0)
23+
rspec-core (2.0.0)
24+
rspec-expectations (2.0.0)
25+
diff-lcs (>= 1.1.2)
26+
rspec-mocks (2.0.0)
27+
rspec-core (= 2.0.0)
28+
rspec-expectations (= 2.0.0)
29+
30+
PLATFORMS
31+
ruby
32+
33+
DEPENDENCIES
34+
activesupport (>= 2.3)
35+
i18n
36+
json (= 1.4.3)
37+
rack (= 1.1)
38+
rack-oauth2!
39+
rake (>= 0.8)
40+
rcov (>= 0.9)
41+
rspec (>= 2.0)

Rakefile

+3-26
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
1-
require 'rubygems'
2-
require 'rake'
3-
4-
begin
5-
require 'jeweler'
6-
Jeweler::Tasks.new do |gem|
7-
gem.name = 'rack-oauth2'
8-
gem.summary = %Q{Rack Middleware for OAuth2 Server}
9-
gem.description = %Q{Rack Middleware for OAuth2. Currently support only Server/Provider, not Client/Consumer.}
10-
gem.email = '[email protected]'
11-
gem.homepage = 'http://github.com/nov/rack-oauth2'
12-
gem.authors = ['nov matake']
13-
gem.add_dependency 'json'
14-
gem.add_dependency 'activesupport'
15-
gem.add_development_dependency 'rspec', '>= 2.0.0'
16-
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
17-
end
18-
Jeweler::GemcutterTasks.new
19-
rescue LoadError
20-
puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
21-
end
1+
require 'bundler'
2+
Bundler::GemHelper.install_tasks
223

234
require 'rspec/core/rake_task'
245
RSpec::Core::RakeTask.new(:spec)
@@ -28,16 +9,12 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
289
spec.rcov_opts = ['--exclude spec,gems']
2910
end
3011

31-
task :spec => :check_dependencies
32-
3312
task :default => :spec
3413

3514
require 'rake/rdoctask'
3615
Rake::RDocTask.new do |rdoc|
37-
version = File.exist?('VERSION') ? File.read('VERSION') : ''
38-
3916
rdoc.rdoc_dir = 'rdoc'
40-
rdoc.title = 'rack-oauth2 #{version}'
17+
rdoc.title = "rack-oauth2 #{File.read('VERSION')}"
4118
rdoc.rdoc_files.include('README*')
4219
rdoc.rdoc_files.include('lib/**/*.rb')
4320
end

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.1
1+
0.2.2

rack-oauth2.gemspec

+18-104
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,23 @@
1-
# Generated by jeweler
2-
# DO NOT EDIT THIS FILE DIRECTLY
3-
# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
4-
# -*- encoding: utf-8 -*-
5-
61
Gem::Specification.new do |s|
7-
s.name = %q{rack-oauth2}
8-
s.version = "0.2.1"
9-
10-
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
2+
s.name = "rack-oauth2"
3+
s.version = File.read("VERSION")
4+
s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
115
s.authors = ["nov matake"]
12-
s.date = %q{2010-10-13}
13-
s.description = %q{Rack Middleware for OAuth2. Currently support only Server/Provider, not Client/Consumer.}
14-
s.email = %q{[email protected]}
15-
s.extra_rdoc_files = [
16-
"LICENSE",
17-
"README.rdoc"
18-
]
19-
s.files = [
20-
".document",
21-
".gitignore",
22-
"LICENSE",
23-
"README.rdoc",
24-
"Rakefile",
25-
"VERSION",
26-
"lib/rack/oauth2.rb",
27-
"lib/rack/oauth2/server.rb",
28-
"lib/rack/oauth2/server/abstract.rb",
29-
"lib/rack/oauth2/server/abstract/handler.rb",
30-
"lib/rack/oauth2/server/abstract/request.rb",
31-
"lib/rack/oauth2/server/abstract/response.rb",
32-
"lib/rack/oauth2/server/authorize.rb",
33-
"lib/rack/oauth2/server/authorize/code.rb",
34-
"lib/rack/oauth2/server/authorize/code_and_token.rb",
35-
"lib/rack/oauth2/server/authorize/token.rb",
36-
"lib/rack/oauth2/server/error.rb",
37-
"lib/rack/oauth2/server/error/authorize.rb",
38-
"lib/rack/oauth2/server/error/resource.rb",
39-
"lib/rack/oauth2/server/error/token.rb",
40-
"lib/rack/oauth2/server/resource.rb",
41-
"lib/rack/oauth2/server/token.rb",
42-
"lib/rack/oauth2/server/token/assertion.rb",
43-
"lib/rack/oauth2/server/token/authorization_code.rb",
44-
"lib/rack/oauth2/server/token/password.rb",
45-
"lib/rack/oauth2/server/token/refresh_token.rb",
46-
"lib/rack/oauth2/server/util.rb",
47-
"rack-oauth2.gemspec",
48-
"spec/rack/oauth2/server/authorize/code_and_token_spec.rb",
49-
"spec/rack/oauth2/server/authorize/code_spec.rb",
50-
"spec/rack/oauth2/server/authorize/token_spec.rb",
51-
"spec/rack/oauth2/server/authorize_spec.rb",
52-
"spec/rack/oauth2/server/error/authorize_spec.rb",
53-
"spec/rack/oauth2/server/error/resource_spec.rb",
54-
"spec/rack/oauth2/server/error/token_spec.rb",
55-
"spec/rack/oauth2/server/error_spec.rb",
56-
"spec/rack/oauth2/server/resource_spec.rb",
57-
"spec/rack/oauth2/server/token/assertion_spec.rb",
58-
"spec/rack/oauth2/server/token/authorization_code_spec.rb",
59-
"spec/rack/oauth2/server/token/password_spec.rb",
60-
"spec/rack/oauth2/server/token/refresh_token_spec.rb",
61-
"spec/rack/oauth2/server/token_spec.rb",
62-
"spec/rack/oauth2/server/util_spec.rb",
63-
"spec/spec.opts",
64-
"spec/spec_helper.rb"
65-
]
66-
s.homepage = %q{http://github.com/nov/rack-oauth2}
6+
s.description = %q{Rack Middleware for OAuth2 server}
7+
s.summary = %q{Rack Middleware for OAuth2 server}
8+
s.email = "[email protected]"
9+
s.extra_rdoc_files = ["LICENSE", "README.rdoc"]
6710
s.rdoc_options = ["--charset=UTF-8"]
11+
s.homepage = "http://github.com/nov/rack-oauth2"
6812
s.require_paths = ["lib"]
69-
s.rubygems_version = %q{1.3.7}
70-
s.summary = %q{Rack Middleware for OAuth2 Server}
71-
s.test_files = [
72-
"spec/rack/oauth2/server/authorize/code_and_token_spec.rb",
73-
"spec/rack/oauth2/server/authorize/code_spec.rb",
74-
"spec/rack/oauth2/server/authorize/token_spec.rb",
75-
"spec/rack/oauth2/server/authorize_spec.rb",
76-
"spec/rack/oauth2/server/error/authorize_spec.rb",
77-
"spec/rack/oauth2/server/error/resource_spec.rb",
78-
"spec/rack/oauth2/server/error/token_spec.rb",
79-
"spec/rack/oauth2/server/error_spec.rb",
80-
"spec/rack/oauth2/server/resource_spec.rb",
81-
"spec/rack/oauth2/server/token/assertion_spec.rb",
82-
"spec/rack/oauth2/server/token/authorization_code_spec.rb",
83-
"spec/rack/oauth2/server/token/password_spec.rb",
84-
"spec/rack/oauth2/server/token/refresh_token_spec.rb",
85-
"spec/rack/oauth2/server/token_spec.rb",
86-
"spec/rack/oauth2/server/util_spec.rb",
87-
"spec/spec_helper.rb"
88-
]
89-
90-
if s.respond_to? :specification_version then
91-
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
92-
s.specification_version = 3
93-
94-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
95-
s.add_runtime_dependency(%q<json>, [">= 0"])
96-
s.add_runtime_dependency(%q<activesupport>, [">= 0"])
97-
s.add_development_dependency(%q<rspec>, [">= 2"])
98-
else
99-
s.add_dependency(%q<json>, [">= 0"])
100-
s.add_dependency(%q<activesupport>, [">= 0"])
101-
s.add_dependency(%q<rspec>, [">= 2"])
102-
end
103-
else
104-
s.add_dependency(%q<json>, [">= 0"])
105-
s.add_dependency(%q<activesupport>, [">= 0"])
106-
s.add_dependency(%q<rspec>, [">= 2"])
107-
end
13+
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
14+
s.files = `git ls-files`.split("\n")
15+
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
16+
s.add_runtime_dependency "rack", "1.1"
17+
s.add_runtime_dependency "json", "1.4.3"
18+
s.add_runtime_dependency "activesupport", ">= 2.3"
19+
s.add_runtime_dependency "i18n"
20+
s.add_development_dependency "rake", ">= 0.8"
21+
s.add_development_dependency "rcov", ">= 0.9"
22+
s.add_development_dependency "rspec", ">= 2"
10823
end
109-

spec/spec_helper.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
$LOAD_PATH.unshift(File.dirname(__FILE__))
22
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
3+
34
require 'rack/oauth2'
4-
require 'rspec/core'
5-
require 'rack/mock'
5+
require 'rspec'
66

77
def simple_app
88
lambda do |env|

0 commit comments

Comments
 (0)