padrino-gen 0.1.3 → 0.1.4

data/README.rdoc

@@ -7,14 +7,14 @@ To install the 'full-stack' padrino framework, simply grab the latest version fr
   $ sudo gem install padrino --source http://gemcutter.org
   
 This will install the necessary padrino gems to get you started.
-Now you are ready to use this gem to enhance your sinatra projects or to create new Padrino applications.
+Now you are ready to use this gem to enhance your existing Sinatra projects or build new Padrino applications.
   
 == Overview
 
-Padrino comes preloaded with flexible code generators for Sinatra powered in part by the excellent 
-Thor gem (incidentally also used in the Rails 3 generators). These generators are intended to allow for easy code 
-generation both in creating new applications and building on existing ones. The generators have been built to be as 
-library-agnostic as possible, supporting a myriad of test frameworks, js libraries, mocking libraries, etc. 
+Padrino comes preloaded with flexible code generators powered in part by the excellent Thor gem
+(incidentally also used in the Rails 3 generators). These generators are intended to allow for easy code generation
+both in creating new applications and building on existing ones. The generators have been built to be as library agnostic
+as possible, supporting a myriad of test frameworks, js libraries, mocking libraries, etc.
 
 See the wiki article for additional information: <...WIKI...>
 
@@ -52,6 +52,10 @@ There is also support for aliases for each component within the command:
 
   $ padrino-gen demo_app . -t=rspec -r=haml -m=rr -s=jquery -d=datamapper
   
+You can also instruct the generator to skip a certain component to avoid using one at all (or to use your own):
+
+  $ padrino-gen demo_app . --test=none --renderer=none
+  
 The available components and their default options are listed below:
 
 * test:     <tt>bacon</tt>  (default), <tt>shoulda</tt>, <tt>rspec</tt>, <tt>testspec</tt>, <tt>riot</tt>
@@ -70,8 +74,8 @@ If not executed manually, the bundling will be performed automatically the first
 Note that this command only has to be performed when the application is first generated or when the Gemfile is modified.
  
 The generator framework within padrino is extensible and additional components and tools can be added easily.
-This would be achieved through forking our project and reading through the code in <tt>/generators/sinatra_generator.rb</tt> and
-the setup instructions inside the relevant files within <tt>/generators/components/</tt>. We are happy to accept pull requests
+This would be achieved through forking our project and reading through the code in <tt>lib/generators/skeleton.rb</tt> and
+the setup instructions inside the relevant files within <tt>lib/generators/components/</tt>. We are happy to accept pull requests
 for additional component types not originally included (although helping us maintain them would also be appreciated).
 
 === Model Generator ===

data/Rakefile

@@ -8,14 +8,15 @@ begin
     gem.summary = "Generators for easily creating and building padrino applications"
     gem.description = "Generators for easily creating and building padrino applications from the console"
     gem.email = "nesquena@gmail.com"
-    gem.homepage = "http://github.com/padrino/padrino-gen"
+    gem.homepage = "http://github.com/padrino/padrino-framework/tree/master/padrino-gen"
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
+    gem.executables = ["padrino-gen"]
     gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
     gem.add_runtime_dependency     "padrino-core",  ">= 0.1.1"
     gem.add_runtime_dependency     "thor",          ">= 0.11.8"
-    gem.add_runtime_dependency     "bundler"
+    gem.add_runtime_dependency     "bundler",       ">= 0.5.0"
     gem.add_development_dependency "haml",          ">= 2.2.1"
-    gem.add_development_dependency "shoulda", ">= 0"
+    gem.add_development_dependency "shoulda",       ">= 0"
     gem.add_development_dependency "mocha",         ">= 0.9.7"
     gem.add_development_dependency "rack-test",     ">= 0.5.0"
     gem.add_development_dependency "webrat",        ">= 0.5.1"

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bin/padrino-gen

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-%w[rubygems activesupport thor].each { |gem| require gem }
+%w[rubygems thor].each { |gem| require gem }
 require File.dirname(__FILE__) + "/../lib/padrino-gen"
 
