padrino-gen 0.9.7 → 0.9.9

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'sdoc'
 
 GEM_VERSION = File.read(File.dirname(__FILE__) + '/VERSION')
 

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.9

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

@@ -14,7 +14,7 @@ module Padrino
       include Thor::Actions
       include Padrino::Generators::Actions
 
-      desc "Description:\n\n\tpadrino-gen project generate a new Padrino application"
+      desc "Description:\n\n\tpadrino-gen app generates a new Padrino application"
 
       argument :name, :desc => "The name of your padrino application"
 
@@ -36,9 +36,9 @@ module Padrino
           say (<<-TEXT).gsub(/ {10}/,'')
 
           =================================================================
-          Your #{@class_name} Application now is installed.
-          It's available on /#{name.underscore}
-          You can setup a new path editing config/apps.rb
+          Your #{@class_name} application has been installed.
+          This application has been mounted to /#{name.underscore}
+          You can configure a different path by editing 'config/apps.rb'
           =================================================================
 
           TEXT

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

@@ -6,24 +6,22 @@ module Padrino
         module BaconGen
           BACON_SETUP = (<<-TEST).gsub(/^ {10}/, '')
           PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
-          require File.dirname(__FILE__) + "/../config/boot"
+          require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
           class Bacon::Context
             include Rack::Test::Methods
           end
 
           def app
-            # Sinatra < 1.0 always disable sessions for test env
-            # so if you need them it's necessary force the use
-            # of Rack::Session::Cookie
-            CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+            ##
             # You can hanlde all padrino applications using instead:
             #   Padrino.application
+            CLASS_NAME.tap { |app|  }
           end
           TEST
 
           BACON_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../test_config.rb'
+          require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
 
           describe "!NAME!Controller" do
             it 'returns text at root' do
@@ -43,7 +41,7 @@ module Padrino
           TEST
 
           BACON_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../test_config.rb'
+          require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
 
           describe "!NAME! Model" do
             it 'can be created' do

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

@@ -10,17 +10,15 @@ module Padrino
 
           CUCUMBER_SETUP = (<<-TEST).gsub(/^ {10}/, '')
           PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
-          require File.dirname(__FILE__) + "/../../config/boot"
+          require File.expand_path(File.dirname(__FILE__) + "/../../config/boot")
 
           require 'capybara/cucumber'
           require 'spec/expectations'
 
-          # Sinatra < 1.0 always disable sessions for test env
-          # so if you need them it's necessary to force the use
-          # of Rack::Session::Cookie
-          Capybara.app = CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
-          # You can handle all padrino applications instead using:
-          #   Capybara.app = Padrino.application
+          ##
+          # You can hanlde all padrino applications using instead:
+          #   Padrino.application
+          Capybara.app = CLASS_NAME.tap { |app|  }
           TEST
 
           CUCUMBER_YML = (<<-TEST).gsub(/^ {10}/, '')

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

@@ -6,24 +6,22 @@ module Padrino
         module RiotGen
           RIOT_SETUP = (<<-TEST).gsub(/^ {10}/, '')
           PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
-          require File.dirname(__FILE__) + "/../config/boot"
+          require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
           class Riot::Situation
             include Rack::Test::Methods
 
             def app
-              # Sinatra < 1.0 always disable sessions for test env
-              # so if you need them it's necessary force the use
-              # of Rack::Session::Cookie
-              CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+              ##
               # You can hanlde all padrino applications using instead:
               #   Padrino.application
+              CLASS_NAME.tap { |app|  }
             end
           end
           TEST
 
           RIOT_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../test_config.rb'
+          require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
 
           context "!NAME!Controller" do
             context "description here" do
@@ -46,7 +44,7 @@ module Padrino
           TEST
 
           RIOT_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../test_config.rb'
+          require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
 
           context "!NAME! Model" do
             context 'can be created' do

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

@@ -7,26 +7,24 @@ module Padrino
           unless defined?(RSPEC_SETUP)
             RSPEC_SETUP = (<<-TEST).gsub(/^ {12}/, '')
             PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
-            require File.dirname(__FILE__) + "/../config/boot"
+            require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
             Spec::Runner.configure do |conf|
               conf.include Rack::Test::Methods
             end
 
             def app
-              # Sinatra < 1.0 always disable sessions for test env
-              # so if you need them it's necessary force the use
-              # of Rack::Session::Cookie
-              CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+              ##
               # You can hanlde all padrino applications using instead:
               #   Padrino.application
+              CLASS_NAME.tap { |app|  }
             end
             TEST
           end
 
           unless defined?(RSPEC_CONTROLLER_TEST)
             RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {12}/, '')
-            require File.dirname(__FILE__) + '/../spec_helper.rb'
+            require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
             describe "!NAME!Controller" do
               before do
@@ -53,7 +51,7 @@ module Padrino
 
           unless defined?(RSPEC_MODEL_TEST)
             RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '')
-            require File.dirname(__FILE__) + '/../spec_helper.rb'
+            require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
             describe "!NAME! Model" do
               it 'can be created' do

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

@@ -6,24 +6,22 @@ module Padrino
         module ShouldaGen
           SHOULDA_SETUP = (<<-TEST).gsub(/^ {10}/, '')
           PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
-          require File.dirname(__FILE__) + "/../config/boot"
+          require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
           class Test::Unit::TestCase
             include Rack::Test::Methods
 
             def app
-              # Sinatra < 1.0 always disable sessions for test env
-              # so if you need them it's necessary force the use
-              # of Rack::Session::Cookie
-              CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+              ##
               # You can hanlde all padrino applications using instead:
               #   Padrino.application
+              CLASS_NAME.tap { |app|  }
             end
           end
           TEST
 
           SHOULDA_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../test_config.rb'
