merb-gen 0.9.5 → 0.9.6

data/Rakefile

@@ -17,7 +17,7 @@ GEM_EMAIL  = "jonas.nicklas@gmail.com"
 
 GEM_NAME    = "merb-gen"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.5") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.6") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -38,8 +38,8 @@ spec = Gem::Specification.new do |s|
   s.bindir = "bin"
   s.executables = %w( merb-gen )
 
-  s.add_dependency "merb-core", ">= 0.9.5"
-  s.add_dependency "templater", ">= 0.1.5"
+  s.add_dependency "merb-core", ">= 0.9.6"
+  s.add_dependency "templater", ">= 0.2.0"
 
   s.require_path = 'lib'
   s.autorequire = GEM_NAME
@@ -52,14 +52,14 @@ end
 
 desc "Install the gem"
 task :install => [:package] do
-  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}
+  sh install_command(GEM_NAME, GEM_VERSION)
 end
 
 namespace :jruby do
 
   desc "Run :package and install the resulting .gem with jruby"
   task :install => :package do
-    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
+    sh jinstall_command(GEM_NAME, GEM_VERSION)
   end
 
 end

data/bin/merb-gen

@@ -1,6 +1,36 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
+# See also: merb-gen scripts and script/merb-gen
+
+# Try to use minigems instead of the fully rubygems library
+begin
+  require 'minigems'
+rescue LoadError
+  require 'rubygems'
+end
+
+# Load script helpers if available - either local or system-wide.
+begin
+  # Figure out the merb root - defaults to the current directory.
+  root_key = %w[-m --merb-root].detect { |o| ARGV.index(o) }
+  root = ARGV[ARGV.index(root_key) + 1] if root_key
+  __DIR__ = root.to_a.empty? ? Dir.getwd : root
+  
+  # Piggyback on the merb-core rubygem for initial setup scripts.
+  # Requiring it doesn't affect the local gem version of merb-core
+  # we might effectively want to load here after.
+  if merb_core_dir = Dir[File.join(__DIR__, 'gems', 'gems', 'merb-core-*')].last
+    require File.join(merb_core_dir, 'lib', 'merb-core', 'script')
+  else
+    require 'merb-core/script'
+  end
+  # Now setup local gems to be incorporated into the normal loaded gems.
+  # Unless the option --no-frozen is given, local gems are enabled.
+  include Merb::ScriptHelpers
+  setup_local_gems!(__DIR__)
+rescue LoadError
+end
+
 require 'merb-gen'
 
 Merb::BootLoader.after_app_loads do

data/lib/generators/controller.rb

@@ -17,24 +17,24 @@ module Merb::Generators
     
     invoke :helper
     
-    template :controller do
-      source('app/controllers/%file_name%.rb')
-      destination("app/controllers", base_path, "#{file_name}.rb")
+    template :controller do |template|
+      template.source = 'app/controllers/%file_name%.rb'
+      template.destination = "app/controllers" / base_path / "#{file_name}.rb"
     end
     
-    template :index_erb, :template_engine => :erb do
-      source('app/views/%file_name%/index.html.erb')
-      destination("app/views", base_path, "#{file_name}/index.html.erb")
+    template :index_erb, :template_engine => :erb do |template|
+      template.source = 'app/views/%file_name%/index.html.erb'
+      template.destination = "app/views" / base_path / "#{file_name}/index.html.erb"
     end
     
-    template :controller_spec, :testing_framework => :rspec do
-      source('spec/controllers/%file_name%_spec.rb')
-      destination("spec/controllers", base_path, "#{file_name}_spec.rb")
+    template :controller_spec, :testing_framework => :rspec do |template|
+      template.source = 'spec/controllers/%file_name%_spec.rb'
+      template.destination = "spec/controllers" / base_path / "#{file_name}_spec.rb"
     end
     
-    template :controller_test_unit, :testing_framework => :test_unit do
-      source('test/controllers/%file_name%_test.rb')
-      destination("test/controllers", base_path, "#{file_name}_test.rb")
+    template :controller_test_unit, :testing_framework => :test_unit do |template|
+      template.source = 'test/controllers/%file_name%_test.rb'
+      template.destination = "test/controllers" / base_path / "#{file_name}_test.rb"
     end
     
   end