-generator_mappings = ActiveSupport::OrderedHash.new
+generator_mappings = SupportLite::OrderedHash.new
 generator_mappings[:app]        = Padrino::Generators::Skeleton
 generator_mappings[:model]      = Padrino::Generators::Model
 generator_mappings[:controller] = Padrino::Generators::Controller

data/lib/generators/actions.rb

@@ -97,7 +97,7 @@ module Padrino
         def component_option(name, caption, options = {})
           (@component_types ||= []) << name # TODO use ordered hash and combine with choices below
           (@available_choices ||= Hash.new({}))[name] = options[:choices]
-          description = "The #{caption} component (#{options[:choices].join(', ')})"
+          description = "The #{caption} component (#{options[:choices].join(', ')}, none)"
           class_option name, :default => options[:choices].first, :aliases => options[:aliases], :desc => description
         end
 

data/lib/generators/components/actions.rb

@@ -2,6 +2,12 @@ module Padrino
   module Generators
     module Components
       module Actions
+        BASE_TEST_HELPER = (<<-TEST).gsub(/^ {8}/, '')
+        RACK_ENV = 'test' unless defined?(RACK_ENV)
+        require File.dirname(__FILE__) + "/../config/boot"
+        Bundler.require_env(:testing)
+        TEST
+
         # Adds all the specified gems into the Gemfile for bundler
         # require_dependencies 'activerecord'
         # require_dependencies 'mocha', 'bacon', :env => :testing
@@ -25,8 +31,9 @@ module Padrino
         # insert_test_suite_setup('...CLASS_NAME...')
         # => inject_into_file("test/test_config.rb", TEST.gsub(/CLASS_NAME/, @class_name), :after => "set :environment, :test\n")
         def insert_test_suite_setup(suite_text, options={})
-          options.reverse_merge!(:path => "test/test_config.rb", :after => /Test configuration\n/)
-          inject_into_file(options[:path], suite_text.gsub(/CLASS_NAME/, @class_name), :after => options[:after])
+          test_helper_text = [BASE_TEST_HELPER, suite_text.gsub(/CLASS_NAME/, @class_name)].join("\n")
+          options.reverse_merge!(:path => "test/test_config.rb")
+          create_file(options[:path], test_helper_text)
         end
 
         # Injects the mock library include into the test class in test_config for setting up mock gen
@@ -34,6 +41,7 @@ module Padrino
         # => inject_into_file("test/test_config.rb", "  include Mocha::API\n", :after => /class.*?\n/)
         def insert_mocking_include(library_name, options={})
           options.reverse_merge!(:indent => 2, :after => /class.*?\n/, :path => "test/test_config.rb")
+          return unless File.exist?(File.join(self.destination_root, options[:path]))
           include_text = indent_spaces(options[:indent]) + "include #{library_name}\n"
           inject_into_file(options[:path], include_text, :after => options[:after])
         end

data/lib/generators/components/orms/activerecord_gen.rb

@@ -52,6 +52,7 @@ module Padrino
             require_dependencies 'activerecord'
             create_file("config/database.rb", AR)
             create_file("Rakefile", RAKE)
+            empty_directory('app/models')
           end
 
           AR_MODEL = (<<-MODEL).gsub(/^ {10}/, '')

data/lib/generators/components/orms/couchrest_gen.rb

@@ -19,6 +19,7 @@ module Padrino
           def setup_orm
             require_dependencies 'couchrest'
             create_file("config/database.rb", COUCHREST)
+            empty_directory('app/models')
           end
 
           CR_MODEL = (<<-MODEL).gsub(/^ {10}/, '')

data/lib/generators/components/orms/datamapper_gen.rb

@@ -4,13 +4,14 @@ module Padrino
       module Orms
 
         module DatamapperGen
-
           DM = (<<-DM).gsub(/^ {10}/, '')
           module DatabaseSetup
             def self.registered(app)
               app.configure(:development) { DataMapper.setup(:default, 'your_dev_db_here') }
               app.configure(:production)  { DataMapper.setup(:default, 'your_production_db_here') }
               app.configure(:test)        { DataMapper.setup(:default, 'your_test_db_here') }
