merb-gen 1.0.4 → 1.0.5

data/lib/generators/merb/merb_core.rb

@@ -45,11 +45,6 @@ module Merb
       #
 
       empty_directory :gems, 'gems'
-      file :thorfile do |file|
-        file.source      = File.join(common_templates_dir, "merb.thor")
-        file.destination = "merb.thor"
-      end
-
       template :rakefile do |template|
         template.source = File.join(common_templates_dir, "Rakefile")
         template.destination = "Rakefile"
@@ -71,6 +66,11 @@ module Merb
         directory.source      = File.join(source_root, dir)
         directory.destination = dir
       end
+      
+      directory :thor_file do |directory|
+        directory.source = File.join(common_templates_dir, "merb_thor")
+        directory.destination = File.join("tasks", "merb.thor")
+      end
 
       #
       # ==== Layout specific things

data/lib/generators/merb/merb_flat.rb

@@ -45,11 +45,6 @@ module Merb
       #
 
       empty_directory :gems, 'gems'
-      file :thorfile do |file|
-        file.source      = File.join(common_templates_dir, "merb.thor")
-        file.destination = "merb.thor"
-      end
-
       template :rakefile do |template|
         template.source = File.join(common_templates_dir, "Rakefile")
         template.destination = "Rakefile"
@@ -66,6 +61,11 @@ module Merb
         directory.source      = File.join(source_root, dir)
         directory.destination = dir
       end
+      
+      directory :thor_file do |directory|
+        directory.source = File.join(common_templates_dir, "merb_thor")
+        directory.destination = File.join("tasks", "merb.thor")
+      end
 
       #
       # ==== Layout specific things

data/lib/generators/merb/merb_stack.rb

@@ -49,11 +49,6 @@ module Merb
       #
 
       empty_directory :gems, 'gems'
-      file :thorfile do |file|
-        file.source      = File.join(common_templates_dir, "merb.thor")
-        file.destination = "tasks/merb.thor"
-      end
-
       template :rakefile do |template|
         template.source = File.join(common_templates_dir, "Rakefile")
         template.destination = "Rakefile"
@@ -79,6 +74,11 @@ module Merb
         file.destination = 'public/javascripts/jquery.js'
       end
 
+      directory :thor_file do |directory|
+        directory.source = File.join(common_templates_dir, "merb_thor")
+        directory.destination = File.join("tasks", "merb.thor")
+      end
+
       directory :test_dir do |directory|
         dir = testing_framework == :rspec ? "spec" : "test"
 

data/lib/generators/merb/merb_very_flat.rb

@@ -49,16 +49,16 @@ module Merb
         directory.destination = dir
       end
 
+      directory :thor_file do |directory|
+        directory.source = File.join(common_templates_dir, "merb_thor")
+        directory.destination = File.join("tasks", "merb.thor")
+      end
+
       template :rakefile do |template|
         template.source = File.join(common_templates_dir, "Rakefile")
         template.destination = "Rakefile"
       end
 
-      file :thorfile do |file|
-        file.source      = File.join(common_templates_dir, "merb.thor")
-        file.destination = "merb.thor"
-      end
-
       def class_name
         self.name.gsub("-", "_").camel_case
       end

data/lib/generators/templates/application/common/dotgitignore

@@ -15,4 +15,9 @@ schema/*.db
 src/*
 .hgignore
 .hg/*
-.svn/*
+.svn/*
+gems/gems/*/
+gems/specifications/*
+!gems/gems/thor*/
+!gems/specifications/thor*
+merb_profile_results

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

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+# This was added by Merb's bundler
+
+require "rubygems"
+require File.join(File.dirname(__FILE__), "common")
+
+gems_dir = File.join(File.dirname(__FILE__), '..', 'gems')
+
+if File.directory?(gems_dir)
+  $BUNDLE = true
+  Gem.clear_paths
+  Gem.path.replace([File.expand_path(gems_dir)])
+  ENV["PATH"] = "#{File.dirname(__FILE__)}:#{ENV["PATH"]}"
+  
+  gem_file = File.join(gems_dir, "specifications", "<%= spec.name %>-*.gemspec")
+  
+  if local_gem = Dir[gem_file].last
+    version = File.basename(local_gem)[/-([\.\d]+)\.gemspec$/, 1]
+  end
+end
+
+version ||= "<%= Gem::Requirement.default %>"
+
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+  version = $1
+  ARGV.shift
+end
+
+gem '<%= @spec.name %>', version
+load '<%= bin_file_name %>'

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

