padrino-gen 0.7.3 → 0.7.4

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'sdoc'
 
 GEM_VERSION = File.read(File.dirname(__FILE__) + '/VERSION')
 
@@ -17,7 +18,7 @@ begin
     gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
     gem.add_runtime_dependency     "padrino-core",  "= #{GEM_VERSION}"
     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 "haml",          ">= 2.2.1"
     gem.add_development_dependency "shoulda",       ">= 0"
     gem.add_development_dependency "mocha",         ">= 0.9.7"
@@ -27,7 +28,7 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
-  Jeweler::GemcutterTasks.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-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', :only => :testing
+      # require_dependencies 'mocha', 'bacon', :group => :testing
       def require_dependencies(*gem_names)
         options = gem_names.extract_options!
         gem_names.reverse.each { |lib| insert_into_gemfile(lib, options) }
@@ -98,10 +98,10 @@ module Padrino
 
       # Inserts a required gem into the Gemfile to add the bundler dependency
       # insert_into_gemfile(name)
-      # insert_into_gemfile(name, :only => :testing, :require_as => 'foo')
+      # insert_into_gemfile(name, :group => :testing, :require => 'foo')
       def insert_into_gemfile(name, options={})
-        after_pattern = options[:only] ? "#{options[:only].to_s.capitalize} requirements\n" : "Component requirements\n"
-        gem_options = options.slice(:only, :require_as).collect { |k, v| "#{k.inspect} => #{v.inspect}" }.join(", ")
+        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(", ")
         include_text = "gem '#{name}'" << (gem_options.present? ? ", #{gem_options}" : "") << "\n"
         options.merge!(:content => include_text, :after => after_pattern)
         inject_into_file('Gemfile', options[:content], :after => options[:after])

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

@@ -40,6 +40,7 @@ module Padrino
         self.destination_root = File.join(options[:root], name)
         directory("app/", destination_root)
         store_component_config('.components')
+        template "templates/Gemfile.tt", destination_root("Gemfile")
       end
 
       # For each component, retrieve a valid choice and then execute the associated generator
@@ -54,7 +55,7 @@ module Padrino
       def bundle_dependencies
         if options[:run_bundle]
           say "Bundling application dependencies using bundler..."
-          in_root { run 'gem bundle' }
+          in_root { run 'bundle install' }
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Padrino
         
         module MochaGen
           def setup_mock
-            require_dependencies 'mocha', :only => :testing
+            require_dependencies 'mocha', :group => :testing
             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', :only => :testing
+            require_dependencies 'rr', :group => :testing
             insert_mocking_include "RR::Adapters::RRMethods", :path => "test/test_config.rb"
           end
         end

data/lib/padrino-gen/generators/components/orms/activerecord_gen.rb

@@ -57,7 +57,8 @@ module Padrino
           AR
 
           def setup_orm
-            require_dependencies 'activerecord', :require_as => 'active_record'
+            require_dependencies 'sqlite3-ruby', :require => 'sqlite3'
+            require_dependencies 'activerecord', :require => 'active_record'
             create_file("config/database.rb", AR)
             empty_directory('app/models')
           end

data/lib/padrino-gen/generators/components/orms/datamapper_gen.rb

@@ -23,7 +23,7 @@ module Padrino
           DM
 
           def setup_orm
-            require_dependencies 'dm-core', 'dm-validations', 'dm-aggregates', 'dm-timestamps'
+            require_dependencies 'data_objects', 'do_sqlite3', 'dm-core', 'dm-validations', 'dm-aggregates', 'dm-timestamps', 'dm-migrations'
             create_file("config/database.rb", DM)
             empty_directory('app/models')
           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', :only => :testing
+            require_dependencies 'bacon', :group => :testing
             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', :only => :testing
+            require_dependencies 'riot', :group => :testing
             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', :only => :testing, :require_as => 'spec'
+            require_dependencies 'rspec', :group => :testing, :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', :only => :testing
+            require_dependencies 'shoulda', :group => :testing
             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', :only => :testing
+            require_dependencies 'test/spec', :group => :testing
             insert_test_suite_setup TESTSPEC_SETUP
           end
 

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

