stick 1.3.2 → 1.3.3

data/lib/stick/units/currency.rb

@@ -1,6 +1,7 @@
 require 'stick/units/base'
 require 'soap/wsdlDriver'
 
+module Stick
 module Units
 
   class CurrencyLoader < Loader
@@ -10,17 +11,16 @@ module Units
 
     def ce_service(converter, name, &blk)
       old_service = Thread.current[THREAD_REFERENCE]
-      Thread.current[THREAD_REFERENCE] = ::Units::Converter::ExchangeRate.const_get(name)
+      Thread.current[THREAD_REFERENCE] = Units::Converter::ExchangeRate.const_get(name)
       yield
     ensure
       Thread.current[THREAD_REFERENCE] = old_service
     end
 
     def currency_unit(converter, name)
-      service = Thread.current[THREAD_REFERENCE] || ::Units::Config::DEFAULT_CURRENCY_SERVICE
+      service = Thread.current[THREAD_REFERENCE] || Units::Config::DEFAULT_CURRENCY_SERVICE
       converter.send(:register_unit, name, :equals => service.create_conversion(name, converter))
     end
-
   end
 
   class Converter
@@ -40,7 +40,7 @@ module Units
     class ExchangeRate
 
       def self.create_conversion(curr, converter) # :nodoc:
-        {:unit => ::Units::Unit.new({'--base-currency--'.to_sym => 1}, converter), :multiplier => self.new(curr)}
+        {:unit => Units::Unit.new({'--base-currency--'.to_sym => 1}, converter), :multiplier => self.new(curr)}
       end
 
       def initialize(curr) # :nodoc:
@@ -104,7 +104,7 @@ module Units
         private
 
         def data
-          @@data ||= eval(File.read(File.join(::Units::Config::CONFIGDIR, 'xmethods', 'mapping.rb')))
+          @@data ||= eval(File.read(File.join(Units::Config::CONFIGDIR, 'xmethods', 'mapping.rb')))
         end
 
         def country_mapping
@@ -133,7 +133,7 @@ module Units
         private
 
         def data
-          @@data ||= eval(File.read(File.join(::Units::Config::CONFIGDIR, 'xmethods', 'cached.rb')))
+          @@data ||= eval(File.read(File.join(Units::Config::CONFIGDIR, 'xmethods', 'cached.rb')))
         end
 
       end #class CachedXMethods
@@ -153,8 +153,8 @@ module Units
   # Contains some configuration related constants
   module Config
     # The standard service used for looking up currency exchange rates
-    DEFAULT_CURRENCY_SERVICE = ::Units::Converter::ExchangeRate::XMethods
+    DEFAULT_CURRENCY_SERVICE = Units::Converter::ExchangeRate::XMethods
   end
 
 end
-
+end

data/lib/stick/units/loaders.rb

@@ -1,3 +1,4 @@
+module Stick
 module Units
 
   class Loader
@@ -73,7 +74,7 @@ module Units
       end
 
       def load_config(file, context)
-        data = File.read(File.join(::Units::Config::CONFIGDIR, file)) rescue File.read(file)
+        data = File.read(File.join(Units::Config::CONFIGDIR, file)) rescue File.read(file)
         context.instance_eval { eval data, nil, file }
       end
 
@@ -96,4 +97,4 @@ module Units
   end
 
 end
-
+end

data/lib/stick/units/units.rb

@@ -1,5 +1,6 @@
 require 'stick/units/base'
 
+module Stick
 module Units
 
   class SILoader < Loader
@@ -107,3 +108,4 @@ module Units
   end
 
 end
+end

data/lib/stick/vector.rb

@@ -0,0 +1,20 @@
+# = TITLE:
+#   Vector
+#
+# = SYNOPSIS:
+#   An implementation of the Vector class.
+#
+# = AUTHORS:
+#   - Keiju ISHITSUKA
+#   - Cosmin Bonchis
+#
+# = DOCUMENTORS:
+#   - Gavin Sinclair
+#
+# = NOTES:
+#   - Original Version from Smalltalk-80 version.
+#   - Extensions from Google Summer of Code 2007 project for Ruby Central Inc.
+
+require 'stick/matrix'
+
+# TODO: Separate Vector from Matrix.

data/meta/MANIFEST

@@ -15,6 +15,14 @@ lib/stick/constants/typeless_mks.rb
 lib/stick/constants.rb
 lib/stick/currency.rb
 lib/stick/mapcar.rb