@@ -0,0 +1,64 @@
+# This was added via Merb's bundler
+
+require "rubygems"
+require "rubygems/source_index"
+
+module Gem
+  BUNDLED_SPECS = File.join(Dir.pwd, "gems", "specifications")
+  MAIN_INDEX = Gem::SourceIndex.from_gems_in(BUNDLED_SPECS)
+  FALLBACK_INDEX = Gem::SourceIndex.from_installed_gems
+  
+  def self.source_index
+    MultiSourceIndex.new
+  end
+  
+  def self.searcher
+    MultiPathSearcher.new
+  end
+  
+  class ArbitrarySearcher < GemPathSearcher
+    def initialize(source_index)
+      @source_index = source_index
+      super()
+    end
+    
+    def init_gemspecs
+      @source_index.map { |_, spec| spec }.sort { |a,b|
+        (a.name <=> b.name).nonzero? || (b.version <=> a.version)
+      }
+    end
+  end
+
+  class MultiPathSearcher
+    def initialize
+      @main_searcher = ArbitrarySearcher.new(MAIN_INDEX)
+      @fallback_searcher = ArbitrarySearcher.new(FALLBACK_INDEX)
+    end
+    
+    def find(path)
+      try = @main_searcher.find(path)
+      return try if try
+      @fallback_searcher.find(path)
+    end
+    
+    def find_all(path)
+      try = @main_searcher.find_all(path)
+      return try unless try.empty?
+      @fallback_searcher.find_all(path)
+    end
+  end
+  
+  class MultiSourceIndex
+    def search(*args)
+      try = MAIN_INDEX.search(*args)
+      return try unless try.empty?
+      FALLBACK_INDEX.search(*args)
+    end
+    
+    def find_name(*args)
+      try = MAIN_INDEX.find_name(*args)
+      return try unless try.empty?
+      FALLBACK_INDEX.find_name(*args)
+    end
+  end
+end

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

@@ -0,0 +1,123 @@
+require "erb"
+
+Gem.pre_install_hooks.push(proc do |installer|
+  $INSTALLING << installer.spec
+  
+  unless File.file?(installer.bin_dir / "common.rb")
+    FileUtils.mkdir_p(installer.bin_dir)
+    FileUtils.cp(File.dirname(__FILE__) / "common.rb", installer.bin_dir / "common.rb")
+  end
+  
+  include ColorfulMessages
+  name = installer.spec.name
+  if $GEMS && versions = ($GEMS.assoc(name) || [])[1]
+    dep = Gem::Dependency.new(name, versions)
+    unless dep.version_requirements.satisfied_by?(installer.spec.version)
+      error "Cannot install #{installer.spec.full_name} " \
+            "for #{$INSTALLING.map {|x| x.full_name}.join(", ")}; " \
+            "you required #{dep}"
+      ::Thor::Tasks::Merb::Gem.rollback_trans
+      exit!
+    end
+  end
+  success "Installing #{installer.spec.full_name}"
+end)
+
+class ::Gem::Uninstaller
+  def self._with_silent_ui
+    
+    ui = Gem::DefaultUserInteraction.ui 
+    def ui.say(str)
+      puts "- #{str}"
+    end
+    
+    yield
+    
+    class << Gem::DefaultUserInteraction.ui
+      undef :say
+    end 
+  end
+  
+  def self._uninstall(source_index, name, op, version)
+    unless source_index.find_name(name, "#{op} #{version}").empty?
+      uninstaller = Gem::Uninstaller.new(
+        name,
+        :version => "#{op} #{version}",
+        :install_dir => Dir.pwd / "gems",
+        :all => true,
+        :ignore => true
+      )
+      _with_silent_ui { uninstaller.uninstall }
+    end
+  end
+  
+  def self._uninstall_others(source_index, name, version)
+    _uninstall(source_index, name, "<", version)
+    _uninstall(source_index, name, ">", version)
+  end
+end
+
+Gem.post_install_hooks.push(proc do |installer|
+  $INSTALLING.pop
+  source_index = installer.instance_variable_get("@source_index")
+  ::Gem::Uninstaller._uninstall_others(
+    source_index, installer.spec.name, installer.spec.version
+  )
+end)
+
+class ::Gem::DependencyInstaller
+  alias old_fg find_gems_with_sources
+  
+  def find_gems_with_sources(dep)
+    if @source_index.any? { |_, installed_spec|
+      installed_spec.satisfies_requirement?(dep)
+    }
+      return []
+    end
+    
+    old_fg(dep)
+  end
+end
+
+class ::Gem::SpecFetcher
+  alias old_fetch fetch
+  def fetch(dependency, all = false, matching_platform = true)
+    idx = Gem::SourceIndex.from_installed_gems
+    
+    dep = idx.search(dependency).sort.last
+    
+    if dep
+      file = dep.loaded_from.dup
+      file.gsub!(/specifications/, "cache")
+      file.gsub!(/gemspec$/, "gem")
+      spec = ::Gem::Format.from_file_by_path(file).spec
+      [[spec, file]]
+    else
+      old_fetch(dependency, all, matching_platform)
+    end
+  end
+end
+
+class ::Gem::Installer
+  def app_script_text(bin_file_name)
+    template = File.read(File.dirname(__FILE__) / "app_script.rb")
+    erb = ERB.new(template)
+    erb.result(binding)
+  end
+end
+
+class ::Gem::Specification
+  def recursive_dependencies(from, index = Gem.source_index)
+    specs = self.runtime_dependencies.map do |dep|
+      spec = index.search(dep).last
+      unless spec
+        wider_net = index.find_name(dep.name).last
+        ThorUI.error "Needed #{dep} for #{from.full_name}, but could not find it"
+        ThorUI.error "Found #{wider_net.full_name}" if wider_net
+        ::Thor::Tasks::Merb::Gem.rollback_trans
+      end
+      spec
+    end
+    specs + specs.map {|s| s.recursive_dependencies(self, index)}.flatten.uniq
+  end
+end

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

