fortran 1.1.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 54f7278f378508a10c2f262ffd521a26fdfb2b48
+  data.tar.gz: 6807383ca0ee2b4009dc9207d68d4a989f45624b
+SHA512:
+  metadata.gz: 7d9e6c71695aaf2f562b3645a4234684685580866f2df3fdc012598c68d5e8412852b3f52dd2dc60959aa98ec10242c5fef7cf188e4229b63220b606a642bfdb
+  data.tar.gz: bbbf71a09306c1ec89e66434d4335c3dd23713c2a7304870d5bde9ea5043eb7a3e1556583b97201a56c5631ffc96624984a9bf4302af2dffb8ffc6194dfdaeae

data/{History.txt → History.rdoc}

@@ -1,3 +1,13 @@
+== 1.1.0 / 2016-02-05
+
+* 1 minor enhancement
+  * make included files available for possible dependencies
+
+== 1.1.0 / 2016-01-15
+
+* 1 minor enhancement
+  * parse included (inlined) files for module use statments
+
 == 1.1.0 / 2009-10-28
 
 * 1 minor enhancement

data/Manifest.txt

@@ -1,7 +1,7 @@
-History.txt
+History.rdoc
 License.txt
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 lib/fortran.rb
 test/test_fortran.rb

data/{README.txt → README.rdoc}

@@ -1,25 +1,25 @@
-fortran
+= fortran
 
-* http://nasarb.rubyforge.org/fortran
-* http://rubyforge.org/projects/nasarb
-* mailto:Bil.Kleb@nasa.gov
+home  :: https://rubygems.org/gems/fortran
+code  :: https://github.com/kleb/nasarb/tree/master/fortran
+bugs  :: https://github.com/kleb/nasarb/issues
+rdoc  :: http://www.rubydoc.info/gems/fortran
 
 == DESCRIPTION:
 
-Fortran 90/95/2003 utilities.
+Fortran utilities.
 
 Currently, only provides Fortran 90/95/2003 dependencies.
 
 == SYNOPSIS:
 
-  require 'rubygems'
   require 'fortran'
 
   Fortran::Dependencies.new( 'main.f90' ).dependencies
 
 == REQUIREMENTS:
 
-* Ruby with Rubygems
+* Ruby
 
 == INSTALL:
 

data/Rakefile

@@ -1,20 +1,13 @@
 # -*- ruby -*-
 
-require 'rubygems'
 require 'hoe'
 
