padrino-gen 0.9.4 → 0.9.5

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/bin/padrino-gen

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-$:.unshift File.dirname(__FILE__) + "/../lib"
+padrino_gen_path = File.expand_path('../../lib', __FILE__)
+$:.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$:.include?(padrino_gen_path)
 
 # We try to load the vendored padrino-core if exist
-if File.exist?(File.dirname(__FILE__) + "/../../padrino-core/lib")
-  $:.unshift File.dirname(__FILE__) + "/../../padrino-core/lib"
-end
+padrino_core_path = File.expand_path('../../../padrino-core/lib', __FILE__)
+$:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)
 
 require 'padrino-gen'
 require 'padrino-gen/generators/cli'

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

@@ -1,5 +1,4 @@
 require 'thor/group'
-require 'padrino-core/support_lite'
 
 module Padrino
   module Generators
@@ -19,10 +18,12 @@ module Padrino
       def load_boot
         begin
           ENV['PADRINO_LOG_LEVEL'] ||= "test"
-          if options[:root]
-            require File.join(options[:root], 'config/boot.rb') if File.exist?(File.join(options[:root], 'config/boot.rb'))
+          boot = options[:root] ? File.join(options[:root], 'config/boot.rb') : 'config/boot.rb'
+          if File.exist?(boot)
+            require boot
           else
-            require 'config/boot.rb' if File.exist?('config/boot.rb')
+            # If we are outside app we need to load support_lite
+            require 'padrino-core/support_lite'
           end
         rescue Exception => e
           puts "=> Problem loading config/boot.rb"

data/lib/padrino-gen/generators/components/renderers/erb_gen.rb

@@ -5,7 +5,7 @@ module Padrino
 
         module ErbGen
           def setup_renderer
-            require_dependencies 'erubis'
+            # Nothing to do
           end
         end
       end

data/lib/padrino-gen/generators/components/renderers/haml_gen.rb

@@ -7,7 +7,7 @@ module Padrino
 
           SASS_INIT = (<<-SASS).gsub(/^ {10}/, '')
           # Enables support for SASS template reloading for rack.
-          # Store SASS files by default within 'public/stylesheets/sass'
+          # Store SASS files by default within 'app/stylesheets/sass'
           # See http://nex-3.com/posts/88-sass-supports-rack for more details.
 
           module SassInitializer
@@ -28,6 +28,7 @@ module Padrino
             require_dependencies 'haml'
             create_file destination_root('/lib/sass.rb'), SASS_INIT
             inject_into_file destination_root('/app/app.rb'), SASS_REGISTER, :after => "configure do\n"
+            empty_directory destination_root('/app/stylesheets')
           end
         end
 

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

@@ -1,3 +1,2 @@
-PADRINO_ENV = ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= "development" unless defined?(PADRINO_ENV)
 require File.dirname(__FILE__) + '/config/boot.rb'
 run Padrino.application

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

@@ -11,7 +11,7 @@
   # end
 
   # get :foo, :with => :id do
-  #   "Im foo/#{params[:id]}"
+  #   "Maps to url '/foo/#{params[:id]}'"
   # end
 
   # get "/example" do

data/lib/padrino-gen/padrino-tasks/activerecord.rb

@@ -66,7 +66,7 @@ if defined?(ActiveRecord)
                 "TO '#{config[:username]}'@'localhost' " \
                 "IDENTIFIED BY '#{config[:password]}' WITH GRANT OPTION;"
               ActiveRecord::Base.establish_connection(config.merge(
-                  :database => nil, 'username' => 'root', 'password' => root_password))
+                  :database => nil, :username => 'root', :password => root_password))
               ActiveRecord::Base.connection.create_database(config[:database], creation_options)
               ActiveRecord::Base.connection.execute grant_statement
               ActiveRecord::Base.establish_connection(config)
@@ -79,8 +79,8 @@ if defined?(ActiveRecord)
         when 'postgresql'
           @encoding = config[:encoding] || ENV['CHARSET'] || 'utf8'
           begin
-            ActiveRecord::Base.establish_connection(config.merge(:database => 'postgres', 'schema_search_path' => 'public'))
-            ActiveRecord::Base.connection.create_database(config[:database], config.merge('encoding' => @encoding))
+            ActiveRecord::Base.establish_connection(config.merge(:database => 'postgres', :schema_search_path => 'public'))
+            ActiveRecord::Base.connection.create_database(config[:database], config.merge(:encoding => @encoding))
             ActiveRecord::Base.establish_connection(config)
           rescue
             $stderr.puts $!, *($!.backtrace)
