merb-gen 1.1.0 → 1.1.1

data/Rakefile

@@ -1,49 +1,9 @@
 require 'rubygems'
 require 'rake'
 
-# Assume a typical dev checkout to fetch the current merb-core version
-require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
-
 # Load this library's version information
 require File.expand_path('../lib/merb-gen/version', __FILE__)
 
-begin
-
-  gem 'jeweler', '~> 1.4'
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gemspec|
-
-    gemspec.version     = Merb::Generators::VERSION.dup
-
-    gemspec.name        = "merb-gen"
-    gemspec.description = "Merb plugin containing useful code generators"
-    gemspec.summary     = "Merb plugin that provides a suite of code generators for Merb."
-
-    gemspec.authors     = [ "Jonas Nicklas" ]
-    gemspec.email       = "jonas.nicklas@gmail.com"
-    gemspec.homepage    = "http://merbivore.com/"
-
-    gemspec.files       = %w(LICENSE Rakefile README TODO) + Dir['{bin,lib,spec}/**/*']
-
-    # Runtime dependencies
-    gemspec.add_dependency('merb-core', "~> #{Merb::VERSION}")
-    gemspec.add_dependency "templater", ">= 1.0.0"
-
-    # Development dependencies
-    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
-
-    # Executable files
-    gemspec.executables = 'merb-gen'
-
-  end
-
-  Jeweler::GemcutterTasks.new
-
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')

data/lib/generators/templates/application/common/Gemfile

@@ -1,3 +1,5 @@
+source :rubygems
+
 # dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
 merb_gems_version = "<%= merb_gems_version %>"
 
@@ -7,6 +9,10 @@ merb_gems_version = "<%= merb_gems_version %>"
 gem "json_pure", ">= 1.1.7", :require => "json"
 gem "merb-core", merb_gems_version
 
+# Change to server of your choice
+gem "thin"
+
 <%= gems_for_orm(orm) %>
 <%= gems_for_template_engine(template_engine) %>
 <%= gems_for_testing_framework(testing_framework) %>
+

data/lib/generators/templates/application/common/merb

@@ -14,7 +14,7 @@ require 'merb-core'
 
 ARGV.push '-H' if ARGV[0] && ARGV[0] =~ /^[^-]/
 unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
-  ARGV.push *%w[-a mongrel]
+  ARGV.push *%w[-a thin]
 end
 
 Merb.start

data/lib/generators/templates/application/merb_core/config/init.rb

@@ -1,9 +1,9 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
 
-# Specify your dependencies in the Gemfile
-<%= "use_orm :#{orm}" unless orm == :none %>
+# Specify your dependencies in the Gemfile but require them explicitly
+<%= "require 'merb_#{orm}'" unless orm == :none %>
 use_test :<%= testing_framework %>
-use_template_engine :<%= template_engine %>
+<%= "require 'merb-haml'" if template_engine == :haml %>
  
 Merb::Config.use do |c|
   c[:use_mutex] = false

data/lib/generators/templates/application/merb_core/config/rack.rb

@@ -1,5 +1,5 @@
 # use Rack::Head to handle HEAD requests properly
-use Rack::Head
+use Merb::Rack::Head
 
 # Correctly set a content length.
 use Merb::Rack::ContentLength

data/lib/generators/templates/application/merb_core/spec/spec_helper.rb

@@ -19,4 +19,6 @@ Spec::Runner.configure do |config|
   config.include(Merb::Test::ViewHelper)
   config.include(Merb::Test::RouteHelper)
   config.include(Merb::Test::ControllerHelper)
+  # You don't need this if you don't use Webrat directly in your specs
+  config.include(Merb::Test::WebratHelper)
 end

data/lib/generators/templates/application/merb_flat/config/init.rb

@@ -1,8 +1,9 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
 
-<%= "use_orm :#{orm}" unless orm == :none %>
+# Specify your dependencies in the Gemfile but require them explicitly
+<%= "require 'merb_#{orm}'" unless orm == :none %>
 use_test :<%= testing_framework %>
-use_template_engine :<%= template_engine %>
+<%= "require 'merb-haml'" if template_engine == :haml %>
 
 # Specify your dependencies in the Gemfile
 

data/lib/generators/templates/application/merb_flat/spec/spec_helper.rb

@@ -23,4 +23,6 @@ Spec::Runner.configure do |config|
   config.include(Merb::Test::ViewHelper)
   config.include(Merb::Test::RouteHelper)
   config.include(Merb::Test::ControllerHelper)
+  # You don't need this if you don't use Webrat directly in your specs
+  config.include(Merb::Test::WebratHelper)
 end

data/lib/generators/templates/application/merb_stack/Gemfile

@@ -1,3 +1,5 @@
+source :rubygems
+
 # Dependencies are generated using a strict version,
 # Don't forget to edit the dependency versions when upgrading.
 
@@ -32,6 +34,9 @@ gem("merb-cache", merb_gems_version) do
   end
 end
 
+# Change to server of your choice
+gem "thin"
+
 gem "data_objects",             do_gems_version
 gem "do_sqlite3",               do_gems_version # If using another database, replace this
 gem "dm-core",                  dm_gems_version
@@ -46,3 +51,4 @@ gem "dm-constraints",           dm_gems_version
 gem "merb_datamapper",          merb_gems_version
 <%= gems_for_template_engine(template_engine) %>
 <%= gems_for_testing_framework(testing_framework) %>
+