data/lib/generators/helper.rb

@@ -14,14 +14,14 @@ module Merb::Generators
     
     first_argument :name, :required => true, :desc => "helper name"
     
-    template :helper do
-      source('app/helpers/%file_name%_helper.rb')
-      destination("app/helpers", base_path, "#{file_name}_helper.rb")
+    template :helper do |template|
+      template.source = 'app/helpers/%file_name%_helper.rb'
+      template.destination = "app/helpers" / base_path / "#{file_name}_helper.rb"
     end
     
-    template :helper_spec, :testing_framework => :rspec do
-      source('spec/helpers/%file_name%_helper_spec.rb')
-      destination("spec/helpers", base_path, "#{file_name}_helper_spec.rb")
+    template :helper_spec, :testing_framework => :rspec do |template|
+      template.source = 'spec/helpers/%file_name%_helper_spec.rb'
+      template.destination = "spec/helpers" / base_path / "#{file_name}_helper_spec.rb"
     end
     
   end

data/lib/generators/layout.rb

@@ -15,9 +15,9 @@ module Merb::Generators
     
     first_argument :name, :required => true, :desc => "layout name"
     
-    template :layout_erb, :template_engine => :erb do
-      source('app/views/layout/%file_name%.html.erb')
-      destination("app/views/layout/#{file_name}.html.erb")
+    template :layout_erb, :template_engine => :erb do |template|
+      template.source = 'app/views/layout/%file_name%.html.erb'
+      template.destination = "app/views/layout/#{file_name}.html.erb"
     end
     
   end

data/lib/generators/merb/merb_very_flat.rb

@@ -13,9 +13,9 @@ module Merb::Generators
     
     first_argument :name, :required => true, :desc => "Application name"
     
-    template :application do
-      source('application.rbt')
-      destination("#{base_name}.rb")
+    template :application do |template|
+      template.source = 'application.rbt'
+      template.destination = "#{base_name}.rb"
     end
 
     file :spec_helper, 'spec/spec_helper.rb', 'spec/spec_helper.rb'

data/lib/generators/model.rb

@@ -17,19 +17,19 @@ module Merb::Generators
     first_argument :name, :required => true, :desc => "model name"
     second_argument :attributes, :as => :hash, :default => {}, :desc => "space separated model properties in form of name:type. Example: state:string"
     
-    template :model_none, :orm => :none do
-      source("app/models/%file_name%.rb")
-      destination("app/models", base_path, "#{file_name}.rb")
+    template :model_none, :orm => :none do |template|
+      template.source = "app/models/%file_name%.rb"
+      template.destination = "app/models" / base_path / "#{file_name}.rb"
     end
     
-    template :spec, :testing_framework => :rspec do
-      source('spec/models/%file_name%_spec.rb')
-      destination("spec/models", base_path, "#{file_name}_spec.rb")
+    template :spec, :testing_framework => :rspec do |template|
+      template.source = 'spec/models/%file_name%_spec.rb'
+      template.destination = "spec/models" / base_path / "#{file_name}_spec.rb"
     end
     
-    template :test_unit, :testing_framework => :test_unit do
-      source('test/models/%file_name%_test.rb')
-      destination("test/models", base_path, "#{file_name}_test.rb")
+    template :test_unit, :testing_framework => :test_unit do |template|
+      template.source = 'test/models/%file_name%_test.rb'
+      template.destination = "test/models" / base_path / "#{file_name}_test.rb"
     end
     
     def attributes?

data/lib/generators/part_controller.rb

@@ -16,14 +16,14 @@ module Merb::Generators
       generator.new(destination_root, options, "#{full_class_name}Part")
     end
     
-    template :controller do
-      source('app/parts/%file_name%_part.rb')
-      destination("app/parts", base_path, "#{file_name}_part.rb")
+    template :controller do |template|
+      template.source = 'app/parts/%file_name%_part.rb'
+      template.destination = "app/parts" / base_path / "#{file_name}_part.rb"
     end
     
-    template :index do
-      source('app/parts/views/%file_name%_part/index.html.erb')
-      destination("app/parts/views", base_path, "#{file_name}_part/index.html.erb")
+    template :index do |template|
+      template.source = 'app/parts/views/%file_name%_part/index.html.erb'
+      template.destination = "app/parts/views" / base_path / "#{file_name}_part/index.html.erb"
     end
     
   end

