padrino-core 0.6.1 → 0.6.2

data/README.rdoc

@@ -1,4 +1,4 @@
-= padrino-core
+= Padrino (padrino-core)
 
 Padrino is the godfather of Sinatra.
 
@@ -417,4 +417,4 @@ Using these commands can simplify common tasks making development that much smoo
 
 == Copyright
 
-Copyright (c) 2010 Padrino. See LICENSE for details.
+Copyright (c) 2010 Padrino. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/padrino-core/cli.rb

@@ -41,8 +41,6 @@ module Padrino
       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="")
-        require 'padrino-core/support_lite'
-        require 'padrino-core/tasks'
         boot = check_boot
         return unless boot
         require 'rake'

data/lib/padrino-core/loader.rb

@@ -4,7 +4,7 @@ module Padrino
     def load!
       return false if loaded?
       @_called_from = first_caller
-      load_required_gems # load bundler gems
+      # load_required_gems # load bundler gems
       require_dependencies("#{root}/lib/**/*.rb", "#{root}/models/**/*.rb") # load root app models
       require_dependencies("#{root}/config/database.rb", "#{root}/config/apps.rb") # load configuration
       Stat.reload! # We need to fill our Stat::CACHE but we do that only for development
@@ -56,30 +56,5 @@ module Padrino
     end
     alias :load_dependency :load_dependencies
 
-    protected
-      # Loads the vendored gems or system wide gems through Gemfile
-      def load_required_gems
-        require root('vendor', 'gems', 'environment')
-        Bundler.require_env(Padrino.env)
-        say! "=> Loaded bundled gems for #{Padrino.env} with #{Padrino.support.to_s.humanize}"
-      rescue LoadError
-        require 'bundler'
-        if File.exist?(root("Gemfile"))
-          Bundler::Bundle.load(root("Gemfile")).environment.require_env(Padrino.env)
-          say! "=> Located Gemfile for #{Padrino.env} with #{Padrino.support.to_s.humanize}"
-        else
-          say! "=> Gemfile for #{Padrino.env} not found!"
-        end
-      end
-
-      # Prints out a message to the stdout if not in test environment
-      def say(text)
-        print text if Padrino.env != :test
-      end
-    
-      # Puts out a message to the stdout if not in test environment
-      def say!(text)
-        puts text if Padrino.env != :test
-      end
   end
 end

data/lib/padrino-core/stat.rb

@@ -30,7 +30,7 @@ module Padrino
 
       # A safe Kernel::load, issuing the hooks depending on the results
       def safe_load(file, mtime)
-        Padrino.say! "=> Reloading #{file}"
+        logger.debug "Reloading #{file}"
         load(file)
         file
       rescue LoadError, SyntaxError => ex

data/lib/padrino-core/support_lite.rb

@@ -19,6 +19,7 @@ Required for Padrino to run:
 
 =end
 require 'i18n'
+
 # Load our locales
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"]
 
@@ -28,6 +29,7 @@ module Padrino
   def self.support
     @_padrino_support
   end
+
 end
 
 if defined?(Extlib) # load if already using extlib

data/lib/padrino-core.rb

@@ -1,8 +1,6 @@
 require 'usher'
 require 'sinatra/base'
 
-Dir[File.dirname(__FILE__) + '/padrino-core/*.rb'].each {|file| require file }
-
 # Defines our PADRINO_ENV
 PADRINO_ENV = ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= "development" unless defined?(PADRINO_ENV)
 
@@ -30,4 +28,27 @@ module Padrino
     self.mounted_apps.each { |app| app.map_onto(builder) }
     builder
   end
+
+  # Method used for require dependencies and correct support_lite
+  def self.require_dependencies!
+    require root('vendor', 'gems', 'environment')
+    Bundler.require_env(Padrino.env)
+    Dir[File.dirname(__FILE__) + '/padrino-core/*.rb'].each {|file| require file }
+    puts "=> Loaded bundled gems for #{Padrino.env} with #{Padrino.support.to_s.humanize}"
+  rescue LoadError
+    require 'bundler'
+    if File.exist?(root("Gemfile"))
+      Bundler::Bundle.load(root("Gemfile")).environment.require_env(Padrino.env)
+      Dir[File.dirname(__FILE__) + '/padrino-core/*.rb'].each {|file| require file }
+      puts "=> Located Gemfile for #{Padrino.env} with #{Padrino.support.to_s.humanize}"
+    else
+      Dir[File.dirname(__FILE__) + '/padrino-core/*.rb'].each {|file| require file }
+    end
+  end
 end
+
+# When we require this file is necessary check if we have a gemfile o bundled gems, 
+# this because we load ExtLib or ActiveSupport if some of our dependencies
+# just require them. This prevent for example to load ActiveSupport
+# when we require only 'dm-core'.
+Padrino.require_dependencies!

data/padrino-core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.6.1"
+  s.version = "0.6.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"]

data/test/fixtures/apps/complex.rb

@@ -21,7 +21,7 @@ Complex1Demo.controllers do
 end
 
 Complex2Demo.controllers do
-  get("(/)"){ "The magick number is: 53!" } # Change only the number!!!
+  get("(/)"){ "The magick number is: 78!" } # 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: 43!' # Change only the number!!!
+    'The magick number is: 45!' # Change only the number!!!
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Padrino Team