Skip to content

Commit 636fbd7

Browse files
committed
Merge pull request #3 from sosedoff/fixes
Update the README. Thanks to @sosedoff.
2 parents b64bb9c + 65a7ed0 commit 636fbd7

File tree

5 files changed

+49
-12
lines changed

5 files changed

+49
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.bundle
33
Gemfile.lock
44
pkg/*
5+
.DS_Store

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
source "http://rubygems.org"
1+
source "https://rubygems.org"
22

3-
# Specify your gem's dependencies in omniauth-bitbucket.gemspec
43
gemspec
54

65
group :development, :test do

README.md

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,56 @@
11
# OmniAuth Bitbucket
22

3-
This is the OmniAuth strategy for authenticating to Bitbucket. To
4-
use it, you'll need to sign up for an OAuth consumer key and Secret
5-
by sending emails to [Bitbucket Support](mailto:support@bitbucket.org).
3+
This is the OmniAuth strategy for authenticating to [Bitbucket](https://bitbucket.org).
4+
To use it, you'll need to signup and create a new application or use your
5+
existing OAuth consumer and secret keys.
6+
7+
## Install
8+
9+
Add dependency to your Gemfile:
10+
11+
```
12+
gem 'omniauth-bitbucket'
13+
```
14+
15+
Or install manually:
16+
17+
```
18+
gem install omniauth-bitbucket
19+
```
620

721
## Basic Usage
822

9-
use OmniAuth::Builder do
10-
provider :bitbucket, ENV['BITBUCKET_KEY'], ENV['BITBUCKET_SECRET']
11-
end
23+
```ruby
24+
use OmniAuth::Builder do
25+
provider :bitbucket, ENV['BITBUCKET_KEY'], ENV['BITBUCKET_SECRET']
26+
end
27+
```
28+
29+
If using Rails, add an initializer `config/initializers/omniauth.rb`:
30+
31+
```ruby
32+
Rails.application.config.middleware.use OmniAuth::Builder do
33+
provider :bitbucket, 'BITBUCKET_KEY', 'BITBUCKET_SECRET'
34+
end
35+
```
1236

1337
## License
1438

15-
Copyright (c) 2011 Dingding Ye.
39+
Copyright (c) 2011-2013 Dingding Ye.
1640

17-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
41+
Permission is hereby granted, free of charge, to any person obtaining a copy of
42+
this software and associated documentation files (the "Software"), to deal in
43+
the Software without restriction, including without limitation the rights to
44+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
45+
the Software, and to permit persons to whom the Software is furnished to do so,
46+
subject to the following conditions:
1847

19-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
48+
The above copyright notice and this permission notice shall be included in all
49+
copies or substantial portions of the Software.
2050

21-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
51+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
52+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
53+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
54+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
55+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
56+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
File renamed without changes.

omniauth-bitbucket.gemspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ Gem::Specification.new do |s|
2020
s.add_dependency 'omniauth', '~> 1.1'
2121
s.add_dependency 'omniauth-oauth', '~> 1.0'
2222
s.add_dependency 'multi_json', '~> 1.7'
23+
2324
s.add_development_dependency 'rspec', '~> 2.7'
2425
s.add_development_dependency 'rack-test'
2526
s.add_development_dependency 'simplecov'
2627
s.add_development_dependency 'webmock'
28+
s.add_development_dependency 'rake'
2729
end

0 commit comments

Comments
 (0)