padrino-core 0.8.1 → 0.8.2

data/README.rdoc

@@ -430,15 +430,21 @@ The following commands are available:
   # Stops a daemonized app server
   $ padrino stop
   
-  # Run all the unit tests
-  $ padrino test
-  
   # Bootup the Padrino console (irb)
   $ padrino console
   
   # Run/List tasks
   $ padrino rake
 
+The last command "padrino rake" look for rake files in:
+
+  lib/tasks/**/*.rake
+  tasks/**/*.rake
+  test/test.rake
+  spec/spec.rake
+
+In this way you can customize project tasks.
+
 Using these commands can simplify common tasks making development that much smoother.
 
 === Special Folders

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/bin/padrino

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-%w[rubygems thor].each { |gem| require gem }
+require 'rubygems'
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
-require "padrino-core/cli/base"
-arguments = ARGV.any? ? ARGV : ['-h']
-Padrino::Cli::Base.start(arguments)
+require 'padrino-core/cli/base'
+
+Padrino::Cli::Base.start(ARGV)

data/lib/padrino-core/application.rb

@@ -14,7 +14,7 @@ module Padrino
         Padrino.set_load_paths File.join(subclass.root, "/models")
         Padrino.require_dependencies File.join(subclass.root, "/models.rb")
         Padrino.require_dependencies File.join(subclass.root, "/models/**/*.rb")
-        super # Loading the subclass
+        super(subclass) # Loading the subclass
         subclass.default_filters!
         subclass.default_routes!
         subclass.default_errors!
@@ -28,7 +28,7 @@ module Padrino
       # 
       def new(*args, &bk)
         setup_application!
-        super
+        super(*args, &bk)
       end
 
       ##
@@ -115,7 +115,7 @@ module Padrino
       # Padrino look for your/app/views/layouts/custom.(haml|erb|etc)
       # 
       def layout(name=:layout, &block)
-        return super if block_given?
+        return super(name, &block) if block_given?
         @_layout = name
       end
 
@@ -169,7 +169,7 @@ module Padrino
         def default_configuration!
           # Overwriting Sinatra defaults
           set :app_file, caller_files.first || $0 # Assume app file is first caller
-          set :environment, PADRINO_ENV.to_sym
+          set :environment, Padrino.env
           set :raise_errors, true if development?
           set :logging, false # !test?
           set :sessions, true
@@ -381,9 +381,9 @@ module Padrino
           unbound_method = instance_method("#{verb} #{path}")
           block =
             if block.arity != 0
-              lambda { unbound_method.bind(self).call(*@block_params) }
+              proc { unbound_method.bind(self).call(*@block_params) }
             else
-              lambda { unbound_method.bind(self).call }
+              proc { unbound_method.bind(self).call }
             end
 
           invoke_hook(:route_added, verb, path, block)
@@ -499,7 +499,7 @@ module Padrino
             I18n.locale = params[:locale].to_sym rescue options.locale
           end
         end
-        super
+        super(&block)
       end
 
       ##
@@ -528,7 +528,7 @@ module Padrino
             logger.debug "Rendering layout #{options[:layout]}"
           end
         end
-        super
+        super(engine, data, options, locals, &block)
       end
 
       ##

data/lib/padrino-core/cli/base.rb

@@ -1,26 +1,25 @@
 require 'thor'
-require 'thor/rake_compat'
 
 module Padrino
   module Cli
+
     class Base < Thor
       include Thor::Actions
       include Thor::RakeCompat
 
-      class_option :chdir, :type => :string, :aliases => "-c"
+      class_option :chdir, :type => :string, :aliases => "-c", :desc => "Change to dir before starting"
+      class_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development, :desc => "Padrino Environment"
+      class_option :help, :type => :boolean, :desc => "Show help usage"
 
       desc "start", "Starts the Padrino application"
-      method_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development
-      method_option :adapter,     :type => :string,  :aliases => "-a"
-      method_option :host,        :type => :string,  :aliases => "-h", :required => true, :default => "localhost"
-      method_option :port,        :type => :numeric, :aliases => "-p", :required => true, :default => 3000
-      method_option :boot,        :type => :string,  :aliases => "-b", :required => true, :default => "config/boot.rb"
-      method_option :daemonize,   :type => :boolean, :aliases => "-d"
+      method_option :adapter,     :type => :string,  :aliases => "-a", :desc => "Rack Handler (default: autodetect)"
+      method_option :host,        :type => :string,  :aliases => "-h", :required => true, :default => "localhost", :desc => "Bind to HOST address"
+      method_option :port,        :type => :numeric, :aliases => "-p", :required => true, :default => 3000, :desc => "Use PORT"
+      method_option :daemonize,   :type => :boolean, :aliases => "-d", :desc => "Run daemonized in the background"
       def start
+        prepare :start
         require File.dirname(__FILE__) + "/adapter"
-        boot = check_boot
-        return unless boot
-        require boot
+        require 'config/boot'
         Padrino::Cli::Adapter.start(options)
       end
 
