merb-gen 1.0.15 → 1.1.0.pre

data/spec/merb_core_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::MerbCoreGenerator do
   
@@ -7,7 +7,18 @@ describe Merb::Generators::MerbCoreGenerator do
     before do
       @generator = Merb::Generators::MerbCoreGenerator.new('/tmp', {}, 'testing')
     end
+
+    it_should_behave_like "named generator"
+    it_should_behave_like "app generator"
+
+    it "should create an Gemfile" do
+      @generator.should create('/tmp/testing/Gemfile')
+    end
     
+    it "should create an bin/merb" do
+      @generator.should create('/tmp/testing/bin/merb')
+    end
+
     it "should create an init.rb" do
       @generator.should create('/tmp/testing/config/init.rb')
     end
@@ -24,15 +35,16 @@ describe Merb::Generators::MerbCoreGenerator do
       @generator.should create('/tmp/testing/.gitignore')
     end
     
-    it "should have an htaccess file" do
-      @generator.should create('/tmp/testing/public/.htaccess')
-    end
-    
     it "should create a number of views"
     
     it "should render templates successfully" do
       lambda { @generator.render! }.should_not raise_error
     end
+
+    it "should have an empty lib/tasks directory" do
+      @generator.should create('/tmp/testing/lib/tasks')
+    end
+
     
   end
   

data/spec/merb_flat_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::MerbFlatGenerator do
   
@@ -9,6 +9,15 @@ describe Merb::Generators::MerbFlatGenerator do
     end
     
     it_should_behave_like "named generator"
+    it_should_behave_like "app generator"
+
+    it "should create an Gemfile" do
+      @generator.should create('/tmp/testing/Gemfile')
+    end
+
+    it "should create an bin/merb" do
+      @generator.should create('/tmp/testing/bin/merb')
+    end
     
     it "should create a number of views"
     

data/spec/merb_plugin_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::MerbPluginGenerator do
   
@@ -9,7 +9,7 @@ describe Merb::Generators::MerbPluginGenerator do
     end
     
     it_should_behave_like "named generator"
-    
+
     it "should create a number of views"
     
     it "should render templates successfully" do
@@ -18,4 +18,4 @@ describe Merb::Generators::MerbPluginGenerator do
     
   end
   
-end
+end

data/spec/merb_stack_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::MerbStackGenerator do
 
@@ -8,12 +8,23 @@ describe Merb::Generators::MerbStackGenerator do
       @generator = Merb::Generators::MerbStackGenerator.new('/tmp', {}, 'testing')
     end
 
-    it "should create config/init.rb" do
-      @generator.should create('/tmp/testing/config/init.rb')
+    it_should_behave_like "named generator"
+    it_should_behave_like "app generator"
+
+    it "should create an Gemfile" do
+      @generator.should create('/tmp/testing/Gemfile')
     end
 
-    it "should create config/dependencies.rb" do
-      @generator.should create('/tmp/testing/config/dependencies.rb')
+    it "should create an bin/merb" do
+      @generator.should create('/tmp/testing/bin/merb')
+    end
+
+    it "should create a passenger config file" do
+      @generator.should create('/tmp/testing/config.ru')
+    end
+
+    it "should create config/init.rb" do
+      @generator.should create('/tmp/testing/config/init.rb')
     end
 
     it "should create config/database.yml" do
@@ -32,14 +43,16 @@ describe Merb::Generators::MerbStackGenerator do
       @generator.should create('/tmp/testing/.gitignore')
     end
 
-    it "should have an htaccess file" do
-      @generator.should create('/tmp/testing/public/.htaccess')
-    end
-
     it "should create a number of views"
 
     it "should render templates successfully" do
-      lambda { @generator.render! }.should_not raise_error
+      lambda do 
+        @generator.render! 
+      end.should_not raise_error
+    end
+
+    it "should create an empty lib/tasks directory" do
+      @generator.should create('/tmp/testing/lib/tasks')
     end
 
   end

data/spec/merb_very_flat_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::MerbVeryFlatGenerator do
   