+          require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
 
           class !NAME!ControllerTest < Test::Unit::TestCase
             context "!NAME!Controller" do
@@ -48,7 +46,7 @@ module Padrino
           TEST
 
           SHOULDA_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../test_config.rb'
+          require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
 
           class !NAME!ControllerTest < Test::Unit::TestCase
             context "!NAME! Model" do

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

@@ -6,24 +6,22 @@ module Padrino
         module TestspecGen
           TESTSPEC_SETUP = (<<-TEST).gsub(/^ {10}/, '')
           PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
-          require File.dirname(__FILE__) + "/../config/boot"
+          require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
           class Test::Unit::TestCase
             include Rack::Test::Methods
 
             def app
-              # Sinatra < 1.0 always disable sessions for test env
-              # so if you need them it's necessary force the use
-              # of Rack::Session::Cookie
-              CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+              ##
               # You can hanlde all padrino applications using instead:
               #   Padrino.application
+              CLASS_NAME.tap { |app|  }
             end
           end
           TEST
 
           TESTSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../test_config.rb'
+          require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
 
           context "!NAME!Controller" do
             setup { get('/') }
@@ -43,7 +41,7 @@ module Padrino
           TEST
 
           TESTSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../test_config.rb'
+          require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
 
           context "!NAME! Model" do
             specify 'can be created' do

data/lib/padrino-gen/generators/project/config.ru

@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/config/boot.rb'
+require ::File.dirname(__FILE__) + '/config/boot.rb'
 run Padrino.application

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

@@ -8,7 +8,7 @@ module Padrino
       Padrino::Generators.add_generator(:project, self)
 
       # Define the source template root
-      def self.source_root; File.dirname(__FILE__); end
+      def self.source_root; File.expand_path(File.dirname(__FILE__)); end
       def self.banner; "padrino-gen project [name] [options]"; end
 
       # Include related modules
@@ -66,7 +66,7 @@ module Padrino
         say (<<-TEXT).gsub(/ {8}/,'')
 
         =================================================================
-        #{name} has been successfully created, now follow this steps:
+        #{name} is ready for development! Next, follow these steps:
         =================================================================
           1) cd #{name}
           2) bundle install

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.9.7"
+  s.version = "0.9.9"
 
   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{2010-03-22}
+  s.date = %q{2010-03-29}
   s.default_executable = %q{padrino-gen}
   s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{padrinorb@gmail.com}
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/app/controllers/.empty_directory",
      "lib/padrino-gen/generators/app/helpers/.empty_directory",
      "lib/padrino-gen/generators/app/views/.empty_directory",
+     "lib/padrino-gen/generators/app/views/layouts/.emptydirectory",
      "lib/padrino-gen/generators/cli.rb",
      "lib/padrino-gen/generators/components/actions.rb",
      "lib/padrino-gen/generators/components/mocks/mocha_gen.rb",
@@ -107,7 +108,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.7"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.9"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -115,7 +116,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.3"])
     else
-      s.add_dependency(%q<padrino-core>, ["= 0.9.7"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.9"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -124,7 +125,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<fakeweb>, [">= 1.2.3"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.7"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.9"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/test_app_generator.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'thor/group'
 require 'fakeweb'
 
@@ -28,6 +28,7 @@ class TestAppGenerator < Test::Unit::TestCase
       assert_file_exists('/tmp/sample_project/demo/controllers')
       assert_file_exists('/tmp/sample_project/demo/helpers')
       assert_file_exists('/tmp/sample_project/demo/views')
+      assert_file_exists('/tmp/sample_project/demo/views/layouts')
       assert_match_in_file 'Padrino.mount("Demo").to("/demo")', '/tmp/sample_project/config/apps.rb'
       assert_match_in_file 'class Demo < Padrino::Application', '/tmp/sample_project/demo/app.rb'
     end

data/test/test_cli.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'padrino-gen/generators/cli'
 
 class TestCli < Test::Unit::TestCase

data/test/test_controller_generator.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'thor/group'
 
 class TestControllerGenerator < Test::Unit::TestCase

data/test/test_generator.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestGenerator < Test::Unit::TestCase
 

data/test/test_mailer_generator.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'thor/group'
 
 class TestMailerGenerator < Test::Unit::TestCase

data/test/test_migration_generator.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'thor/group'
 
 class TestMigrationGenerator < Test::Unit::TestCase

data/test/test_model_generator.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'thor/group'
 
 class TestModelGenerator < Test::Unit::TestCase

data/test/test_project_generator.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'thor/group'
 require 'fakeweb'
 
@@ -81,7 +81,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       buffer = silence_logger { @project.start(['sample_project', '--root=/tmp', '--mock=rr', '--test=riot', '--script=none']) }
       assert_match /Applying.*?rr.*?mock/, buffer
       assert_match_in_file(/gem 'rr'/, '/tmp/sample_project/Gemfile')
-      assert_match_in_file(/require 'riot\/rr'/m, '/tmp/sample_project/test/test_config.rb')
     end
 
     should "properly generater for rr and bacon" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-03-29 00:00:00 -07:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 7
-        version: 0.9.7
+        - 9
+        version: 0.9.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -141,6 +141,7 @@ files:
 - lib/padrino-gen/generators/app/controllers/.empty_directory
 - lib/padrino-gen/generators/app/helpers/.empty_directory
 - lib/padrino-gen/generators/app/views/.empty_directory
+- lib/padrino-gen/generators/app/views/layouts/.emptydirectory
 - lib/padrino-gen/generators/cli.rb
 - lib/padrino-gen/generators/components/actions.rb
 - lib/padrino-gen/generators/components/mocks/mocha_gen.rb