@@ -30,58 +29,63 @@ module Padrino
         Padrino::Cli::Adapter.stop
       end
 
-      desc "test", "Executes all the Padrino test files"
-      def test
-        require File.dirname(__FILE__) + "/test"
-        Padrino::Cli::Test.start
-      end
-
-      desc "rake", "Execute rake tasks in {Padrino.root}/lib/tasks"
-      method_option :boot,        :type => :string, :aliases => "-b", :required => true, :default => "config/boot.rb"
-      method_option :environment, :type => :string, :aliases => "-e", :required => true, :default => :development
-      method_option :task_list,   :type => :string, :aliases => "-T"  # Only for accept rake
-      def rake(task="")
+      desc "rake", "Execute rake tasks"
+      method_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development
+      method_option :list,        :type => :string,  :aliases => "-T", :desc => "Display the tasks (matching optional PATTERN) with descriptions, then exit."
+      method_option :trace,       :type => :boolean, :aliases => "-t", :desc => "Turn on invoke/execute tracing, enable full backtrace."
+      method_option :verbose,     :type => :boolean, :aliases => "-v", :desc => "Log message to standard output."
+      def rake(*args)
+        prepare :rake
+        args << "-T" if options[:list]
+        args << options[:list]  unless options[:list].nil? || options[:list].to_s == "list"
+        args << "--trace" if options[:trace]
+        args << "--verbose" if options[:verbose]
+        ARGV.clear
+        ARGV.concat(args)
+        puts "=> Executing Rake #{ARGV.join(' ')} ..."
         ENV['PADRINO_LOG_LEVEL'] ||= "test"
-        boot = check_boot
-        return unless boot
-        require 'rake'
-        require boot
-        puts "=> Executing Rake..."
-        Rake.application.init
-        load(File.dirname(__FILE__) + "/rake.rb")
-        Rake.application.top_level
+        require File.dirname(__FILE__) + '/rake'
+        silence(:stdout) { require 'config/boot' }
+        PadrinoTasks.init
       end
 
       desc "console", "Boots up the Padrino application irb console"
-      method_option :boot,        :type => :string, :aliases => "-b", :required => true, :default => "config/boot.rb"
-      method_option :environment, :type => :string, :aliases => "-e", :required => true, :default => :development
       def console
+        prepare :console
         require File.dirname(__FILE__) + "/../version"
-        boot = check_boot
-        return unless boot
         ARGV.clear
         puts "=> Loading #{options.environment} console (Padrino v.#{Padrino.version})"
         require 'irb'
         require "irb/completion"
-        require boot
+        require 'config/boot'
         require File.dirname(__FILE__) + '/console'
         IRB.start
       end
 
+      desc "version", "Show current Padrino Version"
+      map "-v" => :version, "--version" => :version
+      def version
+        require 'padrino-core/version'
+        puts "Padrino v. #{Padrino.version}"
+      end
+
       private
-        def check_boot
+        def prepare(task)
+          if options.help?
+            help(task.to_s)
+            raise SystemExit
+          end
           ENV["PADRINO_ENV"] ||= options.environment.to_s
           chdir(options.chdir)
-          unless File.exist?(options.boot)
-            puts "=> Could not find boot file: #{options.boot.inspect} !!!"
-            return
+          unless File.exist?('config/boot.rb')
+            puts "=> Could not find boot file in: #{options.chdir}/config/boot.rb !!!"
+            raise SystemExit
           end
-          options.boot
         end
 
       protected
         def self.banner(task)
-          "padrino-gen #{task.name}"
+          "padrino #{task.name}"
         end
 
         def chdir(dir)
@@ -89,13 +93,25 @@ module Padrino
           begin
             Dir.chdir(dir.to_s)
           rescue Errno::ENOENT
-            puts "=> Specified Padrino root '#{dir}' " +
-                 "does not appear to exist!"
+            puts "=> Specified Padrino root '#{dir}' does not appear to exist!"
           rescue Errno::EACCES
-            puts "=> Specified Padrino root '#{dir}' " +
-                 "cannot be accessed by the current user!"
+            puts "=> Specified Padrino root '#{dir}' cannot be accessed by the current user!"
           end
         end
+
+        def capture(stream)
+          begin
+            stream = stream.to_s
+            eval "$#{stream} = StringIO.new"
+            yield
+            result = eval("$#{stream}").string
+          ensure 
+            eval("$#{stream} = #{stream.upcase}")
+          end
+
+          result
+        end
+        alias :silence :capture
     end # Base
   end # Cli
 end # Padrino

data/lib/padrino-core/cli/rake.rb

@@ -1,22 +1,27 @@
-require 'rake'
 require File.dirname(__FILE__) + '/../tasks'
+require 'rake'
 
-Dir["lib/tasks/**/*.rake"].each { |ext| load(ext) }
-Padrino::Tasks.files.flatten.uniq.each { |ext| load(ext) }
+Rake.application.instance_variable_set(:@rakefile, __FILE__)
+
+module PadrinoTasks
+  def self.init
+    Padrino::Tasks.files.flatten.uniq.each { |ext| load(ext) }
+    Rake.application.init
+    Rake.application.top_level
+  end
+end
 
 def shell
   @_shell ||= Thor::Shell::Basic.new
 end
 
+Dir["lib/tasks/**/*.rake"].
+  concat(Dir["tasks/**/*.rake"]).
+  concat(Dir["{test,spec}/*.rake"]).each  { |ext| load(ext) }
+
 task :environment do
   Padrino.mounted_apps.each do |app|
     Padrino.require_dependency(app.app_file)
     app.app_object.setup_application!
   end
-end
-
-desc 'Load the seed data from db/seeds.rb'
-task :seed => :environment do
-  seed_file = Padrino.root('db', 'seeds.rb')
-  load(seed_file) if File.exist?(seed_file)
 end

data/lib/padrino-core/logger.rb

@@ -82,7 +82,7 @@ module Padrino
       :production  => { :log_level => :warn,  :stream => :to_file },
       :development => { :log_level => :debug, :stream => :stdout },
       :test        => { :log_level => :debug, :stream => :null }
-    } unless const_defined?(:Config)
+    }
 
     ##
     # Setup a new logger

data/lib/padrino-core/mounter.rb

@@ -43,7 +43,7 @@ module Padrino
       builder.map self.uri_root do
         app_obj.set :uri_root, app_data.uri_root
         app_obj.set :app_name, app_data.name
-        app_obj.set :app_file, app_data.app_file unless File.exist?(app_obj.app_file)
+        app_obj.set :app_file, app_data.app_file unless ::File.exist?(app_obj.app_file)
         app_obj.set :root,     app_data.app_root unless app_data.app_root.blank?
         # We need to initialize here the app.
         app_obj.setup_application!

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.8.1"
+  s.version = "0.8.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{2010-02-14}
+  s.date = %q{2010-02-17}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{padrinorb@gmail.com}
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
      "lib/padrino-core/cli/base.rb",
      "lib/padrino-core/cli/console.rb",
      "lib/padrino-core/cli/rake.rb",
-     "lib/padrino-core/cli/test.rb",
      "lib/padrino-core/images/404.png",
      "lib/padrino-core/images/500.png",
      "lib/padrino-core/loader.rb",

data/test/fixtures/apps/complex.rb

@@ -21,7 +21,7 @@ Complex1Demo.controllers do
 end
 
 Complex2Demo.controllers do
-  get("(/)"){ "The magick number is: 78!" } # Change only the number!!!
+  get("(/)"){ "The magick number is: 40!" } # Change only the number!!!
 end
 
 Padrino.load!

data/test/fixtures/apps/simple.rb

@@ -11,7 +11,7 @@ end
 
 SimpleDemo.controllers do
   get "/" do
-    'The magick number is: 45!' # Change only the number!!!
+    'The magick number is: 12!' # Change only the number!!!
   end
 end
 

data/test/helper.rb

@@ -58,7 +58,7 @@ class Test::Unit::TestCase
     if response && response.respond_to?(name)
       response.send(name, *args, &block)
     else
-      super
+      super(name, *args, &block)
     end
   end
 

data/test/test_core.rb

@@ -24,9 +24,7 @@ class TestCore < Test::Unit::TestCase
 
     should 'set correct utf-8 encoding' do
       Padrino.set_encoding
-      if RUBY_VERSION >= '1.9'
-        assert_equal nil, $KCODE
-      else
+      if RUBY_VERSION <'1.9'
         assert_equal 'UTF8', $KCODE
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 +01:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,7 +138,6 @@ files:
 - lib/padrino-core/cli/base.rb
 - lib/padrino-core/cli/console.rb
 - lib/padrino-core/cli/rake.rb
-- lib/padrino-core/cli/test.rb
 - lib/padrino-core/images/404.png
 - lib/padrino-core/images/500.png
 - lib/padrino-core/loader.rb

data/lib/padrino-core/cli/test.rb

@@ -1,20 +0,0 @@
-module Padrino
-  module Cli
-    module Test
-      class << self
-
-        # This method executes tests found for the given app.
-        # It look for any spec/*_spec.rb and test/test_*.rb files in your app root.
-        def start
-          puts "=> Executing Tests..."
-          tests  = Dir['test/**/test_*.rb'] - ['test/test_helper.rb']         # TestUnit
-          tests << Dir['test/**/*_test.rb'] - ['test/test_config.rb']         # Bacon
-          tests << Dir['spec/**/*_spec.rb'] - Dir['spec/**/spec_helper.rb']   # Rspec
-          cmd = "ruby -rubygems -I.:lib -e'%w( #{tests.join(' ')} ).each { |file| require file }'"
-          system cmd
-        end
-      end
-
-    end
-  end
-end