Permalink
Browse files

Switched to 2-clause BSD license.

  • Loading branch information...
1 parent 1d82eea commit 587f38399a7297b8637d551497b6c635962dce44 Andrew Kirilenko committed Feb 23, 2012
Showing with 30 additions and 30 deletions.
  1. +19 −17 LICENSE
  2. +5 −6 Rakefile
  3. +6 −7 iron_worker_ng.gemspec
View
@@ -1,20 +1,22 @@
-Copyright (c) 2012 Andrew Kirilenko
+Copyright (c) 2012 Iron.io, Inc
+All rights reserved.
-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:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
-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.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
@@ -16,12 +16,11 @@ require 'jeweler'
Jeweler::Tasks.new do |gem|
gem.name = "iron_worker_ng"
- gem.homepage = "http://github.com/iced/iron_worker_ruby_ng"
- gem.license = "MIT"
- gem.summary = %Q{IronWorkerNG}
- gem.description = %Q{New generation ruby client for IronWorke}
- gem.email = "andrew.kirilenko@gmail.com"
- gem.authors = ["Andrew Kirilenko"]
+ gem.homepage = "http://www.iron.io"
+ gem.description = %Q{New generation ruby client for IronWorker}
+ gem.summary = %Q{New generation ruby client for IronWorker}
+ gem.email = "info@iron.io"
+ gem.authors = ["Andrew Kirilenko", "Iron.io, Inc"]
gem.files.exclude('.document', 'Gemfile', 'Gemfile.lock', 'Rakefile', 'iron_worker_ng.gemspec', 'sample/**')
end
@@ -8,10 +8,10 @@ Gem::Specification.new do |s|
s.version = "0.1.0"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Andrew Kirilenko"]
- s.date = "2012-02-22"
- s.description = "New generation ruby client for IronWorke"
- s.email = "andrew.kirilenko@gmail.com"
+ s.authors = ["Andrew Kirilenko", "Iron.io, Inc"]
+ s.date = "2012-02-23"
+ s.description = "New generation ruby client for IronWorker"
+ s.email = "info@iron.io"
s.executables = ["iron_worker_ng"]
s.extra_rdoc_files = [
"LICENSE",
@@ -41,11 +41,10 @@ Gem::Specification.new do |s|
"lib/iron_worker_ng/feature/ruby/merge_worker.rb",
"lib/iron_worker_ng/version.rb"
]
- s.homepage = "http://github.com/iced/iron_worker_ruby_ng"
- s.licenses = ["MIT"]
+ s.homepage = "http://www.iron.io"
s.require_paths = ["lib"]
s.rubygems_version = "1.8.15"
- s.summary = "IronWorkerNG"
+ s.summary = "New generation ruby client for IronWorker"
if s.respond_to? :specification_version then
s.specification_version = 3

0 comments on commit 587f383

Please sign in to comment.