config_generator.rb in cream-0.8.9.3

- old
+ new

@@ -1,10 +1,9 @@
 require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
 require 'rails3_artifactor'
-require 'logging_assist'
 require 'generators/cream/helpers/all'
 
 module Roles
   module Generators 
     class ConfigGenerator < Rails::Generators::Base        
@@ -18,16 +17,20 @@
       class_option :roles,              :type => :array,    :default => ['guest', 'admin'], :desc => "Valid roles to use"
 
       class_option :role_class,         :type => :string, :aliases => "-rc",  :default => 'Role',     :desc => "Role class name", :optional => true
       class_option :user_role_class,    :type => :string, :aliases => "-urc", :default => 'UserRole', :desc => "User-Role (join table) class name", :optional => true
 
+      class_option :logging,            :type => :boolean,  :default => false,             :desc => "Logging on?" 
       class_option :logfile,            :type => :string,   :default => nil,                :desc => "Logfile location" 
       class_option :default_roles,      :type => :boolean,  :default => true,               :desc => "Create default roles :admin and :guest"
       class_option :gems,               :type => :boolean,  :default => true,               :desc => "Add gems to gemfile?"       
       
       def configure_roles
-      	logger.add_logfile :logfile => logfile if logfile
+        if logging_on?
+          require 'logging_assist'
+      	  
+    	  end
 
         # make the artifactor model methods behave according to selected orm! - this is a macro
         set_orm      	
 
         roles_gems if gems?
@@ -53,11 +56,12 @@
         add_gem gem_name
         bundle_install #gem_name
       end 
 
       def create_roles
-        rgen "#{roles_generator} #{user_class} --strategy #{strategy} --roles #{roles_list} #{default_roles_option} #{class_options}"        
+        # #{default_roles_option}
+        rgen "#{roles_generator} #{user_class} --strategy #{strategy} --roles #{roles_list} #{class_options}"        
       end
 
       def set_valid_roles_cream
         user_exist_check
 
@@ -104,11 +108,11 @@
 
       def cream_valid_roles_statement
         "valid_roles_are Cream::Role.available"
       end
 
-      def default_roles_option
-        default_roles? ? '--default-roles' : '--no-default-roles'
-      end      
+      # def default_user_types_option
+      #   default_user_types? ? '--default-user-types' : '--no-default-user-types'
+      # end      
     end
   end
 end
\ No newline at end of file