@@ -110,7 +110,7 @@ if defined?(ActiveRecord)
 
     desc 'Drops the database for the current Padrino.env'
     task :drop => :environment do
-      config = ActiveRecord::Base.configurations[Padrino.env || 'development']
+      config = ActiveRecord::Base.configurations[Padrino.env || :development]
       begin
         drop_database(config)
       rescue Exception => e
@@ -184,7 +184,7 @@ if defined?(ActiveRecord)
 
     desc "Retrieves the charset for the current environment's database"
     task :charset => :environment do
-      config = ActiveRecord::Base.configurations[Padrino.env || 'development']
+      config = ActiveRecord::Base.configurations[Padrino.env || :development]
       case config[:adapter]
       when 'mysql'
         ActiveRecord::Base.establish_connection(config)
@@ -199,7 +199,7 @@ if defined?(ActiveRecord)
 
     desc "Retrieves the collation for the current environment's database"
     task :collation => :environment do
-      config = ActiveRecord::Base.configurations[Padrino.env || 'development']
+      config = ActiveRecord::Base.configurations[Padrino.env || :development]
       case config[:adapter]
       when 'mysql'
         ActiveRecord::Base.establish_connection(config)
@@ -267,32 +267,32 @@ if defined?(ActiveRecord)
       desc "Dump the database structure to a SQL file"
       task :dump => :environment do
         abcs = ActiveRecord::Base.configurations
-        case abcs[Padrino.env]["adapter"]
+        case abcs[Padrino.env][:adapter]
         when "mysql", "oci", "oracle"
           ActiveRecord::Base.establish_connection(abcs[Padrino.env])
           File.open("#{Padrino.root}/db/#{Padrino.env}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
         when "postgresql"
-          ENV['PGHOST']     = abcs[Padrino.env]["host"] if abcs[Padrino.env]["host"]
-          ENV['PGPORT']     = abcs[Padrino.env]["port"].to_s if abcs[Padrino.env]["port"]
-          ENV['PGPASSWORD'] = abcs[Padrino.env]["password"].to_s if abcs[Padrino.env]["password"]
-          search_path = abcs[Padrino.env]["schema_search_path"]
+          ENV['PGHOST']     = abcs[Padrino.env][:host] if abcs[Padrino.env][:host]
+          ENV['PGPORT']     = abcs[Padrino.env][:port].to_s if abcs[Padrino.env][:port]
+          ENV['PGPASSWORD'] = abcs[Padrino.env][:password].to_s if abcs[Padrino.env][:password]
+          search_path = abcs[Padrino.env][:schema_search_path]
           unless search_path.blank?
             search_path = search_path.split(",").map{|search_path| "--schema=#{search_path.strip}" }.join(" ")
           end
-          `pg_dump -i -U "#{abcs[Padrino.env]["username"]}" -s -x -O -f db/#{Padrino.env}_structure.sql #{search_path} #{abcs[Padrino.env]["database"]}`
+          `pg_dump -i -U "#{abcs[Padrino.env][:username]}" -s -x -O -f db/#{Padrino.env}_structure.sql #{search_path} #{abcs[Padrino.env][:database]}`
           raise "Error dumping database" if $?.exitstatus == 1
         when "sqlite", "sqlite3"
-          dbfile = abcs[Padrino.env]["database"] || abcs[Padrino.env]["dbfile"]
-          `#{abcs[Padrino.env]["adapter"]} #{dbfile} .schema > db/#{Padrino.env}_structure.sql`
+          dbfile = abcs[Padrino.env][:database] || abcs[Padrino.env][:dbfile]
+          `#{abcs[Padrino.env][:adapter]} #{dbfile} .schema > db/#{Padrino.env}_structure.sql`
         when "sqlserver"
-          `scptxfr /s #{abcs[Padrino.env]["host"]} /d #{abcs[Padrino.env]["database"]} /I /f db\\#{Padrino.env}_structure.sql /q /A /r`
-          `scptxfr /s #{abcs[Padrino.env]["host"]} /d #{abcs[Padrino.env]["database"]} /I /F db\ /q /A /r`
+          `scptxfr /s #{abcs[Padrino.env][:host]} /d #{abcs[Padrino.env][:database]} /I /f db\\#{Padrino.env}_structure.sql /q /A /r`
+          `scptxfr /s #{abcs[Padrino.env][:host]} /d #{abcs[Padrino.env][:database]} /I /F db\ /q /A /r`
         when "firebird"
           set_firebird_env(abcs[Padrino.env])
           db_string = firebird_db_string(abcs[Padrino.env])
           sh "isql -a #{db_string} > #{Padrino.root}/db/#{Padrino.env}_structure.sql"
         else
-          raise "Task not supported by '#{abcs["test"]["adapter"]}'"
+          raise "Task not supported by '#{abcs[Padrino.env][:adapter]}'"
         end
 
         if ActiveRecord::Base.connection.supports_migrations?
@@ -361,15 +361,11 @@ if defined?(ActiveRecord)
 
       FileUtils.rm(file)
     when 'postgresql'
-      ActiveRecord::Base.establish_connection(config.merge(:database => 'postgres', 'schema_search_path' => 'public'))
+      ActiveRecord::Base.establish_connection(config.merge(:database => 'postgres', :schema_search_path => 'public'))
       ActiveRecord::Base.connection.drop_database config[:database]
     end
   end
 
-  def session_table_name
-    ActiveRecord::SessionStore::Session.table_name
-  end
-
   def set_firebird_env(config)
     ENV["ISC_USER"]     = config[:username].to_s if config[:username]
     ENV["ISC_PASSWORD"] = config[:password].to_s if config[:password]
@@ -526,7 +522,7 @@ if defined?(ActiveRecord)
         fields     = Array(args.shift).map(&:to_s)
         options    = args.shift
 
-        index_name = options[:name] if options  
+        index_name = options[:name].to_s if options
         index_name ||= ActiveRecord::Base.connection.index_name(table_name, :column => fields)
 
         (self.indexes_in_schema ||= []) << index_name

data/lib/padrino-gen.rb

@@ -1,4 +1,3 @@
-require 'padrino-core/support_lite'
 require 'padrino-core/tasks'
 
 module Padrino

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-03-11}
   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}
