padrino-gen 0.12.0.rc1 → 0.12.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34257b397db80982537c1b0e65fdb8bec6380419
-  data.tar.gz: bfbb59c39f77c8305b62b95e5fb86399d4d9f289
+  metadata.gz: bb758a8b5d177651269c465fbd6f8500897d56db
+  data.tar.gz: f68899fefea730d134b4e743751456a9103ea8b4
 SHA512:
-  metadata.gz: 7a33c18c27dcab467595384094a24afa5d073162148a8dc7999a4286c567f6598e0d04d0ae36bef692bebe87c670e92e4ed056431593a91e4086d83d8aec8bf7
-  data.tar.gz: 3afec25a54e43dfc53f09b3bf048a698c3a13f0988881711364a61e3983bfef1ee6e67e96f5690ef99ff8503af321dddd45e9574aab866dba5e6f290ffe71293
+  metadata.gz: 7f5d6894a90e300df8269b1e0a285142328cffc178ec49f06b639f4184623635afb5742f4483929a731e92214c0cdb00db97448a0ef73d1a0cf4815b10dd7869
+  data.tar.gz: bc3ccddb22ad86f32befb5f3edf5724eb9972762e767bf846870bc8df3c44138d7608311650071bd446d26119876a4ecce909c3f63cbe6cbbe373c0830f5dc3b

data/README.rdoc

@@ -38,7 +38,7 @@ You can also instruct the generator to skip a certain component to avoid using o
 
 The available components and their default options are listed below:
 
-test::       none  (default), bacon, shoulda, cucumber, testspec, riot, rspec, minitest, steak
+test::       none  (default), bacon, shoulda, cucumber, riot, rspec, minitest, steak
 renderer::   slim  (default), erb, erubis, liquid, haml
 stylesheet:: none  (default), less, compass, sass, scss
 mock::       none  (default), mocha, rr

data/lib/padrino-gen/padrino-tasks/activerecord.rb

@@ -240,7 +240,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       desc "Load a schema.rb file into the database"
       task :load => :environment do
         file = ENV['SCHEMA'] || Padrino.root("db", "schema.rb")
-        if File.exists?(file)
+        if File.exist?(file)
           load(file)
         else
           raise %{#{file} doesn't exist yet. Run "rake ar:migrate" to create it then try again. If you do not intend to use a database, you should instead alter #{Padrino.root}/config/boot.rb to limit the frameworks that will be loaded}

data/lib/padrino-gen/padrino-tasks/sequel.rb

@@ -2,7 +2,7 @@ if PadrinoTasks.load?(:sequel, defined?(Sequel))
   namespace :sq do
     namespace :migrate do
       desc "Perform automigration (reset your db data)"
-      task :auto => :environment do
+      task :auto => :skeleton do
         ::Sequel.extension :migration
         ::Sequel::Migrator.run Sequel::Model.db, "db/migrate", :target => 0
         ::Sequel::Migrator.run Sequel::Model.db, "db/migrate"
@@ -10,7 +10,7 @@ if PadrinoTasks.load?(:sequel, defined?(Sequel))
       end
 
       desc "Perform migration up/down to VERSION"
-      task :to, [:version] => :environment do |t, args|
+      task :to, [:version] => :skeleton do |t, args|
         version = (args[:version] || ENV['VERSION']).to_s.strip
         ::Sequel.extension :migration
         raise "No VERSION was provided" if version.empty?
@@ -19,14 +19,14 @@ if PadrinoTasks.load?(:sequel, defined?(Sequel))
       end
 
       desc "Perform migration up to latest migration available"
-      task :up => :environment do
+      task :up => :skeleton do
         ::Sequel.extension :migration
         ::Sequel::Migrator.run Sequel::Model.db, "db/migrate"
         puts "<= sq:migrate:up executed"
       end
 
       desc "Perform migration down (erase all data)"
-      task :down => :environment do
+      task :down => :skeleton do
         ::Sequel.extension :migration
         ::Sequel::Migrator.run Sequel::Model.db, "db/migrate", :target => 0
         puts "<= sq:migrate:down executed"
@@ -37,7 +37,7 @@ if PadrinoTasks.load?(:sequel, defined?(Sequel))
     task :migrate => 'sq:migrate:up'
 
     desc "Create the database"
-    task :create => :environment do
+    task :create => :skeleton do
       config = Sequel::Model.db.opts
       user, password, host = config[:user], config[:password], config[:host]
       database = config[:database]
@@ -55,7 +55,7 @@ if PadrinoTasks.load?(:sequel, defined?(Sequel))
     end
 
     desc "Drop the database (postgres and mysql only)"
-    task :drop => :environment do
+    task :drop => :skeleton do
       config = ::Sequel::Model.db.opts
       user, password, host, database = config[:user], config[:password], config[:host], config[:database]
 

data/padrino-gen.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency("padrino-core", Padrino.version)
   s.add_dependency("bundler", "~> 1.0")
+  s.add_development_dependency("padrino-helpers", Padrino.version)
+  s.add_development_dependency("padrino-mailer", Padrino.version)
 end

data/test/helper.rb

@@ -87,7 +87,7 @@ class MiniTest::Spec
   end
 
   def assert_no_match_in_file(pattern, file)
-    File.exists?(file) ? assert_no_match(pattern, File.read(file)) : assert_file_exists(file)
+    File.exist?(file) ? assert_no_match(pattern, File.read(file)) : assert_file_exists(file)
   end
 
   # expects_generated :model, "post title:string body:text"

data/test/test_controller_generator.rb

@@ -115,14 +115,6 @@ describe "ControllerGenerator" do
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app', 'subby'))
     end
 
-    should "generate controller test for testspec" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testspec') }
-      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby'))
-      assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
-    end
-
     should "generate controller test for rspec" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }

data/test/test_model_generator.rb

@@ -489,27 +489,6 @@ describe "ModelGenerator" do
       assert_match_in_file(/assert_not_nil @some_person/m, "#{@apptmp}/sample_project/test/subby/models/some_person_test.rb")
       assert_match_in_file(/'(\/\.\.){2}\/test/m, "#{@apptmp}/sample_project/test/subby/models/some_person_test.rb")
     end
-
-    # TESTSPEC
-    should "generate test file for testspec" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testspec', '-d=activerecord') }
-      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/context "SomeUser Model"/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
-      assert_match_in_file(/@some_user = SomeUser.new/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
-      assert_match_in_file(/@some_user\.should\.not\.be\.nil/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
-      assert_match_in_file(/'(\/\.\.){1}\/test/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
-    end
-
-    should "generate test file for testspec in specified app" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testspec', '-d=activerecord') }
-      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/context "SomeUser Model"/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
-      assert_match_in_file(/@some_user = SomeUser.new/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
-      assert_match_in_file(/@some_user\.should\.not\.be\.nil/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
-      assert_match_in_file(/'(\/\.\.){2}\/test/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
-    end
   end
 
   context "the model destroy option" do

data/test/test_project_generator.rb

@@ -582,21 +582,6 @@ describe "ProjectGenerator" do
       assert_match_in_file(/task 'test' => test_tasks/,"#{@apptmp}/sample_project/test/test.rake")
     end # minitest
 
-    should "properly generate for testspec" do
-      out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=testspec', '--script=none') }
-      assert_match(/applying.*?testspec.*?test/, out)
-      assert_match_in_file(/gem 'rack-test'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/:require => 'rack\/test'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/:group => 'test'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/gem 'test-spec'.*?:require => 'test\/spec'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/test/test_config.rb")
-      assert_match_in_file(/Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/test_config.rb")
-      assert_match_in_file(/gem 'test-spec'.*?:require => 'test\/spec'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_file_exists("#{@apptmp}/sample_project/test/test.rake")
-      assert_match_in_file(/Rake::TestTask\.new\("test:\#/,"#{@apptmp}/sample_project/test/test.rake")
-      assert_match_in_file(/task 'test' => test_tasks/,"#{@apptmp}/sample_project/test/test.rake")
-    end
-
     should "properly generate for cucumber" do
       out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=cucumber', '--script=none') }
       assert_match(/applying.*?cucumber.*?test/, out)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.12.0.rc1
+  version: 0.12.0.rc2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc1
+        version: 0.12.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc1
+        version: 0.12.0.rc2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -41,6 +41,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: padrino-helpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.0.rc2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.0.rc2
+- !ruby/object:Gem::Dependency
+  name: padrino-mailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.0.rc2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.0.rc2
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -100,7 +128,6 @@ files:
 - lib/padrino-gen/generators/components/tests/rspec.rb
 - lib/padrino-gen/generators/components/tests/shoulda.rb
 - lib/padrino-gen/generators/components/tests/steak.rb
-- lib/padrino-gen/generators/components/tests/testspec.rb
 - lib/padrino-gen/generators/controller.rb
 - lib/padrino-gen/generators/mailer.rb
 - lib/padrino-gen/generators/migration.rb

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

@@ -1,81 +0,0 @@
-TESTSPEC_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTSPEC_SETUP)
-PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
-require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
-
-class Test::Unit::TestCase
-  include Rack::Test::Methods
-
-  # You can use this method to custom specify a Rack app
-  # you want rack-test to invoke:
-  #
-  #   app CLASS_NAME
-  #   app CLASS_NAME.tap { |a| }
-  #   app(CLASS_NAME) do
-  #     set :foo, :bar
-  #   end
-  #
-  def app(app = nil, &blk)
-    @app ||= block_given? ? app.instance_eval(&blk) : app
-    @app ||= Padrino.application
-  end
-end
-TEST
-
-TESTSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTSPEC_CONTROLLER_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
-
-context "!NAME!Controller" do
-  setup { get('/') }
-  specify "returns hello world" do
-    last_response.body.should.equal "Hello World"
-  end
-end
-TEST
-
-TESTSPEC_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTSPEC_RAKE)
-require 'rake/testtask'
-
-test_tasks = Dir['test/*/'].map { |d| File.basename(d) }
-
-test_tasks.each do |folder|
-  Rake::TestTask.new("test:\#{folder}") do |test|
-    test.pattern = "test/\#{folder}/**/*_test.rb"
-    test.verbose = true
-  end
-end
-
-desc "Run application test suite"
-task 'test' => test_tasks.map { |f| "test:\#{f}" }
-TEST
-
-TESTSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTSPEC_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
-
-context "!NAME! Model" do
-  specify 'can be created' do
-    @!DNAME! = !NAME!.new
-    @!DNAME!.should.not.be.nil
-  end
-end
-TEST
-
-def setup_test
-  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
-  require_dependencies 'test-spec', :require => 'test/spec', :group => 'test'
-  insert_test_suite_setup TESTSPEC_SETUP
-  create_file destination_root("test/test.rake"), TESTSPEC_RAKE
-end
-
-def generate_controller_test(name)
-  testspec_contents = TESTSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
-  controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
-  create_file destination_root(controller_test_path), testspec_contents, :skip => true
-end
-
-def generate_model_test(name)
-  tests_contents = TESTSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
-  path = options[:app] == '.' ? '/..' : '/../..'
-  tests_contents.gsub!(/!PATH!/,path)
-  model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
-  create_file destination_root(model_test_path), tests_contents, :skip => true
-end