merb-gen 0.9.10 → 0.9.11

data/lib/generators/layout.rb

@@ -7,7 +7,7 @@ module Merb::Generators
     end
     
     desc <<-DESC
-      Generates a layout
+      Generates a new layout.
     DESC
     
     #option :testing_framework, :desc => 'Testing framework to use (one of: rspec, test_unit)'

data/lib/generators/merb/merb_core.rb

@@ -34,8 +34,8 @@ module Merb
       :desc => 'Template engine to prefer for this application (one of: erb, haml).'
 
       desc <<-DESC
-      This generates a Merb application with Ruby on Rails like structure.
-      Generator lets you configure your ORM and testing framework of choice.
+      Generates a new Merb application with Ruby on Rails like structure.
+      You can specify the ORM and testing framework.
     DESC
 
       first_argument :name, :required => true, :desc => "Application name"

data/lib/generators/merb/merb_flat.rb

@@ -34,9 +34,8 @@ module Merb
       :desc => 'Template engine to prefer for this application (one of: erb, haml).'
 
       desc <<-DESC
-      This generates a flat merb application: all code but config files and
-      templates fits in one application. This is something in between Sinatra
-      and "regular" Merb application.
+      Generates a new flat Merb application: all code in one file except for config files and
+      views, something in-between Sinatra and a "regular" Merb application.
     DESC
 
       first_argument :name, :required => true, :desc => "Application name"

data/lib/generators/merb/merb_stack.rb

@@ -38,8 +38,8 @@ module Merb
       :desc => 'Template engine to prefer for this application (one of: erb, haml).'
 
       desc <<-DESC
-      This generates a "prepackaged" (or "opinionated") Merb application that uses DataMapper,
-      RSpec, helpers, assets, mailer, caching, slices and merb-auth all out of the box.
+      Generates a new "jump start" Merb application with support for DataMapper,
+      helpers, assets, mailer, caching, slices and merb-auth.
     DESC
 
       first_argument :name, :required => true, :desc => "Application name"

data/lib/generators/merb/merb_very_flat.rb

@@ -27,8 +27,8 @@ module Merb
       :desc => 'Template engine to prefer for this application (one of: erb, haml).'
 
       desc <<-DESC
-      This generates a very flat merb application: the whole application
-      fits in one file, very much like Sinatra or Camping.
+      Generates a new very flat Merb application: the whole application
+      in one file, similar to Sinatra or Camping.
     DESC
 
       first_argument :name, :required => true, :desc => "Application name"

data/lib/generators/merb_plugin.rb

@@ -16,7 +16,7 @@ module Merb::Generators
     option :bin, :as => :boolean # TODO: explain this
     
     desc <<-DESC
-      Merb plugin generator: lets you kick start your Merb plugin.
+      Generates a new Merb plugin.
     DESC
     
     glob!

data/lib/generators/migration.rb

@@ -7,7 +7,7 @@ module Merb::Generators
     end
     
     desc <<-DESC
-      This is a migration generator
+      Generates a new database migration.
     DESC
     
     option :orm, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'

data/lib/generators/part_controller.rb

@@ -7,7 +7,7 @@ module Merb::Generators
     end
     
     desc <<-DESC
-      This is a part controller generator
+      Generates a new part controller.
     DESC
     
     first_argument :name, :required => true

data/lib/generators/templates/application/common/dothtaccess

@@ -14,4 +14,4 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^(.*)$ merb.fcgi [QSA,L]
 
 
-ErrorDocument 500 "<h2>Application Error</h2>Merb could not be reached
+ErrorDocument 500 "<h2>Application Error</h2>Merb could not be reached"

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

@@ -5,7 +5,7 @@ require 'fileutils'
 require 'yaml'
 
 # Important - don't change this line or its position
-MERB_THOR_VERSION = '0.0.52'
+MERB_THOR_VERSION = '0.1.0'
 
 ##############################################################################
 
@@ -301,7 +301,7 @@ module GemManagement
       end
     end
   end
-
+  
   private
 
   def executable_wrapper(spec, bin_file_name, minigems = true)
@@ -325,6 +325,7 @@ end
 if File.directory?(gems_dir = File.join(Dir.pwd, 'gems')) ||
    File.directory?(gems_dir = File.join(File.dirname(__FILE__), '..', 'gems'))
   $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir)
+  ENV["PATH"] = "\#{File.dirname(__FILE__)}:\#{gems_dir}/bin:\#{ENV["PATH"]}"
   if (local_gem = Dir[File.join(gems_dir, "specifications", "#{spec.name}-*.gemspec")].last)
     version = File.basename(local_gem)[/-([\\.\\d]+)\\.gemspec$/, 1]
   end
@@ -476,8 +477,9 @@ module MerbThorHelper
   end
   
   def install_dependency(dependency, opts = {})
-    opts[:version] ||= dependency.version_requirements.to_s
-    Merb::Gem.install(dependency.name, default_install_options.merge(opts))
+    version = dependency.version_requirements.to_s
+    install_opts = default_install_options.merge(:version => version)
+    Merb::Gem.install(dependency.name, install_opts.merge(opts))
   end
 
   def install_dependency_from_source(dependency, opts = {})
@@ -760,8 +762,10 @@ module Merb
         if only_missing = comp == 'missing'
           message "Preparing to install missing gems #{where} using #{strategy} strategy..."
           comp = nil
+          clobber = false
         else
           message "Preparing to install #{where} using #{strategy} strategy..."
+          clobber = true
         end
         
         # If comp given, filter on known stack components
@@ -777,7 +781,7 @@ module Merb
           warning "No dependencies to install..."
         else
           puts "#{deps.length} dependencies to install..."
-          install_dependencies(strategy, deps)
+          install_dependencies(strategy, deps, clobber)
         end
         
         # Show current dependency info now that we're done
@@ -873,10 +877,21 @@ module Merb
     # merb:dependencies:configure --config-file file.yml        # write to the specified config file 
     
     desc 'configure [comp]', 'Create a dependencies config file'
-    method_options "--dry-run" => :boolean, "--force" => :boolean
+    method_options "--dry-run" => :boolean, "--force" => :boolean, "--versions" => :boolean
     def configure(comp = nil)
       # If comp given, filter on known stack components
       deps = comp ? Merb::Stack.select_component_dependencies(dependencies, comp) : dependencies
+      
+      # If --versions is set, update the version_requirements with the actual version available
+      if options[:versions]
+        specs = local_gemspecs
+        deps.each do |dep|
+          if spec = specs.find { |s| s.name == dep.name }
+            dep.version_requirements = ::Gem::Requirement.create(spec.version)
+          end
+        end
+      end
+      
       config = YAML.dump(deps.map { |d| d.to_s })
       puts "#{config}\n"
       if File.exists?(config_file) && !options[:force]
@@ -902,31 +917,33 @@ module Merb
       end
     end
     
-    def install_dependencies(strategy, deps)
+    def install_dependencies(strategy, deps, clobber = true)
       if method = strategy?(strategy)
         # Clobber existing local dependencies
-        clobber_dependencies!
+        clobber_dependencies! if clobber
         
         # Run the chosen strategy - collect files installed from stable gems
         installed_from_stable = send(method, deps).map { |d| d.name }
 
-        # Sleep a bit otherwise the following steps won't see the new files
-        sleep(deps.length) if deps.length > 0
-      
-        # Leave a file to denote the strategy that has been used for this dependency
-        self.local.each do |spec|
-          next unless File.directory?(spec.full_gem_path)
-          unless installed_from_stable.include?(spec.name)
-            FileUtils.touch(File.join(spec.full_gem_path, "#{strategy}.strategy"))
-          else
-            FileUtils.touch(File.join(spec.full_gem_path, "stable.strategy"))
-          end           
-        end
+        unless dry_run?
+          # Sleep a bit otherwise the following steps won't see the new files
+          sleep(deps.length) if deps.length > 0 && deps.length <= 10
+          
+          # Leave a file to denote the strategy that has been used for this dependency
+          self.local.each do |spec|
+            next unless File.directory?(spec.full_gem_path)
+            unless installed_from_stable.include?(spec.name)
+              FileUtils.touch(File.join(spec.full_gem_path, "#{strategy}.strategy"))
+            else
+              FileUtils.touch(File.join(spec.full_gem_path, "stable.strategy"))
+            end           
+          end
         