@@ -69,6 +69,7 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/project/config.ru",
      "lib/padrino-gen/generators/project/config/apps.rb.tt",
      "lib/padrino-gen/generators/project/config/boot.rb",
+     "lib/padrino-gen/generators/project/public/favicon.ico",
      "lib/padrino-gen/generators/project/public/images/.empty_directory",
      "lib/padrino-gen/generators/project/public/javascripts/.empty_directory",
      "lib/padrino-gen/generators/project/public/stylesheets/.empty_directory",
@@ -109,7 +110,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.4"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.5"])
       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"])
@@ -117,7 +118,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.4"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.5"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -126,7 +127,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<fakeweb>, [">= 1.2.3"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.4"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.5"])
     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/helper.rb

@@ -14,6 +14,7 @@ require 'thor/group'
 end
 
 require 'padrino-gen'
+require 'padrino-core/support_lite'
 
 Padrino::Generators.load_components!
 

data/test/test_project_generator.rb

@@ -16,6 +16,7 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_file_exists('/tmp/sample_project/app')
       assert_file_exists('/tmp/sample_project/config/boot.rb')
       assert_file_exists('/tmp/sample_project/spec/spec_helper.rb')
+      assert_file_exists('/tmp/sample_project/public/favicon.ico')
     end
 
     should "not create models folder if no orm is chosen" do
@@ -152,7 +153,6 @@ class TestProjectGenerator < Test::Unit::TestCase
     should "properly generate default for erb" do
       buffer = silence_logger { @project.start(['sample_project', '--root=/tmp', '--renderer=erb', '--script=none']) }
       assert_match /Applying.*?erb.*?renderer/, buffer
-      assert_match_in_file(/gem 'erubis'/, '/tmp/sample_project/Gemfile')
     end
 
     should "properly generate for haml" do
@@ -161,6 +161,7 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'haml'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/module SassInitializer.*Sass::Plugin::Rack/m, '/tmp/sample_project/lib/sass.rb')
       assert_match_in_file(/register SassInitializer/m, '/tmp/sample_project/app/app.rb')
+      assert_dir_exists('/tmp/sample_project/app/stylesheets')
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +01:00
+date: 2010-03-11 00:00:00 +01:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 4
-        version: 0.9.4
+        - 5
+        version: 0.9.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -178,6 +178,7 @@ files:
 - lib/padrino-gen/generators/project/config.ru
 - lib/padrino-gen/generators/project/config/apps.rb.tt
 - lib/padrino-gen/generators/project/config/boot.rb
+- lib/padrino-gen/generators/project/public/favicon.ico
 - lib/padrino-gen/generators/project/public/images/.empty_directory
 - lib/padrino-gen/generators/project/public/javascripts/.empty_directory
 - lib/padrino-gen/generators/project/public/stylesheets/.empty_directory