data/lib/generators/resource_controller.rb

@@ -27,26 +27,26 @@ module Merb::Generators
     # add controller and view templates for each of the four big ORM's
 
     
-    template :controller_none, :orm => :none do
-      source("app/controllers/%file_name%.rb")
-      destination("app/controllers", base_path, "#{file_name}.rb")
+    template :controller_none, :orm => :none do |template|
+      template.source = "app/controllers/%file_name%.rb"
+      template.destination = "app/controllers" / base_path / "#{file_name}.rb"
     end
   
     [:index, :show, :edit, :new].each do |view|
-      template "view_#{view}_none".to_sym, :orm => :none do
-        source("app/views/%file_name%/#{view}.html.erb")
-        destination("app/views", base_path, "#{file_name}/#{view}.html.erb")
+      template "view_#{view}_none".to_sym, :orm => :none do |template|
+        template.source = "app/views/%file_name%/#{view}.html.erb"
+        template.destination = "app/views" / base_path / "#{file_name}/#{view}.html.erb"
       end
     end
     
-    template :controller_spec, :testing_framework => :rspec, :orm => :none do
-      source('spec/controllers/%file_name%_spec.rb')
-      destination("spec/controllers", base_path, "#{file_name}_spec.rb")
+    template :controller_spec, :testing_framework => :rspec, :orm => :none do |template|
+      template.source = 'spec/controllers/%file_name%_spec.rb'
+      template.destination = "spec/controllers" / base_path / "#{file_name}_spec.rb"
     end
     
-    template :controller_test_unit, :testing_framework => :test_unit, :orm => :none do
-      source('test/controllers/%file_name%_test.rb')
-      destination("test/controllers", base_path, "#{file_name}_test.rb")
+    template :controller_test_unit, :testing_framework => :test_unit, :orm => :none do |template|
+      template.source = 'test/controllers/%file_name%_test.rb'
+      template.destination = "test/controllers" / base_path / "#{file_name}_test.rb"
     end
     
     def model_class_name

data/lib/generators/scripts.rb

@@ -0,0 +1,51 @@
+module Merb::Generators
+  
+  class ScriptsGenerator < Generator
+
+    def self.source_root
+      File.join(super, 'component', 'scripts')
+    end
+    
+    desc <<-DESC
+      Generates local Merb scripts (script/merb and script/merb-gen for example).
+    DESC
+    
+    # Install a script/merb script for local execution (for frozen apps).
+    file :script_merb do |f|
+      f.source = bin_merb_location
+      f.destination = 'script/merb'
+    end
+    
+    # Install a script/merb-gen script for local execution (for frozen apps).
+    file :script_merb_gen do |f|
+      f.source = bin_merb_gen_location
+      f.destination = 'script/merb-gen'
+    end
+     
+    protected
+    
+    def bin_merb_location
+      if (gem_spec = Gem.source_index.search('merb-core').last) && 
+        File.exists?(location = File.join(gem_spec.full_gem_path, gem_spec.bindir, 'merb'))
+        location
+      else
+        'script/merb'
+      end
+    end
+    
+    def bin_merb_gen_location
+      if (gem_spec = Gem.source_index.search('merb-gen').last) && 
+        File.exists?(location = File.join(gem_spec.full_gem_path, gem_spec.bindir, 'merb-gen'))
+        location
+      else
+        'script/merb-gen'
+      end
+    end
+    
+  end
+  
+  add :scripts, ScriptsGenerator
+  
+  puts ScriptsGenerator
+  
+end

data/lib/generators/templates/application/merb/Rakefile

@@ -1,6 +1,25 @@
 require 'rubygems'
