funit 0.11.1 → 0.12.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d0c1b7e86685588f2c956c94b7db107ad3e5b701
+  data.tar.gz: d67d36f40691f235e6245f4505bad8dcb8400550
+SHA512:
+  metadata.gz: 737765bd524762b7e426851d1cb0108b8d8a0e354c6de3868b006390754fcbb9092246e230436d675e17814679f9074a49c8a8248410c09226591626039334ce
+  data.tar.gz: 86fc8af4c54a5d62ff3c9412472cc46a8516b97b7d68faf707032155cb0b70fc5eb333699b29d3eaa4ce2feb933b02b05a42423ea381eb968a7e03047b710a2a

data/{History.txt → History.rdoc}

@@ -1,3 +1,29 @@
+=== 0.12.3 / 2016-2-05
+
+* 1 minor enhancement
+  * Enable funit to track inlined function dependencies in makefile
+
+* 1 bug fix
+  * reverting back to gem fortran, since access to original gem has been restored
+
+=== 0.12.2 / 2016-1-20
+
+* 1 minor enhancement
+  * Enable funit to read files with .F90 extension
+
+=== 0.12.1 / 2016-1-19
+
+* 1 bug fix
+  * Changed required gem fortran -> fortran_dependencies to track forked gem of "fortran"
+
+=== 0.12.0 / 2016-1-14
+
+* major enhancement
+  * Allow user to specify C/C++ code needed by fortran unit test
+
+* minor enhancement
+  * Refactored option input using optparse
+
 === 0.11.1 / 2009-11-01
 
 * 1 bug fix

data/Manifest.txt

@@ -1,7 +1,7 @@
-History.txt
+History.rdoc
 License.txt
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 bin/funit
 examples/CFD/FluxFunctions.f90
@@ -18,6 +18,7 @@ lib/funit/assertions.rb
 lib/funit/compiler.rb
 lib/funit/functions.rb
 lib/funit/testsuite.rb
+lib/funit/c_tools.rb
 pitch/slides.tex
 test/test_compiler.rb
 test/test_functions.rb

data/{README.txt → README.rdoc}

@@ -1,21 +1,22 @@
-= FUnit
+= funit
 
-* http://rubyforge.org/projects/nasarb
-* http://nasarb.rubyforge.org/funit
-* mailto:nasarb-developers@rubyforge.org
+home  :: https://rubygems.org/gems/funit
+code  :: https://github.com/kleb/nasarb/tree/master/funit
+bugs  :: https://github.com/kleb/nasarb/issues
+rdoc  :: http://www.rubydoc.info/gems/funit
 
 == DESCRIPTION:
 
-FUnit is a unit testing framework for Fortran.
+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
+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
+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,
+which values convention over configuration. Specifically, funit requires,
 
 * a Fortran 95 compiler,
 * tests to be stored along side the code under test, and
@@ -73,15 +74,15 @@ and run the tests, viz,
   gas_physics test suite:
   Passed 2 of 2 possible asserts comprising 1 of 1 tests.
 
-This and other examples come with the FUnit distribution in the
+This and other examples come with the funit distribution in the
 <tt>examples</tt> directory.  There is also an emacs mode in
-the <tt>utils</tt> directory.  If you installed the FUnit via Rubygems,
+the <tt>utils</tt> directory.  If you installed funit via Rubygems,
 these directories can be found in your Rubygems library directory, e.g., <tt>/usr/local/lib/ruby/gems</tt>.
 
 == REQUIREMENTS:
 
-* Fortran 90/95/2003 compiler
-* Ruby with Rubygems package manager
+* Fortran compiler (and setting FC environment variable to point to it)
+* Ruby
 * The fortran Rubygem
 
 == INSTALL:
@@ -94,7 +95,7 @@ these directories can be found in your Rubygems library directory, e.g., <tt>/us
 
 == LICENSE:
 
-FUnit is released under the NASA Open Source Agreement -- see License.txt[link:files/License_txt.html] for details.
+funit is released under the NASA Open Source Agreement -- see License.txt[link:files/License_txt.html] for details.
 
 == ORIGIN:
 

