funit 0.9.3 → 0.9.4

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.9.4 / 2007-01-08
+
+* 2 minor enhancements
+  * broke up more long conditionals with continuation
+    characters to avoid truncated lines
+  * added shebang to main for rubygems 1.0
+
 === 0.9.3 / 2007-12-23
 
 * 2 bug fixes
@@ -7,12 +14,14 @@
 === 0.9.2 / 2007-09-21
 
 * 1 minor enhancement
-  * broke up long generated assert lines with continuations to compile via g95
+  * broke up long generated assert lines with continuations
+    to compile via g95
 
 === 0.9.1 / 2007-08-20
 
 * 1 minor enhancement
-  * Stripped './' path prefixes and '\' continuations to appease windoze
+  * Stripped './' path prefixes and '\' continuations to
+    appease windoze
 
 === 0.9.0 / 2007-07-26
 
@@ -22,7 +31,8 @@
 === 0.1.3 / 2006-06-21
 
 * 1 bug fix
-  * Do not remove unit tests! (Thanks to Sebastian Hanigk and James Quirk.)
+  * Do not remove unit tests! (Thanks to Sebastian Hanigk
+    and James Quirk.)
 
 === 0.1.2 / 2006-05-16
 

data/Manifest.txt

@@ -18,8 +18,11 @@ lib/funit/assertions.rb
 lib/funit/compiler.rb
 lib/funit/functions.rb
 lib/funit/testsuite.rb
+pitch/slides.tex
 test/test_compiler.rb
 test/test_functions.rb
 test/test_funit.rb
 test/test_testsuite.rb
+utils/errorFinder.el
+utils/funit-generic-mode.el
 utils/funit-mode.el

data/README.txt

@@ -1,20 +1,19 @@
 FUnit
 
 * http://rubyforge.org/projects/nasarb
-* http://nasrb.rubyforge.org
+* http://nasarb.rubyforge.org
 
 == DESCRIPTION:
 
-FUnit is a unit testing framework for Fortran modules.
+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 module under test.
+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

data/Rakefile

@@ -3,21 +3,18 @@
 require 'rubygems'
 require 'hoe'
 
-$:.unshift File.join( File.dirname(__FILE__), 'lib' )
-require 'funit'
+require './lib/funit.rb'
 
