Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 3 additions and 3 deletions.
  1. +2 −2 lib/spork.rb
  2. +1 −1 lib/spork/app_framework.rb
View
4 lib/spork.rb
@@ -1,8 +1,8 @@
$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
require 'pathname'
module Spork
- BINARY = File.expand_path(File.dirname(__FILE__) + '/../bin/spork')
- LIBDIR = Pathname.new(File.expand_path(File.dirname(__FILE__)))
+ BINARY = File.expand_path(File.dirname(__FILE__) + '/../bin/spork') unless defined? BINARY
+ LIBDIR = Pathname.new(File.expand_path(File.dirname(__FILE__))) unless defined? LIBDIR
autoload :Server, (LIBDIR + 'spork/server').to_s
autoload :TestFramework, (LIBDIR + 'spork/test_framework').to_s
View
2 lib/spork/app_framework.rb
@@ -1,5 +1,5 @@
class Spork::AppFramework
- APP_FRAMEWORKS = []
+ APP_FRAMEWORKS = [] unless defined? APP_FRAMEWORKS
def self.inherited(child)
APP_FRAMEWORKS << child
end

No commit comments for this range

Something went wrong with that request. Please try again.