padrino-gen 0.1.1 → 0.1.2

data/README.rdoc

@@ -1,6 +1,71 @@
 = padrino-gen
 
-Description goes here.
+== Installation
+
+To install the 'full-stack' padrino framework, simply grab the latest version from gemcutter:
+
+  $ 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.
+  
+== 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. 
+
+The usage for the generator is quite simple:
+
+  $ padrino-gen <the_app_name> </path/to/create/app> --<component-name> <value>
+
+The simplest possible command to generate a base application would be:
+
+  $ padrino-gen demo_app .
+  
+This would construct a Sinatra application DemoApp (which extends from Sinatra::Application) 
+inside the folder 'demo_app' at our current path. Inside the application there would be configuration and 
+setup performed for the default components.
+
+You can also define specific components to be used:
+
+  $ padrino-gen demo_app . --test=rspec --renderer=haml --mock=rr --script=jquery --orm datamapper
+  
+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
+  
+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>
+* renderer: <tt>erb</tt>    (default), <tt>haml</tt>
+* mock:     <tt>mocha</tt>  (default), <tt>rr</tt>
+* script:   <tt>jquery</tt> (default), <tt>prototype</tt>, <tt>rightjs</tt>
+* orm:      <tt>datamapper</tt> (default), <tt>mongomapper</tt>, <tt>activerecord</tt>, <tt>sequel</tt>, <tt>couchrest</tt>
+
+The generator uses the <tt>bundler</tt> gem to resolve any application dependencies when the application is newly created.
+The necessary bundler command can be executed automatically through the generator with
+
+  $ padrino-gen demo_app . --run_bundler # alias -b
+
+or this can be done manually through executing command <tt>gem bundle</tt> in the terminal at the root of the generated application.
+If not executed manually, the bundling will be performed automatically the first time the application attempts to boot.
+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
+for additional component types not originally included (although helping us maintain them would also be appreciated).
+
+We are also planning to add generator actions such as:
+
+* Model generation (working for any of the available orms listed)
+* Routes generation
+* Mailer generation
+* Migrations generation
+
+See the wiki article for additional information: <...WIKI...>
 
 == Copyright
 

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/padrino/padrino-gen"
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
     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_development_dependency "haml",          ">= 2.2.1"

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/padrino-gen

@@ -1,5 +1,17 @@
 #!/usr/bin/env ruby
 %w[rubygems activesupport thor].each { |gem| require gem }
 require File.dirname(__FILE__) + "/../lib/padrino-gen"
+
+generator_mappings = ActiveSupport::OrderedHash.new
+generator_mappings[:app] = Padrino::Generators::Skeleton
+generator_mappings[:controller] = Padrino::Generators::Controller
+
+generator_kind = ARGV.delete_at(0).to_s.downcase.to_sym if ARGV[0].present?
+generator_class = generator_mappings[generator_kind]
 arguments = ARGV.any? ? ARGV : ['-h']
-Padrino::Generators::Skeleton.start(arguments)
+
+if generator_class 
+  generator_class.start(arguments)
+else
+  puts "Please specify generator to use (#{generator_mappings.keys.join(", ")})"
+end

data/lib/generators/actions.rb

@@ -1,5 +1,6 @@
 module Padrino
   module Generators
+    class  AppRootNotFound < RuntimeError; end
     module Actions
 
       def self.included(base)
@@ -14,6 +15,15 @@ module Padrino
         self.class.send(:include, generator_module_for(choice, component))
         send("setup_#{component}") if respond_to?("setup_#{component}")
       end
+      
+      # Includes the component module for the given component and choice
+      # Determines the choice using .components file
+      # include_component_module_for(:mock)
+      # include_component_module_for(:mock, 'rr')
+      def include_component_module_for(component, root=nil, choice=nil)
+        choice = fetch_component_choice(component, root) unless choice
+        self.class.send(:include, generator_module_for(choice, component))
+      end
 
       # Prompts the user if necessary until a valid choice is returned for the component
       # resolve_valid_choice(:mock) => 'rr'