+            rescue ArgumentError => e
+              puts "Database options need to be configured within 'config/database.rb'!" if app.logging?
             end
           end
           DM
@@ -18,6 +19,7 @@ module Padrino
           def setup_orm
             require_dependencies 'dm-core', 'dm-validations'
             create_file("config/database.rb", DM)
+            empty_directory('app/models')
           end
 
           DM_MODEL = (<<-MODEL).gsub(/^ {10}/, '')

data/lib/generators/components/orms/mongomapper_gen.rb

@@ -28,23 +28,10 @@ module Padrino
           end
           MONGO
 
-          CONCERNED = (<<-CONCERN).gsub(/^ {10}/, '')
-          module MongoMapper
-            module Document
-              module ClassMethods
-                # TODO find a cleaner way for it to know where to look for dependencies
-                def concerned_with(*concerns)
-                  concerns.each { |concern| require_dependency "./app/models/\#{name.underscore}/\#{concern}" }
-                end
-              end
-            end
-          end
-          CONCERN
-
           def setup_orm
             require_dependencies 'mongo_mapper'
             create_file("config/database.rb", MONGO)
-            create_file("lib/ext/mongo_mapper.rb", CONCERNED)
+            empty_directory('app/models')
           end
 
           MM_MODEL = (<<-MODEL).gsub(/^ {10}/, '')

data/lib/generators/components/orms/sequel_gen.rb

@@ -19,6 +19,7 @@ module Padrino
           def setup_orm
             require_dependencies 'sequel'
             create_file("config/database.rb", SEQUEL)
+            empty_directory('app/models')
           end
 
           SQ_MODEL = (<<-MODEL).gsub(/^ {10}/, '')
@@ -40,7 +41,6 @@ module Padrino
               create_table :!TABLE! do
                 primary_key :id
                 # <type> <name>
-                text :username, :unique => true, :null => false
                 !FIELDS!
               end
             end

data/lib/generators/components/renderers/haml_gen.rb

@@ -2,15 +2,29 @@ module Padrino
   module Generators
     module Components
       module Renderers
-        
+
         module HamlGen
 
+          SASS_INIT = (<<-SASS).gsub(/^ {10}/, '')
+          # Enables support for SASS template reloading for rack.
+          # See http://nex-3.com/posts/88-sass-supports-rack for more details.
+
+          module SassInitializer
+            def self.registered(app)
+              require 'sass/plugin/rack'
+              app.use Sass::Plugin::Rack
+            end
+          end
+          SASS
+
           def setup_renderer
             require_dependencies 'haml'
+            create_file 'config/initializers/sass.rb', SASS_INIT
+            empty_directory 'public/stylesheets/sass'
           end
         end
-        
+
       end
     end
   end
-end
+end

data/lib/generators/components/scripts/jquery_gen.rb

@@ -6,6 +6,7 @@ module Padrino
         module JqueryGen
           def setup_script
             get("http://jqueryjs.googlecode.com/files/jquery-1.3.2.min.js", "public/javascripts/jquery.min.js")
+            create_file('public/javascripts/application.js')
           end
         end
         

data/lib/generators/components/scripts/prototype_gen.rb

@@ -7,6 +7,7 @@ module Padrino
           def setup_script
             get("http://prototypejs.org/assets/2009/8/31/prototype.js", "public/javascripts/prototype.js")
             get('http://github.com/nesquena/lowpro/raw/master/dist/lowpro.js', "public/javascripts/lowpro.js")
+            create_file('public/javascripts/application.js')
           end
         end
         

data/lib/generators/components/scripts/rightjs_gen.rb

@@ -6,6 +6,7 @@ module Padrino
         module RightjsGen
           def setup_script
             get("http://rightjs.org/builds/current/right-min.js", "public/javascripts/right-min.js")
+            create_file('public/javascripts/application.js')
           end
         end
         

data/lib/generators/model.rb

@@ -22,7 +22,6 @@ module Padrino
       # Copies over the base sinatra starting project
       def create_model
         if in_app_root?(options[:root])
