padrino-gen 0.2.9 → 0.4.5

data/README.rdoc

@@ -105,6 +105,12 @@ Usually the model file will generate files similar to the following:
   
 You can define as many models as you would like in a Padrino application using this generator.
 
+You can destroy models that you created via the destroy option and setting it to true. default is false.
+  
+  $ padrino-gen model User -d
+  
+This remove all created model files.
+
 === Migration Generator ===
 
 Padrino provides generator for quickly generating new migrations to change or manipulate the database schema.
@@ -127,6 +133,12 @@ You can also specify desired columns to be added to the migration file:
 The migration generator will then construct the migration file according to your ORM component chosen
 within <tt>db/migrate/xxx_add_fields_to_users.rb</tt> including the columns specified in the command.
 
+You can destroy migrations that you created via the destroy option and setting it to true. default is false.
+  
+  $ padrino-gen migration AddFieldsToUsers -d
+  
+This removes the migration file.
+
 === Controller Generator ===
 
 Padrino provides generator support for quickly creating new controllers within your Padrino application. Note that
@@ -151,6 +163,12 @@ test framework chosen during app generation. A default route will also be genera
   $ padrino-gen controller User get:index
   
   will create a url route for :index mapping to "/user/index"
+  
+You can destroy controllers that you created via the destroy option and setting it to true. default is false.
+
+    $ padrino-gen controller User -d
+
+This removes all created controller files.
 
 === Mailer Generator ===
 
@@ -168,6 +186,12 @@ You can also specify desired delivery actions to be added to the mailer:
   
 The mailer generator will then construct the mailer file within <tt>app/mailers/user_notifier.rb</tt>
 
+You can destroy mailer that you created via the destroy option and setting it to true. default is false.
+  
+  $ padrino-gen mailer UserNotifer -d
+  
+This remove all created mailer files.
+
 == Copyright
 
 Copyright (c) 2009 Padrino. See LICENSE for details.

data/Rakefile

@@ -30,7 +30,7 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.4.5

data/lib/padrino-gen/generators/app/app/app.rb.tt

@@ -4,7 +4,9 @@ class <%= @class_name %> < Padrino::Application
     # set :sessions, false     # Enabled by default
     # set :log_to_file, true   # Log to file instead of stdout (default is stdout in development)
     # set :reload, false       # Reload application files (default in development)
+    # set :locale, :it         # Set the current locale (default is :en)
     # disable :padrino_helpers # Disables padrino markup helpers (enabled by default)
     # disable :flash           # Disables rack-flash (enabled by default)
+    # enable :auto_locale      # Enable auto localization inspecting "/:locale/your/path" or browser languages
   end
 end

data/lib/padrino-gen/generators/base.rb

@@ -15,8 +15,6 @@ module Padrino
       def load_boot
         if in_app_root?(options[:root])
           require(options[:root] ? File.join(options[:root], 'config/boot.rb') : 'config/boot.rb')
-        else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
         end
       end
     end

data/lib/padrino-gen/generators/components/actions.rb

@@ -39,11 +39,10 @@ module Padrino
           contents = options[:base].dup.gsub(/\s{4}!UP!\n/m, options[:up]).gsub(/!DOWN!\n/m, options[:down])
           contents = contents.gsub(/!NAME!/, model_name.camelize).gsub(/!TABLE!/, model_name.underscore)
           contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.camelize)
-          current_migration_number = Dir[app_root_path('db/migrate/*.rb')].map { |f| 
-            File.basename(f).match(/^(\d+)/)[0].to_i }.max.to_i || 0
+          current_migration_number = return_last_migration_number
           contents = contents.gsub(/!FIELDS!/, column_declarations).gsub(/!VERSION!/, (current_migration_number + 1).to_s)
           migration_filename = "#{format("%03d", current_migration_number+1)}_#{filename.underscore}.rb"
-          create_file(app_root_path('db/migrate/', migration_filename), contents)
+          create_file(app_root_path('db/migrate/', migration_filename), contents, :skip => true)
         end
 
         # For orm database components
