tests cleanup

quix · Sep 14, 2009 · fef5c41 · fef5c41
1 parent 537fac5
commit fef5c41
Show file tree

Hide file tree

Showing 37 changed files with 526 additions and 362 deletions.
diff --git a/devel/jumpstart.rb b/devel/jumpstart.rb
diff --git a/devel/jumpstart/attr_lazy.rb b/devel/jumpstart/attr_lazy.rb
diff --git a/devel/jumpstart/ruby.rb b/devel/jumpstart/ruby.rb
diff --git a/devel/jumpstart/simple_installer.rb b/devel/jumpstart/simple_installer.rb
diff --git a/devel/jumpstart/util.rb b/devel/jumpstart/util.rb
diff --git a/install.rb b/install.rb
@@ -1,3 +1,2 @@
-$LOAD_PATH.unshift "devel"
+load './devel/jumpstart.rb'
-require 'jumpstart/simple_installer'
 Jumpstart::SimpleInstaller.new.run
diff --git a/lib/quix/instance_eval_with_args.rb b/lib/quix/instance_eval_with_args.rb
@@ -0,0 +1,27 @@
+
+module Quix
+  module InstanceEvalWithArgs
+    module_function
+
+    def with_temp_method(instance, method_name, method_block)
+      (class << instance ; self ; end).class_eval do
+        define_method(method_name, &method_block)
+        begin
+          yield method_name
+        ensure
+          remove_method(method_name)
+        end
+      end
+    end
+
+    def call_temp_method(instance, method_name, *args, &method_block)
+      with_temp_method(instance, method_name, method_block) {
+        instance.send(method_name, *args)
+      }
+    end
+
+    def instance_eval_with_args(instance, *args, &block)
+      call_temp_method(instance, :__temp_method, *args, &block)
+    end
+  end
+end
diff --git a/lib/quix/ruby.rb b/lib/quix/ruby.rb
@@ -1,9 +1,11 @@
 
-require 'rbconfig'
-
 module Quix
   module Ruby
-    EXECUTABLE = lambda {
+    module_function
+
+    def executable
+      require 'rbconfig'
+
       name = File.join(
         Config::CONFIG["bindir"],
         Config::CONFIG["RUBY_INSTALL_NAME"]
@@ -15,30 +17,46 @@ module Ruby
       else
         name
       end
-    }.call
+    end
 
-    class << self
+    def run(*args)
-      def run(*args)
+      cmd = [executable, *args]
-        cmd = [EXECUTABLE, *args]
+      unless system(*cmd)
-        unless system(*cmd)
+        cmd_str = cmd.map { |t| "'#{t}'" }.join(", ")
-          cmd_str = cmd.map { |t| "'#{t}'" }.join(", ")
+        raise "system(#{cmd_str}) failed with status #{$?.exitstatus}"
-          raise "system(#{cmd_str}) failed with status #{$?.exitstatus}"
-        end
       end
-
+    end
-      def with_warnings(value = true)
+
-        previous = $VERBOSE
+    def run_code_and_capture(code)
-        $VERBOSE = value
+      IO.popen(%{"#{executable}"}, "r+") { |pipe|
-        begin
+        pipe.print(code)
-          yield
+        pipe.flush
-        ensure
+        pipe.close_write
-          $VERBOSE = previous
+        pipe.read
-        end
+      }
+    end
+
+    def run_file_and_capture(file)
+      unless File.file? file
+        raise "file does not exist: `#{file}'"
       end
+      IO.popen(%{"#{executable}" "#{file}"}, "r") { |pipe|
+        pipe.read
+      }
+    end
 
-      def no_warnings(&block)
+    def with_warnings(value = true)
-        with_warnings(nil, &block)
+      previous = $VERBOSE
+      $VERBOSE = value
+      begin
+        yield
+      ensure
+        $VERBOSE = previous
       end
     end
+
+    def no_warnings(&block)
+      with_warnings(nil, &block)
+    end
   end
 end
diff --git a/test/array_test.rb b/test/array_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/quix_test_base'
 
 require "quix/ext/array"
 

diff --git a/test/attr_lazy_test.rb b/test/attr_lazy_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/quix_test_base'
 
 require 'quix/attr_lazy'
 

diff --git a/test/attr_scope_test.rb b/test/attr_scope_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/quix_test_base'
 
 require "quix/attr_scope"
 

diff --git a/test/casefold_glob_test.rb b/test/casefold_glob_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/quix_test_base'
 
 require "fileutils"
 require "quix/casefold_glob"

diff --git a/test/class_test.rb b/test/class_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/quix_test_base'
 
 require 'quix/ext/class'