-          say "Name: #{name}, Fields: #{fields.inspect}"
           include_component_module_for(:orm, options[:root])
           include_component_module_for(:test, options[:root])
           migration_name = "create_#{name.pluralize.underscore}"

data/lib/generators/skeleton.rb

@@ -25,7 +25,7 @@ module Padrino
       component_option :script,   "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs]
       component_option :renderer, "template engine",    :aliases => '-r', :choices => [:erb, :haml]
 
-      # Copies over the base sinatra starting project
+      # Copies over the Padrino base application skeleton
       def setup_skeleton
         self.destination_root = File.join(path, name)
         @class_name = name.classify

data/lib/generators/skeleton/.gitignore

@@ -1,7 +1,6 @@
 .DS_Store
 log/**/*
 tmp/**/*
-vendor/gems/gems
-vendor/gems/specifications
-vendor/gems/doc
-vendor/gems/environment.rb
+bin/*
+vendor/gems/*
+!vendor/gems/cache/

data/lib/generators/skeleton/config/apps.rb.tt

@@ -7,9 +7,14 @@ You can mount additional applications using any of these below:
    Padrino.mount("blog", :app_class => "BlogApp").to('/blog')
    Padrino.mount("blog", :app_file =>  "/path/to/blog/app.rb").to('/blog')
     
-Note that mounted apps by default should be placed into 'apps/app_name'
+Note that mounted apps by default should be placed into 'apps/app_name'.
+
+By default, this file simply mounts the core app which was generated with this project.
+However, the mounted core can be modified as needed:
+
+  Padrino.mount_core(:app_file => "/path/to/file", :app_class => "Blog")
 
 =end
 
 # Mounts the core application for this project
-Padrino.mount_core(:app_class => "<%= @class_name %>")
+Padrino.mount_core("<%= @class_name %>")

data/lib/generators/templates/controller.rb.tt

@@ -1,4 +1,4 @@
-# Define your named routes inside config/urls.rb
+# Define your named routes inside config/urls.rb or define them inline
 # You can also use unnamed routes by defining them directly
 
 <%= @app_name %>.controllers do
@@ -6,6 +6,10 @@
   #   session[:foo] = "bar"
   #   haml_template 'index'
   # end
+  
+  # get :sample, :map => "/sample/url" do
+  #   "Hello world!"
+  # end
 
   # get "/example" do
   #   "Hello world!"

data/lib/padrino-gen.rb

@@ -1,3 +1,4 @@
+require 'padrino-core/support_lite'
 Dir[File.dirname(__FILE__) + "/generators/{components}/**/*.rb"].each { |lib| require lib }
 require File.dirname(__FILE__) + "/generators/actions.rb"
 Dir[File.dirname(__FILE__) + "/generators/{skeleton,mailer,controller,model}.rb"].each { |lib| require lib }

data/padrino-gen.gemspec

@@ -5,26 +5,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   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-11-20}
+  s.date = %q{2009-11-23}
   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}
   s.executables = ["padrino-gen"]
   s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
      "README.rdoc",
-     "README.rdoc",
-     "Rakefile",
      "Rakefile",
      "VERSION",
      "bin/padrino-gen",
@@ -57,7 +54,6 @@ Gem::Specification.new do |s|
      "lib/generators/skeleton/app/app.rb.tt",
      "lib/generators/skeleton/app/controllers/.empty_directory",
      "lib/generators/skeleton/app/helpers/.empty_directory",
-     "lib/generators/skeleton/app/models/.empty_directory",
      "lib/generators/skeleton/app/views/.empty_directory",
      "lib/generators/skeleton/config.ru",
      "lib/generators/skeleton/config/apps.rb.tt",
@@ -69,16 +65,13 @@ Gem::Specification.new do |s|
      "lib/generators/skeleton/public/images/.empty_directory",
      "lib/generators/skeleton/public/javascripts/.empty_directory",
      "lib/generators/skeleton/public/stylesheets/.empty_directory",
-     "lib/generators/skeleton/test/test_config.rb.tt",
      "lib/generators/skeleton/tmp/.emptydirectory",
