avo-setup 0.0.21 → 0.0.22

data/lib/avo-setup/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/lib/generators/avo/setup_generator.rb

@@ -8,22 +8,26 @@ module Avo
 				if yes?("Would you like to generate a layout?")
 				  generate("avo:layout")
 				end
+				#Devise
 				if yes?("Would you like to install Devise?")
 				  gem("devise")
 				  generate("devise:install")
 				  model_name = ask("What would you like the user model to be called? [user]")
 				  model_name = "user" if model_name.blank?
 				  generate("devise", model_name)
-				end
-				if yes?("Would you like to use CanCan")
-				  gem("cancan")
-			    copy_file "ability.rb", "models/ability.rb"
-					@single=model_name
-					@plural=model_name.pluralize
-					@migname=@plural+"_roles" if @plural <= "roles"
-					@migname="roles_"+@plural if @plural >  "roles"
-					
-					migration_template 'create_roles_migration.rb', "db/migrate/create_roles.rb"
+				
+					#CanCan
+					if yes?("Would you like to use CanCan?")
+					  gem("cancan")
+				    copy_file "ability.rb", "models/ability.rb"
+						@single=model_name
+						@plural=model_name.pluralize
+						@migname=@plural+"_roles" if (@plural.casecmp "roles")>=0
+						@migname="roles_"+@plural if (@plural.casecmp "roles")<0
+
+						migration_template 'create_roles_migration.rb', "db/migrate/create_roles.rb"
+					end
+				
 				end
 		  end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Avocado