-Hoe.new('funit', Funit::VERSION) do |p|
-  p.rubyforge_name  = 'nasarb'
-  p.remote_rdoc_dir = 'funit' 
-  p.extra_deps << [ 'fortran', '>= 1.0.1' ]
-  p.author = ['Karen Bibb','Bil Kleb','Beth Lee-Rausch','Mike Park','Bill Wood']
-  p.email = 'funit-support@rubyforge.org'
-  p.summary = p.paragraphs_of('README.txt',3).to_s
-  p.description = p.paragraphs_of('README.txt', 4..6).join("\n\n")
-  p.url = p.paragraphs_of('README.txt', 1).first.gsub(/^\* /, '').split(/\n/)
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.clean_globs.concat %w( **/*_fun.f90 examples/**/TestRunner* **/*.o **/*.mod **/*.MOD )
-  p.rsync_args = '-rpv --delete' # to preserve group permissions 
+Hoe.new('funit', Funit::VERSION) do |funit|
+  funit.rubyforge_name  = 'nasarb'
+  funit.remote_rdoc_dir = 'funit' 
+  funit.extra_deps << [ 'fortran', '>= 1.0.1' ]
+  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.clean_globs.concat %w( **/*_fun.f90 examples/**/TestRunner* **/*.o **/*.mod **/*.MOD )
+  funit.rsync_args = '-rpv --delete' # to preserve group permissions 
 end
 
 # vim: syntax=Ruby

data/bin/funit

@@ -1,3 +1,5 @@
+#! /usr/bin/env ruby
+
 # Main fUnit routine
 
 begin require 'rubygems'; rescue LoadError; end

data/lib/funit.rb

@@ -16,7 +16,7 @@ module Funit
   ##
   # the version of this fUnit
 
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 
   ##
   # run all tests

data/lib/funit/assertions.rb

@@ -29,8 +29,8 @@ module Funit
       line.match(/\((.*)\)/)
       expected, actual = *(get_args($1))
       @type = 'IsRealEqual'
-      @condition = ".not.(#{expected}+2*spacing(real(#{expected})).ge.#{actual} &\n             .and.#{expected}-2*spacing(real(#{expected})).le.#{actual})"
-      @message = "\"#{actual} (\",#{actual},\") is not\", &\n #{expected},\"within\",2*spacing(real(#{expected}))"
+      @condition = ".not.( (#{expected} &\n        +2*spacing(real(#{expected})) ) &\n        .ge. &\n        (#{actual}) &\n            .and. &\n     (#{expected} &\n      -2*spacing(real(#{expected})) ) &\n      .le. &\n       (#{actual}) )"
+      @message = "\"#{actual} (\", &\n #{actual}, &\n  \") is not\", &\n #{expected},\&\n \"within\", &\n  2*spacing(real(#{expected}))"
       syntax_error("invalid body for #@type",@suite_name) unless $&
       write_assert
     end
@@ -39,7 +39,7 @@ module Funit
       line.match(/\((.*)\)/)
       expected, actual, tolerance = *(get_args($1))
       @type = 'IsEqualWithin'
-      @condition = ".not.(#{actual}+#{tolerance}.ge.#{expected} &\n             .and.#{actual}-#{tolerance}.le.#{expected})"
+      @condition = ".not.((#{actual} &\n     +#{tolerance}) &\n     .ge. &\n     (#{expected}) &\n             .and. &\n     (#{actual} &\n     -#{tolerance}) &\n     .le. &\n     (#{expected}) )"
       @message = "\"#{expected} (\",#{expected},\") is not\", &\n #{actual},\"within\",#{tolerance}"
       syntax_error("invalid body for #@type",@suite_name) unless $&
       write_assert

data/pitch/slides.tex

@@ -0,0 +1,138 @@
+%  pdflatex slides
+
+\documentclass[landscape]{slides}
+\usepackage{url}
+\pagestyle{empty}
+\hoffset 1in
+\begin{document}
+\begin{slide}
+ \begin{center}
+  {\bf\Large F90 Testkit}\\
+  \vspace{0.5in}
+  \begin{minipage}{6.5in}
+    {\bf Goal:} to make Fortran~90 unit/\-mobility/\-developer testing
+    as painless as possible.
+  \end{minipage}
+ \end{center}
+\end{slide}
+\begin{slide}
+  \begin{center}
+    {\bf\Large Why write tests?}\\
+    \vspace{0.5in}
+    \begin{minipage}[t]{3in}
+     \begin{itemize}
+      \item Shame
+      \item Embarrassment
+      \item Speed
+      \item Confidence
+     \end{itemize}
+    \end{minipage}
+    \begin{minipage}[t]{3in}
+     \begin{itemize}
+      \item Trust
+      \item Change
+      \item Documentation
+     \end{itemize}
+    \end{minipage}
+  \end{center}
+\end{slide}
+\begin{slide}
+  \begin{center}
+    {\bf\Large Why write tests first?}\\
+    \vspace{0.5in}
+    \begin{minipage}{3in}
+    \begin{itemize}
+     \item Tests get written
+     \item Succinctness
+     \item Clarity
+     \item Closure
+    \end{itemize}
+    \end{minipage}\\
+    \vspace{1in}
+    \begin{minipage}{5.7in}\raggedright
+      ``No code should be written or changed unless there is a failing
+      test.''
+    \end{minipage}
+  \end{center}
+\end{slide}
+\begin{slide}
+  \begin{center}
+   {\bf\Large How do I add tests to legacy code?}\\
+   \vspace{0.5in}
+   \begin{minipage}{6in}
+    \begin{itemize}
+     \item Fixing Bugs
+      \begin{itemize}
+       \item write test for bug {\small (which fails)}
+       \item write code to satisfy failing test
+       \item write tests/code for similar cases
+      \end{itemize}
+      \vspace{8pt}
+     \item Adding Features
+      \begin{itemize}
+       \item write test for feature {\small (which better fail)}
+       \item write code to satisfy failing test
+      \end{itemize}
+      \vspace{8pt}
+     \item Refactoring ``Bad Smells''
+      \begin{itemize}
+       \item write tests to cover existing code
+       \item update/add tests for new structure
+       \item change code to satisfy failing tests
+      \end{itemize}
+    \end{itemize}
+   \end{minipage}
+  \end{center}
+\end{slide}
+\begin{slide}
+  \begin{center}
+    {\bf\Large Crazy enough to learn more?}\\
+    \vspace{0.5in}
+    \begin{minipage}{6in}
+     \begin{itemize}
+      \item \url{http://c2.com/cgi/wiki?UnitTests}\\[-10pt]
+      \item \url{http://xprogramming.com/software.htm}
+     \end{itemize}
+    \end{minipage}
+  \end{center}
+\end{slide}
+\begin{slide}
+  \begin{center}
+    {\bf\Large Want to try F90 testkit?}\\
+    \vspace{0.5in}
+    \begin{minipage}{9in}
+     \begin{itemize}
+      \item Have your SA install Ruby {\small(or install it yourself)}\\[5pt]
+       \hspace*{1em}\url{http://www.ruby-lang.org/}\\[5pt]
+      \item Check out the FTK repository\\[5pt]
+       \hspace*{1em}\verb+cvs -d :pserver:[username]@abnode3:/usr/local/cvsroot \+\\
+       \hspace*{1em}\verb+checkout -P FTK+\\[5pt]
+       where \verb+[username]+ is your CVS username on \verb+abnode3+
+     \end{itemize}
+    \end{minipage}
+  \end{center}
+\end{slide}
+\begin{slide}
+  \begin{center}
+    {\bf\Large Who does what?}\\
+    \vspace{0.5in}
+    {\bf You:}
+    \begin{minipage}[t]{6.5in}\raggedright
+     \begin{enumerate}
+      \item Create testsuite file, e.g., \verb+RoutineTS.ftk+
+      \item Write test in Fortran with embedded assert macros, .e.g,
+        \verb+IsTrue(x>2)+
+      \item Run testsuite {\small (it should fail)}
+      \item Write \verb+Routine.f90+ to satisfy test
+     \end{enumerate}
+     \vspace{10pt}
+     Repeat steps 2, 3, and 4 until your objective is met.
+    \end{minipage}\\
+    \vspace{0.8in}
+   {\bf It:}
+   \begin{minipage}[t]{6in}\raggedright
+   Translates, compiles, links, and runs tests.
+   \end{minipage}
+  \end{center}
+\end{slide}
+\end{document}

data/test/test_compiler.rb

@@ -6,7 +6,7 @@ class TestCompiler < Test::Unit::TestCase
   def test_no_environment_compiler_name
     begin
       orig_FC = ENV['FC']
-      ENV['FC'] = nil
+      ENV.delete 'FC'
       assert_raises(RuntimeError) {Funit::Compiler.new}
     ensure
       ENV['FC'] = orig_FC

data/test/test_funit.rb

@@ -50,15 +50,13 @@ class TestFunit < Test::Unit::TestCase
     @line_number = "dummy"
     isrealequal("IsRealEqual(a,b)")
     ans = <<-EOF
-.not.(a+2*spacing(real(a)).ge.b &
-             .and.a-2*spacing(real(a)).le.b)
+.not.( (a &\n        +2*spacing(real(a)) ) &\n        .ge. &\n        (b) &\n            .and. &\n     (a &\n      -2*spacing(real(a)) ) &\n      .le. &\n       (b) )
     EOF
     assert_equal ans.chomp, @condition
-    assert_equal %|"b (",b,") is not", &\n a,"within",2*spacing(real(a))|, @message
+    assert_equal %|"b (", &\n b, &\n  ") is not", &\n a,&\n "within", &\n  2*spacing(real(a))|, @message
     isrealequal("IsRealEqual(1.0,m(1,1))")
     ans = <<-EOF
-.not.(1.0+2*spacing(real(1.0)).ge.m(1,1) &
-             .and.1.0-2*spacing(real(1.0)).le.m(1,1))
+.not.( (1.0 &\n        +2*spacing(real(1.0)) ) &\n        .ge. &\n        (m(1,1)) &\n            .and. &\n     (1.0 &\n      -2*spacing(real(1.0)) ) &\n      .le. &\n       (m(1,1)) )
     EOF
     assert_equal ans.chomp, @condition
   end

data/utils/errorFinder.el

@@ -0,0 +1,88 @@
+From - Mon Nov 12 23:36:17 2001
+Path: reznor.larc.nasa.gov!kant.larc.nasa.gov!logbridge.uoregon.edu!news-peer.gip.net!news.gsl.net!gip.net!newsfeed.mathworks.com!cyclone.swbell.net!easynews!sjc-peer.news.verio.net!news.verio.net!sea-read.news.verio.net.POSTED!not-for-mail
+Sender: mikesl@thneed.na.wrq.com
+Newsgroups: comp.emacs
+Subject: Re: Re-centering buffer based on error line indicted in another buffer
+References: <3BF03829.826F39CB@LaRC.NASA.Gov>
+From: Michael Slass <mikesl@wrq.com>
+Message-ID: <m3wv0vipqe.fsf@thneed.na.wrq.com>
+Lines: 68
+User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Date: Mon, 12 Nov 2001 22:33:35 GMT
+NNTP-Posting-Host: 150.215.90.102
+X-Complaints-To: abuse@verio.net
+X-Trace: sea-read.news.verio.net 1005604415 150.215.90.102 (Mon, 12 Nov 2001 22:33:35 GMT)
+NNTP-Posting-Date: Mon, 12 Nov 2001 22:33:35 GMT
+Organization: Verio
+Xref: reznor.larc.nasa.gov comp.emacs:70829
+
+Bil Kleb <W.L.Kleb@LaRC.NASA.Gov> writes:
+
+>So, I have a mode that executes a command on the
+>current buffer, and displays the resulting output
+>in another buffer (with possibly some error messages
+>which include line numbers in the original buffer).
+>
+>What I would like to have now is a function which
+>scans the output buffer for errors (doing a regex
+>pattern match?), and recenters the original buffer
+>on the first error line indicated by the output buffer.
+>(Auctex mode has a similar feature, but the code
+>is much too involved for this newbie lisp brain to
+>effectively decipher.)
+>
+>Any suggestions on references to search, keywords to
+>use during a search, etc.?
+>
+>TIA,
+>--
+>bil <http://abweb.larc.nasa.gov/~kleb/>
+
+Here's a quick kludge for this, if you don't want to try to adapt
+compilation mode.  It's kludgey, but if you're lucky, some of the gurus
+will give you (and me) pointers on how to make it less so.
+
+
+(defvar bk-error-buffer
+  "*error-buffer*"
+  "Buffer name for error messages used by `bk-next-error'")
+
+(defvar bk-error-message-regexp
+  "error at line \\([0-9]+\\)"
+  "Regular expression used by `bk-next-error' to find error messages.
+The sub-expression between the first capturing parens must be the line
+number where the error occured")
+
+
+(defun bk-next-error ()
+  "Goto line in current buffer indicated by next error message in `bk-error-buffer'
+
+Assumes that the point is positioned before the first occurance of
+`bk-error-message-regexp' in the `bk-error-buffer' before the first
+call to this function.
+
+See also `bk-error-message-regexp' `bk-error-buffer'"
+  
+  (interactive)
+  (let ((error-line-number))
+    (save-current-buffer
+      (set-buffer (or (get-buffer bk-error-buffer)
+                      (error
+                       (concat
+                        "Can't find the error buffer: "
+                        bk-error-buffer))))
+      (if (re-search-forward bk-error-message-regexp nil t)
+          (progn
+            (setq error-line-number
+                  (string-to-number
+                   (buffer-substring (match-beginning 1)
+                                     (match-end 1))))
+            (goto-char (1+ (match-end 1))))))
+    (if error-line-number
+        (goto-line error-line-number)
+      (message "No more errors"))))
+
+-- 
+Mike

data/utils/funit-generic-mode.el

@@ -0,0 +1,20 @@
+;; Make a generic-mode for fUnit files:
+(require 'generic)
+(define-generic-mode 'funit-generic-mode
+   (list ?!)
+   (list
+    "beginTest"
+    "endTest"
+    "beginSetup"
+    "endSetup"
+    "beginTeardown"
+    "endTeardown"
+   )
+   '(("\\(IsFalse\\)"		1	'font-lock-function-name-face)
+     ("\\(IsTrue\\)"		1	'font-lock-function-name-face)
+     ("\\(IsEqualWithin\\)"	1	'font-lock-function-name-face)
+     ("\\(IsEqual\\)"		1	'font-lock-function-name-face)
+     ("\\(IsRealEqual\\)"	1	'font-lock-function-name-face))
+   (list "\\.fun\\'")
+   nil
+   "Generic mode for fUnit files.")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: funit
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Karen Bibb
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-23 00:00:00 -05:00
+date: 2008-03-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,10 +32,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.5.1
     version: 
-description: 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 module 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: funit-support@rubyforge.org
+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
 extensions: []
@@ -66,13 +66,16 @@ files:
 - lib/funit/compiler.rb
 - lib/funit/functions.rb
 - lib/funit/testsuite.rb
+- pitch/slides.tex
 - test/test_compiler.rb
 - test/test_functions.rb
 - test/test_funit.rb
 - test/test_testsuite.rb
+- utils/errorFinder.el
+- utils/funit-generic-mode.el
 - utils/funit-mode.el
 has_rdoc: true
-homepage: http://rubyforge.org/projects/nasarb
+homepage: FUnit is a unit testing framework for Fortran.
 post_install_message: 
 rdoc_options: 
 - --main
@@ -91,13 +94,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
-
+requirements: 
+- A Fortran compiler.
 rubyforge_project: nasarb
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
-summary: FUnit is a unit testing framework for Fortran modules.
+summary: FUnit is a unit testing framework for Fortran
 test_files: 
 - test/test_compiler.rb
 - test/test_functions.rb