-     "lib/generators/skeleton/vendor/gems/.empty_directory",
      "lib/generators/templates/controller.rb.tt",
      "lib/generators/templates/helper.rb.tt",
      "lib/generators/templates/mailer.rb.tt",
      "lib/generators/templates/mailer_initializer.rb.tt",
      "lib/padrino-gen.rb",
      "padrino-gen.gemspec",
-     "test/active_support_helpers.rb",
      "test/helper.rb",
      "test/test_controller_generator.rb",
      "test/test_mailer_generator.rb",
@@ -86,7 +79,7 @@ Gem::Specification.new do |s|
      "test/test_model_generator.rb",
      "test/test_skeleton_generator.rb"
   ]
-  s.homepage = %q{http://github.com/padrino/padrino-gen}
+  s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-gen}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
@@ -100,7 +93,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
       s.add_runtime_dependency(%q<padrino-core>, [">= 0.1.1"])
       s.add_runtime_dependency(%q<thor>, [">= 0.11.8"])
-      s.add_runtime_dependency(%q<bundler>, [">= 0"])
+      s.add_runtime_dependency(%q<bundler>, [">= 0.5.0"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -110,7 +103,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
       s.add_dependency(%q<padrino-core>, [">= 0.1.1"])
       s.add_dependency(%q<thor>, [">= 0.11.8"])
-      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0.5.0"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -121,7 +114,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
     s.add_dependency(%q<padrino-core>, [">= 0.1.1"])
     s.add_dependency(%q<thor>, [">= 0.11.8"])
-    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0.5.0"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/helper.rb

@@ -7,14 +7,9 @@ require 'webrat'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'active_support_helpers'
-require 'padrino-helpers'
 require 'padrino-gen'
 
 class Test::Unit::TestCase
-  include Padrino::Helpers::OutputHelpers
-  include Padrino::Helpers::TagHelpers
-  include Padrino::Helpers::AssetTagHelpers
   include Rack::Test::Methods
   include Webrat::Methods
   include Webrat::Matchers
@@ -47,7 +42,26 @@ class Test::Unit::TestCase
     raise "Please specify a block!" if html.blank?
     assert matcher.matches?(html), matcher.failure_message
   end
+  
+  # assert_file_exists('/tmp/app')
+  def assert_file_exists(file_path)
+    assert File.exist?(file_path), "File at path '#{file_path}' does not exist!"
+  end
+  alias assert_dir_exists assert_file_exists
+  
+  # assert_no_file_exists('/tmp/app')
+  def assert_no_file_exists(file_path)
+    assert !File.exist?(file_path), "File should not exist at path '#{file_path}' but was found!"
+  end
+  alias assert_no_dir_exists assert_no_file_exists
 
+  # Asserts that a file matches the pattern
+  def assert_match_in_file(pattern, file)
+    File.exist?(file) ? assert_match(pattern, File.read(file)) : assert_file_exists(file)
+  end
+end
+
+class Object
   # Silences the output by redirecting to stringIO
   # silence_logger { ...commands... } => "...output..."
   def silence_logger(&block)
@@ -57,12 +71,6 @@ class Test::Unit::TestCase
     $stdout = orig_stdout
     log_buffer.rewind && log_buffer.read
   end
-
-  # Asserts that a file matches the pattern
-  def assert_match_in_file(pattern, file)
-    assert File.exist?(file), "File '#{file}' does not exist!"
-    assert_match pattern, File.read(file)
-  end
 end
 
 module Webrat

data/test/test_controller_generator.rb

@@ -12,7 +12,7 @@ class TestControllerGenerator < Test::Unit::TestCase
     should "fail outside app root" do
       output = silence_logger { @contgen.start(['demo', '-r=/tmp']) }
       assert_match(/not at the root/, output)
-      assert !File.exist?('/tmp/app/controllers/demo.rb')
+      assert_no_file_exists('/tmp/app/controllers/demo.rb')
     end
 
     should "generate controller within existing application" do
@@ -20,7 +20,7 @@ class TestControllerGenerator < Test::Unit::TestCase
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
       assert_match_in_file(/SampleApp.controllers do/m, '/tmp/sample_app/app/controllers/demo_items.rb')
       assert_match_in_file(/SampleApp.helpers do/m, '/tmp/sample_app/app/helpers/demo_items_helper.rb')
-      assert File.exist?('/tmp/sample_app/app/views/demo_items')
+      assert_file_exists('/tmp/sample_app/app/views/demo_items')
     end
 
     should "generate controller test for bacon" do

data/test/test_mailer_generator.rb

@@ -12,7 +12,7 @@ class TestMailerGenerator < Test::Unit::TestCase
     should "fail outside app root" do
       output = silence_logger { @mailgen.start(['demo', '-r=/tmp']) }
       assert_match(/not at the root/, output)
-      assert !File.exist?('/tmp/app/mailers/demo_mailer.rb')
+      assert_no_file_exists('/tmp/app/mailers/demo_mailer.rb')
     end
 
     should "support generating a new mailer extended from base" do
@@ -20,7 +20,7 @@ class TestMailerGenerator < Test::Unit::TestCase
       silence_logger { @mailgen.start(['demo', '-r=/tmp/sample_app']) }
       assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_app/app/mailers/demo_mailer.rb')
       assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_app/config/initializers/mailer.rb')
-      assert File.exist?('/tmp/sample_app/app/views/demo_mailer')
+      assert_file_exists('/tmp/sample_app/app/views/demo_mailer')
     end
 
     should "support generating a new mailer extended from base with long name" do
@@ -28,7 +28,7 @@ class TestMailerGenerator < Test::Unit::TestCase
       silence_logger { @mailgen.start(['user_notice', '-r=/tmp/sample_app']) }
       assert_match_in_file(/class UserNoticeMailer/m, '/tmp/sample_app/app/mailers/user_notice_mailer.rb')
       assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_app/config/initializers/mailer.rb')
-      assert File.exist?('/tmp/sample_app/app/views/user_notice_mailer')
+      assert_file_exists('/tmp/sample_app/app/views/user_notice_mailer')
     end
 
     should "support generating a new mailer extended from base with capitalized name" do
@@ -36,7 +36,7 @@ class TestMailerGenerator < Test::Unit::TestCase
       silence_logger { @mailgen.start(['DEMO', '-r=/tmp/sample_app']) }
       assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_app/app/mailers/demo_mailer.rb')
       assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_app/config/initializers/mailer.rb')
-      assert File.exist?('/tmp/sample_app/app/views/demo_mailer')
+      assert_file_exists('/tmp/sample_app/app/views/demo_mailer')
     end
   end
 

data/test/test_model_generator.rb

@@ -12,7 +12,7 @@ class TestModelGenerator < Test::Unit::TestCase
     should "fail outside app root" do
       output = silence_logger { @model_gen.start(['user', '-r=/tmp']) }
       assert_match(/not at the root/, output)
-      assert !File.exist?('/tmp/app/models/user.rb')
+      assert_no_file_exists('/tmp/app/models/user.rb')
     end
 
     should "generate only generate model once" do

data/test/test_skeleton_generator.rb

@@ -10,15 +10,24 @@ class TestSkeletonGenerator < Test::Unit::TestCase
   context 'the skeleton generator' do
     should "allow simple generator to run and create base_app with no options" do
       assert_nothing_raised { silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none']) } }
-      assert File.exist?('/tmp/sample_app')
-      assert File.exist?('/tmp/sample_app/app')
-      assert File.exist?('/tmp/sample_app/config/boot.rb')
-      assert File.exist?('/tmp/sample_app/test/test_config.rb')
+      assert_file_exists('/tmp/sample_app')
+      assert_file_exists('/tmp/sample_app/app')
+      assert_file_exists('/tmp/sample_app/config/boot.rb')
+      assert_dir_exists('/tmp/sample_app/app/models')
+      assert_file_exists('/tmp/sample_app/test/test_config.rb')
+    end
+    should "not create models folder if no orm is chosen" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '--orm=none']) }
+      assert_no_dir_exists('/tmp/sample_app/app/models')
+    end
+    should "not create tests folder if no test framework is chosen" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '--test=none']) }
+      assert_no_dir_exists('/tmp/sample_app/test')
     end
     should "place app specific names into correct files" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none']) }
       assert_match_in_file(/class SampleApp < Padrino::Application/m, '/tmp/sample_app/app/app.rb')
