cream 0.7.8 → 0.7.10

data/README.markdown

@@ -18,14 +18,18 @@ The objective of this project is to
 * Provide generators that can auto-configure your Rails 3 app with these sub-systems for a given ORM
 
 _UPDATE_: 1. Dec 2010
-Finally all dependency issues have been resolved.
-I have tested the 'full_config' generator in a fresh Rails 3.0.3 app and it seems to be working, at least with ORM = 'mongoid' now. 
-Time to check with the other ORMs as well and make fixes where needed.
+Rhe 'full_config' generator ha snow been tested in a fresh Rails 3.0.3 app and works with the following orms:
+* active_record
+* mongoid
 
-## TODO
+I will shortly go through the other ORMs and create Rails 3 demo apps for each with instructions.
 
-The old Demo app [Cream rails 3 app](http://github.com/kristianmandrup/cream-rails3-app) is out of date and needs to be updated!
-Any help to create a Demo app is greatly appreciated.
+## Rails 3 demo apps with Cream
+
+The following Rails 3 demo apps use Cream 0.7.7 and above and were created Dec 1. 2010
+
+* [Cream app with Active Record](https://github.com/kristianmandrup/cream-app-active_record) 
+* [Cream app with Mongoid](https://github.com/kristianmandrup/cream-app-mongoid) 
 
 ## Status
 
@@ -118,6 +122,10 @@ Role strategies can be set up using the [Roles Generic](http://github.com/kristi
 * Mongoid
 * Couch DB (via SimplyStored)
 
+_Note_: 
+Roles for SimplyStored is "shaky" and works only with the admin_flag strategy. I won't develop more on this particular ORM adapter until requested to do so.
+If you need to use Roles with Couch DB, please help implement this adapter, maybe using another (better?) object-mapping solution for Couch DB.
+
 ### Update
 
 The Role systems all ORMs (except SimplyStored which is in progress) have recently been upgraded to take advantage of a new Roles Generic API and archictecture. 

data/Rakefile

@@ -12,6 +12,8 @@ begin
     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_dependency "require_all",       "~> 1.2.0"
     

data/VERSION

@@ -1 +1 @@
-0.7.8
+0.7.10

data/cream.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.7.8"
+  s.version = "0.7.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -133,6 +133,8 @@ Gem::Specification.new do |s|
       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"])
+      s.add_development_dependency(%q<devise-spec>, [">= 0.1.3"])
+      s.add_development_dependency(%q<roles-spec>, [">= 0.1.3"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<devise-links>, [">= 0.2.0"])
       s.add_runtime_dependency(%q<cancan-rest-links>, [">= 0.2.0"])
@@ -160,6 +162,8 @@ Gem::Specification.new do |s|
       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"])
+      s.add_dependency(%q<devise-spec>, [">= 0.1.3"])
+      s.add_dependency(%q<roles-spec>, [">= 0.1.3"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<devise-links>, [">= 0.2.0"])
       s.add_dependency(%q<cancan-rest-links>, [">= 0.2.0"])
@@ -188,6 +192,8 @@ Gem::Specification.new do |s|
     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"])
+    s.add_dependency(%q<devise-spec>, [">= 0.1.3"])
+    s.add_dependency(%q<roles-spec>, [">= 0.1.3"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<devise-links>, [">= 0.2.0"])
     s.add_dependency(%q<cancan-rest-links>, [">= 0.2.0"])

data/lib/generators/cream/full_config/full_config_generator.rb

@@ -26,11 +26,13 @@ module Cream
 
       class_option :configure,      :type => :array,    :default => [],               :desc => "Which generators to run"
       class_option :gems,           :type => :boolean,  :default => true,             :desc => "Add gems to gemfile?"       
+      class_option :migrations,     :type => :boolean,  :default => false,            :desc => "Autorun database migrations?", :aliases => '-m'
 
       def main_flow             
         cream_initializer
         cream_gems if gems?
-        run_generators      
+        run_generators
+        run_migrations if run_migrations?      
       end
 
       # -----------------      
@@ -41,6 +43,10 @@ module Cream
 
       use_helpers :app, :special, :file
 
+      def run_migrations?
+        options[:migrations]
+      end
+
       def logfile
         options[:logfile]
       end
@@ -59,6 +65,11 @@ module Cream
         run_permits if configures.include? :permits
       end
 
+      def run_migrations
+        return if orm != 'active_record'
+        execute "rake db:migrate"
+      end
+
       def run_app
         rgen "cream:app --orm #{orm}"
       end

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

@@ -64,38 +64,39 @@ module Devise
         rgen 'devise:install'
       end        
 
-      def bundle_install #*gems
-        # run "bundle install #{gems.join(' ')}"
+      def bundle_install
         run "bundle install"
       end
 
+      def gems_mongo_db
+        add_gem 'bson_ext', '1.1.4'
+      end
+            
       def devise_gems 
         say "Configuring devise gems for #{orm}", :green
         add_gem 'devise'
 
-        orm_gem = nil
         # Devise ORM integration        
         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 'bson_ext', '1.1.4'
-          # copy_mongoid_config                    
+          gems_mongo_db
         when :mongo_mapper
-          orm_gem = 'mm-devise'
           add_gem 'mm-devise'
+          gems_mongo_db          
         when :data_mapper
-          orm_gem = 'dm-devise'
           add_gem 'dm-devise'
         when :couch_db
-          orm_gem = 'devise_couch'
           add_gem 'devise_couch'
           say "Please note that Couch DB does not currently have a Roles implementation. Feel free to provide one."
           say "Look at Roles DataMapper (roles_data_mapper) for an example ;)"
         else
           say "Orm #{orm} is not currently supported by Cream. You are most welcome to provide a Cream adapter for that ORM ;)"
         end
-        bundle_install #'devise', orm_gem
+        clean_gemfile
+        
+        bundle_install
         if orm.to_sym == :mongoid
           rgen 'mongoid:config'
           rgen "devise mongoid" 
@@ -160,10 +161,6 @@ module Devise
         end
       end
 
-      # def copy_mongoid_config
-      #   file File.dirname(__FILE__) + '/mongoid.yml', 'config/mongoid.yml'        
-      # end
-
       def gems?
         options[:gems]        
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 8
-  version: 0.7.8
+  - 10
+  version: 0.7.10
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -243,8 +243,38 @@ dependencies:
   prerelease: false
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: require_all
+  name: devise-spec
   requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 3
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: roles-spec
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 3
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: require_all
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -256,10 +286,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id016
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: devise-links
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -271,10 +301,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id017
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: cancan-rest-links
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -286,10 +316,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id018
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: cancan-permits
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -301,10 +331,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *id019
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: devise
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -316,10 +346,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *id020
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: cancan
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -331,10 +361,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *id021
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -346,10 +376,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *id022
+  version_requirements: *id024
 - !ruby/object:Gem::Dependency 
   name: rails3_artifactor
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -361,10 +391,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *id023
+  version_requirements: *id025
 - !ruby/object:Gem::Dependency 
   name: logging_assist
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -376,10 +406,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *id024
+  version_requirements: *id026
 - !ruby/object:Gem::Dependency 
   name: r3_plugin_toolbox
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  requirement: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -391,10 +421,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *id025
+  version_requirements: *id027
 - !ruby/object:Gem::Dependency 
   name: sugar-high
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  requirement: &id028 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -406,7 +436,7 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *id026
+  version_requirements: *id028
 description: Provides assistance for setting up Session, Role and Permission systems for a Rails 3 app. Support for multiple ORMs
 email: kmandrup@gmail.com
 executables: []