-Gem.clear_paths
-Gem.path.unshift(File.join(File.dirname(__FILE__), "gems"))
+
+# Figure out the merb root - defaults to the current directory.
+__DIR__ = ENV['MERB_ROOT'] || Dir.getwd
+
+# Piggyback on the merb-core rubygem for initial setup scripts.
+# Requiring it doesn't affect the local gem version of merb-core
+# we might effectively want to load here after. 
+if merb_core_dir = Dir[File.join(__DIR__, 'gems', 'gems', 'merb-core-*')].last
+  require File.join(merb_core_dir, 'lib', 'merb-core', 'script')
+else
+  require 'merb-core/script'
+end
+
+# Include some script helper methods.
+include Merb::ScriptHelpers
+
+# Now setup local gems to be incorporated into the normal loaded gems.
+setup_local_gems!(__DIR__)
+
+# When running rake tasks, you can disable local gems using NO_FROZEN:
+# rake NO_FROZEN=true -T # see all rake tasks, loaded from system gems.
 
 require 'rake'
 require 'rake/rdoctask'
@@ -8,44 +27,8 @@ require 'rake/testtask'
 require 'spec/rake/spectask'
 require 'fileutils'
 
-##
-# requires frozen merb-core (from /framework)
-# adds the other components to the load path
-def require_frozen_framework
-  framework = File.join(File.dirname(__FILE__), "framework")
-  if File.directory?(framework)
-    puts "Running from frozen framework"
-    core = File.join(framework,"merb-core")
-    if File.directory?(core)
-      puts "using merb-core from #{core}"
-      $:.unshift File.join(core,"lib")
-      require 'merb-core'
-    end
-    more = File.join(framework,"merb-more")
-    if File.directory?(more)
-      Dir.new(more).select {|d| d =~ /merb-/}.each do |d|
-        $:.unshift File.join(more,d,'lib')
-      end
-    end
-    plugins = File.join(framework,"merb-plugins")
-    if File.directory?(plugins)
-      Dir.new(plugins).select {|d| d =~ /merb_/}.each do |d|
-        $:.unshift File.join(plugins,d,'lib')
-      end
-    end
-    require "merb-core/core_ext/kernel"
-    require "merb-core/core_ext/rubygems"
-  else
-    p "merb doesn't seem to be frozen in /framework"
-    require 'merb-core'
-  end
-end
-
-if ENV['FROZEN']
-  require_frozen_framework
-else
-  require 'merb-core'
-end
+# Require the *real* merb-core, which is the local version for a frozen setup.
+require "merb-core"
 
 require 'merb-core/tasks/merb'
 include FileUtils
@@ -63,7 +46,6 @@ tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks")
 rake_files = Dir["#{tasks_path}/*.rake"]
 rake_files.each{|rake_file| load rake_file }
 
-
 desc "start runner environment"
 task :merb_env do
   Merb.start_environment(:environment => init_env, :adapter => 'runner')

data/lib/generators/templates/application/merb/app/models/merb/session.rb

@@ -0,0 +1,9 @@
+module Merb
+  module Session
+    
+    # The Merb::Session module gets mixed into Merb::SessionContainer to allow 
+    # app-level functionality; it will be included and methods will be available 
+    # through request.session as instance methods.
+    
+  end
+end

data/lib/generators/templates/application/merb/config/environments/development.rb

@@ -4,5 +4,6 @@ Merb::Config.use { |c|
   c[:reload_classes] = true
   c[:reload_time] = 0.5
   c[:log_auto_flush ] = true
+  c[:ignore_tampered_cookies] = true
   c[:log_level] = :debug
-}
+}

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

@@ -1,3 +1,5 @@
+$KCODE = 'UTF8'
+
 #
 # ==== Structure of Merb initializer
 #
@@ -33,8 +35,6 @@
 # Remember that bundling of dependencies as gems with your application
 # makes it independent of the environment it runs in and is a very
 # good, encouraged practice to follow.
-Gem.clear_paths
-Gem.path.unshift(Merb.root / "gems")
 
 # If you want modules and classes from libraries organized like
 # merbapp/lib/magicwand/lib/magicwand.rb to autoload,
@@ -127,8 +127,9 @@ Merb::Config.use do |c|
   c[:session_secret_key]  = '<%= SHA1.new(rand(100000000000).to_s).to_s %>'
   
   # There are various options here, by default Merb comes with 'cookie', 
-  # 'memory' or 'memcached'.  You can of course use your favorite ORM 
-  # instead: 'datamapper', 'sequel' or 'activerecord'.
+  # 'memory', 'memcache' or 'container'.  
+  # You can of course use your favorite ORM instead: 
+  # 'datamapper', 'sequel' or 'activerecord'.
   c[:session_store] = 'cookie'
 end
 