@@ -54,6 +64,24 @@ module Padrino
       def retrieve_component_config(target)
         YAML.load_file(target)
       end
+      
+      # Returns the component choice stored within the .component file of an application
+      # fetch_component_choice(:mock)
+      def fetch_component_choice(component, root=nil)
+        comp_path = root ? File.join(root, '.components') : '.components'
+        retrieve_component_config(comp_path)[component]
+      end
+      
+      # Returns true if inside a Padrino application
+      def in_app_root?(root=nil)
+        root ? File.exist?(File.join(root, 'config/boot.rb')) : File.exist?('config/boot.rb')
+      end
+      
+      # Returns the app_name for the application at root
+      def fetch_app_name(root=nil)
+        app_path = root ? File.join(root, 'app.rb') : 'app.rb'
+        @app_name ||= File.read(app_path).scan(/class\s(.*?)\s</).flatten[0]
+      end
 
       module ClassMethods
         # Defines a class option to allow a component to be chosen and add to component type list

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

@@ -6,7 +6,7 @@ module Padrino
         module ActiverecordGen
           
           AR = (<<-AR).gsub(/^ {10}/, '')
-          module ActiveRecordInitializer
+          module DatabaseSetup
             def self.registered(app)
               app.configure :development do
                 ActiveRecord::Base.establish_connection(
@@ -50,7 +50,7 @@ module Padrino
 
           def setup_orm
             require_dependencies 'activerecord'
-            create_file("config/initializers/active_record.rb", AR)
+            create_file("config/database.rb", AR)
             create_file("Rakefile", RAKE)
           end
         end

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

@@ -6,7 +6,7 @@ module Padrino
         module CouchrestGen
 
           COUCHREST = (<<-COUCHREST).gsub(/^ {10}/, '')
-          module CouchRestInitializer
+          module DatabaseSetup
             def self.registered(app)
               app.configure(:development) { set :couchdb, CouchRest.database!('your_dev_db_here') }
               app.configure(:production)  { set :couchdb, CouchRest.database!('your_production_db_here') }
@@ -18,7 +18,7 @@ module Padrino
 
           def setup_orm
             require_dependencies 'couchrest'
-            create_file("config/initializers/couch_rest.rb", COUCHREST)
+            create_file("config/database.rb", COUCHREST)
           end
         end
         

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

@@ -6,7 +6,7 @@ module Padrino
         module DatamapperGen
 
           DM = (<<-DM).gsub(/^ {10}/, '')
-          module DataMapperInitializer
+          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') }
@@ -17,7 +17,7 @@ module Padrino
 
           def setup_orm
             require_dependencies 'dm-core', 'dm-validations'
-            create_file("config/initializers/data_mapper.rb", DM)
+            create_file("config/database.rb", DM)
           end
         end
         

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

@@ -8,7 +8,7 @@ module Padrino
           MONGO = (<<-MONGO).gsub(/^ {10}/, '')
           class MongoDBConnectionFailure < RuntimeError; end
 
-          module MongoDbInitializer
+          module DatabaseSetup
             def self.registered(app)
               app.configure :development do
                 MongoMapper.connection = Mongo::Connection.new('localhost')
@@ -43,7 +43,7 @@ module Padrino
 
           def setup_orm
             require_dependencies 'mongo_mapper'
-            create_file("config/initializers/mongo_db.rb", MONGO)
+            create_file("config/database.rb", MONGO)
             create_file("lib/ext/mongo_mapper.rb", CONCERNED)
           end
         end

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

@@ -6,7 +6,7 @@ module Padrino
         module SequelGen
 
           SEQUEL = (<<-SEQUEL).gsub(/^ {10}/, '')
-          module SequelInitializer
+          module DatabaseSetup
             def self.registered(app)
               Sequel::Model.plugin(:schema)
               app.configure(:development) { Sequel.connect('your_dev_db_here') }
@@ -18,7 +18,7 @@ module Padrino
 
           def setup_orm
             require_dependencies 'sequel'
-            create_file("config/initializers/sequel.rb", SEQUEL)
+            create_file("config/database.rb", SEQUEL)
           end
         end
 

data/lib/generators/components/tests/bacon_test_gen.rb

@@ -14,10 +14,28 @@ module Padrino
           end
           TEST
 
+          # Setup the testing configuration helper and dependencies
           def setup_test
             require_dependencies 'bacon', :env => :testing
             insert_test_suite_setup BACON_SETUP
           end
+          
+          BACON_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
+          require File.dirname(__FILE__) + '/../test_config.rb'
+
+          describe "!NAME!Controller" do
+            it 'returns text at root' do
+              get '/'
+              last_response.body.should == "some text"
+            end
+          end
+          TEST
+          
+          # 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
+          end
 
         end
         

data/lib/generators/components/tests/riot_test_gen.rb

@@ -2,7 +2,7 @@ module Padrino
   module Generators
     module Components
       module Tests
-        
+
         module RiotGen
           RIOT_SETUP = (<<-TEST).gsub(/^ {10}/, '')
           class Riot::Situation
@@ -19,8 +19,25 @@ module Padrino
             insert_test_suite_setup RIOT_SETUP
           end
 
+          RIOT_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
+          require File.dirname(__FILE__) + '/../test_config.rb'
+
+          context "!NAME!Controller" do
+            context "description here" do
+              setup { get '/' }
+              asserts("the response body") { last_response.body }.equals "Hello World"
+            end
+          end
+          TEST
+
+          # 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
+          end
+
         end
-        
+
       end
     end
   end

data/lib/generators/components/tests/rspec_test_gen.rb

@@ -2,7 +2,7 @@ module Padrino
   module Generators
     module Components
       module Tests
-        
+
         module RspecGen
           RSPEC_SETUP = (<<-TEST).gsub(/^ {10}/, '')
           Spec::Runner.configure do |conf|
@@ -14,11 +14,30 @@ module Padrino
           end
           TEST
 
+          # TODO move to spec directory to follow convention
           def setup_test
             require_dependencies 'spec', :env => :testing
             insert_test_suite_setup RSPEC_SETUP
           end
 
+          RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
+          require File.dirname(__FILE__) + '/../test_config.rb'
+
+          describe "!NAME!Controller" do
+            setup { get('/') }
+            it "returns hello world" do
+              last_response.body.should == "Hello World"
+            end
+          end
+          TEST
+
+          # TODO move to spec directory to follow convention
+          # 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
+          end
+
         end
       end
     end

data/lib/generators/components/tests/shoulda_test_gen.rb

@@ -2,7 +2,7 @@ module Padrino
   module Generators
     module Components
       module Tests
-        
+
         module ShouldaGen
           SHOULDA_SETUP = (<<-TEST).gsub(/^ {10}/, '')
           class Test::Unit::TestCase
@@ -18,8 +18,31 @@ module Padrino
             require_dependencies 'test/unit', 'shoulda', :env => :testing
             insert_test_suite_setup SHOULDA_SETUP
           end
+
+          SHOULDA_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
+          require File.dirname(__FILE__) + '/../test_config.rb'
+
+          class !NAME!ControllerTest < Test::Unit::TestCase
+            context "!NAME!Controller" do
+              setup do
+                get '/'
+              end
+
+              should "return hello world text" do
+                assert_equal "Hello World", last_response.body
+              end
+            end
+          end
+          TEST
+
+          # 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
+          end
+
         end
-        
+
       end
     end
   end

data/lib/generators/components/tests/testspec_test_gen.rb

@@ -15,9 +15,27 @@ module Padrino
           TEST
 
           def setup_test
-            require_dependencies 'test/spec', :path => "test/test_config.rb"
+            require_dependencies 'test/spec', :env => :testing
             insert_test_suite_setup TESTSPEC_SETUP
           end
+
+          TESTSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
+          require File.dirname(__FILE__) + '/../test_config.rb'
+
+          context "!NAME!Controller" do
+            setup { get('/') }
+            specify "returns hello world" do
+              last_response.body.should.equal "Hello World"
+            end
+          end
+          TEST
+
+          # 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
+          end
+
         end
 
       end

data/lib/generators/controller.rb

@@ -0,0 +1,36 @@
+require 'thor'
+
+module Padrino
+  module Generators
+
+    class Controller < Thor::Group
+      # Define the source template root
+      def self.source_root; File.expand_path(File.dirname(__FILE__)); end
+      def self.banner; "padrino-gen controller [name]"; end
+
+      # Include related modules
+      include Thor::Actions
+      include Padrino::Generators::Actions
+      include Padrino::Generators::Components::Actions
+
+      desc "Description:\n\n\tpadrino-gen controller generates a new Padrino controller"
+
+      argument :name, :desc => "The name of your padrino controller"
+      class_option :root, :aliases => '-r', :default => nil, :type => :string
+
+      # Copies over the base sinatra starting project
+      def create_controller
+        if in_app_root?(options[:root])
+          @app_name = fetch_app_name(options[:root])
+          template "templates/controller.rb.tt", File.join(options[:root] || '.', "app/controllers/#{name}.rb")
+          template "templates/helper.rb.tt",     File.join(options[:root] || '.', "app/helpers/#{name}_helper.rb")
+          include_component_module_for(:test, options[:root])
+          generate_controller_test(name, options[:root] || '.')
+        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

data/lib/generators/skeleton.rb

@@ -5,17 +5,17 @@ module Padrino
     class Skeleton < Thor::Group
       # Define the source template root
       def self.source_root; File.dirname(__FILE__); end
-      def self.banner; "padrino-gen [app_name] [path] [options]"; end
+      def self.banner; "padrino-gen project [name] [path] [options]"; end
 
       # Include related modules
       include Thor::Actions
       include Padrino::Generators::Actions
       include Padrino::Generators::Components::Actions
 
-      desc "Description:\n\n\tpadrino-gen generate a Padrino skeleton or application."
+      desc "Description:\n\n\tpadrino-gen project generates a new Padrino project"
 
-      argument :name, :desc => "The name of your sinatra app"
-      argument :path, :desc => "The path to create your app"
+      argument :name, :desc => "The name of your padrino project"
+      argument :path, :desc => "The path to create your padrino project"
       class_option :run_bundler, :aliases => '-b', :default => false, :type => :boolean
 
       # Definitions for the available customizable components
@@ -25,11 +25,11 @@ 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 application
+      # Copies over the base sinatra starting project
       def setup_skeleton
         self.destination_root = File.join(path, name)
         @class_name = name.classify
-        directory("project/", self.destination_root)
+        directory("skeleton/", self.destination_root)
         store_component_config('.components')
       end
 

data/lib/generators/skeleton/app.rb.tt

@@ -0,0 +1,10 @@
+class <%= @class_name %> < Padrino::Application
+  configure do
+    # Application-specific configuration options
+    # 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)
+    # disable :padrino_helpers # Disables padrino markup helpers (enabled by default)
+    # disable :flash           # Disables rack-flash (enabled by default)
+  end
+end

data/lib/generators/{project → skeleton}/config.ru

@@ -1,6 +1,3 @@
 RACK_ENV = ENV["RACK_ENV"] ||= "development" unless defined? RACK_ENV
 require File.dirname(__FILE__) + '/config/boot.rb'
-
-# Mount and run padrino applications
-Padrino.mount("core").to("/")
 run Padrino.application

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

@@ -0,0 +1,15 @@
+=begin
+
+This file mounts each application within the Padrino project to a specific path.
+You can mount additional applications using any of these below:
+
+   Padrino.mount("blog").to('/blog')
+   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'
+
+=end
+
+# Mounts the core application for this project
+Padrino.mount_core(:app_class => "<%= @class_name %>")

data/lib/generators/skeleton/config/boot.rb

@@ -0,0 +1,4 @@
+# AUTOGENERATED FILE -- Don't change this file unless you know what you are doing! 
+PADRINO_ROOT = File.dirname(__FILE__) + '/..' unless defined? PADRINO_ROOT
+require 'padrino'
+Padrino.load!

data/lib/generators/skeleton/config/initializers/example.rb

@@ -0,0 +1,9 @@
+# Initializers can be used to configure information about your padrino app
+# The following format is used because initializers are applied as plugins into the application
+
+module ExampleInitializer
+  def self.registered(app)
+    # Manipulate 'app' here to register components or adjust configuration
+    # app.set :example, "foo"
+  end
+end

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

@@ -0,0 +1,44 @@
+<%= @class_name %>::urls do
+  # map(:index).to("/")
+  # map(:test).to("/test")
+end
+
+=begin
+
+This file contains named routes to be used in the Padrino application. 
+To create named routes simply add them to the urls block below.
+
+You can specify simple routes as:
+
+    map(:index).to("/")
+    map(:test).to("/test")
+  
+Routes can also contain query parameters:
+
+    map(:account).to("/the/accounts/:name/and/:id")
+    
+Routes can also be grouped by a namespaced:
+
+    map :admin do |namespace|
+      namespace.map(:show).to("/admin/:id/show")
+      namespace.map(:destroy).to("/admin/:id/destroy")
+    end
+    
+Routes can then be accessed in controllers and views:
+
+    url_for(:account, :id => 1, :name => 'first')
+    url_for(:admin, :show, :id => 25)
+    
+To define the controller actions for a named route simply refer to the alias symbol:
+
+    # Configure the routes using the named alias
+    get(:account)  { "name: params[:name] - id: params[:id]" }
+    get(:accounts) { "I am the body for the url /the/accounts/index" }
+    # and for namespaced routes
+    namespace :admin do
+      get :show do
+        "admin show for #{params[:id]}"
+      end
+    end
+
+=end

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

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

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

@@ -0,0 +1,7 @@
+# Helper methods defined here can be accessed in any controller or view in the application
+
+<%= @app_name %>::helpers do
+  # def simple_helper_method
+  #  ...
+  # end
+end

data/lib/padrino-gen.rb

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

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   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-17}
+  s.date = %q{2009-11-18}
   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}
