verilog 0.0.3 → 0.0.4

data/lib/verilog.rb

@@ -3,7 +3,8 @@ libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 module Verilog
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end
 
 require 'verilog/file'
+require 'verilog/path'

data/lib/verilog/file.rb

@@ -6,9 +6,19 @@ module Verilog
     attr_accessor :filename, :contents
 
     def initialize( filename, options={} )
-      @filename         = filename
+      @filename         = ::File.basename( filename )
       @options          = options
-      @options[:path] ||= ''
+
+      options[:path]  ||= ''
+      relative_path_added_with_file_name = filename.dup
+      #Remove the basename section of the filename
+      relative_path_added_with_file_name[@filename] = ''
+
+      @options[:path] = ::File.join( options[:path], relative_path_added_with_file_name )
+    end
+
+    def inspect
+      [":options => #{@options.inspect}", ":filename => #{@filename}", ":contents => #{@contents}"] 
     end
 
     #Alias method
@@ -35,11 +45,7 @@ module Verilog
     end
 
     def absolute_filename
-      if @options[:path] == ''
-        dir = @filename.dup
-      else
-        dir = ::File.join( @options[:path], @filename ) 
-      end
+      dir = ::File.join( @options[:path], @filename ) 
       dir = ::File.expand_path( dir )
 
       return dir

data/lib/verilog/path.rb

@@ -0,0 +1,56 @@
+
+module Verilog
+
+  class Path
+    attr_reader :files
+
+    def initialize( path="" )
+      @files = []
+      load_path( path )
+    end
+
+    def load_path( paths )
+      #path is single string or array of strings
+      paths.each do |path|
+        files = Dir.glob( ::File.join( path, '*.*') )
+        files.each do |file|
+          #Skip if Directory got passed *.* Filter
+          next if ::File.directory?( file )
+
+          file_name = ::File.basename(file)  
+          @files << Verilog::File.new(file_name, {:path => path})
+
+        end
+      end
+    end
+
+    def load_file file 
+      @files << Verilog::File.new( file )
+    end
+
+    def read_all
+      @files.each do |file|
+        file.read_from_disk
+      end
+    end
+
+    def find_by_module( name )
+      result = @files.select do |file|
+         file.module_name == name 
+      end
+
+      return result[0]
+    end
+
+    def includes_file( name )
+        @files.select { |file| file.includes.include?( name ) }
+    end
+
+    def instantiates_module( name )
+        @files.select { |file| file.instantiations.include?( name ) }
+    end
+
+  end
+
+end
+

data/spec/{verilog_spec.rb → verilog_file_spec.rb}

@@ -2,6 +2,14 @@ require 'spec_helper'
 require 'pp'
 
 describe Verilog do
+  it "Checking initialize equivalence, file and path verus absolute path" do
+    path = File.dirname( __FILE__ )
+
+    test_one = Verilog::File.new( File.join( path, 'fixtures', 'test_one.v' ) )
+    test_one.inspect.should == Verilog::File.new(  'test_one.v',{:path => File.join( path, 'fixtures')} ).inspect
+  end
+
+
 
   it "Open file, with path as oart of filename" do
     path = File.dirname( __FILE__ )

data/spec/verilog_path_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'pp'
+
+describe Verilog do
+
+  it "initialize with folder" do
+    path = File.dirname( __FILE__ )
+
+    test_one = Verilog::Path.new( File.join( path, 'fixtures' ) )
+    test_one.read_all
+
+    answer = Verilog::File.new( File.join( path, 'fixtures', 'test_one.v' ) )
+    answer.read
+    test_one.find_by_module( "TEST_ONE" ).inspect.should    == answer.inspect
+    
+  end
+  
+  it "initialize with no args" do
+    path = File.dirname( __FILE__ )
+
+    test_one = Verilog::Path.new( )
+    test_one.read_all
+
+    answer = nil# Verilog::File.new( File.join( path, 'fixtures', 'test_one.v' ) )
+    test_one.find_by_module( "TEST_ONE" ).inspect.should    == answer.inspect
+    
+  end
+  
+  it "initialize with no args, and load_file" do
+    path = File.dirname( __FILE__ )
+
+    test_one = Verilog::Path.new( )
+    test_one.load_file( File.join( path, 'fixtures', 'test_one.v' ) )
+    test_one.read_all
+
+    answer = Verilog::File.new( File.join( path, 'fixtures', 'test_one.v' ) )
+    answer.read
+    test_one.find_by_module( "TEST_ONE" ).inspect.should    == answer.inspect
+    
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: verilog
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Morgan Prior
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 +01:00
+date: 2011-10-25 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -32,12 +32,14 @@ files:
 - README.md
 - Rakefile
 - lib/verilog/file.rb
+- lib/verilog/path.rb
 - lib/verilog.rb
 - spec/fixtures/test_four.vh
 - spec/fixtures/test_one.v
 - spec/fixtures/test_three.v
 - spec/spec_helper.rb
-- spec/verilog_spec.rb
+- spec/verilog_file_spec.rb
+- spec/verilog_path_spec.rb
 has_rdoc: true
 homepage: http://amaras-tech.co.uk/software/verilog
 licenses: []