padrino-gen 0.7.4 → 0.7.5

data/VERSION

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

data/lib/padrino-gen.rb

@@ -1,3 +1,4 @@
+require 'thor/group'
 require 'padrino-core/support_lite'
 require 'padrino-core/version'
 require 'padrino-gen/generators'

data/lib/padrino-gen/generators.rb

@@ -1,6 +1,8 @@
 module Padrino
   module Generators
 
+    DEV_PATH = File.expand_path("../../../", File.dirname(__FILE__))
+
     class << self
       def load_paths
         @load_paths ||= Dir[File.dirname(__FILE__) + '/generators/{app,mailer,controller,model,migration}.rb']

data/lib/padrino-gen/generators/actions.rb

@@ -90,7 +90,7 @@ module Padrino
 
       # Adds all the specified gems into the Gemfile for bundler
       # require_dependencies 'active_record'
-      # require_dependencies 'mocha', 'bacon', :group => :testing
+      # require_dependencies 'mocha', 'bacon', :group => :test
       def require_dependencies(*gem_names)
         options = gem_names.extract_options!
         gem_names.reverse.each { |lib| insert_into_gemfile(lib, options) }
@@ -98,7 +98,7 @@ module Padrino
 
       # Inserts a required gem into the Gemfile to add the bundler dependency
       # insert_into_gemfile(name)
-      # insert_into_gemfile(name, :group => :testing, :require => 'foo')
+      # insert_into_gemfile(name, :group => :test, :require => 'foo')
       def insert_into_gemfile(name, options={})
         after_pattern = options[:group] ? "#{options[:group].to_s.capitalize} requirements\n" : "Component requirements\n"
         gem_options = options.slice(:group, :require).collect { |k, v| "#{k.inspect} => #{v.inspect}" }.join(", ")

data/lib/padrino-gen/generators/app.rb

@@ -18,8 +18,9 @@ module Padrino
 
       argument :name, :desc => "The name of your padrino project"
 
-      class_option :run_bundler, :aliases => '-b', :default => false, :type => :boolean
-      class_option :root, :desc => "The root destination",        :aliases => '-r', :default => ".",   :type => :string
+      class_option :run_bundler,  :desc => "Run 'bundle install'",            :aliases => '-b', :default => false, :type => :boolean
+      class_option :root,         :desc => "The root destination",            :aliases => '-r', :default => ".",   :type => :string
+      class_option :dev,          :desc => "Use padrino from a git checkout",                   :default => false, :type => :boolean
 
       # Definitions for the available customizable components
       component_option :orm,      "database engine",    :aliases => '-d', :choices => [:datamapper, :mongomapper, :activerecord, :sequel, :couchrest]

data/lib/padrino-gen/generators/app/config/boot.rb

@@ -1,10 +1,19 @@
-# AUTOGENERATED FILE -- Don't change this file unless you know what you are doing! 
+# Defines our constants
+PADRINO_ENV  = ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= "development" unless defined?(PADRINO_ENV)
 PADRINO_ROOT = File.dirname(__FILE__) + '/..' unless defined? PADRINO_ROOT
 
-# Try to load the vendorized padrino.
-Dir[PADRINO_ROOT + "/vendor/padrino/**/lib"].each do |gem|
-  $:.unshift gem
+begin
+  # Require the preresolved locked set of gems.
+  require File.expand_path('../../.bundle/environment', __FILE__)
+  require 'padrino'
+rescue LoadError
+  # Fallback on doing the resolve at runtime.
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
 end
 
-require 'padrino'
+Bundler.require :default, PADRINO_ENV
+puts "=> Located #{Padrino.bundle} Gemfile for #{Padrino.env} with #{Padrino.support.to_s.humanize}"
+
 Padrino.load!

data/lib/padrino-gen/generators/components/mocks/mocha_gen.rb

@@ -5,7 +5,7 @@ module Padrino
         
         module MochaGen
           def setup_mock
-            require_dependencies 'mocha', :group => :testing
+            require_dependencies 'mocha', :group => :test
             insert_mocking_include "Mocha::API", :path => "test/test_config.rb"
           end
         end