@@ -47,19 +47,36 @@ Gem::Specification.new do |s|
      "lib/generators/components/tests/rspec_test_gen.rb",
      "lib/generators/components/tests/shoulda_test_gen.rb",
      "lib/generators/components/tests/testspec_test_gen.rb",
-     "lib/generators/project/.gitignore",
-     "lib/generators/project/Gemfile",
-     "lib/generators/project/apps/.empty_directory",
-     "lib/generators/project/config.ru",
-     "lib/generators/project/config/boot.rb",
-     "lib/generators/project/lib/.empty_directory",
-     "lib/generators/project/test/test_config.rb.tt",
-     "lib/generators/project/tmp/.emptydirectory",
+     "lib/generators/controller.rb",
      "lib/generators/skeleton.rb",
+     "lib/generators/skeleton/.gitignore",
+     "lib/generators/skeleton/Gemfile",
+     "lib/generators/skeleton/app.rb.tt",
+     "lib/generators/skeleton/app/.empty_directory",
+     "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",
+     "lib/generators/skeleton/config/boot.rb",
+     "lib/generators/skeleton/config/initializers/.empty_directory",
+     "lib/generators/skeleton/config/initializers/example.rb",
+     "lib/generators/skeleton/config/urls.rb.tt",
+     "lib/generators/skeleton/lib/.empty_directory",
+     "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/padrino-gen.rb",
      "padrino-gen.gemspec",
      "test/active_support_helpers.rb",
      "test/helper.rb",