@@ -64,14 +63,36 @@ module Padrino
           contents = options[:base].dup.gsub(/\s{4}!UP!\n/m,   (direction == 'add' ? forward_text.to_s : back_text.to_s))
           contents.gsub!(/\s{4}!DOWN!\n/m, (direction == 'add' ? back_text.to_s : forward_text.to_s))
           contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.camelize)
-          current_migration_number = Dir[app_root_path('db/migrate/*.rb')].map { |f| 
-            File.basename(f).match(/^(\d+)/)[0].to_i }.max.to_i || 0
-         contents.gsub!(/!VERSION!/, (current_migration_number + 1).to_s)
+          current_migration_number = return_last_migration_number
+          contents.gsub!(/!VERSION!/, (current_migration_number + 1).to_s)
           migration_filename = "#{format("%03d", current_migration_number+1)}_#{filename.underscore}.rb"
           # migration_filename = "#{Time.now.strftime("%Y%m%d%H%M%S")}_#{filename.underscore}.rb"
           create_file(app_root_path('db/migrate/', migration_filename), contents)
         end
 
+        # For migration files
+        # returns the number of the latest(most current) migration file
+        def return_last_migration_number
+          Dir[app_root_path('db/migrate/*.rb')].map do |f|
+            File.basename(f).match(/^(\d+)/)[0].to_i
+          end.max.to_i || 0
+        end
+
+        #For model destroy option
+        #removes the initial migration file of model
+        def remove_model_migration(name)
+          remove_migration "Create" + name
+        end
+        
+        #For the removal of migration files
+        # removes the migration file based on the migration name
+        def remove_migration(name)
+          migration_path =  Dir[app_root_path('db/migrate/*.rb')].select do |f| 
+            File.basename(f).match(/#{name.to_s.underscore}/)
+          end.first
+          remove_file migration_path
+        end
+
         # For testing components
         # Injects the test class text into the test_config file for setting up the test gen
         # insert_test_suite_setup('...CLASS_NAME...')
@@ -98,26 +119,26 @@ module Padrino
         def indent_spaces(count)
           ' ' * count
         end
-        
+
         # For Controller action generation
         # Takes in fields for routes in the form of get:index post:test delete:yada and such
         def controller_actions(fields)
           field_tuples = fields.collect { |value| value.split(":") }
-          action_declarations = field_tuples.collect do |request, name| 
+          action_declarations = field_tuples.collect do |request, name|
             "#{request} :#{name} do\n  end\n"
-            end.join("\n  ")
+          end.join("\n  ")
         end
-        
+
         # For controller route generation
         # Takes in the fields and maps out an appropriate default route.
         # where controller is user and route is get:test, will add map(:test).to("/user/test")
         def controller_routes(name,fields)
           field_tuples = fields.collect { |value| value.split(":") }
-          routes = "\n" + field_tuples.collect do |request, route| 
+          routes = "\n" + field_tuples.collect do |request, route|
             "  map(:#{route}).to(\"/#{name}/#{route}\")"
-            end.join("\n") + "\n"
+          end.join("\n") + "\n"
         end
-        
+
       end
     end
   end

data/lib/padrino-gen/generators/components/orms/activerecord_gen.rb

@@ -65,9 +65,8 @@ module Padrino
 
           def create_model_file(name, fields)
             model_path = app_root_path('app/models/', "#{name.to_s.underscore}.rb")
-            return false if File.exist?(model_path)
             model_contents = AR_MODEL.gsub(/!NAME!/, name.to_s.downcase.camelize)
-            create_file(model_path, model_contents)
+            create_file(model_path, model_contents,:skip => true)
           end
 
           AR_MIGRATION = (<<-MIGRATION).gsub(/^ {10}/, '')

data/lib/padrino-gen/generators/components/tests/bacon_test_gen.rb

@@ -34,7 +34,7 @@ module Padrino
           # Generates a controller test given the controllers name
           def generate_controller_test(name, root)
             bacon_contents = BACON_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file File.join(root, "test/controllers/#{name}_controller_test.rb"), bacon_contents
+            create_file app_root_path("test/controllers/","#{name}_controller_test.rb"), bacon_contents, :skip => true
           end
 
           BACON_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
@@ -50,7 +50,7 @@ module Padrino
 
           def generate_model_test(name)
             bacon_contents = BACON_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), bacon_contents
+            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), bacon_contents, :skip => true
           end
 
         end

data/lib/padrino-gen/generators/components/tests/riot_test_gen.rb

@@ -33,7 +33,7 @@ module Padrino
           # Generates a controller test given the controllers name
           def generate_controller_test(name, root)
             riot_contents = RIOT_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file File.join(root, "test/controllers/#{name}_controller_test.rb"), riot_contents
+            create_file File.join(root, "test/controllers/#{name}_controller_test.rb"), riot_contents, :skip => true
           end
 
           RIOT_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
@@ -49,7 +49,7 @@ module Padrino
 
           def generate_model_test(name)
             riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), riot_contents
+            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), riot_contents, :skip => true
           end
 
         end

data/lib/padrino-gen/generators/components/tests/rspec_test_gen.rb

@@ -35,7 +35,7 @@ module Padrino
           # Generates a controller test given the controllers name
           def generate_controller_test(name, root)
             rspec_contents = RSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file File.join(root, "test/controllers/#{name}_controller_spec.rb"), rspec_contents
+            create_file File.join(root, "test/controllers/#{name}_controller_spec.rb"), rspec_contents, :skip => true
           end
 
           RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
@@ -51,7 +51,7 @@ module Padrino
 
           def generate_model_test(name)
             rspec_contents = RSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}_spec.rb"), rspec_contents
+            create_file app_root_path("test/models/#{name.to_s.downcase}_spec.rb"), rspec_contents, :skip => true
           end
 
         end

data/lib/padrino-gen/generators/components/tests/shoulda_test_gen.rb

@@ -38,7 +38,7 @@ module Padrino
           # Generates a controller test given the controllers name
           def generate_controller_test(name, root)
             shoulda_contents = SHOULDA_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file File.join(root, "test/controllers/#{name}_controller_test.rb"), shoulda_contents
+            create_file File.join(root, "test/controllers/#{name}_controller_test.rb"), shoulda_contents, :skip => true
           end
 
           SHOULDA_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
@@ -56,7 +56,7 @@ module Padrino
 
           def generate_model_test(name)
             shoulda_contents = SHOULDA_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), shoulda_contents
+            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), shoulda_contents, :skip => true
           end
 
         end

data/lib/padrino-gen/generators/components/tests/testspec_test_gen.rb

@@ -33,7 +33,7 @@ module Padrino
           # Generates a controller test given the controllers name
           def generate_controller_test(name, root)
             testspec_contents = TESTSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file File.join(root, "test/controllers/#{name}_controller_test.rb"), testspec_contents
+            create_file File.join(root, "test/controllers/#{name}_controller_test.rb"), testspec_contents, :skip => true
           end
 
           TESTSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
@@ -49,7 +49,7 @@ module Padrino
 
           def generate_model_test(name)
             tests_contents = TESTSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), tests_contents
+            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), tests_contents, :skip => true
           end
 
         end

data/lib/padrino-gen/generators/controller.rb

@@ -22,12 +22,14 @@ module Padrino
       argument :name, :desc => "The name of your padrino controller"
       argument :fields, :desc => "The fields for the controller", :type => :array, :default => []
       class_option :root, :aliases => '-r', :default => nil, :type => :string
+      class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Copies over the base sinatra starting project
       def create_controller
         if in_app_root?(options[:root])
           @app_name = fetch_app_name(options[:root])
           @actions = controller_actions(fields)
+          self.behavior = :revoke if options[:destroy]
           inject_into_file app_root_path("config/urls.rb"), controller_routes(name,fields), :after => "urls do\n"
           template "templates/controller.rb.tt", app_root_path("app/controllers", "#{name}.rb")
           template "templates/helper.rb.tt",     app_root_path("app/helpers", "#{name}_helper.rb")