-        # Add local binaries for the installed framework dependencies
-        comps = Merb::Stack.all_components & deps.map { |d| d.name }
-        comps << { :no_minigems => 'merb-gen' }
-        ensure_bin_wrapper_for(*comps)          
+          # Add local binaries for the installed framework dependencies
+          comps = Merb::Stack.all_components & deps.map { |d| d.name }
+          comps << { :no_minigems => 'merb-gen' }
+          ensure_bin_wrapper_for(*comps)
+        end
         return true
       end
       false
@@ -967,7 +984,7 @@ module Merb
           end
         end
       end
-            
+      
       deps
     end
     
@@ -1037,15 +1054,12 @@ module Merb
       # Selectively update repositories for the matching dependencies
       update_dependency_repositories(deps) unless dry_run?
       
-      # Skip gem dependencies to prevent them from being installed from stable;
-      # however, core dependencies will be retrieved from source when available
-      install_opts = { :ignore_dependencies => true }
       if core = deps.find { |d| d.name == 'merb-core' }
         if dry_run?
           note "Installing #{core.name}..."
         else
-          if install_dependency_from_source(core, install_opts)
-          elsif install_dependency(core, install_opts)
+          if install_dependency_from_source(core)
+          elsif install_dependency(core)
             info "Installed #{core.name} from rubygems..."
             installed_from_rubygems << core
           end
@@ -1057,8 +1071,8 @@ module Merb
         if dry_run?
           note "Installing #{dependency.name}..."
         else
-          if install_dependency_from_source(dependency, install_opts)
-          elsif install_dependency(dependency, install_opts)
+          if install_dependency_from_source(dependency)
+          elsif install_dependency(dependency)
             info "Installed #{dependency.name} from rubygems..."
             installed_from_rubygems << dependency
           end
@@ -1079,24 +1093,31 @@ module Merb
     end
     
     # Extract application dependencies by querying the app directly.
-    def self.extract_dependencies(merb_root, env = 'production')
+    def self.extract_dependencies(merb_root)
       require 'merb-core'
       if !@_merb_loaded || Merb.root != merb_root
         Merb.start_environment(
+          :log_level => :fatal,
           :testing => true, 
           :adapter => 'runner', 
-          :environment => env, 
+          :environment => ENV['MERB_ENV'] || 'development', 
           :merb_root => merb_root
         )
         @_merb_loaded = true
       end
       Merb::BootLoader::Dependencies.dependencies
-    rescue => e
+    rescue StandardError => e     
       error "Couldn't extract dependencies from application!"
       error e.message
       puts  "Make sure you're executing the task from your app (--merb-root), or"
       puts  "specify a config option (--config or --config-file=YAML_FILE)"
       return []
+    rescue SystemExit      
+      error "Couldn't extract dependencies from application!"
+      error "application failed to run"
+      puts  "Please check if your application runs using 'merb'; for example,"
+      puts  "look for any gem version mismatches in dependencies.rb"
+      return []
     end
         
     # Parse the basic YAML config data, and process Gem::Dependency output.
@@ -1124,12 +1145,14 @@ module Merb
     
     DM_STACK = %w[
       extlib
+      data_objects
       dm-core
       dm-aggregates
       dm-migrations
       dm-timestamps
       dm-types
       dm-validations
+      merb_datamapper
     ]
     
     MERB_STACK = %w[      
@@ -1142,6 +1165,11 @@ module Merb
       merb-mailer
       merb-slices
       merb-auth
+      merb-auth-core
+      merb-auth-more 
+      merb-auth-slice-password
+      merb-param-protection
+      merb-exceptions
     ] + DM_STACK
     
     MERB_BASICS = %w[      
@@ -1218,6 +1246,15 @@ module Merb
       dm-rest-adapter
     ]
     
+    DATA_OBJECTS = %w[
+      data_objects 
+      do_derby do_hsqldb 
+      do_jdbc
+      do_mysql
+      do_postgres
+      do_sqlite3
+    ]
+    
     attr_accessor :system, :local, :missing
     
     include MerbThorHelper
@@ -1388,6 +1425,7 @@ module Merb
         comps["merb-more"]    = MERB_MORE.sort
         comps["merb-plugins"] = MERB_PLUGINS.sort
         comps["dm-more"]      = DM_MORE.sort
+        comps["do"]           = DATA_OBJECTS.sort
         
         comps
       end     
@@ -1413,7 +1451,7 @@ module Merb
     end
     
     def self.framework_components