+     "test/test_controller_generator.rb",
      "test/test_skeleton_generator.rb"
   ]
   s.homepage = %q{http://github.com/padrino/padrino-gen}
@@ -74,6 +91,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       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_development_dependency(%q<haml>, [">= 2.2.1"])
@@ -83,6 +101,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
       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<haml>, [">= 2.2.1"])
@@ -93,6 +112,7 @@ Gem::Specification.new do |s|
     end
   else
     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<haml>, [">= 2.2.1"])

data/test/test_controller_generator.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/helper'
+require 'thor'
+
+class TestControllerGenerator < Test::Unit::TestCase
+  def setup
+    @skeleton = Padrino::Generators::Skeleton.dup
+    @contgen = Padrino::Generators::Controller.dup
+    `rm -rf /tmp/sample_app`
+  end
+
+  context 'the controller generator' do
+    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')
+    end
+
+    should "generate controller within existing application" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      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')
+    end
+
+    should "generate controller test for bacon" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
+      assert_match_in_file(/describe "DemoItemsController" do/m, '/tmp/sample_app/test/controllers/demo_items_controller_test.rb')
+    end
+
+    should "generate controller test for riot" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=riot']) }
+      silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
+      assert_match_in_file(/context "DemoItemsController" do/m, '/tmp/sample_app/test/controllers/demo_items_controller_test.rb')
+    end
+
+    should "generate controller test for testspec" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=testspec']) }
+      silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
+      assert_match_in_file(/context "DemoItemsController" do/m, '/tmp/sample_app/test/controllers/demo_items_controller_test.rb')
+    end
+
+    should "generate controller test for rspec" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=rspec']) }
+      silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
+      assert_match_in_file(/describe "DemoItemsController" do/m, '/tmp/sample_app/test/controllers/demo_items_controller_spec.rb')
+    end
+
+    should "generate controller test for shoulda" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=shoulda']) }
+      silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
+      expected_pattern = /class DemoItemsControllerTest < Test::Unit::TestCase/m
+      assert_match_in_file(expected_pattern, '/tmp/sample_app/test/controllers/demo_items_controller_test.rb')
+    end
+  end
+end