+lib/stick/matrix
+lib/stick/matrix/core.rb
+lib/stick/matrix/exception.rb
+lib/stick/matrix/givens.rb
+lib/stick/matrix/hessenberg.rb
+lib/stick/matrix/householder.rb
+lib/stick/matrix/jacobi.rb
+lib/stick/matrix/lu.rb
 lib/stick/matrix.rb
 lib/stick/quaternion.rb
 lib/stick/units
@@ -51,6 +59,7 @@ lib/stick/units/data/xmethods.rb
 lib/stick/units/loaders.rb
 lib/stick/units/units.rb
 lib/stick/units.rb
+lib/stick/vector.rb
 meta
 meta/MANIFEST
 meta/config.yaml
@@ -65,14 +74,25 @@ task/rdoc
 task/release
 task/setup
 task/test
+task/tests
+task/tests/solo
 test
 test/spec_matrix.rb
+test/test_constants.rb
 test/test_currency.rb
 test/test_matrix.rb
 test/test_units.rb
 test/unit
 work
 work/TODO
-work/bytes.rb
-work/multipliers.rb
-work/times.rb
+work/bonchis
+work/bonchis/extendmatrix.rb
+work/bonchis/mapcar.rb
+work/kilmer
+work/kilmer/bytes.rb
+work/kilmer/multipliers.rb
+work/kilmer/times.rb
+work/matrix.rb
+work/p
+work/tmatrix.rb
+work/trash-matrix.rb

data/meta/stick.roll

@@ -1,2 +1,2 @@
-stick 1.3.2 stable 2007-12-21
+stick 1.3.3 stable 2007-12-21
 lib/stick

data/task/tests/solo

@@ -0,0 +1,293 @@
+#!/usr/bin/env ratch
+
+#
+require 'facets/hash/rekey'
+require 'facets/string/tabs'
+require 'facets/progressbar'
+
+require 'test/unit/ui/testrunnermediator' #require 'test/unit'
+::Test::Unit.run = true # Don't autorun tests!
+
+main :test_solo do
+  run_isotests
+end
+
+# Run unit-tests. Each test is run in a separate interpretor
+# to prevent script clash. This makes for a more robust test
+# facility and prevents potential conflicts between test scripts.
+#
+#   tests     Test files (eg. test/tc_**/*.rb) [test/**/*]
+#   libs      Directories to include in load path.
+#             ('./lib' is always included)
+#   live      Deactive use of local libs and test against install.
+#   reqs      List of files to require prior to running tests.
+#   extract   Extract embedded tests first? [false]
+#
+# To isolate tests this tool marshals test results across a
+# stdout->stdin shell pipe. This prevents interfence of one
+# script's tests on another. But consequently it is not always
+# possible to send debug info to stdout in the tests themselves
+# (eg. #p and #puts).
+
+def run_isotests
+  info = configuration['test'] || {}
+
+  tests   = info['files'] || 'test/**/test_*.rb'
+  libs    = info['libpath'] || 'lib'
+  reqs    = info['require']
+  live    = info['live']
+  #extract = info['extract']
+
+  tests = [ tests ].flatten
+  libs  = [ libs ].flatten
+
+  #files = [ @files ].flatten
+  #extract_tests if extract
+
+  results  = TestResults.new #(style)
+
+  # get test files
+  test_libs  = libs.join(':')
+  test_files = Dir.multiglob( *tests )
+  if test_files.empty?
+    puts "Tests        [NONE]"
+    return
+  end
+
+  # run tests
+
+  if trace?
+    pbar = nil
+    size = test_files.collect{|f| f.size}.max + 5
+    dots = '.' * size
+  else
+    pbar = Console::ProgressBar.new( 'Testing', test_files.size )
+    pbar.inc
+  end
+
+  test_files.each do |test_file|
+    pbar.inc if pbar
+    if ! File.file?(test_file)
+      next #r = nil
+    else
+      unless pbar
+        print test_file + dots[test_file.size..-1]
+        $stdout.flush
+      end
+      r = fork_test( test_file, :libs=>libs, :reqs=>reqs, :live=>live )
+      unless pbar
+        puts r.passed? ? "[PASS]" : "[FAIL]"
+      end
+    end
+    results << r
+  end
+
+  pbar.finish if pbar
+
+  # display results
+  puts results
+
+  fails, errrs = results.failure_count, results.error_count
+  #CHECKLIST << :test if fails > 0
+  #CHECKLIST << :test if errrs > 0
+  return (fails + errrs > 0)
+end
+
+# Run a test in a separate process.
+#
+# Currently send program output to null device.
+# Could send to a logger in future version.
+#
+# Key parameters are libs, reqs, live.
+
+def fork_test( file, keys )
+  keys = keys.rekey(:to_s)
+
+  libs = keys['lib'] || []
+  reqs = keys['req'] || []
+  live = keys['live']
+
+  src = ''
+
+  unless live
+    l = File.join( Dir.pwd, 'lib' )
+    if File.directory?( l )
+      src << %{$:.unshift('#{l}')\n}
+    end
+    libs.each { |r| src << %{$:.unshift('#{r}')\n} }
+  end
+
+  src << %{
+    #require 'test/unit'
+    require 'test/unit/collector'
+    require 'test/unit/collector/objectspace'
+    require 'test/unit/ui/testrunnermediator'
+  }
+
+  reqs.each do |fix|
+    src << %Q{
+      require '#{fix}'
+    }
+  end
+
+  src << %{
+    def warn(*null); end  # silence warnings
+
+    output = STDOUT.dup
+    STDOUT.reopen( PLATFORM =~ /mswin/ ? "NUL" : "/dev/null" )
+
+    load('#{file}')
+    tests = Test::Unit::Collector::ObjectSpace.new.collect
+    runner = Test::Unit::UI::TestRunnerMediator.new( tests )
+    result = runner.run_suite
+
+    begin
+      marshalled = Marshal.dump(result)
+    rescue TypeError => e
+      $stderr << "MARSHAL ERROR\n"
+      $stderr << "TEST: #{file}\n"
+      $stderr << "DATA:" << result.inspect
+      exit -1
+    end
+    output << marshalled
+
+    STDOUT.reopen(output)
+    output.close
+  }
+
+  result = IO.popen("ruby","w+") do |ruby|
+    ruby.puts src
+    ruby.close_write
+    ruby.read
+  end
+
+  begin
+    marsh = Marshal.load(result)
+  rescue ArgumentError
+    $stderr << "\nCannot load marshalled test data.\n"
+    $stderr << result << "\n"
+    exit -1
+  end
+
+  return marsh
+end
+
+#
+# Support class for collecting test results.
+#
+
+class TestResults
+  attr_reader :assertion_count,
+              :run_count,
+              :failure_count,
+              :error_count
+
+  attr_accessor :style
+
+  def initialize( style=nil )
+    @style = style
+
+    @results = []
+
+    @assertion_count = 0
+    @run_count = 0
+    @failure_count = 0
+    @error_count = 0
+  end
+
+  # Add a result to the results collection.
+
+  def <<( result )
+    @results << result
+
+    @assertion_count += result.assertion_count
+    @run_count += result.run_count
+    @failure_count += result.failure_count
+    @error_count += result.error_count
+  end
+
+  #
+
+  def errors
+    errors = []
+    @results.each do |r|
+      unless r.passed?
+        errors << r.instance_variable_get('@errors')
+      end
+    end
+    errors.reject! { |e| e == [] }
+    errors
+  end
+
+  #
+
+  def failures
+    failures = []
+    @results.each do |r|
+      unless r.passed?
+        failures << r.instance_variable_get('@failures')
+      end
+    end
+    failures.reject! { |e| e == [] }
+    failures
+  end
+
+  # Output format for test results.
+
+  def to_s
+    return @results.to_s if style == 'pease'
+
+    s = []
+    # Display failures
+    unless failures.empty?
+      s << ''
+      s << "FAILURES:"
+      failures.reverse.each do |fails|
+        fails.reverse.each do |failure|
+          #puts
+          s << %{  - test      : #{failure.test_name}}
+          s << %{    location  : #{failure.location}}
+          if failure.message.index("\n")
+            s << %{    message   : >}
+            s << failure.message.tabto(6)
+          else
+            s << %{    message   : #{failure.message}}
+          end
+        end
+      end
+    end
+
+    # Display errors
+    unless errors.empty?
+      s << ''
+      s << "ERRORS:"
+      errors.reverse.each do |errs|
+        errs.reverse.each do |err|
+          s << ''
+          s << %{  - test      : #{err.test_name}}
+          s << %{    message   : #{err.exception.message}}
+          s << %{    backtrace :}
+          err.exception.backtrace[0...-1].each { |bt| s << %Q{      - #{bt}} }
+        end
+      end
+    end
+
+    # Display final results
+    s << ''
+    s << "Summary:"
+    s << "  Tests      : #{@run_count}"
+    s << "  Assertions : #{@assertion_count}"
+    s << "  Failures   : #{@failure_count}"
+    s << "  Errors     : #{@error_count}"
+    s << ''
+    s << ''
+
+    return s.join("\n")
+  end
+
+  # Delegate missing call to the results array.
+
+  def method_missing(*a,&b)
+    @results.send(*a,&b)
+  end
+end