merb-gen 1.0.12 → 1.0.13

data/lib/generators/resource_controller.rb

@@ -30,10 +30,9 @@ module Merb::Generators
     template :controller_none, :orm => :none do |template|
       template.source = "app/controllers/%file_name%.rb"
       template.destination = "app/controllers" / base_path / "#{file_name}.rb"
-      
-      self.add_resource_route(self.plural_model)
+      self.add_resource_route(self.plural_model) unless skip_route_definition?
     end
-  
+
     [:index, :show, :edit, :new].each do |view|
       template "view_#{view}_none".to_sym, :template_engine => :erb, :orm => :none do |template|
         template.source = "app/views/%file_name%/#{view}.html.erb"
@@ -86,7 +85,11 @@ module Merb::Generators
     def properties
       []
     end
-    
+
+    def skip_route_definition?
+      options[:pretend] || options[:delete]
+    end
+
   end
   
   add :resource_controller, ResourceControllerGenerator

data/lib/generators/templates/application/common/merb_thor/gem_ext.rb

@@ -78,7 +78,7 @@ end
 
 class ::Gem::SpecFetcher
   alias old_fetch fetch
-  def fetch(dependency, all = false, matching_platform = true)
+  def fetch(dependency, all = false, matching_platform = true, prerelease = false)
     idx = Gem::SourceIndex.from_installed_gems
     
     reqs = dependency.version_requirements.requirements

data/lib/generators/templates/application/common/merb_thor/main.thor

@@ -95,7 +95,8 @@ module Merb
         end
       rescue ::Gem::LoadError => e
         self.class.error "Configuration could not be confirmed: #{e.message}"
-        self.class.rollback_trans
+        # Don't rollback since its possibly the confirmation is just broken
+        # self.class.rollback_trans
       end
       self.class.info "Confirmed"
     end

data/lib/generators/templates/application/merb_core/spec/spec.opts

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

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

@@ -4,6 +4,10 @@
 use_test :<%= testing_framework %>
 use_template_engine :<%= template_engine %>
 
+# If you need to use dependency immediately in this file you must add :immediate => true 
+# to dependency definition:
+# dependency "merb-slices", :immediate => true
+#
 # Specify a specific version of a dependency
 # dependency "RedCloth", "> 3.0"
 

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

@@ -1,7 +1,7 @@
 # dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
 merb_gems_version = "<%= merb_gems_version %>"
-dm_gems_version   = "<%= dm_gems_version %>"
-do_gems_version   = "<%= do_gems_version %>"
+dm_gems_version   = "~> <%= dm_gems_version %>"
+do_gems_version   = "~> <%= do_gems_version %>"
 
 # For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
 dependency "merb-core", merb_gems_version 

data/lib/generators/templates/application/merb_stack/spec/spec.opts

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

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

@@ -33,6 +33,13 @@
 <%= "# " unless template_engine == :erb %>use_template_engine :erb
 <%= "# " unless template_engine == :haml %>use_template_engine :haml
 
+# If you need to use dependency immediately in this file you must add :immediate => true 
+# to dependency definition:
+# dependency "merb-slices", :immediate => true
+#
+# Specify a specific version of a dependency
+# dependency "RedCloth", "> 3.0"
+
 Merb::Config.use { |c|
   c[:framework]           = { :public => [Merb.root / "public", nil] }
   c[:session_store]       = 'none'
@@ -56,4 +63,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2009-11-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.12
+        version: 1.0.13
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Generators suite for Merb.