@@ -7,6 +7,17 @@ describe Merb::Generators::MerbVeryFlatGenerator do
     before do
       @generator = Merb::Generators::MerbVeryFlatGenerator.new('/tmp', {}, 'testing')
     end
+
+    it_should_behave_like "named generator"
+    it_should_behave_like "app generator"
+
+    it "should create an Gemfile" do
+      @generator.should create('/tmp/testing/Gemfile')
+    end
+
+    it "should create an bin/merb" do
+      @generator.should create('/tmp/testing/bin/merb')
+    end
     
     it "should create a number of views"
     
@@ -16,4 +27,4 @@ describe Merb::Generators::MerbVeryFlatGenerator do
     
   end
   
-end
+end

data/spec/migration_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::MigrationGenerator do
   

data/spec/model_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::ModelGenerator do
   

data/spec/named_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::NamedGenerator do
 

data/spec/namespaced_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::NamespacedGenerator do
 

data/spec/part_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::PartControllerGenerator do
 

data/spec/passenger_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Merb::Generators::PassengerGenerator do
+  
+  describe "templates" do
+    before(:each) do
+      @generator = Merb::Generators::PassengerGenerator.new('/tmp', {})
+    end
+
+    it "should create a config.ru file" do
+      @generator.should create('/tmp/config.ru')
+    end
+    
+    it "should render templates successfully" do
+      lambda { @generator.render! }.should_not raise_error
+    end
+    
+  end
+  
+end

data/spec/resource_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::ResourceControllerGenerator do
 

data/spec/resource_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::ResourceGenerator do
   

data/spec/session_migration_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::MerbPluginGenerator do
   

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -1,9 +1,17 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+require "rubygems"
 
-require 'rubygems'
-require 'spec'
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
 require 'merb-core'
-require 'merb-gen'
+
+# The lib under test
+require "merb-gen"
+
+# Satisfies Autotest and anyone else not using the Rake tasks
+require 'spec'
+
+# Templater spec support
 require 'templater/spec/helpers'
 
 Merb.disable(:initfile)
@@ -12,6 +20,47 @@ Spec::Runner.configure do |config|
   config.include Templater::Spec::Helpers
 end
 
+describe "app generator", :shared => true do
+  
+  describe "#gems_for_orm" do
+    [:activerecord, :sequel, :datamapper].each do |orm|
+      it "should generate DSL for #{orm} ORM plugin" do
+        @generator.gems_for_orm(orm).should == %Q{gem "merb_#{orm}"}
+      end
+    end
+
+    it "should not generate DSL if we don't use ORM" do
+      @generator.gems_for_orm(:none).should  == ''
+    end
+  end
+
+  describe "#gems_for_template_engine" do
+    [:haml, :builder].each do |engine|
+      it "should generate DSL for #{engine} template engine plugin" do
+        @generator.gems_for_template_engine(engine).should == %Q{gem "merb-#{engine}"}
+      end
+    end
+
+    it "should generate DSL for template engine plugins other than haml and builder" do
+      @generator.gems_for_template_engine(:liquid).should == 'gem "merb_liquid"'
+    end
+
+    it "should not generate DSL if we use erb" do
+      @generator.gems_for_template_engine(:erb).should  == ''
+    end
+  end
+
+  describe "#gems_for_testing_framework" do
+    it "should generate DSL for testing framework plugin" do
+      @generator.gems_for_testing_framework(:test_unit).should == 'gem "test_unit", :group => :test'
+    end
+
+    it "should not generate DSL if we use rspec" do
+      @generator.gems_for_testing_framework(:rspec).should  == ''
+    end
+  end
+end
+
 describe "named generator", :shared => true do
 
   describe '#file_name' do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  prerelease: true
