diff --git a/padrino-core/lib/padrino-core/cli/base.rb b/padrino-core/lib/padrino-core/cli/base.rb index d5dd33d7b..528aed558 100644 --- a/padrino-core/lib/padrino-core/cli/base.rb +++ b/padrino-core/lib/padrino-core/cli/base.rb @@ -41,7 +41,6 @@ def stop 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] @@ -51,9 +50,8 @@ def rake(*args) ARGV.clear ARGV.concat(args) puts "=> Executing Rake #{ARGV.join(' ')} ..." - ENV['PADRINO_LOG_LEVEL'] ||= options[:verbose] ? 'development' : 'test' load File.expand_path('../rake.rb', __FILE__) - silence(:stdout) { require File.expand_path('config/boot.rb') } + require File.expand_path('config/boot.rb') PadrinoTasks.init(true) end diff --git a/padrino/padrino.gemspec b/padrino/padrino.gemspec index 1aff23cd9..4814db144 100755 --- a/padrino/padrino.gemspec +++ b/padrino/padrino.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.description = "The Godfather of Sinatra provides a full-stack agnostic framework on top of Sinatra" s.required_rubygems_version = ">= 1.3.6" s.version = Padrino.version - s.platform = Gem::Platform::RUBY + s.platform = Gem::Platform::RUBY s.date = Time.now.strftime("%Y-%m-%d") s.extra_rdoc_files = Dir["*.rdoc"]