tallakt-plcutil 0.2.10 → 0.2.11

data/bin/symlist

@@ -2,10 +2,6 @@
 
 require 'dbf'
 
-symlists_file = ARGV.shift
-
-raise "Please specify the name of the project's SYMLISTS.DBF file as parameter" unless symlists_file && symlists_file.match(/SYMLISTS[.]DBF/i)
-
 class Tag
   attr_reader :name, :address, :comment, :type
 
@@ -14,23 +10,40 @@ class Tag
   end
 end
 
-symlists = DBF::Table.new symlists_file
-files = symlists.map {|record| [record['_UNAME'], record['_DBPATH']] unless record['_DELETED'] }.compact
 
-tags = []
-files.each do |uname, dbpath|
-  fn = File.join(File.dirname(symlists_file), dbpath, 'SYMLIST.DBF')
-  symlist = DBF::Table.new fn
-  symlist.each do |rec|
-    tags << Tag.new(rec['_SKZ'], rec['_DATATYP'], rec['_OPIEC'], rec['_COMMENT']) if rec
+def print_symlist(symlists_file)
+  symlists = DBF::Table.new symlists_file
+  files = symlists.map {|record| [record['_UNAME'], record['_DBPATH']] unless record['_DELETED'] }.compact
+
+  tags = []
+  files.each do |uname, dbpath|
+    fn = File.join(File.dirname(symlists_file), dbpath, 'SYMLIST.DBF')
+    symlist = DBF::Table.new fn
+    symlist.each do |rec|
+      tags << Tag.new(rec['_SKZ'], rec['_DATATYP'], rec['_OPIEC'], rec['_COMMENT']) if rec
+    end
+  end
+
+  tags.each do |t|
+    typ = if t.type == t.address
+          ''
+        else
+          t.type
+        end
+    puts '%-24s%-12s%-13s%s' % [t.name, typ, t.address, t.comment]
   end
 end
 
-tags.each do |t|
-  typ = if t.type == t.address
-        ''
-      else
-        t.type
-      end
-  puts '%-24s%-12s%-13s%s' % [t.name, typ, t.address, t.comment]
+s7_folder = ARGV.shift || '.'
+symlists_files = Dir::glob(File.join(s7_folder, '**', 'SYMLISTS.DBF'))
+
+if symlists_files.size == 1
+  print_symlist symlists_files.first
+else
+  STDERR.puts "Please specify the Step 7 project folder"
+  if symlists_files.any?
+    STDERR.puts 'Possible options:'
+    symlists_files.each {|f| STDERR.puts "   #{File.dirname(File.dirname f)}" }
+  end
 end
+

data/lib/plcutil.rb

@@ -3,6 +3,6 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module PlcUtil
-  VERSION = '0.2.10'
+  VERSION = '0.2.11'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tallakt-plcutil
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby PLC file library
@@ -147,4 +147,3 @@ test_files:
 - test/input_files/step7_v5.4/00000001.AWL
 - test/input_files/step7_v5.4/S7_pro2.zip
 - test/input_files/step7_v5.4/SYMLIST.DBF
-has_rdoc: