padrino-core 0.7.3 → 0.7.4

data/README.rdoc

@@ -270,7 +270,7 @@ we can create Gemfile within the application root. This will contain a list of a
   # /Gemfile
   clear_sources
   source 'http://gemcutter.org'
-  gem 'sinatra',     :require_as => 'sinatra/base'
+  gem 'sinatra',     :require => 'sinatra/base'
   gem 'rack-flash'
   
 This manifest file uses the standard <tt>bundler</tt> gem syntax of which details can be found in the

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'sdoc'
 
 begin
   require 'jeweler'
@@ -12,11 +13,11 @@ begin
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
     gem.executables = ["padrino"]
     gem.rubyforge_project = 'padrino-core'
-    gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
+    gem.add_runtime_dependency     "sinatra",       ">= 0.9.4"
     gem.add_runtime_dependency     "i18n",          ">= 0.3.2"
     gem.add_runtime_dependency     "usher",         ">= 0.6.2"
     gem.add_runtime_dependency     "thor",          ">= 0.13.0"
-    gem.add_runtime_dependency     "bundler",       ">= 0.8.1"
+    gem.add_runtime_dependency     "bundler",       ">= 0.9.3"
     gem.add_development_dependency "shoulda",       ">= 0"
     gem.add_development_dependency "mocha",         ">= 0.9.7"
     gem.add_development_dependency "rack-test",     ">= 0.5.0"
@@ -24,7 +25,7 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new
+  Jeweler::RubyforgeTasks.new { |r| r.doc_task = :none }
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/lib/padrino-core.rb

@@ -63,14 +63,15 @@ module Padrino
     # Method used for require dependencies and correct support_lite
     # 
     def require_dependencies!
-      require root('vendor', 'gems', 'environment')
-      Bundler.require_env(Padrino.env)
+      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
-      require 'bundler'
       if File.exist?(root("Gemfile"))
-        Bundler::Bundle.load(root("Gemfile")).environment.require_env(Padrino.env)
+        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

data/lib/padrino-core/cli.rb

@@ -11,7 +11,7 @@ module Padrino
 
       desc "start", "Starts the Padrino application"
       method_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development
-      method_option :adapter,     :type => :string,  :aliases => "-a", :required => true, :default => :thin
+      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"

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   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-07}
+  s.date = %q{2010-02-08}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{padrinorb@gmail.com}
@@ -78,32 +78,32 @@ 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<sinatra>, [">= 0.9.2"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<usher>, [">= 0.6.2"])
       s.add_runtime_dependency(%q<thor>, [">= 0.13.0"])
-      s.add_runtime_dependency(%q<bundler>, [">= 0.8.1"])
+      s.add_runtime_dependency(%q<bundler>, [">= 0.9.3"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
-      s.add_dependency(%q<sinatra>, [">= 0.9.2"])
+      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
       s.add_dependency(%q<i18n>, [">= 0.3.2"])
       s.add_dependency(%q<usher>, [">= 0.6.2"])
       s.add_dependency(%q<thor>, [">= 0.13.0"])
-      s.add_dependency(%q<bundler>, [">= 0.8.1"])
+      s.add_dependency(%q<bundler>, [">= 0.9.3"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<sinatra>, [">= 0.9.2"])
+    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
     s.add_dependency(%q<i18n>, [">= 0.3.2"])
     s.add_dependency(%q<usher>, [">= 0.6.2"])
     s.add_dependency(%q<thor>, [">= 0.13.0"])
-    s.add_dependency(%q<bundler>, [">= 0.8.1"])
+    s.add_dependency(%q<bundler>, [">= 0.9.3"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])
     s.add_dependency(%q<rack-test>, [">= 0.5.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +01:00
+date: 2010-02-08 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: i18n
@@ -63,7 +63,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.9.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: shoulda