data/lib/padrino-gen/generators/mailer.rb

@@ -21,10 +21,12 @@ module Padrino
 
       argument :name, :desc => "The name of your padrino mailer"
       class_option :root, :aliases => '-r', :default => nil, :type => :string
+      class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Copies over the base sinatra starting project
       def create_mailer
         if in_app_root?(options[:root])
+          self.behavior = :revoke if options[:destroy]
           simple_name = name.to_s.gsub(/mailer/i, '')
           @mailer_basename = "#{simple_name.downcase.underscore}_mailer"
           @mailer_klass    = "#{simple_name.downcase.camelize}Mailer"

data/lib/padrino-gen/generators/migration.rb

@@ -22,11 +22,14 @@ module Padrino
       argument :name, :desc => "The name of your padrino migration"
       argument :columns, :desc => "The columns for the migration", :type => :array, :default => []
       class_option :root, :aliases => '-r', :default => nil, :type => :string
+      class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Copies over the base sinatra starting project
       def create_model
         if in_app_root?(options[:root])
+          remove_migration(name) if options[:destroy]
           include_component_module_for(:orm, options[:root])
+          self.behavior = :revoke if options[:destroy]
           create_migration_file(name, name, columns)
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?

data/lib/padrino-gen/generators/model.rb

@@ -22,22 +22,23 @@ module Padrino
       argument :name, :desc => "The name of your padrino model"
       argument :fields, :desc => "The fields for the model", :type => :array, :default => []
       class_option :root, :aliases => '-r', :default => nil, :type => :string
+      class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Copies over the base sinatra starting project
       def create_model
         if in_app_root?(options[:root])
+          remove_model_migration(name) if options[:destroy]
+          self.behavior = :revoke if options[:destroy]
           include_component_module_for(:orm, options[:root])
           include_component_module_for(:test, options[:root])
           migration_name = "create_#{name.pluralize.underscore}"
-          model_success = create_model_file(name, fields)
-          generate_model_test(name) if model_success
-          model_success ? create_model_migration(migration_name, name, fields) : 
-                          say("'#{name}' model has already been generated!")
+          create_model_file(name, fields)
+          generate_model_test(name)
+          create_model_migration(migration_name, name, fields)
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
         end
       end
     end
-
   end
-end
+end

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.2.9"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2009-12-22}
+  s.date = %q{2010-01-06}
   s.default_executable = %q{padrino-gen}
   s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{nesquena@gmail.com}
@@ -34,6 +34,9 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/app/app/app.rb.tt",
      "lib/padrino-gen/generators/app/app/controllers/.empty_directory",
      "lib/padrino-gen/generators/app/app/helpers/.empty_directory",
+     "lib/padrino-gen/generators/app/app/public/images/.empty_directory",
+     "lib/padrino-gen/generators/app/app/public/javascripts/.empty_directory",
+     "lib/padrino-gen/generators/app/app/public/stylesheets/.empty_directory",
      "lib/padrino-gen/generators/app/app/views/.empty_directory",
      "lib/padrino-gen/generators/app/config.ru",
      "lib/padrino-gen/generators/app/config/apps.rb.tt",
@@ -42,9 +45,6 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/app/config/initializers/example.rb",
      "lib/padrino-gen/generators/app/config/urls.rb.tt",
      "lib/padrino-gen/generators/app/lib/.empty_directory",
-     "lib/padrino-gen/generators/app/public/images/.empty_directory",
-     "lib/padrino-gen/generators/app/public/javascripts/.empty_directory",
-     "lib/padrino-gen/generators/app/public/stylesheets/.empty_directory",
      "lib/padrino-gen/generators/app/tmp/.empty_directory",
      "lib/padrino-gen/generators/base.rb",
      "lib/padrino-gen/generators/components/actions.rb",

data/test/helper.rb

@@ -59,6 +59,11 @@ class Test::Unit::TestCase
   def assert_match_in_file(pattern, file)
     File.exist?(file) ? assert_match(pattern, File.read(file)) : assert_file_exists(file)
   end
+  
+  def assert_no_match_in_file(pattern, file)
+    File.exists?(file) ? !assert_match(pattern, File.read(file)) : assert_file_exists(file)
+  end
+  
 end
 
 class Object

data/test/test_controller_generator.rb

@@ -57,22 +57,54 @@ class TestControllerGenerator < Test::Unit::TestCase
       expected_pattern = /class DemoItemsControllerTest < Test::Unit::TestCase/m
       assert_match_in_file(expected_pattern, @controller_test_path)
     end
-    
+
     # Controller action generation
-        
+
     should "generate actions for get:test post:yada" do
       silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=shoulda'])}
       silence_logger { @contgen.start(['demo_items', "get:test","post:yada",'-r=/tmp/sample_app']) }
       assert_match_in_file(/get :test do\n  end\n/m,@controller_path)
       assert_match_in_file(/post :yada do\n  end\n/m,@controller_path)
     end
-        
+
     should "generate url routes for get:yoda post:yada" do
       silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=shoulda'])}
       silence_logger { @contgen.start(['demo_items', "get:yoda","post:yada",'-r=/tmp/sample_app']) }
       assert_match_in_file(/map\(\:yoda\).to\(\"\/demo_items\/yoda\"\)/m,@route_path)
-      assert_match_in_file(/map\(\:yada\).to\(\"\/demo_items\/yada\"\)/m,@route_path)      
+      assert_match_in_file(/map\(\:yada\).to\(\"\/demo_items\/yada\"\)/m,@route_path)
+    end
+
+  end
+
+  context "the controller destroy option" do
+
+    should "destroy controller files" do
+      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon'])}
+      silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app']) }
+      silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app','-d'])}
+      assert_no_file_exists(@controller_path)
+      assert_no_file_exists(@controller_test_path)
+      assert_no_file_exists('/tmp/sample_app/app/helpers/demo_items_helper.rb')
+    end
+
+    should "destroy controller files with rspec" do
+      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=rspec'])}
+      silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app']) }
+      silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app','-d'])}
+      assert_no_file_exists(@controller_path)
+      assert_no_file_exists('/tmp/sample_app/app/helpers/demo_items_helper.rb')
+      assert_no_file_exists('/tmp/sample_app/test/controllers/demo_items_controller_spec.rb')
     end
     
+    should "remove url routes" do
+      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon'])}
+      silence_logger { @contgen.start(['demo_items', "get:yoda","post:yada",'-r=/tmp/sample_app']) }
+      silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app','-d'])}
+      assert_no_match_in_file(/map\(\:yoda\).to\(\"\/demo_items\/yoda\"\)/m,@route_path)
+      assert_no_match_in_file(/map\(\:yada\).to\(\"\/demo_items\/yada\"\)/m,@route_path)
+    end
+
   end
+
+
 end

data/test/test_mailer_generator.rb

@@ -41,4 +41,16 @@ class TestMailerGenerator < Test::Unit::TestCase
     end
   end
 
+  context "the mailer destroy option" do
+    
+    should "destroy mailer file" do
+      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @mailgen.start(['demo', '-r=/tmp/sample_app']) }
+      silence_logger { @mailgen.start(['demo', '-r=/tmp/sample_app','-d']) }
+      assert_no_dir_exists('/tmp/sample_app/app/views/demo_mailer')
+      assert_no_file_exists('/tmp/sample_app/app/mailers/demo_mailer.rb')
+      assert_no_file_exists('/tmp/sample_app/config/initializers/mailer.rb')
+    end
+  end
+
 end

data/test/test_migration_generator.rb

@@ -164,4 +164,27 @@ class TestMigrationGenerator < Test::Unit::TestCase
       assert_match_in_file(/add_column :age, Integer/m, migration_file_path)
     end
   end
+  
+  context "the migration destroy option" do
+    
+    should "destroy the migration files" do
+      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
+      silence_logger { @mig_gen.start(migration_params) }
+      silence_logger { @mig_gen.start(['RemoveEmailFromUsers', '-r=/tmp/sample_app','-d']) }
+      assert_no_file_exists("/tmp/sample_app/db/migrate/001_remove_email_from_users.rb")
+    end
+    
+    should "destroy the migration file regardless of number" do
+      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
+      migration_param2 = ['AddEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
+      silence_logger { @mig_gen.start(migration_param2) }
+      silence_logger { @mig_gen.start(migration_params) }
+      silence_logger { @mig_gen.start(['RemoveEmailFromUsers', '-r=/tmp/sample_app','-d']) }
+      assert_no_file_exists("/tmp/sample_app/db/migrate/002_remove_email_from_users.rb")
+    end
+    
+  end
+  
 end

data/test/test_model_generator.rb

@@ -21,7 +21,9 @@ class TestModelGenerator < Test::Unit::TestCase
       response_success = silence_logger { @model_gen.start(['user', '-r=/tmp/sample_app']) }
       response_duplicate = silence_logger { @model_gen.start(['user', '-r=/tmp/sample_app']) }
       assert_match_in_file(/class User < ActiveRecord::Base/m, '/tmp/sample_app/app/models/user.rb')
-      assert_match /'user' model has already been generated!/, response_duplicate
+      # assert_match /'user' model has already been generated!/, response_duplicate
+      assert_match "identical\e[0m  mp/sample_app/app/models/user.rb", response_duplicate
+      assert_match "identical\e[0m  mp/sample_app/test/models/user_test.rb", response_duplicate
     end
 
     should "generate migration file versions properly" do
@@ -218,5 +220,33 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_match_in_file(/@user\.should\.not\.be\.nil/m, '/tmp/sample_app/test/models/user_test.rb')
     end
   end
+  
+  context "the model destroy option" do
+    
+    should "destroy the model file" do
+      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app', '-d']) }
+      assert_no_file_exists('/tmp/sample_app/app/models/user.rb')
+      assert_no_file_exists('/tmp/sample_app/test/models/user_test.rb')
+      assert_no_file_exists('/tmp/sample_app/db/migrate/001_create_users.rb')
+    end
+    
+    should "destroy the model test file with rspec" do
+      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=rspec', '-d=activerecord']) }
+      silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app', '-d']) }
+      assert_no_file_exists('/tmp/sample_app/test/models/user_spec.rb')
+    end
+    
+    should "destroy the model migration" do
+      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=rspec', '-d=activerecord']) }
+      silence_logger { @model_gen.start(['Person', '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app', '-d']) }
+      assert_no_file_exists('/tmp/sample_app/db/migrate/002_create_users.rb')
+    end
+        
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.4.5
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 -08:00
+date: 2010-01-06 00:00:00 +01:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -140,6 +140,9 @@ files:
 - lib/padrino-gen/generators/app/app/app.rb.tt
 - lib/padrino-gen/generators/app/app/controllers/.empty_directory
 - lib/padrino-gen/generators/app/app/helpers/.empty_directory
+- lib/padrino-gen/generators/app/app/public/images/.empty_directory
+- lib/padrino-gen/generators/app/app/public/javascripts/.empty_directory
+- lib/padrino-gen/generators/app/app/public/stylesheets/.empty_directory
 - lib/padrino-gen/generators/app/app/views/.empty_directory
 - lib/padrino-gen/generators/app/config.ru
 - lib/padrino-gen/generators/app/config/apps.rb.tt
@@ -148,9 +151,6 @@ files:
 - lib/padrino-gen/generators/app/config/initializers/example.rb
 - lib/padrino-gen/generators/app/config/urls.rb.tt
 - lib/padrino-gen/generators/app/lib/.empty_directory
-- lib/padrino-gen/generators/app/public/images/.empty_directory
-- lib/padrino-gen/generators/app/public/javascripts/.empty_directory
-- lib/padrino-gen/generators/app/public/stylesheets/.empty_directory
 - lib/padrino-gen/generators/app/tmp/.empty_directory
 - lib/padrino-gen/generators/base.rb
 - lib/padrino-gen/generators/components/actions.rb