+  segments: 
+  - 1
+  - 1
+  - 0
+  - pre
+  version: 1.1.0.pre
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,45 +15,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
-default_executable: 
+date: 2010-03-02 00:00:00 +01:00
+default_executable: merb-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
-    version: 
+        segments: 
+        - 1
+        - 1
+        - 0
+        - pre
+        version: 1.1.0.pre
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: templater
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.3
-    version: 
-description: Generators suite for Merb.
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  type: :development
+  version_requirements: *id003
+description: Merb plugin containing useful code generators
 email: jonas.nicklas@gmail.com
 executables: 
 - merb-gen
 extensions: []
 
 extra_rdoc_files: 
-- README
 - LICENSE
+- README
 - TODO
 files: 
 - LICENSE
 - README
 - Rakefile
 - TODO
+- bin/merb-gen
 - lib/generators/controller.rb
+- lib/generators/fcgi.rb
 - lib/generators/helper.rb
 - lib/generators/layout.rb
 - lib/generators/merb/merb_core.rb
@@ -58,20 +89,15 @@ files:
 - lib/generators/migration.rb
 - lib/generators/model.rb
 - lib/generators/part_controller.rb
+- lib/generators/passenger.rb
 - lib/generators/resource.rb
 - lib/generators/resource_controller.rb
 - lib/generators/session_migration.rb
-- lib/generators/templates/application/common/doc.thor
+- lib/generators/templates/application/common/Gemfile
+- lib/generators/templates/application/common/Rakefile
 - lib/generators/templates/application/common/dotgitignore
-- lib/generators/templates/application/common/dothtaccess
 - lib/generators/templates/application/common/jquery.js
-- lib/generators/templates/application/common/merb_thor/app_script.rb
-- lib/generators/templates/application/common/merb_thor/common.rb
-- lib/generators/templates/application/common/merb_thor/gem_ext.rb
-- lib/generators/templates/application/common/merb_thor/main.thor
-- lib/generators/templates/application/common/merb_thor/ops.rb
-- lib/generators/templates/application/common/merb_thor/utils.rb
-- lib/generators/templates/application/common/Rakefile
+- lib/generators/templates/application/common/merb
 - lib/generators/templates/application/merb_core/app/controllers/application.rb
 - lib/generators/templates/application/merb_core/app/controllers/exceptions.rb
 - lib/generators/templates/application/merb_core/app/helpers/global_helpers.rb
@@ -99,29 +125,29 @@ files:
 - lib/generators/templates/application/merb_core/public/favicon.ico
 - lib/generators/templates/application/merb_core/public/images/merb.jpg
 - lib/generators/templates/application/merb_core/public/javascripts/application.js
-- lib/generators/templates/application/merb_core/public/merb.fcgi
 - lib/generators/templates/application/merb_core/public/robots.txt
 - lib/generators/templates/application/merb_core/public/stylesheets/master.css
 - lib/generators/templates/application/merb_core/spec/spec.opts
 - lib/generators/templates/application/merb_core/spec/spec_helper.rb
 - lib/generators/templates/application/merb_core/test/test_helper.rb
+- lib/generators/templates/application/merb_flat/README.txt
 - lib/generators/templates/application/merb_flat/application.rbt
 - lib/generators/templates/application/merb_flat/config/framework.rb
 - lib/generators/templates/application/merb_flat/config/init.rb
-- lib/generators/templates/application/merb_flat/README.txt
 - lib/generators/templates/application/merb_flat/spec/spec_helper.rb
 - lib/generators/templates/application/merb_flat/test/test_helper.rb
 - lib/generators/templates/application/merb_flat/views/foo.html.erb
-- lib/generators/templates/application/merb_plugin/lib/%base_name%/merbtasks.rb
-- lib/generators/templates/application/merb_plugin/lib/%base_name%.rb
 - lib/generators/templates/application/merb_plugin/LICENSE
-- lib/generators/templates/application/merb_plugin/Rakefile
 - lib/generators/templates/application/merb_plugin/README
+- lib/generators/templates/application/merb_plugin/Rakefile
+- lib/generators/templates/application/merb_plugin/TODO
+- lib/generators/templates/application/merb_plugin/lib/%base_name%.rb
+- lib/generators/templates/application/merb_plugin/lib/%base_name%/merbtasks.rb
 - lib/generators/templates/application/merb_plugin/spec/%base_name%_spec.rb
 - lib/generators/templates/application/merb_plugin/spec/spec_helper.rb
 - lib/generators/templates/application/merb_plugin/test/%base_name%_test.rb
 - lib/generators/templates/application/merb_plugin/test/test_helper.rb