@@ -136,22 +137,22 @@ end
 # ==== Tune your inflector
 
 # To fine tune your inflector use the word, singular_word and plural_word
-# methods of Language::English::Inflector module metaclass.
+# methods of English::Inflect module metaclass.
 #
 # Here we define erratum/errata exception case:
 #
-# Language::English::Inflector.word "erratum", "errata"
+# English::Inflect.word "erratum", "errata"
 #
 # In case singular and plural forms are the same omit
 # second argument on call:
 #
-# Language::English::Inflector.word 'information'
+# English::Inflect.word 'information'
 #
 # You can also define general, singularization and pluralization
 # rules:
 #
 # Once the following rule is defined:
-# Language::English::Inflector.rule 'y', 'ies'
+# English::Inflect.rule 'y', 'ies'
 #
 # You can see the following results:
 # irb> "fly".plural
@@ -161,14 +162,14 @@ end
 #
 # Example for singularization rule:
 #
-# Language::English::Inflector.singular_rule 'o', 'oes'
+# English::Inflect.singular_rule 'o', 'oes'
 #
 # Works like this:
 # irb> "heroes".singular
 # => hero
 #
 # Example of pluralization rule:
-# Language::English::Inflector.singular_rule 'fe', 'ves'
+# English::Inflect.singular_rule 'fe', 'ves'
 #
 # And the result is:
 # irb> "wife".plural

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

@@ -1,3 +1,5 @@
+$KCODE = 'UTF8'
+
 # Move this to application.rb if you want it to be reloadable in dev mode.
 Merb::Router.prepare do |r|
   r.match('/').to(:controller => 'foo', :action =>'index')
@@ -15,4 +17,4 @@ Merb::Config.use { |c|
   c[:exception_details]   = true,
   c[:reload_classes]      = true,
   c[:reload_time]         = 0.5
-}
+}

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

@@ -1,3 +1,5 @@
+$KCODE = 'UTF8'
+
 # run very flat apps with merb -I <app file>.
 
 Merb::Config.use { |c|

data/lib/generators/templates/component/scripts/script/merb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+
+# This file was generated by 'merb-gen scripts' and 
+# is identical to the executables merb-core/bin/merb
+
+# Try to use minigems instead of the fully rubygems library
+begin
+  require 'minigems'
+rescue LoadError
+  require 'rubygems'
+end
+
+# Load script helpers if available - either local or system-wide.
+begin
+  # Figure out the merb root - defaults to the current directory.
+  root_key = %w[-m --merb-root].detect { |o| ARGV.index(o) }
+  root = ARGV[ARGV.index(root_key) + 1] if root_key
+  __DIR__ = root.to_a.empty? ? Dir.getwd : root
+  
+  # Piggyback on the merb-core rubygem for initial setup scripts.
+  # Requiring it doesn't affect the local gem version of merb-core
+  # we might effectively want to load here after.
+  if merb_core_dir = Dir[File.join(__DIR__, 'gems', 'gems', 'merb-core-*')].last
+    require File.join(merb_core_dir, 'lib', 'merb-core', 'script')
+  else
+    require 'merb-core/script'
+  end
+  # Now setup local gems to be incorporated into the normal loaded gems.
+  # Unless the option --no-frozen is given, local gems are enabled.
+  include Merb::ScriptHelpers
+  setup_local_gems!(__DIR__)
+rescue LoadError
+end
+
+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]
+end
+
+Merb.start