data/Rakefile

@@ -1,20 +1,17 @@
 # -*- ruby -*-
 
-require 'rubygems'
 require 'hoe'
+#Hoe.plugin :rdoc
 
-$LOAD_PATH.unshift File.join( File.dirname(__FILE__), 'lib')
-
-require 'funit.rb'
-
-Hoe.new('funit', Funit::VERSION) do |funit|
-  funit.rubyforge_name  = 'nasarb'
+Hoe.spec 'funit' do |funit|
+  funit.group_name  = 'nasarb'
   funit.remote_rdoc_dir = 'funit' 
-  funit.extra_deps << [ 'fortran', '>= 1.1.0' ]
+  funit.licenses = ['NASA-1.3']
+  funit.extra_deps << [ 'fortran', '~> 1.0', '>= 1.3.0' ]
   funit.spec_extras[:requirements] = "A Fortran compiler."
   funit.author =
     [ 'Karen Bibb', 'Bil Kleb', 'Beth Lee-Rausch', 'Mike Park', 'Bill Wood' ]
-  funit.email = 'nasarb-developers@rubyforge.org'
+  funit.email = [ 'bil.kleb@nasa.gov' ]
   funit.clean_globs.
     concat %w[ **/*_fun.f90 **/makeTestRunner examples/**/TestRunner* **/*.o **/*.mod **/*.MOD ]
   funit.rsync_args = '-rpv --delete' # to preserve group permissions 

data/bin/funit

@@ -2,63 +2,62 @@
 
 # Main fUnit routine
 
-begin require 'rubygems'; rescue LoadError; end
-
 $:.push "#{File.dirname $0}/../lib"
 require 'funit'
-require 'getoptlong'
+require 'optparse'
+require 'ostruct'
 
 include Funit
 
-prog_source_dirs = ['.']
+funit_data = OpenStruct.new
+funit_data.prog_source_dirs = ['.']
+funit_data.c_code = Funit::C_compile.new
+  
+OptionParser.new do |opts|
+  opts.banner = <<-END_OF_HELP
+        To use fUnit, type:
+          funit [-options] [test_file_name(s)]
+        The argument(s) is optional. If no argument is given, then all the .fun files inside the working directory will be used.
+      END_OF_HELP
+      
+  opts.separator ""
+  opts.separator "Specific options:"
+  
+  opts.on("-s","--source <dir>",String,"Specify a directory for the non-test source") do |dir|
+    funit_data.prog_source_dirs << dir.chomp("/")
+  end
+  
+  opts.on("-l","--link_c_code <dir>",String,"Specify a directory of C/C++ code that must be compiled/linked") do |dir|
+    funit_data.c_code.compile_library(dir)
+  end
   
-opts = GetoptLong.new(
- ['--help',    '-h', GetoptLong::NO_ARGUMENT],
- ['--clean',   '-c', GetoptLong::NO_ARGUMENT],
- ['--version', '-V', GetoptLong::NO_ARGUMENT],
- ['--source',  '-s', GetoptLong::REQUIRED_ARGUMENT]
-)
+  opts.on_tail("--clean","To remove the files generated by funit") do 
+    funit_data.c_code.clean_c_code
+    Funit::clean_genFiles
+    exit
+  end
+  
+  opts.separator ""
+  opts.separator "Common options:"
+  
+  opts.on_tail("-v","--version","Print version") do 
+    puts "funit version #{Funit::VERSION}"
+    exit
+  end
+  
+ opts.on_tail("-h", "--help", "Detailed overview of funit options") do
+   puts opts
+   exit
+ end
 
-opts.each do |opt,arg|
-  begin
-    case opt
-      when '--help'
-        Funit::print_help
-        exit
-      when '--version'
-        puts Funit::VERSION
-        exit
-      when '--clean'
-        Funit::clean_genFiles
-        exit
-      when '--source'
-        if(ENV['FSFLAG'].nil?) then
-          puts <<-EOF
-No environment variable FSFLAG set.
+end.parse!
 
-For example for most compilers such as gfortran you will need: -I
-      sh: export FSFLAG=-I
-     csh: setenv FSFLAG -I
- windows: set FSFLAG=-I
+funit_data.prog_source_dirs.flatten!
+funit_data.prog_source_dirs.uniq!
 
-but for some such as Sun's f95 compiler you will need: -M
-      sh: export FSFLAG=-M
-     csh: setenv FSFLAG -M
- windows: set FSFLAG=-M
-          EOF
-          exit
-        end
-        prog_source_dirs << arg.split
-        prog_source_dirs.flatten!
-        prog_source_dirs.uniq!
-    end
-  rescue => err
-    puts err
-    break
-  end
-end
+Funit::check_for_FSFLAG
 
-Funit::run_tests(prog_source_dirs)
+Funit::run_tests(funit_data)
 
 #--
 # Copyright 2006-2007 United States Government as represented by

data/examples/StopWatch/StopWatch.fun

@@ -6,7 +6,7 @@ real :: seconds
 setup
   NotInitialized = .TRUE.
   last    = 0
-  seconds = HUGE(0.0)
+  seconds = 0.0
 end setup
 
 test SystemDateAndTimeWorks
@@ -42,22 +42,23 @@ end test
 test InitiallyReturnsZero
   seconds = secSinceLast()
   Assert_Real_Equal( 0.0, seconds )
-  call timeDelay(seconds)
+  call timeDelay
   seconds = secSinceLast()
   Assert_True( seconds /= 0.0 )
 end test
 
-subroutine timeDelay (sum)
-  integer :: i
-  real    :: sum
+subroutine timeDelay
+  integer :: i, sum
   do i = 1, 1000000
    sum = sum + i
   enddo
+  print*, sum
 end subroutine timeDelay
 
 test ComputesSeconds
   seconds = secSinceLast()
-  call timeDelay (seconds)
+  call timeDelay
+  print*, seconds
   seconds = secSinceLast()
   Assert_True( seconds > 0.0 )
 end test
@@ -67,7 +68,7 @@ test ComputesSecondsSpecial
 
   seconds = secSinceLast()
   dateAndTime1 = last
-  call timeDelay (seconds)
+  call timeDelay
   seconds = secSinceLast()
   dateAndTime2 = last
   expectedSeconds = secBetween(dateAndTime1,dateAndTime2)

data/lib/funit.rb

@@ -1,5 +1,4 @@
 begin
-  require 'rubygems'
   require 'fortran'
 rescue LoadError
   STDERR.puts "gem install fortran"
@@ -10,16 +9,17 @@ require 'funit/compiler'
 require 'funit/functions'
 require 'funit/assertions'
 require 'funit/testsuite'
+require 'funit/c_tools'
 require 'fileutils'
 
 module Funit
 
-  VERSION = '0.11.1'
+  VERSION = '0.12.3'
 
   ##
   # run all tests
 
-  def run_tests(prog_source_dirs=['.'])
+  def run_tests(funit_data)
     Compiler.new# a test for compiler env set (FIXME: remove this later)
     write_test_runner( test_files = parse_command_line )
     test_suites = []
@@ -29,7 +29,8 @@ module Funit
         ts_name = $1
         ts_content = $2
         if((!File.exist?(ts_name+"_fun.f90")) || File.mtime(ts_name+"_fun.f90") < File.mtime(test_file+".fun")) then
-          if ( File.read(ts_name+'.f90').match(/\s*module\s+#{ts_name}/i) ) then
+          source_file = Dir.glob("#{ts_name}.*90").first
+          if ( File.read(source_file).match(/\s*module\s+#{ts_name}/i) ) then
             TestSuite.new(ts_name, ts_content, false)
           else
             TestSuite.new(ts_name, ts_content, true)
@@ -38,7 +39,7 @@ module Funit
         test_suites.push(ts_name)
       }
     }
-    compile_tests(test_suites,prog_source_dirs)
+    compile_tests(test_suites,funit_data)
     exit 1 unless system "env PATH='.' TestRunner"
   end
 
@@ -55,22 +56,24 @@ module Funit
     FileUtils.rm_f(tbCancelled)
   end
 
-  ##
-  # prints a usage help for the user
+  def check_for_FSFLAG
+    if(ENV['FSFLAG'].nil?) then
+      puts <<-EOF
+No environment variable FSFLAG set.
 
-  def print_help
-    puts <<-END_OF_HELP
-      To use fUnit, type:
-        funit [-options] [test_file_name(s)]
-      The argument(s) is optional. If no argument is given, then all the .fun files inside the working directory will be used.
+For example for most compilers such as gfortran you will need: -I
+      sh: export FSFLAG=-I
+     csh: setenv FSFLAG -I
+ windows: set FSFLAG=-I
 
-      The options are:
-        --clean                   => To remove the files generated by fUnit
-        -h, --help                => Prints this help
-        -s <dir>, --source <dir>  => To specify a directory for the non-test source
-    END_OF_HELP
+but for some such as Sun's f95 compiler you will need: -M
+      sh: export FSFLAG=-M
+     csh: setenv FSFLAG -M
+ windows: set FSFLAG=-M
+    EOF
+    exit
+    end
   end
-
 end
 
 #--

data/lib/funit/c_tools.rb

@@ -0,0 +1,205 @@
+module Funit
+  class C_compile
+    def initialize
+      check_c_compiler
+      @libraries = {}
+    end
+   
+    def check_c_compiler
+      if(ENV['CXX'].nil?) then
+        puts <<-EOF
+        
+          You have not specified a C++ compiler. Please specify a compiler via the $(CXX) environment variable.
+          
+          In bash, for example:
+            
+            export CXX="g++"
+  
+        EOF
+      elsif(ENV['CC'].nil?) then
+        puts <<-EOF
+        
+          You have not specified a C compiler. Please specify a compiler via the $(CC) environment variable.
+          
+          In bash, for example:
+            
+            export CC="gcc"
+            
+        EOF
+      exit
+      end
+    end
+     
+    def compile_library(dir)
+      puts "building: #{dir}"
+      Dir.chdir(dir) do
+        static_lib = make_objs
+        @libraries[dir]=static_lib.match(/lib(\w+)\.a/).captures.join
+      end
+    end
+    
+    def make_objs(dir=Dir.getwd)
+      if File.exist?("Makefile.am")
+        sources = parse_automake_file
+        static_library = sources[0]
+        File.open("makeTestRunner", "w") {|file| file.puts write_custom_c_makefile(sources)}
+      else
+				static_library = "lib#{File.basename(Dir.getwd)}.a"
+        File.open("makeTestRunner", "w") {|file| file.puts write_generic_c_makefile(static_library)}
+      end
+      compile = "make -f makeTestRunner"
+      raise "Compile failed in #{dir}." unless system compile
+      static_library
+    end
+   
+    def parse_automake_file
+      sources = []
+      lines = IO.readlines("Makefile.am")
+      while line = lines.shift
+        sources << $1 if line.match(/^\s*lib_LIBRARIES\s*=\s*(\w+\.a)/)
+        if line.match(/^\s*\w+_SOURCES\s*=/)
+          sources << line.scan(/\w+\.cpp/)
+          while line.match(/\\\s*$/)
+            line = lines.shift
+            sources << line.scan(/(\w+\.cpp)|(\w+\.c)/)
+          end
+        end
+      end
+      sources.uniq.flatten.compact
+    end
+   
+    def print_linker_flags
+      output_string = ''
+      @libraries.each do |k,v|
+        output_string += " -L#{k} -l#{v}"
+      end
+      output_string += " -lstdc++"
+    end
+    
+    def clean_c_code
+      @libraries.keys.each do |k| 
+        Dir.chdir(k) do
+          puts "cleaning C code in #{k}"
+          make_clean = "make -f makeTestRunner clean"
+          system make_clean
+          FileUtils.rm "makeTestRunner"
+        end
+      end
+    end
+     
+    def write_generic_c_makefile(library)
+      c_makefile = %Q{
+      # makefile to compile c++ code
+      # Add .d to Make's recognized suffixes.
+      SUFFIXES += .d
+      
+      #Archive command and options 
+      AR = ar
+      AR_OPTS = cru
+       
+      LIBRARY = #{library}
+       
+      #We don't need to clean up when we're making these targets
+      NODEPS:=clean tags svn
+      #Find all the C++ files in this directory
+      SOURCES:=$(shell find . -name "*.cpp")
+      SOURCES+=$(shell find . -name "*.c")
+      
+      #These are the dependency files, which make will clean up after it creates them
+      CFILES:=$(SOURCES:.cpp=.c)
+      DEPFILES:=$(CFILES:.c=.d)
+   
+      OBJS:=$(CFILES:.c=.o)
+      
+      all: $(LIBRARY)
+      
+      #Rule to create library archive 
+      $(LIBRARY): $(OBJS)
+      \t$(AR) $(AR_OPTS) $@ $^
+    
+      #Don't create dependencies when we're cleaning, for instance
+      ifeq (0, $(words $(findstring $(MAKECMDGOALS), $(NODEPS))))
+          #Chances are, these files don't exist.  GMake will create them and
+          #clean up automatically afterwards
+          -include $(DEPFILES)
+      endif
+    
+      #This is the rule for creating the C++ dependency files
+      %.d: %.cpp
+      \t$(CXX) $(CXXFLAGS) -MM -MT '$(patsubst %.cpp,%.o,$<)' $< -MF $@
+      
+      #This is the rule for creating the C dependency files
+      %.d: %.c
+      \t$(CC) $(CFLAGS) -MM -MT '$(patsubst %.c,%.o,$<)' $< -MF $@
+      
+      #This rule does the compilation for C++ files
+      %.o: %.cpp %.d %.h
+      \t$(CXX) $(CXXFLAGS) -o $@ -c $<
+      
+      #This rule does the compilation for C files
+      %.o: %.c %.d %.h
+      \t$(CC) $(CFLAGS) -o $@ -c $<
+      
+      clean:
+      \trm -rf *.o *.d *.a
+    
+      }.gsub!(/^      /,'')
+    end
+    
+    def write_custom_c_makefile(sources)
+      library = sources.shift
+      source_files = sources.join(" ")
+      c_makefile = %Q{
+      # makefile to compile c++ code
+      # Add .d to Make's recognized suffixes.
+      SUFFIXES += .d
+ 
+      #Archive command and options 
+      AR = ar
+      AR_OPTS = cru
+       
+      LIBRARY = #{library}
+       
+      SOURCES = #{source_files}
+      
+      #These are the dependency files, which make will clean up after it creates them
+      CFILES:=$(SOURCES:.cpp=.c)
+      DEPFILES:=$(CFILES:.c=.d)
+ 
+      OBJS:=$(CFILES:.c=.o)
+      
+      all: $(LIBRARY)
+     
+      #Rule to create library archive 
+      $(LIBRARY): $(OBJS)
+      \t$(AR) $(AR_OPTS) $@ $^
+      
+      #Don't create dependencies when we're cleaning, for instance
+      ifeq (0, $(words $(findstring $(MAKECMDGOALS), $(NODEPS))))
+          #Chances are, these files don't exist.  GMake will create them and
+          #clean up automatically afterwards
+          -include $(DEPFILES)
+      endif
+    
+      #This is the rule for creating the C++ dependency files
+      %.d: %.cpp
+      \t$(CXX) $(CXXFLAGS) -MM -MT '$(patsubst %.cpp,%.o,$<)' $< -MF $@
+      
+      #This is the rule for creating the C dependency files
+      %.d: %.c
+      \t$(CC) $(CFLAGS) -MM -MT '$(patsubst %.c,%.o,$<)' $< -MF $@
+      
+      #This rule does the compilation for C++ files
+      %.o: %.cpp %.d %.h
+      \t$(CXX) $(CXXFLAGS) -o $@ -c $<
+      
+      #This rule does the compilation for C files
+      %.o: %.c %.d %.h
+      \t$(CC) $(CFLAGS) -o $@ -c $<
+      
+      clean:
+      \trm -rf *.o *.d *.a
+      }.gsub!(/^      /,'')
+    end
+  end
+end

data/lib/funit/functions.rb

@@ -24,7 +24,7 @@ module Funit
         ( numTests(<%= i+1 %>), numAsserts(<%= i+1 %>), numAssertsTested(<%= i+1 %>), numFailures(<%= i+1 %>) )
       write(*,1) numAssertsTested(<%= i+1 %>), numAsserts(<%= i+1 %>), &
         numTests(<%= i+1 %>)-numFailures(<%= i+1 %>), numTests(<%= i+1 %>)
-    1 format('Passed ',i0,' of ',i0,' possible asserts comprising ',i0,' of ',i0,' tests.')
+  <%= i+1 %> format('Passed ',i0,' of ',i0,' possible asserts comprising ',i0,' of ',i0,' tests.')
       <% end -%>
 
       write(*,*)
@@ -51,14 +51,15 @@ module Funit
     # <%= File.basename $0 %> generated this file on <%= Time.now %>.
 
     OBJ=<%= required_objects.join(' ') %>
+    LDFLAGS=<%= c_code.print_linker_flags %>
 
     all:testrunner
 
     testrunner: $(OBJ)
-    <%= "\t#{ENV['FC']} #{ENV['FCFLAGS']} #{ENV['LDFLAGS']}" %> -o TestRunner $(OBJ)
+    <%= "\t#{ENV['FC']} #{ENV['FCFLAGS']} #{ENV['LDFLAGS']}" %> -o TestRunner $(OBJ) $(LDFLAGS)
 
     <% file_dependencies.each do |source,dep| -%>
-    <%= "#{source.sub(/\.f90/i,'.o')}: #{source} #{dep.map{ |d| d.sub(/\.f90/i,'.o') }.join(' ')}" %>
+    <%= "#{source.sub(/\.f90/i,'.o')}: #{source} #{dep.map{ |d| d.sub(/\.f90/i,'.o') }.join(' ')} #{inlined_dependencies[source].join(' ')}" %>
     <%= "\t(cd #{File.dirname(source)}; #{ENV['FC']} #{ENV['FCFLAGS']} #{sourceflag} -c #{File.basename(source)})" %>
     <% end -%>
   }.gsub(/^    /,''), nil, '-' ) # turn off newlines for <% -%>
@@ -71,7 +72,7 @@ module Funit
   end
 
   def funit_exists?(module_name)
-    File.exists? "#{module_name}.fun"
+    File.exist? "#{module_name}.fun"
   end
 
   def parse_command_line
@@ -111,7 +112,10 @@ module Funit
     $stderr.puts "\n *Warning: #{message} [#{test_suite}.fun:#$.]"
   end
 
-  def compile_tests(test_suites,prog_source_dirs=['.'])
+  def compile_tests(test_suites,funit_data)
+    prog_source_dirs = funit_data.prog_source_dirs
+    c_code = funit_data.c_code
+
     puts "computing dependencies"
 
     sourceflag = ''
@@ -123,6 +127,7 @@ module Funit
     puts "locating associated source files and sorting for compilation"
     dependencies.source_file_dependencies('TestRunner.f90')
     file_dependencies = dependencies.file_dependencies
+    inlined_dependencies = dependencies.inlined_dependencies
     required_objects = file_dependencies.values.flatten.uniq.map{|s|s.sub(/\.f90/i,'.o')}
     required_objects << 'TestRunner.o'
 

data/lib/funit/testsuite.rb

@@ -1,5 +1,3 @@
-require 'funit'
-
 module Funit
   
   include Assertions # FIXME
@@ -20,7 +18,7 @@ module Funit
       @suite_name = suite_name
       @suite_content = suite_content
       return nil unless funit_exists?(suite_name)
-      File.delete(suite_name+"_fun.f90") if File.exists?(suite_name+"_fun.f90")
+      File.delete(suite_name+"_fun.f90") if File.exist?(suite_name+"_fun.f90")
       super(suite_name+"_fun.f90","w")
       @tests, @setup, @teardown = [], [], []
       header

data/test/test_funit.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'funit'
-require 'ftools' # FIXME: migrate to fileutils
+require 'fileutils'
+require 'ostruct'
 
 class TestFunit < Test::Unit::TestCase
 
@@ -10,34 +11,37 @@ class TestFunit < Test::Unit::TestCase
   include Funit::Assertions # FIXME
 
   def setup
-    File.rm_f(*Dir["dummyunit*"])
-    File.rm_f(*Dir["unit*"])
-    File.rm_f(*Dir["another*"])
-    File.rm_f(*Dir["ydsbe*"])
-    File.rm_f(*Dir["lmzd*"])
-    File.rm_f(*Dir["ldfdl*"])
-    File.rm_f(*Dir["ydsbe*"])
-    File.rm_f(*Dir["*TestRunner*"])
+    FileUtils.rm_f Dir.glob("dummyunit*")
+    FileUtils.rm_f Dir.glob("unit*")
+    FileUtils.rm_f Dir.glob("another*")
+    FileUtils.rm_f Dir.glob("ydsbe*")
+    FileUtils.rm_f Dir.glob("lmzd*")
+    FileUtils.rm_f Dir.glob("ldfdl*")
+    FileUtils.rm_f Dir.glob("ydsbe*")
+    FileUtils.rm_f Dir.glob("*TestRunner*")
+    @@funit_data = OpenStruct.new
+    @@funit_data.prog_source_dirs = ['.']
+    @@funit_data.c_code = Funit::C_compile.new
   end
 
   def teardown
-    File.rm_f(*Dir["dummyunit*"])
-    File.rm_f(*Dir["unit*"])
-    File.rm_f(*Dir["another*"])
-    File.rm_f(*Dir["ydsbe*"])
-    File.rm_f(*Dir["lmzd*"])
-    File.rm_f(*Dir["ldfdl*"])
-    File.rm_f(*Dir["ydsbe*"])
-    File.rm_f(*Dir["*TestRunner*"])
+    FileUtils.rm_f Dir.glob("dummyunit*")
+    FileUtils.rm_f Dir.glob("unit*")
+    FileUtils.rm_f Dir.glob("another*")
+    FileUtils.rm_f Dir.glob("ydsbe*")
+    FileUtils.rm_f Dir.glob("lmzd*")
+    FileUtils.rm_f Dir.glob("ldfdl*")
+    FileUtils.rm_f Dir.glob("ydsbe*")
+    FileUtils.rm_f Dir.glob("*TestRunner*")
   end
 
   def test_empty_test_runner_created_and_compilable
     write_test_runner []
-    assert File.exists?("TestRunner.f90"), 'TestRunner.f90 not created.'
-    compile_tests []
-    assert File.exists?("makeTestRunner"), 'makeTestRunner.f90 not created.'
+    assert File.exist?("TestRunner.f90"), 'TestRunner.f90 not created.'
+    compile_tests([],@@funit_data)
+    assert File.exist?("makeTestRunner"), 'makeTestRunner.f90 not created.'
     assert system("make -f makeTestRunner"), 'make -f makeTestRunner failed.'
-    assert File.exists?("TestRunner"), 'TestRunner executable not created.'
+    assert File.exist?("TestRunner"), 'TestRunner executable not created.'
   end
 
   def test_is_equal
@@ -75,7 +79,7 @@ class TestFunit < Test::Unit::TestCase
     File.open('unit.fun','w') do |f|
       f.puts "test_suite unit\ntest a_gets_set\nAssert_Equal(5,a)\nend test\nend test_suite"
     end
-    assert_nothing_raised{run_tests}
+    assert_nothing_raised{run_tests(@@funit_data)}
   end
 
   def test_should_accommodate_doubly_embedded_use_dependencies
@@ -91,8 +95,8 @@ class TestFunit < Test::Unit::TestCase
     File.open('unit.fun','w') do |f|
       f.puts "begin test_suite unit\ntest a_gets_set\n Assert_Equal(5, a)\nend test\nend test_suite"
     end
-    assert_nothing_raised{run_tests}
- end
+    assert_nothing_raised{run_tests(@@funit_data)}
+  end
 
   def test_should_accommodate_cap_F_extensions
     File.open('unit.F90','w') do |f|
@@ -101,8 +105,8 @@ class TestFunit < Test::Unit::TestCase
     File.open('unit.fun','w') do |f|
       f.puts "begin test_suite unit\ntest a_gets_set\n Assert_Equal(1, a)\nend test\nend test_suite"
     end
-    assert_nothing_raised{run_tests}
- end
+    assert_nothing_raised{run_tests(@@funit_data)}
+  end
 
   def test_requested_modules
     tu_assert_equal ["asdfga"], requested_modules(["asdfga"])
@@ -116,7 +120,7 @@ class TestFunit < Test::Unit::TestCase
 
   def test_funit_exists_method
     module_name = "ydsbe"
-    File.rm_f(module_name+".fun")
+    FileUtils.rm_f module_name+".fun"
     tu_assert_equal false, funit_exists?(module_name)
     system "touch "+module_name+".fun"
     assert funit_exists?(module_name)

data/test/test_testsuite.rb

@@ -18,8 +18,8 @@ class TestTestSuite < Test::Unit::TestCase
 
   def test_nonexistent_funit_file_is_not_created
     Funit::TestSuite.new 'dummyf90test', '', false
-    assert !File.exists?("dummyf90test.fun")
-    assert !File.exists?("dummyf90test_fun.f90")
+    assert !File.exist?("dummyf90test.fun")
+    assert !File.exist?("dummyf90test_fun.f90")
   end
 
   def create_funit_file funit_contents

metadata

@@ -1,9 +1,9 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: funit
-version: !ruby/object:Gem::Version 
-  version: 0.11.1
+version: !ruby/object:Gem::Version
+  version: 0.12.3
 platform: ruby
-authors: 
+authors:
 - Karen Bibb
 - Bil Kleb
 - Beth Lee-Rausch
@@ -12,46 +12,86 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-11-01 01:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-02-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fortran
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
   name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.14'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
-    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, * tests to be stored along side the code under test, and * test files to be named appropriately.
-email: nasarb-developers@rubyforge.org
-executables: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.14'
+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,
+  * tests to be stored along side the code under test, and
+  * test files to be named appropriately.
+email:
+- bil.kleb@nasa.gov
+executables:
 - funit
 extensions: []
-
-extra_rdoc_files: 
-- History.txt
+extra_rdoc_files:
+- History.rdoc
 - License.txt
 - Manifest.txt
-- README.txt
-files: 
-- History.txt
+- README.rdoc
+files:
+- History.rdoc
 - License.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - bin/funit
 - examples/CFD/FluxFunctions.f90
@@ -65,6 +105,7 @@ files:
 - examples/StopWatch/StopWatch.fun
 - lib/funit.rb
 - lib/funit/assertions.rb
+- lib/funit/c_tools.rb
 - lib/funit/compiler.rb
 - lib/funit/functions.rb
 - lib/funit/testsuite.rb
@@ -76,35 +117,31 @@ files:
 - utils/errorFinder.el
 - utils/funit-generic-mode.el
 - utils/funit-mode.el
-has_rdoc: true
-homepage: http://rubyforge.org/projects/nasarb
+homepage: https://rubygems.org/gems/funit
+licenses:
+- NASA-1.3
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
-- README.txt
-require_paths: 
+- README.rdoc
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - A Fortran compiler.
-rubyforge_project: nasarb
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 2
-summary: FUnit is a unit testing framework for Fortran
-test_files: 
-- test/test_compiler.rb
-- test/test_functions.rb
-- test/test_funit.rb
-- test/test_testsuite.rb
+specification_version: 4
+summary: funit is a unit testing framework for Fortran
+test_files: []