milhouse-spork 0.7.5.1 → 0.7.5.2

data/lib/spork/app_framework/rails_stub_files/application_controller.rb

@@ -1,22 +1,22 @@
-# This is a stub used to help Spork delay the loading of the real ApplicationController
-class ::ApplicationController < ActionController::Base
-  @@preloading = true
-  class << self
-    def inherited(klass)
-      (@_descendants ||= []) << klass if @@preloading
-      super
-    end
-
-    def reapply_inheritance!
-      @@preloading = false
-      Array(@_descendants).each do |descendant|
-        descendant.master_helper_module.send(:include, master_helper_module)
-        descendant.send(:default_helper_module!)
-
-        descendant.respond_to?(:reapply_inheritance!) && descendant.reapply_inheritance!
-      end
-    end
-  end
-end
-
-Spork.each_run { ApplicationController.reapply_inheritance! }
+# This is a stub used to help Spork delay the loading of the real ApplicationController
+class ::ApplicationController < ActionController::Base
+  @@preloading = true
+  class << self
+    def inherited(klass)
+      (@_descendants ||= []) << klass if @@preloading
+      super
+    end
+
+    def reapply_inheritance!
+      @@preloading = false
+      Array(@_descendants).each do |descendant|
+        descendant.master_helper_module.send(:include, master_helper_module)
+        descendant.send(:default_helper_module!)
+
+        descendant.respond_to?(:reapply_inheritance!) && descendant.reapply_inheritance!
+      end
+    end
+  end
+end
+
+Spork.each_run { ApplicationController.reapply_inheritance! }

data/lib/spork/app_framework/rails_stub_files/application_helper.rb

@@ -1,3 +1,3 @@
-# This is a stub used to help Spork delay the loading of the real ApplicationHelper
-module ::ApplicationHelper
+# This is a stub used to help Spork delay the loading of the real ApplicationHelper
+module ::ApplicationHelper
 end

data/lib/spork/app_framework/unknown.rb

@@ -1,6 +1,6 @@
-# This is used if no supported appliction framework is detected
-class Spork::AppFramework::Unknown < Spork::AppFramework
-  def entry_point
-    nil
-  end
+# This is used if no supported appliction framework is detected
+class Spork::AppFramework::Unknown < Spork::AppFramework
+  def entry_point
+    nil
+  end
 end

data/lib/spork/app_framework.rb

