funit 0.10.2 → 0.10.3

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.10.3 / 2009-10-05
+
+* 1 minor enhancement
+  * Allow --source to accept multiple directories
+* 1 bug fix
+  * Make funit's setup and teardown subroutine names unique to avoid
+    collision with same routine names in module under test.
+
 === 0.10.2 / 2008-03-30
 
 * 2 bug fixes

data/README.txt

@@ -1,7 +1,8 @@
-FUnit
+= FUnit
 
 * http://rubyforge.org/projects/nasarb
-* http://nasarb.rubyforge.org
+* http://nasarb.rubyforge.org/funit
+* mailto:nasarb-developers@rubyforge.org
 
 == DESCRIPTION:
 
@@ -112,10 +113,10 @@ rewrote the framework in Ruby[http://www.ruby-lang.org].
 
 == TODO:
 
-* To avoid Fortran's 32-character limit, don't add test name during translation.
+* To avoid Fortran's 32-character limit, don't add test name during translation
+  or allow another method for naming longer tests altogether.
 * Add assertions that capture stops, warning messages, and other exits.
 * For compilation, use internal rake task instead of an external makefile.
-* Allow users to specify dependency search paths (currently hardwired).
 * To increase portability, create stand-alone executables with Erik Veenstra's
   RubyScript2Exe[http://www.erikveen.dds.nl/rubyscript2exe/].
 * Make FUnit self-tests fail gracefully if Fortran compiler is not found.

data/bin/funit

@@ -10,7 +10,7 @@ require 'getoptlong'
 
 include Funit
 
-prog_source_dir = nil
+prog_source_dirs = ['.']
   
 opts = GetoptLong.new(
  ['--help',    '-h', GetoptLong::NO_ARGUMENT],
@@ -48,7 +48,9 @@ but for some such as Sun's f95 compiler you will need: -M
           EOF
           exit
         end
-        prog_source_dir = arg
+        prog_source_dirs << arg.split
+        prog_source_dirs.flatten!
+        prog_source_dirs.uniq!
     end
   rescue => err
     puts err
@@ -56,11 +58,7 @@ but for some such as Sun's f95 compiler you will need: -M
   end
 end
 
-if(prog_source_dir.nil?) then
-  Funit::run_tests
-else
-  Funit::run_tests(prog_source_dir)
-end
+Funit::run_tests(prog_source_dirs)
 
 #--
 # Copyright 2006-2007 United States Government as represented by

data/lib/funit.rb

@@ -14,12 +14,12 @@ require 'fileutils'
 
 module Funit
 
-  VERSION = '0.10.2'
+  VERSION = '0.10.3'
 
   ##
   # run all tests
 
-  def run_tests(prog_source_dir='.')
+  def run_tests(prog_source_dirs=['.'])
     Compiler.new# a test for compiler env set (FIXME: remove this later)
     write_test_runner( test_files = parse_command_line )
     test_suites = []
@@ -33,7 +33,7 @@ module Funit
         test_suites.push(ts_name)
       }
     }
-    compile_tests(test_suites,prog_source_dir)
+    compile_tests(test_suites,prog_source_dirs)
     exit 1 unless system "env PATH='.' TestRunner"
   end
 

data/lib/funit/functions.rb

@@ -111,20 +111,15 @@ module Funit
     $stderr.puts "\n *Warning: #{message} [#{test_suite}.fun:#$.]"
   end
 
-  def compile_tests(test_suites,prog_source_dir='.')
+  def compile_tests(test_suites,prog_source_dirs=['.'])
     puts "computing dependencies"
 
-    # calculates parameters
-    if ( prog_source_dir=='.' ) then
-      sourceflag = ""
-    else
-#      prog_source_dir = File.expand_path(prog_source_dir)  # commented as it doesn't seem necessary
-      sourceflag = " "+ ENV['FSFLAG'] + prog_source_dir
+    sourceflag = ''
+    if ENV['FSFLAG'] then
+      sourceflag = prog_source_dirs.map{|pd| ENV['FSFLAG']+pd }.join(' ')
     end
-    current_dir = `pwd`.chomp
-    sp = ['.'] + (prog_source_dir.empty? ? [] : [prog_source_dir])
+    dependencies = Fortran::Dependencies.new(:search_paths=>prog_source_dirs)
 
-    dependencies = Fortran::Dependencies.new(:search_paths=> sp)
     puts "locating associated source files and sorting for compilation"
     dependencies.source_file_dependencies('TestRunner.f90')
     file_dependencies = dependencies.file_dependencies

data/lib/funit/testsuite.rb

@@ -138,14 +138,14 @@ module #{@suite_name}_fun
     end
 
     def close
-      puts "\n subroutine Setup"
+      puts "\n subroutine funit_setup"
       puts @setup
       puts "  noAssertFailed = .true."
-      puts " end subroutine Setup\n\n"
+      puts " end subroutine funit_setup\n\n"
 
-      puts "\n subroutine Teardown"
+      puts "\n subroutine funit_teardown"
       puts @teardown
-      puts " end subroutine Teardown\n\n"
+      puts " end subroutine funit_teardown\n\n"
 
       puts <<-NEXTONE
 
@@ -160,9 +160,9 @@ module #{@suite_name}_fun
       NEXTONE
 
       @tests.each do |test_name|
-        puts "\n  call Setup"
+        puts "\n  call funit_setup"
         puts "  call #{test_name}"
-        puts "  call Teardown"
+        puts "  call funit_teardown"
       end
 
       puts <<-LASTONE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: funit
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors: 
 - Karen Bibb
@@ -13,11 +13,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-01 00:00:00 -04:00
+date: 2009-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fortran
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -27,14 +28,29 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.12.2
     version: 
-description: FUnit is a unit testing framework for Fortran.  Unit tests are written as Fortran fragments that use a small set of testing-specific keywords and functions.  FUnit transforms these fragments into valid Fortran code, compiles, links, and runs them against the code under test.  FUnit is {opinionated software}[http://www.oreillynet.com/pub/a/network/2005/08/30/ruby-rails-david-heinemeier-hansson.html], which values convention over configuration. Specifically, FUnit,  * requires a Fortran 95 compiler, * only supports testing routines contained in modules, * requires tests to be stored along side the code under test, and * requires test files to be named appropriately.
+description: |-
+  FUnit is a unit testing framework for Fortran.
+  
+  Unit tests are written as Fortran fragments that use a small
+  set of testing-specific keywords and functions.  FUnit transforms
+  these fragments into valid Fortran code, compiles, links, and
+  runs them against the code under test.
+  
+  FUnit is {opinionated software}[http://www.oreillynet.com/pub/a/network/2005/08/30/ruby-rails-david-heinemeier-hansson.html], which values convention over
+  configuration. Specifically, FUnit,
+  
+  * requires a Fortran 95 compiler,
+  * only supports testing routines contained in modules,
+  * requires tests to be stored along side the code under test, and
+  * requires test files to be named appropriately.
 email: nasarb-developers@rubyforge.org
 executables: 
 - funit
@@ -75,7 +91,9 @@ files:
 - utils/funit-generic-mode.el
 - utils/funit-mode.el
 has_rdoc: true
-homepage: FUnit is a unit testing framework for Fortran.
+homepage: http://rubyforge.org/projects/nasarb
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -97,9 +115,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - A Fortran compiler.
 rubyforge_project: nasarb
-rubygems_version: 1.1.0
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: FUnit is a unit testing framework for Fortran
 test_files: 
 - test/test_compiler.rb