cream 0.6.3 → 0.6.4

data/Gemfile

@@ -20,7 +20,7 @@ group :default do
 end
 
 group :test do
-  gem "rspec",             "~> 2.0.0.beta.22" 
+  gem "rspec",             ">= 2.0.0.rc" 
   gem "generator-spec",    "~> 0.6.5" 
   gem "rspec-action_view", "~> 0.3.1"     
   gem "rails-app-spec",    "~> 0.2.14"

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.homepage = "http://github.com/kristianmandrup/devise-assistant"
     gem.authors = ["Kristian Mandrup"]
 
-    gem.add_development_dependency "rspec",             "~> 2.0.0.beta.22" 
+    gem.add_development_dependency "rspec",             ">= 2.0.0.rc" 
     gem.add_development_dependency "generator-spec",    "~> 0.6.5" 
     gem.add_development_dependency "rspec-action_view", "~> 0.3.1"     
     gem.add_development_dependency "rails-app-spec",    "~> 0.2.14"

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/cream.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-10-05}
+  s.date = %q{2010-10-07}
   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 = [
@@ -75,6 +75,7 @@ Gem::Specification.new do |s|
      "spec/cream/view/host_area_spec.rb",
      "spec/cream/view/role_area_spec.rb",
      "spec/generator_spec_helper.rb",
+     "spec/generators/cream/config/CONFIG_GENERATOR_SPEC.markdown",
      "spec/generators/cream/config/devise/existing_devise_users.rb",
      "spec/generators/cream/config/empty_app/default_args_spec.rb",
      "spec/generators/cream/config/permits/existing_permits_spec.rb",
@@ -125,7 +126,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.rc"])
       s.add_development_dependency(%q<generator-spec>, ["~> 0.6.5"])
       s.add_development_dependency(%q<rspec-action_view>, ["~> 0.3.1"])
       s.add_development_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
@@ -141,7 +142,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<r3_plugin_toolbox>, ["~> 0.3.6"])
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
       s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
       s.add_dependency(%q<rspec-action_view>, ["~> 0.3.1"])
       s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
@@ -158,7 +159,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
     s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
     s.add_dependency(%q<rspec-action_view>, ["~> 0.3.1"])
     s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])

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

@@ -37,13 +37,21 @@ module Cream::Generators
 
     class_option :logfile,            :type => :string,   :default => nil,              :desc => "Logfile location"
 
+    class_option :app_config,         :type => :boolean,  :default => true,             :desc => "Make Rails app ready for Cream"
+    class_option :cream_config,       :type => :boolean,  :default => true,             :desc => "Configure app with Cream"
+    class_option :devise_config,      :type => :boolean,  :default => true,             :desc => "Configure app with Devise"
+    class_option :devise_user_config, :type => :boolean,  :default => true,             :desc => "Configure app with Devise Users"
+    class_option :cancan_config,      :type => :boolean,  :default => true,             :desc => "Configure app with CanCan"
+    class_option :permits_config,     :type => :boolean,  :default => true,             :desc => "Configure app with Permits"
+    class_option :roles_config,       :type => :boolean,  :default => true,             :desc => "Configure app with Roles"    
+
     def main_flow 
       configure_logger
       configure_gems       
 
       MODULES.each do |name|
         method = "configure_#{name}"
-        send method if respond_to?(method)
+        send method if respond_to?(method) && options[:"#{name}_config"]
       end
     end
 
@@ -70,7 +78,7 @@ module Cream::Generators
     def configure_gems
       MODULES.each do |name|
         method = "#{name}_gems"
-        send method if respond_to?(method)
+        send method if respond_to?(method) && options[:"#{name}_config"]
       end
       run "bundle install"
     end

data/lib/generators/cream/config/modules/roles_config.rb

@@ -9,7 +9,7 @@ module Cream::Generators
 
       def roles_gems
         gem "roles_#{orm}"
-      end
+      end 
 
       def create_roles
         rgen "#{roles_generator} --strategy #{strategy} --roles #{roles} #{default_roles}"        

data/spec/generators/cream/config/CONFIG_GENERATOR_SPEC.markdown

@@ -0,0 +1,15 @@
+# Cream Config Generator spec Design Notes
+
+The Cream Config generator is very complex and is designed various Session, Permission and Roles aspects encapsulated by Cream.
+
+## Modular architecture
+
+In order to achieve this, a modular Generator approach is used. Each module has responsibility to set up a particular aspect of Cream.
+When running the generator, this modular architecture can be leveraged, so that specific parts of the generation process can be run and not others.
+
+## Specs
+
+This also makes it easier to test the functionality of the generator, as a single module can be tested in isolation or in combination with one or more other modules.
+
+  
+ 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 +02:00
+date: 2010-10-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,15 +23,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        - rc
+        version: 2.0.0.rc
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -312,6 +311,7 @@ files:
 - spec/cream/view/host_area_spec.rb
 - spec/cream/view/role_area_spec.rb
 - spec/generator_spec_helper.rb
+- spec/generators/cream/config/CONFIG_GENERATOR_SPEC.markdown
 - spec/generators/cream/config/devise/existing_devise_users.rb
 - spec/generators/cream/config/empty_app/default_args_spec.rb
 - spec/generators/cream/config/permits/existing_permits_spec.rb