padrino-core 0.7.4 → 0.7.5

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/lib/padrino-core/server.rb

@@ -55,8 +55,7 @@ module Padrino
         Handlers.each do |server_name|
           begin
             return Rack::Handler.get(server_name.downcase)
-          rescue LoadError
-          rescue NameError
+          rescue Exception
           end
         end
         raise LoadError, "Server handler (#{servers.join(',')}) not found."

data/lib/padrino-core.rb

@@ -1,5 +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)
@@ -60,31 +61,12 @@ module Padrino
     end
 
     ##
-    # Method used for require dependencies and correct support_lite
+    # Return bundle status :+:locked+ if .bundle/environment.rb exist :+:unlocked if Gemfile exist
+    # otherwise return nil
     # 
-    def require_dependencies!
-      require root('.bundle/environment.rb')
-      Dir[File.dirname(__FILE__) + '/padrino-core/*.rb'].each {|file| require file }
-      Bundler.require :default, Padrino.env
-      puts "=> Loaded bundled gems for #{Padrino.env} with #{Padrino.support.to_s.humanize}"
-    rescue LoadError
-      if File.exist?(root("Gemfile"))
-        require 'bundler'
-        Bundler.setup
-        Bundler.require :default, 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
+    def bundle
+      return :locked   if File.exist?(root('.bundle/environment.rb'))
+      return :unlocked if File.exist?(root("Gemfile"))
     end
   end # self
-end # Padrino
-
-##
-# 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!
+end # Padrino

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.7.4"
+  s.version = "0.7.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-02-08}
+  s.date = %q{2010-02-09}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{padrinorb@gmail.com}

data/test/test_core.rb

@@ -9,7 +9,6 @@ class TestCore < Test::Unit::TestCase
       assert_respond_to Padrino, :env
       assert_respond_to Padrino, :application
       assert_respond_to Padrino, :set_encoding
-      assert_respond_to Padrino, :require_dependencies!
       assert_respond_to Padrino, :load!
       assert_respond_to Padrino, :reload!
       assert_respond_to Padrino, :version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 +01:00
+date: 2010-02-09 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency