cream 0.7.10 → 0.8.0

data/Gemfile

@@ -16,7 +16,7 @@ group :default do
   gem 'logging_assist',    "~> 0.1.6"
 
   gem "r3_plugin_toolbox", ">= 0.4.0" 
-  gem "sugar-high",        "~> 0.3.0"      
+  gem "sugar-high",        "~> 0.3.1"      
 end
 
 group :test do    

data/README.markdown

@@ -30,6 +30,7 @@ The following Rails 3 demo apps use Cream 0.7.7 and above and were created Dec 1
 
 * [Cream app with Active Record](https://github.com/kristianmandrup/cream-app-active_record) 
 * [Cream app with Mongoid](https://github.com/kristianmandrup/cream-app-mongoid) 
+* [Cream app with Mongo Mapper](https://github.com/kristianmandrup/cream-app-mongo_mapper) 
 
 ## Status
 

data/Rakefile

@@ -8,12 +8,12 @@ begin
     gem.homepage = "http://github.com/kristianmandrup/devise-assistant"
     gem.authors = ["Kristian Mandrup"]
 
-    gem.add_development_dependency "rspec",             ">= 2.0.0" 
+    gem.add_development_dependency "rspec",             ">= 2.0.1" 
     gem.add_development_dependency "generator-spec",    ">= 0.7.0" 
     gem.add_development_dependency "rspec-action_view", ">= 0.3.1"     
     gem.add_development_dependency "rails-app-spec",    ">= 0.3.0"
     gem.add_development_dependency "devise-spec",       ">= 0.1.3"    
-    gem.add_development_dependency "roles-spec",       ">= 0.1.3"    
+    gem.add_development_dependency "roles-spec",        ">= 0.1.3"    
 
     gem.add_dependency "require_all",       "~> 1.2.0"
     
@@ -29,7 +29,7 @@ begin
     gem.add_dependency 'logging_assist',    "~> 0.1.6"
 
     gem.add_dependency "r3_plugin_toolbox", ">= 0.4.0" 
-    gem.add_dependency "sugar-high",        "~> 0.3.0"
+    gem.add_dependency "sugar-high",        "~> 0.3.1"
            
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     

data/VERSION

@@ -1 +1 @@
-0.7.10
+0.8.0

data/cream.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.7.10"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-12-01}
+  s.date = %q{2010-12-02}
   s.description = %q{Provides assistance for setting up Session, Role and Permission systems for a Rails 3 app. Support for multiple ORMs}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -128,8 +128,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
       s.add_runtime_dependency(%q<logging_assist>, ["~> 0.1.6"])
       s.add_runtime_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.1"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.1"])
       s.add_development_dependency(%q<generator-spec>, [">= 0.7.0"])
       s.add_development_dependency(%q<rspec-action_view>, [">= 0.3.1"])
       s.add_development_dependency(%q<rails-app-spec>, [">= 0.3.0"])
@@ -145,7 +145,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
       s.add_runtime_dependency(%q<logging_assist>, ["~> 0.1.6"])
       s.add_runtime_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.1"])
     else
       s.add_dependency(%q<devise-links>, ["~> 0.2.0"])
       s.add_dependency(%q<cancan-rest-links>, [">= 0.2.0"])
@@ -157,8 +157,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
       s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
       s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.3.1"])
+      s.add_dependency(%q<rspec>, [">= 2.0.1"])
       s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
       s.add_dependency(%q<rspec-action_view>, [">= 0.3.1"])
       s.add_dependency(%q<rails-app-spec>, [">= 0.3.0"])
@@ -174,7 +174,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
       s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
       s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.3.1"])
     end
   else
     s.add_dependency(%q<devise-links>, ["~> 0.2.0"])
@@ -187,8 +187,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
     s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
     s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.3.1"])
+    s.add_dependency(%q<rspec>, [">= 2.0.1"])
     s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
     s.add_dependency(%q<rspec-action_view>, [">= 0.3.1"])
     s.add_dependency(%q<rails-app-spec>, [">= 0.3.0"])
@@ -204,7 +204,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
     s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
     s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.3.1"])
   end
 end
 

data/lib/generators/devise/config/config_generator.rb

@@ -69,7 +69,7 @@ module Devise
       end
 
       def gems_mongo_db
-        add_gem 'bson_ext', '1.1.4'
+        add_gem 'bson_ext', '>= 1.1.4'
       end
             
       def devise_gems 
@@ -80,7 +80,7 @@ module Devise
         case orm.to_sym
         when :mongoid
           say "Please configure Devise for Mongoid similar to Rails 3 example app: http://github.com/fortuity/rails3-mongoid-devise"
-          add_gem 'mongoid', '2.0.0.beta.19'
+          add_gem 'mongoid', '>= 2.0.0'
           gems_mongo_db
         when :mongo_mapper
           add_gem 'mm-devise'
@@ -145,14 +145,18 @@ module Devise
       def add_gem_version name, version
         if !has_gem_version?(name, version)
           logger.debug "Adding gem: #{name}, #{version}"
-          gem(name, version) 
+          gem name, :version => version
         else
           logger.debug "gem: #{name}, #{version} already in Gemfile"
         end        
       end
 
       def add_gem name, version = nil
-        add_gem_version(name, version) and return if version
+        if version
+          add_gem_version name, version 
+          return 
+        end
+        
         if !has_gem? name
           logger.debug "Adding gem: #{name}"
           gem name

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 10
-  version: 0.7.10
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +01:00
+date: 2010-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -177,8 +177,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: *id011
@@ -192,8 +192,8 @@ dependencies:
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        - 1
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: *id012
@@ -432,8 +432,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: *id028