-      %w[merb-core merb-more merb-plugins].inject([]) do |all, comp| 
+      %w[merb-core merb-more].inject([]) do |all, comp| 
         all + components(comp)
       end
     end
@@ -1435,7 +1473,7 @@ module Merb
     end
     
     def self.base_components
-      %w[thor rake]
+      %w[thor rake extlib]
     end
     
     def self.all_components
@@ -1447,6 +1485,7 @@ module Merb
     def self.core_dependencies(gem_dir = nil, ignore_deps = false)
       @_core_dependencies ||= begin
         if gem_dir # add local gems to index
+          orig_gem_path = ::Gem.path
           ::Gem.clear_paths; ::Gem.path.unshift(gem_dir)
         end
         deps = []
@@ -1461,7 +1500,7 @@ module Merb
             deps += gemspec.dependencies
           end
         end
-        ::Gem.clear_paths if gem_dir # reset
+        ::Gem.path.replace(orig_gem_path) if gem_dir # reset
         deps
       end
     end
@@ -1818,6 +1857,8 @@ module Merb
           message "Installing #{current_gem} from source..."
           if install_dependency_from_source(dependency)
             ensure_bin_wrapper_for(dependency.name) if options[:binaries]
+          else
+            raise "gem source not found"
           end
         end
       end

data/lib/generators/templates/application/merb_core/config/environments/test.rb

@@ -6,7 +6,7 @@ Merb::Config.use { |c|
   # log less in testing environment
   c[:log_level]         = :error
 
-  c[:log_file]  = Merb.root / "log" / "test.log"
+  #c[:log_file]  = Merb.root / "log" / "test.log"
   # or redirect logger using IO handle
-  # c[:log_stream] = STDOUT
+  c[:log_stream] = STDOUT
 }

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

@@ -1,4 +1,3 @@
-
 # use PathPrefix Middleware if :path_prefix is set in Merb::Config
 if prefix = ::Merb::Config[:path_prefix]
   use Merb::Rack::PathPrefix, prefix

data/lib/generators/templates/application/merb_stack/config/environments/test.rb

@@ -6,7 +6,7 @@ Merb::Config.use { |c|
   # log less in testing environment
   c[:log_level]         = :error
 
-  c[:log_file]  = Merb.root / "log" / "test.log"
+  #c[:log_file]  = Merb.root / "log" / "test.log"
   # or redirect logger using IO handle
-  # c[:log_stream] = STDOUT
+  c[:log_stream] = STDOUT
 }

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

@@ -1,4 +1,3 @@
-
 # use PathPrefix Middleware if :path_prefix is set in Merb::Config
 if prefix = ::Merb::Config[:path_prefix]
   use Merb::Rack::PathPrefix, prefix

data/lib/generators/templates/component/resource_controller/spec/requests/%file_name%_spec.rb

@@ -52,9 +52,9 @@ describe "resource(:<%= plural_model %>)" do
     
     it "redirects to resource(:<%= plural_model %>)" do
       <%- if orm.to_sym == :datamapper -%>
-      @response.should redirect_to(resource(<%= singular_model.capitalize %>.first), :message => {:notice => "<%= singular_model %> was successfully created"})
+      @response.should redirect_to(resource(<%= model_class_name %>.first), :message => {:notice => "<%= singular_model %> was successfully created"})
       <%- elsif orm.to_sym == :activerecord -%>
-      @response.should redirect_to(resource(<%= singular_model.capitalize %>.first), :message => {:notice => "<%= singular_model %> was successfully created"})
+      @response.should redirect_to(resource(<%= model_class_name %>.first), :message => {:notice => "<%= singular_model %> was successfully created"})
       <% end -%>
     end
     

data/lib/merb-gen/generator.rb

@@ -41,10 +41,6 @@ module Merb
         Merb::BootLoader::Logger.run
         Merb::BootLoader::BuildFramework.run
         Merb::BootLoader::Dependencies.run
-
-        Merb::BootLoader::BeforeAppLoads.run
-        Merb::BootLoader::ReloadClasses.run
-        Merb::BootLoader::AfterAppLoads.run
         
         super
         options[:orm] ||= Merb.orm

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-21 00:00:00 -07:00
+date: 2008-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.10
+        version: 0.9.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater