mkuklis-webrat 0.5.1 → 0.6.rc1

data/spec/integration/merb/tasks/merb.thor/main.thor

@@ -1,150 +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
+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/spec/integration/merb/tasks/merb.thor/ops.rb

@@ -1,93 +1,93 @@
-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)
-        versions.pop if versions.last.is_a?(Hash)
-        @dependencies << [name, versions]
-      end
-    end
-
-    class Gem < Thor
-      def full_list
-        @idx.load_gems_in("gems/specifications")
-
-        @list.map do |name, versions|
-          dep = ::Gem::Dependency.new(name, versions)
-          spec = @idx.search(dep).last
-          unless spec
-            self.class.error "A required dependency #{dep} was not found"
-            self.class.rollback_trans
-          end
-          deps = spec.recursive_dependencies(dep, @idx)
-          [spec] + 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)
-        @idx.load_gems_in("gems/specifications")
-        return if @idx.search(dep).last
-
-        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
+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)
+        versions.pop if versions.last.is_a?(Hash)
+        @dependencies << [name, versions]
+      end
+    end
+
+    class Gem < Thor
+      def full_list
+        @idx.load_gems_in("gems/specifications")
+
+        @list.map do |name, versions|
+          dep = ::Gem::Dependency.new(name, versions)
+          spec = @idx.search(dep).last
+          unless spec
+            self.class.error "A required dependency #{dep} was not found"
+            self.class.rollback_trans
+          end
+          deps = spec.recursive_dependencies(dep, @idx)
+          [spec] + 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)
+        @idx.load_gems_in("gems/specifications")
+        return if @idx.search(dep).last
+
+        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/spec/integration/merb/tasks/merb.thor/utils.rb

@@ -1,40 +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
+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/spec/integration/rack/Rakefile

@@ -1,5 +1,5 @@
-require "rake/testtask"
-
-Rake::TestTask.new do |t|
-  t.test_files = FileList["test/*_test.rb"]
-end
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList["test/*_test.rb"]
+end