data/lib/padrino-gen/generators/components/mocks/rr_gen.rb

@@ -5,7 +5,7 @@ module Padrino
         
         module RrGen
           def setup_mock
-            require_dependencies 'rr', :group => :testing
+            require_dependencies 'rr', :group => :test
             insert_mocking_include "RR::Adapters::RRMethods", :path => "test/test_config.rb"
           end
         end

data/lib/padrino-gen/generators/components/tests/bacon_test_gen.rb

@@ -16,7 +16,7 @@ module Padrino
 
           # Setup the testing configuration helper and dependencies
           def setup_test
-            require_dependencies 'bacon', :group => :testing
+            require_dependencies 'bacon', :group => :test
             insert_test_suite_setup BACON_SETUP
           end
 

data/lib/padrino-gen/generators/components/tests/riot_test_gen.rb

@@ -15,7 +15,7 @@ module Padrino
           TEST
 
           def setup_test
-            require_dependencies 'riot', :group => :testing
+            require_dependencies 'riot', :group => :test
             insert_test_suite_setup RIOT_SETUP
           end
 

data/lib/padrino-gen/generators/components/tests/rspec_test_gen.rb

@@ -16,7 +16,7 @@ module Padrino
 
           # TODO move to spec directory to follow convention
           def setup_test
-            require_dependencies 'rspec', :group => :testing, :require => 'spec'
+            require_dependencies 'rspec', :group => :test, :require => 'spec'
             insert_test_suite_setup RSPEC_SETUP
           end
 

data/lib/padrino-gen/generators/components/tests/shoulda_test_gen.rb

@@ -15,7 +15,7 @@ module Padrino
           TEST
 
           def setup_test
-            require_dependencies 'shoulda', :group => :testing
+            require_dependencies 'shoulda', :group => :test
             insert_test_suite_setup SHOULDA_SETUP
           end
 

data/lib/padrino-gen/generators/components/tests/testspec_test_gen.rb

@@ -15,7 +15,7 @@ module Padrino
           TEST
 
           def setup_test
-            require_dependencies 'test/spec', :group => :testing
+            require_dependencies 'test/spec', :group => :test
             insert_test_suite_setup TESTSPEC_SETUP
           end
 

data/lib/padrino-gen/generators/templates/Gemfile.tt

@@ -2,11 +2,20 @@ source 'http://gemcutter.org'
 
 # Project requirements
 gem 'sinatra', :require => 'sinatra/base'
-gem 'padrino', "<%= Padrino.version %>"
 gem 'rack-flash'
 gem 'thin' # or mongrel
 
 # Component requirements
 
-# Testing requirements
-gem 'rack-test', :require => 'rack/test', :group => :testing
+# Test requirements
+gem 'rack-test', :require => 'rack/test', :group => :test
+
+<%- if options.dev? -%>
+# Vendored Padrino
+%w(core gen helpers mailer admin).each do |gem|
+  gem 'padrino-' + gem, :path => "<%= Padrino::Generators::DEV_PATH %>/padrino-" + gem
+end
+<%- else -%>
+# Padrino
+gem 'padrino', "<%= Padrino.version %>"
+<%- end -%>

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  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-gen}
   s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{padrinorb@gmail.com}
@@ -99,7 +99,7 @@ Gem::Specification.new do |s|
 
     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<padrino-core>, ["= 0.7.4"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.5"])
       s.add_runtime_dependency(%q<thor>, [">= 0.13.0"])
       s.add_runtime_dependency(%q<bundler>, [">= 0.9.3"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
@@ -110,7 +110,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.3"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<padrino-core>, ["= 0.7.4"])
+      s.add_dependency(%q<padrino-core>, ["= 0.7.5"])
       s.add_dependency(%q<thor>, [">= 0.13.0"])
       s.add_dependency(%q<bundler>, [">= 0.9.3"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
@@ -122,7 +122,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.7.4"])
+    s.add_dependency(%q<padrino-core>, ["= 0.7.5"])
     s.add_dependency(%q<thor>, [">= 0.13.0"])
     s.add_dependency(%q<bundler>, [">= 0.9.3"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 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-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.4
+        version: 0.7.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: thor