Merging in Josh's tidy changes, and, unfortunately, reverting most of…

… them.
kares · Mar 23, 2011 · 99d51c9 · 99d51c9
2 parents 5f9061d + ca8c8c5
commit 99d51c9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/vendor/closure-compiler-20110322.jar → lib/closure-compiler-20110322.jar b/vendor/closure-compiler-20110322.jar → lib/closure-compiler-20110322.jar
diff --git a/lib/closure-compiler.rb b/lib/closure-compiler.rb
@@ -8,10 +8,10 @@ module Closure
 
   COMPILER_ROOT     = File.expand_path(File.dirname(__FILE__))
 
-  COMPILER_JAR      = COMPILER_ROOT + "/../vendor/closure-compiler-#{COMPILER_VERSION}.jar"
+  COMPILER_JAR      = File.join(COMPILER_ROOT, "closure-compiler-#{COMPILER_VERSION}.jar")
 
 end
 
 require 'stringio'
-require Closure::COMPILER_ROOT + '/closure/popen'
-require Closure::COMPILER_ROOT + '/closure/compiler'
+require File.join(Closure::COMPILER_ROOT, 'closure/popen')
+require File.join(Closure::COMPILER_ROOT, 'closure/compiler')
diff --git a/lib/closure/compiler.rb b/lib/closure/compiler.rb
@@ -57,4 +57,4 @@ def command
     end
 
   end
-end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -2,4 +2,4 @@
 
 class Test::Unit::TestCase
   include Closure
-end
+end