@@ -1,74 +1,74 @@
-class Spork::AppFramework
-  # A hash of procs where the key is the class name, and the proc takes no arguments and returns true if it detects that said application framework is being used in the project.
-  # 
-  # The key :Rails maps to Spork::AppFramework::Rails
-  #
-  # This is used to reduce the amount of code needed to be loaded - only the detected application framework's support code is loaded.
-  SUPPORTED_FRAMEWORKS = {
-    :Rails => lambda {
-      File.exist?("config/environment.rb") && File.read("config/environment.rb").include?('RAILS_GEM_VERSION')
-    }
-  } unless defined? SUPPORTED_FRAMEWORKS
-  
-  def self.setup_autoload
-    ([:Unknown] + SUPPORTED_FRAMEWORKS.keys).each do |name|
-      autoload name, File.join(File.dirname(__FILE__), "app_framework", name.to_s.downcase)
-    end
-  end
-  
-  # Iterates through all SUPPORTED_FRAMEWORKS and returns the symbolic name of the project application framework detected.  Otherwise, returns :Unknown
-  def self.detect_framework_name
-    SUPPORTED_FRAMEWORKS.each do |key, value|
-      return key if value.call
-    end
-    :Unknown
-  end
-  
-  # Same as detect_framework_name, but returns an instance of the specific AppFramework class.
-  def self.detect_framework
-    name = detect_framework_name
-    self[name]
-  end
-  
-  # Initializes, stores, and returns a singleton instance of the named AppFramework.
-  #
-  # == Parameters
-  #
-  # # +name+ - A symbolic name of a AppFramework subclass
-  #
-  # == Example
-  #
-  #   Spork::AppFramework[:Rails]
-  def self.[](name)
-    instances[name] ||= const_get(name).new
-  end
-  
-  def self.short_name
-    name.gsub('Spork::AppFramework::', '')
-  end
-  
-  # If there is some stuff out of the box that the Spork can do to speed up tests without the test helper file being bootstrapped, this should return false.
-  def bootstrap_required?
-    entry_point.nil?
-  end
-  
-  # Abstract: The path to the file that loads the project environment, ie config/environment.rb.  Returns nil if there is none.
-  def entry_point
-    raise NotImplementedError
-  end
-  
-  def preload(&block)
-    yield
-  end
-  
-  def short_name
-    self.class.short_name
-  end
-  
-  protected
-    def self.instances
-      @instances ||= {}
-    end
-end
-
+class Spork::AppFramework
+  # A hash of procs where the key is the class name, and the proc takes no arguments and returns true if it detects that said application framework is being used in the project.
+  # 
+  # The key :Rails maps to Spork::AppFramework::Rails
+  #
+  # This is used to reduce the amount of code needed to be loaded - only the detected application framework's support code is loaded.
+  SUPPORTED_FRAMEWORKS = {
+    :Rails => lambda {
+      File.exist?("config/environment.rb") && File.read("config/environment.rb").include?('RAILS_GEM_VERSION')
+    }
+  } unless defined? SUPPORTED_FRAMEWORKS
+  
+  def self.setup_autoload
+    ([:Unknown] + SUPPORTED_FRAMEWORKS.keys).each do |name|
+      autoload name, File.join(File.dirname(__FILE__), "app_framework", name.to_s.downcase)
+    end
+  end
+  
+  # Iterates through all SUPPORTED_FRAMEWORKS and returns the symbolic name of the project application framework detected.  Otherwise, returns :Unknown
+  def self.detect_framework_name
+    SUPPORTED_FRAMEWORKS.each do |key, value|
+      return key if value.call
+    end
+    :Unknown
+  end
+  
+  # Same as detect_framework_name, but returns an instance of the specific AppFramework class.
+  def self.detect_framework
+    name = detect_framework_name
+    self[name]
+  end
+  
+  # Initializes, stores, and returns a singleton instance of the named AppFramework.
+  #
+  # == Parameters
+  #
+  # # +name+ - A symbolic name of a AppFramework subclass
+  #
+  # == Example
+  #
+  #   Spork::AppFramework[:Rails]
+  def self.[](name)
+    instances[name] ||= const_get(name).new
+  end
+  
+  def self.short_name
+    name.gsub('Spork::AppFramework::', '')
+  end
+  
+  # If there is some stuff out of the box that the Spork can do to speed up tests without the test helper file being bootstrapped, this should return false.
+  def bootstrap_required?
+    entry_point.nil?
+  end
+  
+  # Abstract: The path to the file that loads the project environment, ie config/environment.rb.  Returns nil if there is none.
+  def entry_point
+    raise NotImplementedError
+  end
+  
+  def preload(&block)
+    yield
+  end
+  
+  def short_name
+    self.class.short_name
+  end
+  
+  protected
+    def self.instances
+      @instances ||= {}
+    end
+end
+
 Spork::AppFramework.setup_autoload

data/lib/spork/custom_io_streams.rb

@@ -1,25 +1,25 @@
-# This class is mainly used for testing.
-# When included (and used), it gives us an opportunity to stub out the output streams used for a given class
-module Spork::CustomIOStreams
-  def self.included(klass)
-    klass.send(:extend, ::Spork::CustomIOStreams::ClassMethods)
-  end
-  
-  def stderr
-    self.class.stderr
-  end
-
-  def stdout
-    self.class.stdout
-  end
-  
-  module ClassMethods
-    def stderr
-      $stderr
-    end
-  
-    def stdout
-      $stdout
-    end
-  end
+# This class is mainly used for testing.
+# When included (and used), it gives us an opportunity to stub out the output streams used for a given class
+module Spork::CustomIOStreams
+  def self.included(klass)
+    klass.send(:extend, ::Spork::CustomIOStreams::ClassMethods)
+  end
+  
+  def stderr
+    self.class.stderr
+  end
+
+  def stdout
+    self.class.stdout
+  end
+  
+  module ClassMethods
+    def stderr
+      $stderr
+    end
+  
+    def stdout
+      $stdout
+    end
+  end
 end