@@ -0,0 +1,12 @@
+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

data/lib/padrino-gen.rb

@@ -1,4 +1,5 @@
 require 'padrino-core/support_lite'
+require 'padrino-core/version'
 require 'padrino-gen/generators'
 require 'padrino-core/tasks'
 Padrino::Tasks.files << Dir[File.dirname(__FILE__) + "/padrino-gen/padrino-tasks/**/*.rb"]

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  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-gen}
   s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{padrinorb@gmail.com}
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/actions.rb",
      "lib/padrino-gen/generators/app.rb",
      "lib/padrino-gen/generators/app/.gitignore",
-     "lib/padrino-gen/generators/app/Gemfile",
      "lib/padrino-gen/generators/app/app/.empty_directory",
      "lib/padrino-gen/generators/app/app/app.rb.tt",
      "lib/padrino-gen/generators/app/app/controllers/.empty_directory",
@@ -67,6 +66,7 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/mailer.rb",
      "lib/padrino-gen/generators/migration.rb",
      "lib/padrino-gen/generators/model.rb",
+     "lib/padrino-gen/generators/templates/Gemfile.tt",
      "lib/padrino-gen/generators/templates/controller.rb.tt",
      "lib/padrino-gen/generators/templates/helper.rb.tt",
      "lib/padrino-gen/generators/templates/mailer.rb.tt",
@@ -99,9 +99,9 @@ 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.3"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.4"])
       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<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -110,9 +110,9 @@ 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.3"])
+      s.add_dependency(%q<padrino-core>, ["= 0.7.4"])
       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<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -122,9 +122,9 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.7.3"])
+    s.add_dependency(%q<padrino-core>, ["= 0.7.4"])
     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<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/test_app_generator.rb

@@ -105,7 +105,7 @@ class TestAppGenerator < Test::Unit::TestCase
     should "properly generate for activerecord" do
       buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--orm=activerecord', '--script=none']) }
       assert_match /Applying.*?activerecord.*?orm/, buffer
-      assert_match_in_file(/gem 'active_record'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/gem 'activerecord', :require => "active_record"/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/ActiveRecord::Base.establish_connection/, '/tmp/sample_app/config/database.rb')
       assert_dir_exists('/tmp/sample_app/app/models')
     end
@@ -194,7 +194,7 @@ class TestAppGenerator < Test::Unit::TestCase
     should "properly generate for rspec" do
       buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--test=rspec', '--script=none']) }
       assert_match /Applying.*?rspec.*?test/, buffer
-      assert_match_in_file(/gem 'rspec'.*?:require_as => "spec"/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/gem 'rspec'.*?:require => "spec"/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Spec::Runner/, '/tmp/sample_app/test/test_config.rb')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 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-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.3
+        version: 0.7.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.9.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -136,7 +136,6 @@ files:
 - lib/padrino-gen/generators/actions.rb
 - lib/padrino-gen/generators/app.rb
 - lib/padrino-gen/generators/app/.gitignore
-- lib/padrino-gen/generators/app/Gemfile
 - lib/padrino-gen/generators/app/app/.empty_directory
 - lib/padrino-gen/generators/app/app/app.rb.tt
 - lib/padrino-gen/generators/app/app/controllers/.empty_directory
@@ -173,6 +172,7 @@ files:
 - lib/padrino-gen/generators/mailer.rb
 - lib/padrino-gen/generators/migration.rb
 - lib/padrino-gen/generators/model.rb
+- lib/padrino-gen/generators/templates/Gemfile.tt
 - lib/padrino-gen/generators/templates/controller.rb.tt
 - lib/padrino-gen/generators/templates/helper.rb.tt
 - lib/padrino-gen/generators/templates/mailer.rb.tt

data/lib/padrino-gen/generators/app/Gemfile

@@ -1,12 +0,0 @@
-clear_sources
-source 'http://gemcutter.org'
-
-# Project requirements
-gem 'sinatra', :require_as => 'sinatra/base'
-gem 'padrino'
-gem 'rack-flash'
-
-# Component requirements
-
-# Testing requirements
-gem 'rack-test', :require_as => 'rack/test', :only => :testing