-require './lib/fortran'
-
-Hoe.new( 'fortran', Fortran::VERSION ) do |p|
-  p.rubyforge_name  = 'nasarb'
+Hoe.spec 'fortran' do |p|
+  p.group_name  = 'nasarb'
   p.remote_rdoc_dir = 'fortran'
   p.author      = ['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.rsync_args = '-rpv --delete' # to preserve group permissions
+  p.licenses    = ['NASA-1.3']
 end
 
 # vim: syntax=Ruby

data/lib/fortran.rb

@@ -3,7 +3,7 @@ module Fortran
   ##
   # This version of Fortran library
 
-  VERSION = '1.1.0'
+  VERSION = '1.3.0'
 
   ##
   # Find Fortran dependencies
@@ -17,34 +17,43 @@ module Fortran
     
     USE_MODULE_REGEX = /^\s*use\s+(\w+)/i
     MODULE_DEF_REGEX = /^\s*module\s+(\w+)/i
+    MODULE_INCLUDE_REGEX = /\s*include\s+('|")(\w+\.(f|F)90)('|")/i
  
     FILE_EXTENSION = /\.f90$/i
   
-    attr_reader :file_dependencies, :source_files
+    attr_reader :file_dependencies, :source_files, :inlined_dependencies
 
     def initialize( config=OPTIONS )
       @config = config
       OPTIONS.each{ |opt,default| @config[opt] = default unless @config.has_key? opt }
       @parsed, @file_dependencies, @source_files = [], {}, []
+      @inlined_dependencies = {}
       @hash = build_hash_of_modules_in_files
+      @included_files = build_hash_of_non_module_files
       self
     end
 
     def modules_used_in( file )
-      modules = IO.readlines( file ).map do |line|
+      IO.readlines( file ).map do |line|
         $1.downcase if line.match USE_MODULE_REGEX
       end.uniq.compact
     end
 
     def modules_defined_in( file )
-      modules = IO.readlines( file ).map do |line| 
+      IO.readlines( file ).map do |line| 
         $1.downcase if line.match MODULE_DEF_REGEX
       end.uniq.compact
     end
 
-    def build_dictionary_of_modules( files )
+    def files_included_in( file )
+      IO.readlines( file ).map do |line|
+        $2 if line.match MODULE_INCLUDE_REGEX
+      end.uniq.compact
+    end
+
+    def build_dictionary_of_modules( array_of_file_names )
       file_containing_module = {}
-      files.each do |file|
+      array_of_file_names.each do |file|
         modules_defined_in( file ).each{ |mod| file_containing_module[mod]=file }
       end
       file_containing_module
@@ -58,10 +67,40 @@ module Fortran
       source.map!{ |file| file.sub(/^\.\//,'') }# strip leading ./
     end
 
+    def build_hash_of_non_module_files
+      files = find_fortran_files
+      included_files = {}
+      files.each do |file|
+        unless file_is_module?(file)
+          included_files[File.basename(file)] = file
+        end
+      end
+      included_files
+    end
+
+    def file_is_module?(file)
+      IO.readlines( file ).map do |line|
+        return true if line.match MODULE_DEF_REGEX
+      end
+      return false
+    end
+
     def build_hash_of_modules_in_files
       build_dictionary_of_modules find_fortran_files
     end
 
+    def modules_in_included_files( file )
+      files_included_in( file ).map do |included_file|
+        modules_used_in(@included_files[included_file])
+      end.flatten.uniq.compact
+    end
+
+    def included_files_in_module( file )
+      files_included_in( file ).map do |included_file|
+        @included_files[included_file]
+      end.flatten.uniq.compact
+    end
+
     def makefile_dependency_line( source )
       real_source = source.sub(/PHYSICS_DUMMY/,'PHYSICS_MODULES')# FIXME: What's this?!
       source_no_path = File.basename source
@@ -96,14 +135,18 @@ module Fortran
         next if @parsed.include?(file)
         @parsed.push file
         dependencies file
-      end.to_s
+      end.join
     end
 
     def source_file_dependencies( head_f90 )
       modules_head_uses = modules_used_in( head_f90 )
+      modules_head_uses += modules_in_included_files( head_f90 )
       required_f90s = modules_head_uses.map{ |mod| @hash[mod] }.compact
       required_f90s.delete_if{ |f| f == head_f90 }
+      required_inlined = included_files_in_module( head_f90 )
+      required_inlined.delete_if{ |f| f == head_f90 }
       @file_dependencies[head_f90] = required_f90s
+      @inlined_dependencies[head_f90] = required_inlined
       required_f90s.each do |required_f90|
         next if @parsed.include?(required_f90)
         source_file_dependencies( required_f90 )

data/test/test_fortran.rb

@@ -50,7 +50,7 @@ class TestFortran < Test::Unit::TestCase
 
   def test_create_module_definition_hash
     assert_equal %w[circle rectangle_fun3d],
-    @dep.build_dictionary_of_modules( 'shapes.f90' ).keys.sort
+    @dep.build_dictionary_of_modules( ['shapes.f90'] ).keys.sort
   end
 
   def test_locating_all_fortran_files_in_search_path
@@ -170,17 +170,4 @@ shapes.o: shapes.f90 \\
     assert_equal [file], @dep.required_source_files(file).sort
   end
 
-  def test_two_modules_in_a_single_source_file_uses
-    begin
-      File.open('two_modules.f90','w') do |f|
-        f.puts "module one\nend module one\nmodule two\n use one\nend module two"
-      end
-      dep = Fortran::Dependencies.new
-      assert_equal %w[one], dep.modules_used_in( 'two_modules.f90' )
-      dep.source_file_dependencies 'two_modules.f90'
-    ensure
-      FileUtils.rm 'two_modules.f90'
-    end
-  end
-
 end

metadata

@@ -1,75 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fortran
-version: !ruby/object:Gem::Version 
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.3.0
 platform: ruby
-authors: 
+authors:
 - Bil Kleb
 - Mike Park
 - Bill Wood
 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: 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: Fortran 90/95/2003 utilities.  Currently, only provides Fortran 90/95/2003 dependencies.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.14'
+description: |-
+  Fortran utilities.
+
+  Currently, only provides Fortran 90/95/2003 dependencies.
 email: Bil.Kleb@NASA.gov
 executables: []
-
 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
 - lib/fortran.rb
 - test/test_fortran.rb
-has_rdoc: true
-homepage: http://nasarb.rubyforge.org/fortran
+homepage: https://rubygems.org/gems/fortran
+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: 
+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: []
-
-rubyforge_project: nasarb
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 2
-summary: Fortran 90/95/2003 utilities.
-test_files: 
-- test/lakos/test_analyze_dependencies.rb
-- test/test_fortran.rb
+specification_version: 4
+summary: Fortran utilities
+test_files: []

data/test/lakos/test_analyze_dependencies.rb

@@ -1,35 +0,0 @@
-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