Permalink
Browse files

update License

  • Loading branch information...
1 parent c988fe6 commit 87374b31e45c85908ad55abdcc66724e6ae9c22c @jweiss committed Nov 29, 2011
Showing with 23 additions and 25 deletions.
  1. +2 −2 Gemfile
  2. +13 −15 LICENSE.txt
  3. +8 −8 rocking_chair.gemspec
View
@@ -1,8 +1,8 @@
source :rubygems
gem 'uuidtools'
-gem 'simply_stored', '0.7.0rc6', :require => 'simply_stored/couch'
-gem 'couch_potato', '0.5.7.5'
+gem 'simply_stored', '0.7.0rc7', :require => 'simply_stored/couch'
+gem 'couch_potato', '0.6.0.1'
gem 'jeweler'
group :test do
View
@@ -1,15 +1,13 @@
-/*
- * Copyright (c) 2010 Jonathan Weiss <jw@innerewut.de>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
+Copyright 2010-2011 Jonathan Weiss <jw@innerewut.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
View
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = "rocking_chair"
- s.version = "0.4.9"
+ s.version = "0.4.10"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Jonathan Weiss"]
- s.date = "2011-09-12"
+ s.date = "2011-10-13"
s.description = "In-memory CouchDB for Couchrest and SimplyStored. Works for database and document API, by_attribute views, and for SimplyStored generated views"
s.email = "jw@innerewut.de"
s.extra_rdoc_files = [
@@ -39,25 +39,25 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<uuidtools>, [">= 0"])
- s.add_runtime_dependency(%q<simply_stored>, ["= 0.7.0rc6"])
- s.add_runtime_dependency(%q<couch_potato>, ["= 0.5.7.5"])
+ s.add_runtime_dependency(%q<simply_stored>, ["= 0.7.0rc7"])
+ s.add_runtime_dependency(%q<couch_potato>, ["= 0.6.0.1"])
s.add_runtime_dependency(%q<jeweler>, [">= 0"])
s.add_runtime_dependency(%q<simply_stored>, [">= 0.1.12"])
s.add_runtime_dependency(%q<rest-client>, [">= 1.6.1"])
s.add_runtime_dependency(%q<couchrest>, [">= 1.0.1"])
else
s.add_dependency(%q<uuidtools>, [">= 0"])
- s.add_dependency(%q<simply_stored>, ["= 0.7.0rc6"])
- s.add_dependency(%q<couch_potato>, ["= 0.5.7.5"])
+ s.add_dependency(%q<simply_stored>, ["= 0.7.0rc7"])
+ s.add_dependency(%q<couch_potato>, ["= 0.6.0.1"])
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<simply_stored>, [">= 0.1.12"])
s.add_dependency(%q<rest-client>, [">= 1.6.1"])
s.add_dependency(%q<couchrest>, [">= 1.0.1"])
end
else
s.add_dependency(%q<uuidtools>, [">= 0"])
- s.add_dependency(%q<simply_stored>, ["= 0.7.0rc6"])
- s.add_dependency(%q<couch_potato>, ["= 0.5.7.5"])
+ s.add_dependency(%q<simply_stored>, ["= 0.7.0rc7"])
+ s.add_dependency(%q<couch_potato>, ["= 0.6.0.1"])
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<simply_stored>, [">= 0.1.12"])
s.add_dependency(%q<rest-client>, [">= 1.6.1"])

0 comments on commit 87374b3

Please sign in to comment.