data/test/test_skeleton_generator.rb

@@ -4,18 +4,25 @@ require 'thor'
 class TestSkeletonGenerator < Test::Unit::TestCase
   def setup
     `rm -rf /tmp/sample_app`
+    @skeleton = Padrino::Generators::Skeleton.dup
   end
 
   context 'the skeleton generator' do
     should "allow simple generator to run and create base_app with no options" do
-      assert_nothing_raised { silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--script=none']) } }
+      assert_nothing_raised { silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none']) } }
       assert File.exist?('/tmp/sample_app')
-      assert File.exist?('/tmp/sample_app/apps')
+      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')
     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.rb')
+      assert_match_in_file(/Padrino.mount_core\(:app_class => "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
-      silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp']) }
+      silence_logger { @skeleton.start(['sample_app', '/tmp']) }
       components_chosen = YAML.load_file('/tmp/sample_app/.components')
       assert_equal 'datamapper', components_chosen[:orm]
       assert_equal 'bacon', components_chosen[:test]
@@ -25,7 +32,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
     should "create components file containing options chosen" do
       component_options = ['--orm=datamapper', '--test=riot', '--mock=mocha', '--script=prototype', '--renderer=erb']
-      silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', *component_options]) }
+      silence_logger { @skeleton.start(['sample_app', '/tmp', *component_options]) }
       components_chosen = YAML.load_file('/tmp/sample_app/.components')
       assert_equal 'datamapper', components_chosen[:orm]
       assert_equal 'riot',  components_chosen[:test]
@@ -35,7 +42,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
     should "output to log components being applied" do
       component_options = ['--orm=datamapper', '--test=riot', '--mock=mocha', '--script=prototype', '--renderer=erb']
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', *component_options]) }
+      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', *component_options]) }
       assert_match /Applying.*?datamapper.*?orm/, buffer
       assert_match /Applying.*?riot.*?test/, buffer
       assert_match /Applying.*?mocha.*?mock/, buffer
@@ -43,7 +50,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       assert_match /Applying.*?erb.*?renderer/, buffer
     end
     should "output gem files for base app" do
-      silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--script=none']) }
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none']) }
       assert_match_in_file(/gem 'sinatra'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/gem 'padrino'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/gem 'rack-flash'/, '/tmp/sample_app/Gemfile')
@@ -53,14 +60,14 @@ class TestSkeletonGenerator < Test::Unit::TestCase
 
   context "a generator for mock component" do
     should "properly generate for rr" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--mock=rr', '--script=none']) }
+      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--mock=rr', '--script=none']) }
       assert_match /Applying.*?rr.*?mock/, buffer
       assert_match_in_file(/gem 'rr'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/include RR::Adapters::RRMethods/m, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate default for mocha" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--mock=mocha', '--script=none']) }
+      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--mock=mocha', '--script=none']) }
       assert_match /Applying.*?mocha.*?mock/, buffer
       assert_match_in_file(/gem 'mocha'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/include Mocha::API/m, '/tmp/sample_app/test/test_config.rb')
@@ -69,53 +76,52 @@ class TestSkeletonGenerator < Test::Unit::TestCase
 
   context "the generator for orm components" do
     should "properly generate for sequel" do
-      Padrino::Generators::Skeleton.instance_eval("undef setup_orm if respond_to?('setup_orm')")
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--orm=sequel', '--script=none']) }
+      @skeleton.instance_eval("undef setup_orm if respond_to?('setup_orm')")
+      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--orm=sequel', '--script=none']) }
       assert_match /Applying.*?sequel.*?orm/, buffer
       assert_match_in_file(/gem 'sequel'/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/SequelInitializer/, '/tmp/sample_app/config/initializers/sequel.rb')
-      # assert_match_in_file(/class User < Sequel::Model/, '/tmp/sample_app/app/models/user.rb')
+      assert_match_in_file(/Sequel.connect/, '/tmp/sample_app/config/database.rb')
     end
 
     should "properly generate for activerecord" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--orm=activerecord', '--script=none']) }
+      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--orm=activerecord', '--script=none']) }
       assert_match /Applying.*?activerecord.*?orm/, buffer
       assert_match_in_file(/gem 'activerecord'/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/ActiveRecordInitializer/, '/tmp/sample_app/config/initializers/active_record.rb')
       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')
     end
 
     should "properly generate default for datamapper" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--orm=datamapper', '--script=none']) }
+      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--orm=datamapper', '--script=none']) }
       assert_match /Applying.*?datamapper.*?orm/, buffer
       assert_match_in_file(/gem 'dm-core'/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/DataMapperInitializer/, '/tmp/sample_app/config/initializers/data_mapper.rb')
+      assert_match_in_file(/DataMapper.setup/, '/tmp/sample_app/config/database.rb')
     end
 
     should "properly generate for mongomapper" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--orm=mongomapper', '--script=none']) }
+      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--orm=mongomapper', '--script=none']) }
       assert_match /Applying.*?mongomapper.*?orm/, buffer
       assert_match_in_file(/gem 'mongo_mapper'/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/MongoDbInitializer/, '/tmp/sample_app/config/initializers/mongo_db.rb')
+      assert_match_in_file(/MongoMapper.database/, '/tmp/sample_app/config/database.rb')
     end
 
     should "properly generate for couchrest" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--orm=couchrest', '--script=none']) }
+      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--orm=couchrest', '--script=none']) }
       assert_match /Applying.*?couchrest.*?orm/, buffer
       assert_match_in_file(/gem 'couchrest'/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/CouchRestInitializer/, '/tmp/sample_app/config/initializers/couch_rest.rb')    
+      assert_match_in_file(/CouchRest.database!/, '/tmp/sample_app/config/database.rb')    
     end
   end
 
   context "the generator for renderer component" do
     should "properly generate default for erb" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--renderer=erb', '--script=none']) }
+      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--renderer=erb', '--script=none']) }
       assert_match /Applying.*?erb.*?renderer/, buffer
       assert_match_in_file(/gem 'erubis'/, '/tmp/sample_app/Gemfile')
     end
 
     should "properly generate for haml" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--renderer=haml','--script=none']) }
+      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')
     end
@@ -123,20 +129,20 @@ class TestSkeletonGenerator < Test::Unit::TestCase
 
   context "the generator for script component" do
     should "properly generate for jquery" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--script=jquery']) }
+      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')
     end
 
     should "properly generate for prototype" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--script=prototype']) }
+      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')
     end
 
     should "properly generate for rightjs" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--script=rightjs']) }
+      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')
     end
@@ -144,35 +150,35 @@ class TestSkeletonGenerator < Test::Unit::TestCase
 
   context "the generator for test component" do
     should "properly default generate for bacon" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--test=bacon', '--script=none']) }
+      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(/Bacon::Context/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for riot" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--test=riot', '--script=none']) }
+      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(/Riot::Situation/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for rspec" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--test=rspec', '--script=none']) }
+      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(/Spec::Runner/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for shoulda" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--test=shoulda', '--script=none']) }
+      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(/Test::Unit::TestCase/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for testspec" do
-      buffer = silence_logger { Padrino::Generators::Skeleton.start(['sample_app', '/tmp', '--test=testspec', '--script=none']) }
+      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(/Test::Unit::TestCase/, '/tmp/sample_app/test/test_config.rb')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 -08:00
+date: 2009-11-18 00:00:00 -08:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +25,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: padrino-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: thor
   type: :runtime
@@ -131,19 +141,36 @@ files:
 - lib/generators/components/tests/rspec_test_gen.rb
 - lib/generators/components/tests/shoulda_test_gen.rb
 - lib/generators/components/tests/testspec_test_gen.rb
-- lib/generators/project/.gitignore
-- lib/generators/project/Gemfile
-- lib/generators/project/apps/.empty_directory
-- lib/generators/project/config.ru
-- lib/generators/project/config/boot.rb
-- lib/generators/project/lib/.empty_directory
-- lib/generators/project/test/test_config.rb.tt
-- lib/generators/project/tmp/.emptydirectory
+- lib/generators/controller.rb
 - lib/generators/skeleton.rb
+- lib/generators/skeleton/.gitignore
+- lib/generators/skeleton/Gemfile
+- lib/generators/skeleton/app.rb.tt
+- lib/generators/skeleton/app/.empty_directory
+- 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
+- lib/generators/skeleton/config/boot.rb
+- lib/generators/skeleton/config/initializers/.empty_directory
+- lib/generators/skeleton/config/initializers/example.rb
+- lib/generators/skeleton/config/urls.rb.tt
+- lib/generators/skeleton/lib/.empty_directory
+- 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/padrino-gen.rb
 - padrino-gen.gemspec
 - test/active_support_helpers.rb
 - test/helper.rb
+- test/test_controller_generator.rb
 - test/test_skeleton_generator.rb
 has_rdoc: true
 homepage: http://github.com/padrino/padrino-gen

data/lib/generators/project/config/boot.rb

@@ -1,6 +0,0 @@
-# This file is merely for beginning the boot process
-PADRINO_ROOT = File.dirname(__FILE__) + '/..' unless defined? PADRINO_ROOT
-
-# Loads the required files into the application
-require 'padrino'
-Padrino.load!