padrino-gen 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/generators/actions.rb

@@ -60,7 +60,7 @@ module Padrino
         # Also builds the available_choices hash of which component choices are supported
         # component_option :test, "Testing framework", :aliases => '-t', :choices => [:bacon, :shoulda]
         def component_option(name, caption, options = {})
-          (@component_types ||= []) << name
+          (@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(', ')})"
           class_option name, :default => options[:choices].first, :aliases => options[:aliases], :desc => description

data/lib/generators/{base_app → project}/Gemfile

@@ -1,11 +1,9 @@
 clear_sources
 source 'http://gemcutter.org'
-# Base requirements
+# Project requirements
 gem 'sinatra'
 gem 'padrino'
 gem 'rack-flash'
-gem 'warden'
-gem 'bcrypt-ruby', :require_as => 'bcrypt'
 
 # Component requirements
 

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

@@ -0,0 +1,6 @@
+# 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!

data/lib/generators/project/config.ru

@@ -0,0 +1,6 @@
+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.rb

@@ -29,7 +29,7 @@ module Padrino
       def setup_skeleton
         self.destination_root = File.join(path, name)
         @class_name = name.classify
-        directory("base_app/", self.destination_root)
+        directory("project/", self.destination_root)
         store_component_config('.components')
       end
 

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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-16}
+  s.date = %q{2009-11-17}
   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}
@@ -23,14 +23,12 @@ Gem::Specification.new do |s|
      ".gitignore",
      "LICENSE",
      "README.rdoc",
+     "README.rdoc",
+     "Rakefile",
      "Rakefile",
      "VERSION",
      "bin/padrino-gen",
      "lib/generators/actions.rb",
-     "lib/generators/base_app/.gitignore",
-     "lib/generators/base_app/Gemfile",
-     "lib/generators/base_app/config/dependencies.rb.tt",
-     "lib/generators/base_app/test/test_config.rb.tt",
      "lib/generators/components/actions.rb",
      "lib/generators/components/mocks/mocha_gen.rb",
      "lib/generators/components/mocks/rr_gen.rb",
@@ -49,6 +47,14 @@ 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/skeleton.rb",
      "lib/padrino-gen.rb",
      "padrino-gen.gemspec",
@@ -61,11 +67,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Generators for easily creating and building padrino applications}
-  s.test_files = [
-    "test/active_support_helpers.rb",
-     "test/helper.rb",
-     "test/test_skeleton_generator.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/helper.rb

@@ -8,7 +8,8 @@ require 'webrat'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'active_support_helpers'
-require File.dirname(__FILE__) + '/../../padrino-helpers/lib/padrino-helpers.rb'
+require 'padrino-helpers'
+require 'padrino-gen'
 
 class Test::Unit::TestCase
   include Padrino::Helpers::OutputHelpers

data/test/test_skeleton_generator.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/helper'
-require File.dirname(__FILE__) + "/../lib/padrino-gen"
 require 'thor'
 
 class TestSkeletonGenerator < Test::Unit::TestCase
@@ -11,7 +10,8 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     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 File.exist?('/tmp/sample_app')
-      assert File.exist?('/tmp/sample_app/config/dependencies.rb')
+      assert File.exist?('/tmp/sample_app/apps')
+      assert File.exist?('/tmp/sample_app/config/boot.rb')
       assert File.exist?('/tmp/sample_app/test/test_config.rb')
     end
     should "create components file containing options chosen with defaults" do
@@ -83,8 +83,6 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       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(/CreateUsers < ActiveRecord::Migration/, '/tmp/sample_app/db/migrate/001_create_users.rb')
-      #  assert_match_in_file(/class User < ActiveRecord::Base/, '/tmp/sample_app/app/models/user.rb')
     end
 
     should "properly generate default for datamapper" do
@@ -92,7 +90,6 @@ 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(/DataMapperInitializer/, '/tmp/sample_app/config/initializers/data_mapper.rb')
-      # assert_match_in_file(/class User.*?include DataMapper::Resource/m, '/tmp/sample_app/app/models/user.rb')
     end
 
     should "properly generate for mongomapper" do
@@ -100,15 +97,13 @@ 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(/MongoDbInitializer/, '/tmp/sample_app/config/initializers/mongo_db.rb')
-      #  assert_match_in_file(/class User.*?include MongoMapper::Document/m, '/tmp/sample_app/app/models/user.rb')
     end
 
     should "properly generate for couchrest" do
       buffer = silence_logger { Padrino::Generators::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(/class User < CouchRest::ExtendedDocument/m, '/tmp/sample_app/app/models/user.rb')      
+      assert_match_in_file(/CouchRestInitializer/, '/tmp/sample_app/config/initializers/couch_rest.rb')    
     end
   end
 
@@ -123,8 +118,6 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { Padrino::Generators::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(/gem 'hassle'/, '/tmp/sample_app/Gemfile')
-      # assert_match_in_file(/HassleInitializer/, '/tmp/sample_app/config/initializers/hassle.rb')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 -08:00
+date: 2009-11-17 00:00:00 -08:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,10 +113,6 @@ files:
 - VERSION
 - bin/padrino-gen
 - lib/generators/actions.rb
-- lib/generators/base_app/.gitignore
-- lib/generators/base_app/Gemfile
-- lib/generators/base_app/config/dependencies.rb.tt
-- lib/generators/base_app/test/test_config.rb.tt
 - lib/generators/components/actions.rb
 - lib/generators/components/mocks/mocha_gen.rb
 - lib/generators/components/mocks/rr_gen.rb
@@ -135,6 +131,14 @@ 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/skeleton.rb
 - lib/padrino-gen.rb
 - padrino-gen.gemspec
@@ -169,7 +173,5 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Generators for easily creating and building padrino applications
-test_files: 
-- test/active_support_helpers.rb
-- test/helper.rb
-- test/test_skeleton_generator.rb
+test_files: []
+

data/lib/generators/base_app/config/dependencies.rb.tt

@@ -1,41 +0,0 @@
-# Dependencies contains all required gems, helpers and core configuration
-
-def app(&block)
-  <%= @class_name %>.class_eval(&block)
-end
-
-class <%= @class_name %> < Sinatra::Application
-  bundler_require_dependencies
-  
-  # Required middleware
-  use Rack::Session::Cookie
-  use Rack::Flash
-  
-  # Includes all necessary sinatra_more helpers
-  register SinatraMore::MarkupPlugin
-  register SinatraMore::RenderPlugin
-  register SinatraMore::MailerPlugin
-  register SinatraMore::RoutingPlugin
-
-  # Requires the initializer modules which configure specific components
-  Dir[File.dirname(__FILE__) + '/initializers/*.rb'].each do |file|
-    # Each initializer file contains a module called 'XxxxInitializer' (i.e HassleInitializer)
-    require file
-    file_class = File.basename(file, '.rb').classify
-    register "#{file_class}Initializer".constantize
-  end
-  
-  # Returns the list of load paths for this sinatra application
-  def self.file_loading_paths
-    ["lib/**/*.rb", "app/helpers/**/*.rb", "app/routes/**/*.rb", "app/models/*.rb", "app/mailers/*.rb"]
-  end
-  
-  # Require all the folders and files necessary to run the application
-  file_loading_paths.each { |load_path| Dir[root_path(load_path)].each { |file| require file } }
-  
-  # Require Warden plugin below to allow User to be loaded
-  register SinatraMore::WardenPlugin
-    
-  # Required helpers
-  helpers ViewHelpers
-end