@@ -0,0 +1,150 @@
+require "rubygems"
+require "rubygems/source_index"
+require "rubygems/dependency_installer"
+require "rubygems/uninstaller"
+require "fileutils"
+require File.join(File.dirname(__FILE__), "utils")
+require File.join(File.dirname(__FILE__), "gem_ext")
+require File.join(File.dirname(__FILE__), "ops")
+
+$INSTALLING = []
+
+module Merb
+  
+  class Gem < Thor
+    extend ColorfulMessages
+    
+    def initialize
+      dirs = [Dir.pwd, File.dirname(__FILE__) / ".."]
+      root = dirs.find {|d| File.file?(d / "config" / "dependencies.rb")}
+      
+      if root
+        @depsrb = root / "config" / "dependencies.rb"
+      else
+        self.class.error "dependencies.rb was not found"
+        exit!
+      end
+      
+      FileUtils.mkdir_p(Dir.pwd / "gems")
+      
+      @list = Collector.collect(File.read(@depsrb))
+      @idx = ::Gem::SourceIndex.new.load_gems_in("gems/specifications")
+    end
+    
+    def list
+      require "pp"
+      pp @list
+    end
+    
+    desc "redeploy", "Syncs up gems/cache with gems/gems. All gems in the cache " \
+                     "that are not already installed will be installed from the " \
+                     "cache. All installed gems that are not in the cache will " \
+                     "be uninstalled."
+    def redeploy
+      gem_dir = Dir.pwd / "gems" / "gems"
+      cache_dir = Dir.pwd / "gems" / "cache"
+      
+      gems  = Dir[gem_dir / "*"].map!  {|n| File.basename(n)}
+      cache = Dir[cache_dir / "*.gem"].map! {|n| File.basename(n, ".gem")}
+      new_gems = cache - gems
+      outdated = gems - cache
+      idx = ::Gem::SourceIndex.new
+      idx.load_gems_in(Dir.pwd / "gems" / "specifications")
+
+      new_gems.each do |g|
+        installer = ::Gem::Installer.new(cache_dir / "#{g}.gem",
+          :bin_dir => Dir.pwd / "bin",
+          :install_dir => Dir.pwd / "gems",
+          :ignore_dependencies => true,
+          :user_install => false,
+          :wrappers => true,
+          :source_index => idx)
+            
+        installer.install
+      end
+      
+      outdated.each do |g|
+        /(.*)\-(.*)/ =~ g
+        name, version = $1, $2
+        uninstaller = ::Gem::Uninstaller.new(name,
+          :version => version,
+          :bin_dir => Dir.pwd / "bin",
+          :install_dir => Dir.pwd / "gems",
+          :ignore => true,
+          :executables => true
+        )
+        uninstaller.uninstall
+      end
+    end
+    
+    desc "confirm", "Confirm the current setup. merb:gem:install will " \
+                    "automatically run this task before committing the " \
+                    "changes it makes."
+    def confirm(gems = @list)
+      ::Gem.path.replace([Dir.pwd / "gems"])
+      ::Gem.source_index.load_gems_in(Dir.pwd / "gems" / "specifications")
+      
+      self.class.info "Confirming configuration..."
+      
+      ::Gem.loaded_specs.clear
+      
+      begin
+        gems.each do |name, versions|
+          versions ||= []
+          ::Gem.activate name, *versions
+        end
+      rescue ::Gem::LoadError => e
+        self.class.error "Configuration could not be confirmed: #{e.message}"
+        self.class.rollback_trans
+      end
+      self.class.info "Confirmed"
+    end
+    
+    desc 'install', 'Sync up your bundled gems with the list in config/dependencies.rb'
+    def install(*gems)
+      if gems.empty?
+        gems = @list
+      else
+        gems = gems.map {|desc| name, *versions = desc.split(" ") }
+      end
+      
+      $GEMS = gems
+      
+      self.class.begin_trans
+      
+      gems.each do |name, versions|
+        dep = ::Gem::Dependency.new(name, versions || [])
+        unless @idx.search(dep).empty?
+          next
+        end
+        
+        rescue_failures do
+          $INSTALLING = []
+          _install(dep)
+        end
+      end
+
+      gem_dir = Dir.pwd / "gems" / "gems"
+      installed_gems  = Dir[gem_dir / "*"].map!  {|n| File.basename(n)}
+      
+      list = full_list.map {|x| x.full_name}.compact
+      
+      (installed_gems - list).each do |g|
+        /^(.*)\-(.*)$/ =~ g
+        name, version = $1, $2
+        uninstaller = ::Gem::Uninstaller.new(name,
+          :version => version,
+          :bin_dir => (Dir.pwd / "bin").to_s,
+          :install_dir => (Dir.pwd / "gems").to_s,
+          :ignore => true,
+          :executables => true
+        )
+        uninstaller.uninstall
+      end
+      
+      confirm(gems)
+      
+      self.class.commit_trans
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+module Thor::Tasks
+  module Merb
+    class Collector
+      attr_reader :dependencies
+
+      def self.collect(str)
+        collector = new
+        collector.instance_eval(str)
+        collector.dependencies
+      end
+
+      def initialize
+        @dependencies = []
+      end
+
+      def dependency(name, *versions)
+        @dependencies << [name, versions]
+      end
+    end
+    
+    class Gem < Thor
+      def full_list
+        @idx.load_gems_in("gems/specifications")
+
+        @list.map do |name, versions|
+          dep = @idx.find_name(name).last
+          unless dep
+            self.class.error "A required dependency #{dep} was not found"
+            self.class.rollback_trans
+          end
+          deps = dep.recursive_dependencies(dep, @idx)
+          [dep] + deps
+        end.flatten.uniq
+      end
+      
+      def rescue_failures(error = StandardError, prc = nil)
+        begin
+          yield
+        rescue error => e
+          if prc
+            prc.call(e)
+          else
+            puts e.message
+            puts e.backtrace
+          end
+          self.class.rollback_trans
+        end
+      end
+
+      def self.begin_trans
+        note "Beginning transaction"
+        FileUtils.cp_r(Dir.pwd / "gems", Dir.pwd / ".original_gems")
+      end
+
+      def self.commit_trans
+        note "Committing transaction"
+        FileUtils.rm_rf(Dir.pwd / ".original_gems")
+      end
+
+      def self.rollback_trans
+        if File.exist?(Dir.pwd / ".original_gems")
+          note "Rolling back transaction"
+          FileUtils.rm_rf(Dir.pwd / "gems")
+          FileUtils.mv(Dir.pwd / ".original_gems", Dir.pwd / "gems")
+        end
+        exit!
+      end
+      
+      private
+      def _install(dep)
+        installer = ::Gem::DependencyInstaller.new(
+          :bin_dir => Dir.pwd / "bin",
+          :install_dir => Dir.pwd / "gems",
+          :user_install => false)
+
+        begin
+          installer.install dep.name, dep.version_requirements
+        rescue ::Gem::GemNotFoundException => e
+          puts "Cannot find #{dep}"
+        rescue ::Gem::RemoteFetcher::FetchError => e
+          puts e.message
+          puts "Retrying..."
+          retry
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+class String
+  def /(other)
+    (Pathname.new(self) + other).to_s
+  end
+end
+
+module ColorfulMessages
+  
+  # red
+  def error(*messages)
+    puts messages.map { |msg| "\033[1;31m#{msg}\033[0m" }
+  end
+  
+  # yellow
+  def warning(*messages)
+    puts messages.map { |msg| "\033[1;33m#{msg}\033[0m" }
+  end
+  
+  # green
+  def success(*messages)
+    puts messages.map { |msg| "\033[1;32m#{msg}\033[0m" }
+  end
+  
+  alias_method :message, :success
+  
+  # magenta
+  def note(*messages)
+    puts messages.map { |msg| "\033[1;35m#{msg}\033[0m" }
+  end
+  
+  # blue
+  def info(*messages)
+    puts messages.map { |msg| "\033[1;34m#{msg}\033[0m" }
+  end
+  
+end
+
+module ThorUI
+  extend ColorfulMessages
+end

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