data/lib/spork/diagnoser.rb

@@ -1,103 +1,103 @@
-# The Diagnoser hooks into load and require and keeps track of when files are required / loaded, and who loaded them.
-# It's used when you run spork --diagnose
-#
-# = Example
-#  
-#  Spork::Diagnoser.install_hook!('/path/env.rb', '/path')
-#  require '/path/to/env.rb'
-#  Spork::Diagnoser.output_results(STDOUT)
-class Spork::Diagnoser
-  class << self
-    def loaded_files
-      @loaded_files ||= {}
-    end
-    
-    # Installs the diagnoser hook into Kernel#require and Kernel#load
-    #
-    # == Parameters
-    #
-    # * +entry_file+ - The file that is used to load the project.  Used to filter the backtrace so anything that happens after it is hidden.
-    # * +dir+ - The project directory.  Any file loaded outside of this directory will not be logged.
-    def install_hook!(entry_file = nil, dir = Dir.pwd)
-      @dir = File.expand_path(Dir.pwd, dir)
-      @entry_file = entry_file
-      
-      Kernel.class_eval do
-        alias :require_without_diagnoser :require
-        alias :load_without_diagnoser :load
-        
-        def require(string)
-          ::Spork::Diagnoser.add_included_file(string, caller)
-          require_without_diagnoser(string)
-        end
-        
-        def load(string)
-          ::Spork::Diagnoser.add_included_file(string, caller)
-          load_without_diagnoser(string)
-        end
-      end
-    end
-    
-    def add_included_file(filename, callstack)
-      filename = expand_filename(filename)
-      return unless File.exist?(filename)
-      loaded_files[filename] = filter_callstack(caller) if subdirectory?(filename)
-    end
-    
-    # Uninstall the hook. Generally useful only for testing the Diagnoser.
-    def remove_hook!
-      return unless Kernel.private_instance_methods.include?('require_without_diagnoser')
-      Kernel.class_eval do
-        alias :require :require_without_diagnoser
-        alias :load :load_without_diagnoser
-        
-        undef_method(:require_without_diagnoser)
-        undef_method(:load_without_diagnoser)
-      end
-      true
-    end
-    
-    # output the results of a diagnostic run.
-    #
-    # == Parameters
-    #
-    # * +stdout+ - An IO stream to output the results to.
-    def output_results(stdout)
-      project_prefix = Dir.pwd + "/"
-      minimify = lambda { |f| f.gsub(project_prefix, '')}
-      stdout.puts "- Spork Diagnosis -\n"
-      stdout.puts "-- Summary --"
-      stdout.puts loaded_files.keys.sort.map(&minimify)
-      stdout.puts "\n\n\n"
-      stdout.puts "-- Detail --"
-      loaded_files.keys.sort.each do |file|
-        stdout.puts "\n\n\n--- #{minimify.call(file)} ---\n"
-        stdout.puts loaded_files[file].map(&minimify)
-      end
-    end
-    
-    private
-      def filter_callstack(callstack, entry_file = @entry_file)
-        callstack.pop until callstack.empty? || callstack.last.include?(@entry_file) if @entry_file
-        callstack.map do |line|
-          next if line.include?('lib/spork/diagnoser.rb')
-          line.gsub!('require_without_diagnoser', 'require')
-          line
-        end.compact
-      end
-    
-      def expand_filename(filename)
-        ([Dir.pwd] + $:).each do |attempted_path|
-          attempted_filename = File.expand_path(filename, attempted_path)
-          return attempted_filename if File.file?(attempted_filename)
-          attempted_filename = attempted_filename + ".rb"
-          return attempted_filename if File.file?(attempted_filename)
-        end
-        filename
-      end
-    
-      def subdirectory?(directory)
-        File.expand_path(directory, Dir.pwd).include?(@dir)
-      end
-  end
-end
+# The Diagnoser hooks into load and require and keeps track of when files are required / loaded, and who loaded them.
+# It's used when you run spork --diagnose
+#
+# = Example
+#  
+#  Spork::Diagnoser.install_hook!('/path/env.rb', '/path')
+#  require '/path/to/env.rb'
+#  Spork::Diagnoser.output_results(STDOUT)
+class Spork::Diagnoser
+  class << self
+    def loaded_files
+      @loaded_files ||= {}
+    end
+    
+    # Installs the diagnoser hook into Kernel#require and Kernel#load
+    #
+    # == Parameters
+    #
+    # * +entry_file+ - The file that is used to load the project.  Used to filter the backtrace so anything that happens after it is hidden.
+    # * +dir+ - The project directory.  Any file loaded outside of this directory will not be logged.
+    def install_hook!(entry_file = nil, dir = Dir.pwd)
+      @dir = File.expand_path(Dir.pwd, dir)
+      @entry_file = entry_file
+      
+      Kernel.class_eval do
+        alias :require_without_diagnoser :require
+        alias :load_without_diagnoser :load
+        
+        def require(string)
+          ::Spork::Diagnoser.add_included_file(string, caller)
+          require_without_diagnoser(string)
+        end
+        
+        def load(string)
+          ::Spork::Diagnoser.add_included_file(string, caller)
+          load_without_diagnoser(string)
+        end
+      end
+    end
+    
+    def add_included_file(filename, callstack)
+      filename = expand_filename(filename)
+      return unless File.exist?(filename)
+      loaded_files[filename] = filter_callstack(caller) if subdirectory?(filename)
+    end
+    
+    # Uninstall the hook. Generally useful only for testing the Diagnoser.
+    def remove_hook!
+      return unless Kernel.private_instance_methods.include?('require_without_diagnoser')
+      Kernel.class_eval do
+        alias :require :require_without_diagnoser
+        alias :load :load_without_diagnoser
+        
+        undef_method(:require_without_diagnoser)
+        undef_method(:load_without_diagnoser)
+      end
+      true
+    end
+    
+    # output the results of a diagnostic run.
+    #
+    # == Parameters
+    #
+    # * +stdout+ - An IO stream to output the results to.
+    def output_results(stdout)
+      project_prefix = Dir.pwd + "/"
+      minimify = lambda { |f| f.gsub(project_prefix, '')}
+      stdout.puts "- Spork Diagnosis -\n"
+      stdout.puts "-- Summary --"
+      stdout.puts loaded_files.keys.sort.map(&minimify)
+      stdout.puts "\n\n\n"
+      stdout.puts "-- Detail --"
+      loaded_files.keys.sort.each do |file|
+        stdout.puts "\n\n\n--- #{minimify.call(file)} ---\n"
+        stdout.puts loaded_files[file].map(&minimify)
+      end
+    end
+    
+    private
+      def filter_callstack(callstack, entry_file = @entry_file)
+        callstack.pop until callstack.empty? || callstack.last.include?(@entry_file) if @entry_file
+        callstack.map do |line|
+          next if line.include?('lib/spork/diagnoser.rb')
+          line.gsub!('require_without_diagnoser', 'require')
+          line
+        end.compact
+      end
+    
+      def expand_filename(filename)
+        ([Dir.pwd] + $:).each do |attempted_path|
+          attempted_filename = File.expand_path(filename, attempted_path)
+          return attempted_filename if File.file?(attempted_filename)
+          attempted_filename = attempted_filename + ".rb"
+          return attempted_filename if File.file?(attempted_filename)
+        end
+        filename
+      end
+    
+      def subdirectory?(directory)
+        File.expand_path(directory, Dir.pwd).include?(@dir)
+      end
+  end
+end