data/lib/generators/templates/component/scripts/script/merb-gen

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+# This file was generated by 'merb-gen scripts' and 
+# is identical to the executable merb-gen/bin/merb-gen
+
+# Try to use minigems instead of the fully rubygems library
+begin
+  require 'minigems'
+rescue LoadError
+  require 'rubygems'
+end
+
+# Load script helpers if available - either local or system-wide.
+begin
+  # Figure out the merb root - defaults to the current directory.
+  root_key = %w[-m --merb-root].detect { |o| ARGV.index(o) }
+  root = ARGV[ARGV.index(root_key) + 1] if root_key
+  __DIR__ = root.to_a.empty? ? Dir.getwd : root
+  
+  # Piggyback on the merb-core rubygem for initial setup scripts.
+  # Requiring it doesn't affect the local gem version of merb-core
+  # we might effectively want to load here after.
+  if merb_core_dir = Dir[File.join(__DIR__, 'gems', 'gems', 'merb-core-*')].last
+    require File.join(merb_core_dir, 'lib', 'merb-core', 'script')
+  else
+    require 'merb-core/script'
+  end
+  # Now setup local gems to be incorporated into the normal loaded gems.
+  # Unless the option --no-frozen is given, local gems are enabled.
+  include Merb::ScriptHelpers
+  setup_local_gems!(__DIR__)
+rescue LoadError
+end
+
+require 'merb-gen'
+
+Merb::BootLoader.after_app_loads do
+  Merb::Generators.run_cli(Dir.pwd, 'merb-gen', Merb::VERSION, ARGV)
+end
+
+Merb.start :environment => 'development', :log_level => 'error'

data/lib/merb-gen.rb

@@ -1,14 +1,14 @@
 require 'rubygems'
 require 'merb-core'
 require 'sha1'
-gem 'templater', '>= 0.1.5'
+gem 'templater', '>= 0.2.0'
 require 'templater'
 
 path = File.join(File.dirname(__FILE__))
 
-require path / "merb-gen" / "generator"
-require path / "merb-gen" / "named_generator"
-require path / "merb-gen" / "namespaced_generator"
+require path / "merb-gen"   / "generator"
+require path / "merb-gen"   / "named_generator"
+require path / "merb-gen"   / "namespaced_generator"
 require path / "generators" / "merb"
 require path / "generators" / "merb" / "merb_full"
 require path / "generators" / "merb" / "merb_flat"
@@ -22,8 +22,8 @@ require path / "generators" / "session_migration"
 require path / "generators" / "model"
 require path / "generators" / "resource_controller"
 require path / "generators" / "resource"
-require path / "generators" / "freezer"
 require path / "generators" / "layout"
+require path / "generators" / "scripts"
 
 Templater::Discovery.discover!("merb-gen")
 

data/spec/generator_spec.rb

@@ -27,13 +27,13 @@ describe Merb::Generators::Generator do
     before do
       @class = Class.new(Merb::Generators::Generator)
       path = File.expand_path('fixtures', File.dirname(__FILE__))
-      @class.template(:no_modules) do
-        source path / "templates" / "no_modules.test"
-        destination path / "results" / "no_modules.test"
+      @class.template(:no_modules) do |template|
+        template.source = path / "templates" / "no_modules.test"
+        template.destination = path / "results" / "no_modules.test"
       end
-      @class.template(:some_modules) do
-        source path / "templates" / "some_modules.test"
-        destination path / "results" / "some_modules.test"
+      @class.template(:some_modules) do |template|
+        template.source = path / "templates" / "some_modules.test"
+        template.destination = path / "results" / "some_modules.test"
       end
       @generator = @class.new('/tmp', {})
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire: merb-gen
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 +03:00
+date: 2008-09-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.5
+        version: 0.2.0
     version: 
 description: Generators suite for Merb.
 email: jonas.nicklas@gmail.com
@@ -49,7 +49,6 @@ files:
 - TODO
 - lib/generators
 - lib/generators/controller.rb
-- lib/generators/freezer.rb
 - lib/generators/helper.rb
 - lib/generators/layout.rb
 - lib/generators/merb
@@ -63,6 +62,7 @@ files:
 - lib/generators/part_controller.rb
 - lib/generators/resource.rb
 - lib/generators/resource_controller.rb
+- lib/generators/scripts.rb
 - lib/generators/session_migration.rb
 - lib/generators/templates
 - lib/generators/templates/application
@@ -73,6 +73,9 @@ files:
 - lib/generators/templates/application/merb/app/controllers/exceptions.rb
 - lib/generators/templates/application/merb/app/helpers
 - lib/generators/templates/application/merb/app/helpers/global_helpers.rb
+- lib/generators/templates/application/merb/app/models
+- lib/generators/templates/application/merb/app/models/merb
+- lib/generators/templates/application/merb/app/models/merb/session.rb
 - lib/generators/templates/application/merb/app/views
 - lib/generators/templates/application/merb/app/views/exceptions
 - lib/generators/templates/application/merb/app/views/exceptions/internal_server_error.html.erb