@@ -17,4 +17,9 @@ Spec::Runner.configure do |config|
   config.include(Merb::Test::ViewHelper)
   config.include(Merb::Test::RouteHelper)
   config.include(Merb::Test::ControllerHelper)
+  
+  config.before(:all) do
+    DataMapper.auto_migrate! if Merb.orm == :datamapper
+  end
+  
 end

data/lib/generators/templates/component/controller/app/controllers/%file_name%.rb

@@ -1,8 +1,6 @@
 <% with_modules(modules) do -%>
 class <%= class_name %> < Application
 
-  # ...and remember, everything returned from an action
-  # goes to the client...
   def index
     render
   end

data/lib/generators/thor.rb

@@ -0,0 +1,28 @@
+module Merb
+  module Generators
+    class ThorGenerator < AppGenerator
+      #
+      # ==== Paths
+      #
+
+      def self.source_root
+        File.join(super, 'application', 'common', 'merb_thor')
+      end
+
+      def destination_root
+        File.join(@destination_root, 'tasks')
+      end
+
+      def common_templates_dir
+        File.expand_path(File.join(File.dirname(__FILE__),
+                                   'templates', 'application', 'common'))
+      end
+
+      directory :thor_file do |directory|
+        directory.source = File.join(common_templates_dir, "merb_thor")
+        directory.destination = File.join("merb.thor")
+      end
+    end
+    add :thor,   ThorGenerator
+  end
+end

data/lib/merb-gen/templater.rb

@@ -0,0 +1,40 @@
+module Templater
+  module Actions
+    class Directory < File
+      def identical?
+        sanity = ::File.directory?(destination) && exists?
+        if sanity
+          src  = Dir[::File.join(source, "**", "*")]
+          src.map! {|f| f.gsub(/#{source}/, "")}
+          dest = Dir[::File.join(destination, "**", "*")]
+          dest.map!   {|f| f.gsub(/#{destination}/, "")}
+          src == dest
+        else
+          false
+        end
+      end
+    end
+  end
+end
+
+module Templater
+  module Actions
+    class File < Action
+
+      # Renders the template and copies it to the destination.
+      def invoke!
+        callback(:before)
+        ::FileUtils.mkdir_p(::File.dirname(destination))
+        ::FileUtils.rm_rf(destination)
+        ::FileUtils.cp_r(source, destination)
+        callback(:after)
+      end
+    
+      # removes the destination file
+      def revoke!
+        ::FileUtils.rm_r(destination, :force => true)
+      end
+
+    end
+  end
+end