-      assert_match_in_file(/Padrino.mount_core\(:app_class => "SampleApp"\)/m, '/tmp/sample_app/config/apps.rb')
+      assert_match_in_file(/Padrino.mount_core\("SampleApp"\)/m, '/tmp/sample_app/config/apps.rb')
       assert_match_in_file(/SampleApp.urls do/m, '/tmp/sample_app/config/urls.rb')
     end
     should "create components file containing options chosen with defaults" do
@@ -81,6 +90,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       assert_match /Applying.*?sequel.*?orm/, buffer
       assert_match_in_file(/gem 'sequel'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/Sequel.connect/, '/tmp/sample_app/config/database.rb')
+      assert_dir_exists('/tmp/sample_app/app/models')
     end
 
     should "properly generate for activerecord" do
@@ -89,6 +99,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'activerecord'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/Migrate the database/, '/tmp/sample_app/Rakefile')
       assert_match_in_file(/ActiveRecord::Base.establish_connection/, '/tmp/sample_app/config/database.rb')
+      assert_dir_exists('/tmp/sample_app/app/models')
     end
 
     should "properly generate default for datamapper" do
@@ -96,6 +107,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       assert_match /Applying.*?datamapper.*?orm/, buffer
       assert_match_in_file(/gem 'dm-core'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/DataMapper.setup/, '/tmp/sample_app/config/database.rb')
+      assert_dir_exists('/tmp/sample_app/app/models')
     end
 
     should "properly generate for mongomapper" do
@@ -103,6 +115,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       assert_match /Applying.*?mongomapper.*?orm/, buffer
       assert_match_in_file(/gem 'mongo_mapper'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/MongoMapper.database/, '/tmp/sample_app/config/database.rb')
+      assert_dir_exists('/tmp/sample_app/app/models')
     end
 
     should "properly generate for couchrest" do
@@ -110,6 +123,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       assert_match /Applying.*?couchrest.*?orm/, buffer
       assert_match_in_file(/gem 'couchrest'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/CouchRest.database!/, '/tmp/sample_app/config/database.rb')
+      assert_dir_exists('/tmp/sample_app/app/models')
     end
   end
 
@@ -124,6 +138,8 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--renderer=haml','--script=none']) }
       assert_match /Applying.*?haml.*?renderer/, buffer
       assert_match_in_file(/gem 'haml'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/module SassInitializer.*Sass::Plugin::Rack/m, '/tmp/sample_app/config/initializers/sass.rb')
+      assert_file_exists('/tmp/sample_app/public/stylesheets/sass')
     end
   end
 
@@ -131,20 +147,23 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     should "properly generate for jquery" do
       buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=jquery']) }
       assert_match /Applying.*?jquery.*?script/, buffer
-      assert File.exist?('/tmp/sample_app/public/javascripts/jquery.min.js')
+      assert_file_exists('/tmp/sample_app/public/javascripts/jquery.min.js')
+      assert_file_exists('/tmp/sample_app/public/javascripts/application.js')
     end
 
     should "properly generate for prototype" do
       buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=prototype']) }
       assert_match /Applying.*?prototype.*?script/, buffer
-      assert File.exist?('/tmp/sample_app/public/javascripts/prototype.js')
-      assert File.exist?('/tmp/sample_app/public/javascripts/lowpro.js')
+      assert_file_exists('/tmp/sample_app/public/javascripts/prototype.js')
+      assert_file_exists('/tmp/sample_app/public/javascripts/lowpro.js')
+      assert_file_exists('/tmp/sample_app/public/javascripts/application.js')
     end
 
     should "properly generate for rightjs" do
       buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=rightjs']) }
       assert_match /Applying.*?rightjs.*?script/, buffer
-      assert File.exist?('/tmp/sample_app/public/javascripts/right-min.js')
+      assert_file_exists('/tmp/sample_app/public/javascripts/right-min.js')
+      assert_file_exists('/tmp/sample_app/public/javascripts/application.js')
     end
   end
 
@@ -153,6 +172,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--test=bacon', '--script=none']) }
       assert_match /Applying.*?bacon.*?test/, buffer
       assert_match_in_file(/gem 'bacon'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/Bundler.require_env\(:testing\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Bacon::Context/, '/tmp/sample_app/test/test_config.rb')
     end
 
@@ -160,6 +180,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--test=riot', '--script=none']) }
       assert_match /Applying.*?riot.*?test/, buffer
       assert_match_in_file(/gem 'riot'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/Bundler.require_env\(:testing\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Riot::Situation/, '/tmp/sample_app/test/test_config.rb')
     end
 
@@ -167,6 +188,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--test=rspec', '--script=none']) }
       assert_match /Applying.*?rspec.*?test/, buffer
       assert_match_in_file(/gem 'spec'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/Bundler.require_env\(:testing\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Spec::Runner/, '/tmp/sample_app/test/test_config.rb')
     end
 
@@ -174,6 +196,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--test=shoulda', '--script=none']) }
       assert_match /Applying.*?shoulda.*?test/, buffer
       assert_match_in_file(/gem 'shoulda'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/Bundler.require_env\(:testing\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Test::Unit::TestCase/, '/tmp/sample_app/test/test_config.rb')
     end
 
@@ -181,6 +204,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--test=testspec', '--script=none']) }
       assert_match /Applying.*?testspec.*?test/, buffer
       assert_match_in_file(/gem 'test\/spec'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/Bundler.require_env\(:testing\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Test::Unit::TestCase/, '/tmp/sample_app/test/test_config.rb')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 -08:00
+date: 2009-11-23 00:00:00 -08:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -112,7 +112,6 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
 files: 
 - .document
@@ -151,7 +150,6 @@ files:
 - lib/generators/skeleton/app/app.rb.tt
 - lib/generators/skeleton/app/controllers/.empty_directory
 - lib/generators/skeleton/app/helpers/.empty_directory
-- lib/generators/skeleton/app/models/.empty_directory
 - lib/generators/skeleton/app/views/.empty_directory
 - lib/generators/skeleton/config.ru
 - lib/generators/skeleton/config/apps.rb.tt
@@ -163,16 +161,13 @@ files:
 - lib/generators/skeleton/public/images/.empty_directory
 - lib/generators/skeleton/public/javascripts/.empty_directory
 - lib/generators/skeleton/public/stylesheets/.empty_directory
-- lib/generators/skeleton/test/test_config.rb.tt
 - lib/generators/skeleton/tmp/.emptydirectory
-- lib/generators/skeleton/vendor/gems/.empty_directory
 - lib/generators/templates/controller.rb.tt
 - lib/generators/templates/helper.rb.tt
 - lib/generators/templates/mailer.rb.tt
 - lib/generators/templates/mailer_initializer.rb.tt
 - lib/padrino-gen.rb
 - padrino-gen.gemspec
-- test/active_support_helpers.rb
 - test/helper.rb
 - test/test_controller_generator.rb
 - test/test_mailer_generator.rb
@@ -180,7 +175,7 @@ files:
 - test/test_model_generator.rb
 - test/test_skeleton_generator.rb
 has_rdoc: true
-homepage: http://github.com/padrino/padrino-gen
+homepage: http://github.com/padrino/padrino-framework/tree/master/padrino-gen
 licenses: []
 
 post_install_message: 

data/lib/generators/skeleton/test/test_config.rb.tt

@@ -1,5 +0,0 @@
-RACK_ENV = 'test' unless defined?(RACK_ENV)
-require File.dirname(__FILE__) + "/../config/boot"
-Bundler.require_env(:testing)
-
-# Test configuration

data/test/active_support_helpers.rb

@@ -1,7 +0,0 @@
-unless Fixnum.method_defined?(:days)
-  require 'active_support/core_ext/object/misc'
-  require 'active_support/core_ext/date'
-  require 'active_support/core_ext/time'
-  require 'active_support/core_ext/numeric'
-  require 'active_support/duration'
-end