-- lib/generators/templates/application/merb_plugin/TODO
+- lib/generators/templates/application/merb_stack/Gemfile
 - lib/generators/templates/application/merb_stack/app/controllers/application.rb
 - lib/generators/templates/application/merb_stack/app/controllers/exceptions.rb
 - lib/generators/templates/application/merb_stack/app/helpers/global_helpers.rb
@@ -131,8 +157,8 @@ files:
 - lib/generators/templates/application/merb_stack/autotest/discover.rb
 - lib/generators/templates/application/merb_stack/autotest/merb.rb
 - lib/generators/templates/application/merb_stack/autotest/merb_rspec.rb
+- lib/generators/templates/application/merb_stack/config.ru
 - lib/generators/templates/application/merb_stack/config/database.yml
-- lib/generators/templates/application/merb_stack/config/dependencies.rb
 - lib/generators/templates/application/merb_stack/config/environments/development.rb
 - lib/generators/templates/application/merb_stack/config/environments/production.rb
 - lib/generators/templates/application/merb_stack/config/environments/rake.rb
@@ -154,7 +180,6 @@ files:
 - lib/generators/templates/application/merb_stack/public/favicon.ico
 - lib/generators/templates/application/merb_stack/public/images/merb.jpg
 - lib/generators/templates/application/merb_stack/public/javascripts/application.js
-- lib/generators/templates/application/merb_stack/public/merb.fcgi
 - lib/generators/templates/application/merb_stack/public/robots.txt
 - lib/generators/templates/application/merb_stack/public/stylesheets/master.css
 - lib/generators/templates/application/merb_stack/spec/spec.opts
@@ -167,6 +192,8 @@ files:
 - lib/generators/templates/component/controller/app/views/%file_name%/index.html.erb
 - lib/generators/templates/component/controller/spec/requests/%file_name%_spec.rb
 - lib/generators/templates/component/controller/test/requests/%file_name%_test.rb
+- lib/generators/templates/component/fcgi/dothtaccess
+- lib/generators/templates/component/fcgi/merb.fcgi
 - lib/generators/templates/component/helper/app/helpers/%file_name%_helper.rb
 - lib/generators/templates/component/layout/app/views/layout/%file_name%.html.erb
 - lib/generators/templates/component/layout/spec/views/layout/%file_name%.html.erb_spec.rb
@@ -182,15 +209,15 @@ files:
 - lib/generators/templates/component/resource_controller/app/views/%file_name%/show.html.erb
 - lib/generators/templates/component/resource_controller/spec/requests/%file_name%_spec.rb
 - lib/generators/templates/component/resource_controller/test/controllers/%file_name%_test.rb
-- lib/generators/thor.rb
+- lib/merb-gen.rb
 - lib/merb-gen/app_generator.rb
 - lib/merb-gen/generator.rb
 - lib/merb-gen/named_generator.rb
 - lib/merb-gen/namespaced_generator.rb
 - lib/merb-gen/templater.rb
-- lib/merb-gen.rb
-- bin/merb-gen
+- lib/merb-gen/version.rb
 - spec/controller_spec.rb
+- spec/fcgi_spec.rb
 - spec/fixtures/results/no_modules.test
 - spec/fixtures/results/some_modules.test
 - spec/fixtures/templates/no_modules.test
@@ -207,37 +234,43 @@ files:
 - spec/named_generator_spec.rb
 - spec/namespaced_generator_spec.rb
 - spec/part_controller_spec.rb
+- spec/passenger_spec.rb
 - spec/resource_controller_spec.rb
 - spec/resource_spec.rb
 - spec/session_migration_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merbivore.com
+homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: merb
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Generators suite for Merb.
+summary: Merb plugin that provides a suite of code generators for Merb.
 test_files: []