fortran 1.0.0 → 1.0.1

data/History.txt

@@ -1,5 +1,9 @@
+== 1.0.1 / 2007-08-20
+
+* 1 minor enhancement
+  * stripped './' from source file names to appease windoze.
+
 == 1.0.0 / 2007-07-26
 
 * 1 major enhancement
   * Birthday!
-

data/README.txt

@@ -1,16 +1,21 @@
 fortran
 
+* http://nasarb.rubyforge.org/fortran
 * http://rubyforge.org/projects/nasarb
-* http://nasarb.rubyforge.org
-* mailto:Bil.Kleb@NASA.gov
+* mailto:Bil.Kleb@nasa.gov
 
 == DESCRIPTION:
 
-* Provides Fortran 90/95/2003 makefile dependencies.
+Fortran 90/95/2003 utilities.
+
+Currently, only provides Fortran 90/95/2003 dependencies.
 
 == SYNOPSIS:
 
-* <tt>fortran</tt>
+  require 'rubygems'
+  require 'fortran'
+
+  Fortran::Dependencies.new( 'main.f90' ).dependencies
 
 == REQUIREMENTS:
 

data/Rakefile

@@ -3,15 +3,18 @@
 require 'rubygems'
 require 'hoe'
 
-$:.unshift File.join( File.dirname(__FILE__), 'lib' )
-require 'fortran'
+require './lib/fortran'
 
-Hoe.new('fortran', Fortran::VERSION) do |p|
+Hoe.new( 'fortran', Fortran::VERSION ) do |p|
   p.rubyforge_name = 'nasarb'
-  p.author = ['Bil Kleb','Mike Park','Bill Wood']
-  p.email = 'Bil.Kleb@NASA.gov'
-  p.summary = 'Fortran 90/95/2003 utilities.'
-  p.description = p.paragraphs_of('README.txt', 3..4).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.author      = %w( 'Bil Kleb', 'Mike Park', 'Bill Wood' )
+  p.email       = 'Bil.Kleb@NASA.gov'
+  p.url         = p.paragraphs_of( 'README.txt', 1 ).to_s.gsub(/^\* /, '').split(/\n/)
+  p.summary     = p.paragraphs_of( 'README.txt', 3 ).to_s
+  p.description = p.paragraphs_of( 'README.txt',  3..4 ).join("\n\n")
+  p.changes     = p.paragraphs_of( 'History.txt', 0..1 ).join("\n\n")
+  p.remote_rdoc_dir = 'fortran' # release webpages to http://nasarb.rubyforge.org/fortran
+  p.rsync_args << ' --exclude=statsvn/'
 end
+
+# vim: syntax=Ruby

data/lib/fortran.rb

@@ -1,9 +1,12 @@
 module Fortran
   
-  VERSION = '1.0.0'
+  ##
+  # This version of Fortran library
+
+  VERSION = '1.0.1'
 
   ##
-  # Find Fortran file dependencies
+  # Find Fortran dependencies
 
   class Dependencies
  
@@ -52,6 +55,7 @@ module Fortran
       source.flatten!.uniq!
       source.delete_if{ |file| File.lstat(file).symlink? } if @config[:ignore_symlinks]
       source.delete_if{ |file| file.match @config[:ignore_files] }
+      source.map!{ |file| file.sub(/^\.\//,'') }# strip leading ./
     end
 
     def build_hash_of_modules_in_files
@@ -120,8 +124,9 @@ module Fortran
       sources
     end
 
-  end
-end
+  end # class
+
+end # module
 
 #--
 # Copyright 2007 United States Government as represented by

data/test/lakos/test_analyze_dependencies.rb

@@ -0,0 +1,35 @@
+require 'test/unit'
+require 'lakos/analyze_dependencies'
+require 'fileutils'
+
+class TestAnalyzeDependencies < Test::Unit::TestCase
+
+ def setup
+  FileUtils.rm_rf 'AD_fixtures'
+  Dir.mkdir 'AD_fixtures'
+  Dir.chdir 'AD_fixtures'
+  File.open('m.f90','w'){|f| f.puts "program m\nuse a\nuse b\nuse d\nuse f" }
+  File.open('a.f90','w'){|f| f.puts "module a" }
+  File.open('b.f90','w'){|f| f.puts "module b\nuse c\nuse d\nuse e" }
+  File.open('c.f90','w'){|f| f.puts "module c" }
+  File.open('d.f90','w'){|f| f.puts "module d" }
+  File.open('e.f90','w'){|f| f.puts "module e" }
+  File.open('f.f90','w'){|f| f.puts "module f\nuse c\nuse e" }
+  @da = DependencyAnalyzer.new( 'm.f90', ['.'] )
+  Dir.chdir '..'
+  File.open('main.dot','w'){ |f| f.puts @da.graph(@da.dd_deps) }
+ end
+
+ def test_statistics
+  assert_equal(  3, @da.levels.size )
+  assert_equal(  7, @da.components )
+  assert_equal( 18, @da.ccd )
+  assert_in_delta( 18/7.to_f,  @da.acd,  Float::EPSILON )
+  assert_in_delta( 18/17.to_f, @da.nccd, Float::EPSILON )
+ end
+
+ def teardown
+  FileUtils.rm_rf 'AD_fixtures'
+ end
+
+end

data/test/test_fortran.rb

@@ -54,18 +54,18 @@ class TestFortran < Test::Unit::TestCase
   end
 
   def test_locating_all_fortran_files_in_search_path
-    files = %w[ ../lib/solution.f90 ./area.f90 ./externalUse.f90
-                ./grid.f90 ./main.F90 ./shapes.f90 ]
+    files = %w[ ../lib/solution.f90 area.f90 externalUse.f90
+                grid.f90 main.F90 shapes.f90 ]
     @dep.find_fortran_files.each do |file|
       assert files.include?(file)
     end
   end
 
   def test_build_hash_with_source_files
-    f90 = %w[./grid.f90 ../lib/solution.f90 ./shapes.f90 ./area.f90]
+    f90 = %w[grid.f90 ../lib/solution.f90 shapes.f90 area.f90]
     hash = @dep.build_dictionary_of_modules( f90 )
-    assert_equal %w[ ./shapes.f90 ./shapes.f90 ./area.f90
-                     ../lib/solution.f90 ./grid.f90 ].sort,
+    assert_equal %w[ shapes.f90 shapes.f90 area.f90
+                     ../lib/solution.f90 grid.f90 ].sort,
                  hash.values.sort
     assert_equal %w[ rectangle_fun3d circle area solution grid ].sort,
                  hash.keys.sort
@@ -80,7 +80,7 @@ class TestFortran < Test::Unit::TestCase
     assert_equal %w[grid solution circle], modules
     
     new_source_files = modules.collect{ |mod| directoryHash[mod] }
-    assert_equal %w[ ./grid.f90 ../lib/solution.f90 ./shapes.f90],
+    assert_equal %w[ grid.f90 ../lib/solution.f90 shapes.f90],
                  new_source_files
     
     new_modules = new_source_files.collect do |file|
@@ -130,22 +130,22 @@ shapes.o: shapes.f90 \\
     @dep.source_file_dependencies('main.F90')
     assert_equal( 5, @dep.file_dependencies.size )
     expected = {
-      "./area.f90" => [],
-      "./grid.f90" => ["./area.f90"],
-      "../lib/solution.f90" => ["./area.f90"],
-      "./shapes.f90" => ["./area.f90"],
-      "main.F90" => ["./grid.f90", "../lib/solution.f90", "./shapes.f90"]
+      "area.f90" => [],
+      "grid.f90" => ["area.f90"],
+      "../lib/solution.f90" => ["area.f90"],
+      "shapes.f90" => ["area.f90"],
+      "main.F90" => ["grid.f90", "../lib/solution.f90", "shapes.f90"]
     }
     assert_equal expected, @dep.file_dependencies
   end
 
   def test_finds_required_source_files
-    expected = %w[ ./area.f90 ./shapes.f90 ../lib/solution.f90
-                   ./grid.f90 ./main.F90 ]
-    found = @dep.required_source_files('./main.F90')
+    expected = %w[ area.f90 shapes.f90 ../lib/solution.f90
+                   grid.f90 main.F90 ]
+    found = @dep.required_source_files('main.F90')
     assert_equal expected.size, found.size
-    assert_equal './main.F90', found.last
-    assert_equal './area.f90', found.first
+    assert_equal 'main.F90', found.last
+    assert_equal 'area.f90', found.first
   end
 
   def test_finds_required_source_files_unordered
@@ -159,14 +159,14 @@ shapes.o: shapes.f90 \\
   end
 
   def test_can_find_required_source_files_twice
-    files = %w[ ./main.F90 ./shapes.f90 ./area.f90
-                ../lib/solution.f90 ./grid.f90 ]
-    @dep.required_source_files('./main.F90')
-    assert_equal files.sort, @dep.required_source_files('./main.F90').sort
+    files = %w[ main.F90 shapes.f90 area.f90
+                ../lib/solution.f90 grid.f90 ]
+    @dep.required_source_files('main.F90')
+    assert_equal files.sort, @dep.required_source_files('main.F90').sort
   end
 
   def test_recognizes_external_modules
-    file = './externalUse.f90'
+    file = 'externalUse.f90'
     assert_equal [file], @dep.required_source_files(file).sort
   end
 

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: fortran
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-08-01 00:00:00 -04:00
+  version: 1.0.1
+date: 2007-08-20 00:00:00 -04:00
 summary: Fortran 90/95/2003 utilities.
 require_paths: 
 - lib
 email: Bil.Kleb@NASA.gov
-homepage: http://rubyforge.org/projects/nasarb
+homepage: http://nasarb.rubyforge.org/fortran
 rubyforge_project: nasarb
-description: "* Provides Fortran 90/95/2003 makefile dependencies.  == SYNOPSIS:"
+description: Fortran 90/95/2003 utilities.  Currently, only provides Fortran 90/95/2003 dependencies.
 autorequire: 
 default_executable: 
 bindir: bin
@@ -27,9 +27,12 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- Bil Kleb
-- Mike Park
-- Bill Wood
+- "'Bil"
+- Kleb',
+- "'Mike"
+- Park',
+- "'Bill"
+- Wood'
 files: 
 - History.txt
 - License.txt
@@ -39,6 +42,7 @@ files:
 - lib/fortran.rb
 - test/test_fortran.rb
 test_files: 
+- test/lakos/test_analyze_dependencies.rb
 - test/test_fortran.rb
 rdoc_options: 
 - --main
@@ -62,5 +66,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.3.0
     version: