From 2e98c7462bca5363ec3b476fc460ba24dde5a89d Mon Sep 17 00:00:00 2001 From: Erik Michaels-Ober Date: Sat, 17 Nov 2012 20:33:55 -0800 Subject: [PATCH] Add #licenses declaration to gemspec --- .yardopts | 2 +- LICENSE => LICENSE.md | 2 +- README.md | 33 ++++++++++++++++----------------- omniauth.gemspec | 41 +++++++++++++++++++++-------------------- 4 files changed, 39 insertions(+), 39 deletions(-) rename LICENSE => LICENSE.md (94%) diff --git a/.yardopts b/.yardopts index 7a69ee4..36bc261 100644 --- a/.yardopts +++ b/.yardopts @@ -1,4 +1,4 @@ --markup markdown --markup-provider maruku - -LICENSE +LICENSE.md diff --git a/LICENSE b/LICENSE.md similarity index 94% rename from LICENSE rename to LICENSE.md index 811fa0e..155ff48 100644 --- a/LICENSE +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2010-2011 Michael Bleigh and Intridea, Inc. +Copyright (c) 2010-2013 Michael Bleigh and Intridea, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 5922da2..b821522 100644 --- a/README.md +++ b/README.md @@ -143,23 +143,22 @@ OmniAuth is tested under 1.8.7, 1.9.2, 1.9.3, JRuby (1.8 mode), and Rubinius (1.8 and 1.9 modes). ## License +Copyright (c) 2010-2013 Michael Bleigh and Intridea, Inc. -Copyright (c) 2011 Intridea, Inc. +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: -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: +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -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. +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. diff --git a/omniauth.gemspec b/omniauth.gemspec index d6c92bb..e13aa81 100644 --- a/omniauth.gemspec +++ b/omniauth.gemspec @@ -1,27 +1,28 @@ # encoding: utf-8 require File.expand_path('../lib/omniauth/version', __FILE__) -Gem::Specification.new do |gem| - gem.name = 'omniauth' - gem.description = %q{A generalized Rack framework for multiple-provider authentication.} - gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober'] - gem.email = ['michael@intridea.com', 'sferik@gmail.com'] +Gem::Specification.new do |spec| + spec.name = 'omniauth' + spec.description = %q{A generalized Rack framework for multiple-provider authentication.} + spec.authors = ['Michael Bleigh', 'Erik Michaels-Ober'] + spec.email = ['michael@intridea.com', 'sferik@gmail.com'] - gem.add_runtime_dependency 'rack' - gem.add_runtime_dependency 'hashie', '~> 1.2' + spec.add_runtime_dependency 'rack' + spec.add_runtime_dependency 'hashie', '~> 1.2' - gem.add_development_dependency 'maruku' - gem.add_development_dependency 'simplecov' - gem.add_development_dependency 'rack-test' - gem.add_development_dependency 'rake' - gem.add_development_dependency 'rspec', '~> 2.8' - gem.add_development_dependency 'yard' + spec.add_development_dependency 'maruku' + spec.add_development_dependency 'simplecov' + spec.add_development_dependency 'rack-test' + spec.add_development_dependency 'rake' + spec.add_development_dependency 'rspec', '~> 2.8' + spec.add_development_dependency 'yard' - gem.version = OmniAuth::VERSION - gem.files = `git ls-files`.split("\n") - gem.homepage = 'http://github.com/intridea/omniauth' - gem.require_paths = ['lib'] - gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version= - gem.summary = gem.description - gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") + spec.version = OmniAuth::VERSION + spec.files = `git ls-files`.split("\n") + spec.homepage = 'http://github.com/intridea/omniauth' + spec.licenses = ['MIT'] + spec.require_paths = ['lib'] + spec.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') + spec.summary = spec.description + spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") end