data/lib/generators/templates/application/merb_stack/config/rack.rb

@@ -1,5 +1,5 @@
 # use Rack::Head to handle HEAD requests properly
-use Rack::Head
+use Merb::Rack::Head
 
 # Correctly set a content length.
 use Merb::Rack::ContentLength

data/lib/generators/templates/application/merb_stack/spec/spec_helper.rb

@@ -19,6 +19,8 @@ Spec::Runner.configure do |config|
   config.include(Merb::Test::ViewHelper)
   config.include(Merb::Test::RouteHelper)
   config.include(Merb::Test::ControllerHelper)
+  # You don't need this if you don't use Webrat directly in your specs
+  config.include(Merb::Test::WebratHelper)
   
   config.before(:all) do
     DataMapper.auto_migrate! if Merb.orm == :datamapper

data/lib/generators/templates/application/merb_very_flat/application.rbt

@@ -1,13 +1,13 @@
 # run very flat apps with merb -I <app file>.
 
 # Uncomment for DataMapper ORM
-<%= "# " unless orm == :datamapper %>use_orm :datamapper
+<%= "# " unless orm == :datamapper %>require 'merb_datamapper'
 
 # Uncomment for ActiveRecord ORM
-<%= "# " unless orm == :activerecord %>use_orm :activerecord
+<%= "# " unless orm == :activerecord %>require 'merb_activerecord'
 
 # Uncomment for Sequel ORM
-<%= "# " unless orm == :sequel %>use_orm :sequel
+<%= "# " unless orm == :sequel %>require 'merb_sequel'
 
 
 #
@@ -29,9 +29,7 @@
 #
 
 # Merb can generate views for different template engines, choose your favourite as the default.
-
-<%= "# " unless template_engine == :erb %>use_template_engine :erb
-<%= "# " unless template_engine == :haml %>use_template_engine :haml
+<%= "# " unless template_engine == :haml %>require 'merb-haml'
 
 Merb::Config.use { |c|
   c[:framework]           = { :public => [Merb.root / "public", nil] }
@@ -56,4 +54,4 @@ class <%= class_name %> < Merb::Controller
   def index
     "Hi, I am 'very flat' Merb application. I have everything in one single file and well suited for dynamic stub pages."
   end
-end
+end

data/lib/generators/templates/application/merb_very_flat/spec/spec_helper.rb

@@ -23,4 +23,6 @@ Spec::Runner.configure do |config|
   config.include(Merb::Test::ViewHelper)
   config.include(Merb::Test::RouteHelper)
   config.include(Merb::Test::ControllerHelper)
+  # You don't need this if you don't use Webrat directly in your specs
+  config.include(Merb::Test::WebratHelper)
 end

data/lib/merb-gen/version.rb

@@ -1,7 +1,7 @@
 module Merb
   module Generators
 
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
 
     # Duplicated here (originally in merb_datamapper)
     # This is currently the easiest way to get at the

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +00:00
-default_executable: merb-gen
+date: 2010-06-15 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 1
+        version: 1.1.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: templater
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -66,14 +73,11 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README
+- LICENSE
 - TODO
 files: 
-- LICENSE
-- README
 - Rakefile
-- TODO
 - bin/merb-gen
 - lib/generators/controller.rb
 - lib/generators/fcgi.rb
@@ -91,11 +95,11 @@ files:
 - lib/generators/resource.rb
 - lib/generators/resource_controller.rb
 - lib/generators/session_migration.rb
-- lib/generators/templates/application/common/Gemfile
-- lib/generators/templates/application/common/Rakefile
 - lib/generators/templates/application/common/dotgitignore
+- lib/generators/templates/application/common/Gemfile
 - lib/generators/templates/application/common/jquery.js
 - lib/generators/templates/application/common/merb
+- lib/generators/templates/application/common/Rakefile
 - 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
@@ -128,24 +132,23 @@ files:
 - 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/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/README
 - 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_stack/Gemfile
+- lib/generators/templates/application/merb_plugin/TODO
 - 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
@@ -155,7 +158,6 @@ 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/environments/development.rb
 - lib/generators/templates/application/merb_stack/config/environments/production.rb
@@ -165,6 +167,7 @@ files:
 - lib/generators/templates/application/merb_stack/config/init.rb
 - lib/generators/templates/application/merb_stack/config/rack.rb
 - lib/generators/templates/application/merb_stack/config/router.rb
+- lib/generators/templates/application/merb_stack/config.ru
 - lib/generators/templates/application/merb_stack/doc/rdoc/generators/merb_generator.rb
 - lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/api_grease.js
 - lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/index.html.erb
@@ -172,6 +175,7 @@ files:
 - lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/merb.rb
 - lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/merb_doc_styles.css
 - lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/prototype.js
+- lib/generators/templates/application/merb_stack/Gemfile
 - lib/generators/templates/application/merb_stack/merb/merb-auth/setup.rb
 - lib/generators/templates/application/merb_stack/merb/merb-auth/strategies.rb
 - lib/generators/templates/application/merb_stack/merb/session/session.rb
@@ -207,13 +211,13 @@ 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/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/version.rb
+- lib/merb-gen.rb
 - spec/controller_spec.rb
 - spec/fcgi_spec.rb
 - spec/fixtures/results/no_modules.test
@@ -238,33 +242,40 @@ files:
 - spec/session_migration_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- README
+- LICENSE
+- TODO
 has_rdoc: true
 homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Merb plugin that provides a suite of code generators for Merb.