@@ -146,9 +149,6 @@ files:
 - lib/generators/templates/component/controller/test
 - lib/generators/templates/component/controller/test/controllers
 - lib/generators/templates/component/controller/test/controllers/%file_name%_test.rb
-- lib/generators/templates/component/freezer
-- lib/generators/templates/component/freezer/script
-- lib/generators/templates/component/freezer/script/frozen_merb
 - lib/generators/templates/component/helper
 - lib/generators/templates/component/helper/app
 - lib/generators/templates/component/helper/app/helpers
@@ -246,6 +246,10 @@ files:
 - lib/generators/templates/component/resource_controller/test
 - lib/generators/templates/component/resource_controller/test/controllers
 - lib/generators/templates/component/resource_controller/test/controllers/%file_name%_test.rb
+- lib/generators/templates/component/scripts
+- lib/generators/templates/component/scripts/script
+- lib/generators/templates/component/scripts/script/merb
+- lib/generators/templates/component/scripts/script/merb-gen
 - lib/generators/templates/component/session_migration
 - lib/generators/templates/component/session_migration/activerecord
 - lib/generators/templates/component/session_migration/activerecord/schema
@@ -267,7 +271,6 @@ files:
 - spec/fixtures/templates
 - spec/fixtures/templates/no_modules.test
 - spec/fixtures/templates/some_modules.test
-- spec/freezer_spec.rb
 - spec/generator_spec.rb
 - spec/helper_spec.rb
 - spec/layout_spec.rb

data/lib/generators/freezer.rb

@@ -1,19 +0,0 @@
-module Merb::Generators
-  
-  class FreezerGenerator < Generator
-
-    def self.source_root
-      File.join(super, 'component', 'freezer')
-    end
-    
-    desc <<-DESC
-      Generates Merb freezer scripts.
-    DESC
-    
-    template :freezer, 'script/frozen_merb', 'script/frozen_merb'
-    
-  end
-  
-  add :freezer, FreezerGenerator
-  
-end

data/lib/generators/templates/component/freezer/script/frozen_merb

@@ -1,43 +0,0 @@
-#!/usr/bin/env ruby
-
-__DIR__ = File.join(File.dirname(__FILE__),"..")
-
-framework = File.join(__DIR__,"framework")
-
-if File.directory?(framework)
-  puts "Running from frozen framework"
-  core = File.join(framework,"merb-core")
-  if File.directory?(core)
-    $:.push File.join(core,"lib")
-  end
-  more = File.join(framework,"merb-more")
-  if File.directory?(more)
-    Dir.new(more).select {|d| d =~ /merb-/}.each do |d|
-      $:.push File.join(more,d,'lib')
-    end
-  end
-  plugins = File.join(framework,"merb-plugins")
-  if File.directory?(plugins)
-    Dir.new(plugins).select {|d| d =~ /merb_/}.each do |d|
-      $:.push File.join(plugins,d,'lib')
-    end
-  end
-  require "merb-core/core_ext/kernel"
-  require "merb-core/core_ext/rubygems"
-else
-  gem = Dir.glob(__DIR__ + "/gems/gems/merb-core-*").last
-  raise "Can't run frozen without framework/ or local gem" unless gem
-  require gem + "/lib/merb-core/core_ext/kernel"
-  require gem + "/lib/merb-core/core_ext/rubygems"
-  
-  Gem.clear_paths
-  Gem.path.unshift(__DIR__+"/gems")
-end
-
-require 'merb-core'
-unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
-  ARGV.push *%w[-a mongrel]
-end
-  
-Merb.frozen!
-Merb.start

data/spec/freezer_spec.rb

@@ -1,17 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Merb::Generators::FreezerGenerator do
-
-  before(:each) do
-    @generator = Merb::Generators::FreezerGenerator.new('/tmp', {})
-  end
-  
-  it "should create a freezing script" do
-    @generator.should create('/tmp/script/frozen_merb')
-  end
-  
-  it "should render templates successfully" do
-    lambda { @generator.render! }.should_not raise_error
-  end
-  
-end