ladder_converter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bdbf1d8ffd40e261a76df93ba59bfa11bc2d01c3
-  data.tar.gz: 374b5bb33728e8a1dc270ff7134ccdcce9d34ce5
+SHA256:
+  metadata.gz: 4235ce3af1d0bd3a947ee1f378ecd56d1fe5322ef6fb8c07401d14496810b896
+  data.tar.gz: 3360d36110694cd1d4efba24675a44fe0ae2858d798bca71dd50ca04839b804c
 SHA512:
-  metadata.gz: d353c76986aa8e88cf507af7fd920b9d5a50d75076c58d1bda1e25d7c89a1284a6e882f50ee1bf127db20f2fec0f5fb3556a08e7e99c659b091e11c9a498fce4
-  data.tar.gz: fb4a6eea270bbb0f7f488e7c8ae6e521e187ba4c097bf18eae7c2cbd56466861cd938294ccb1302b1319fae08a8aaca637fb86e6850bb74796e769adda97d401
+  metadata.gz: 81d69eeb8539a23d073ffc77a4be3c465ce29d0906fe6bbf33271c045a3cd463b5fa120db26e0474bb33058228ec9073d1f276dc00bfe644a9810494ac8d7e57
+  data.tar.gz: aa72168f6f99a5f8ab8e32cb51227abd19be6e45a7cc44c91a34a890904aabcac133af06790ba33a76304e25a470937b438dd2d7386e50b8d1b74ea03a10122f

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in ladder_converter.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in ladder_converter.gemspec
+gemspec

data/exe/ladder_converter

@@ -8,11 +8,19 @@ include LadderConverter
 @options = {ignore_unknown:true}
 
 opt = OptionParser.new do |opt|
-  opt.banner = 'Usage: ladder_converter source_file target_file'
+  opt.banner = 'Usage: ladder_converter source_file target_file [options]'
   opt.on('--[no-]ignore-unknown', "Skip a code if it's an unknown mnemonic or device. If set no- quit converting immediately.") {|v| @options[:ignore_unknown] = v }
+  opt.on('-f', '--force-converting', "Convert codes without querying to overwrite the target file.") {|v| @options[:force_converting] = v }
+  opt.on('-l file', '--logging-file file', "Set a path to write a logging file.") {|v| @options[:logging_file] = v }
+  opt.on('-v', '--version', "print the version number, then exit.") {|v| @options[:version] = v }
   opt.parse!(ARGV)
 end
 
+if @options[:version]
+  puts "Ladder Converter #{LadderConverter::VERSION}"
+  exit 0
+end
+
 unless ARGV.size == 2
   puts opt.help
   exit -1
@@ -26,14 +34,16 @@ unless File.exist? src_path
   exit -1
 end
 
-while File.exist? dst_path
-  print "Target file #{File.basename(dst_path)} is exist. Overwrite existing file (y/N) ? "
-  case STDIN.gets.chomp
-  when /^y$/i, /^yes$/i
-    break
-  when /^n$/i, /^no$/i
-    STDERR.puts "Abort converting!"
-    exit -1
+unless @options[:force_converting]
+  while File.exist? dst_path
+    print "Target file #{File.basename(dst_path)} is exist. Overwrite existing file (y/N) ? "
+    case STDIN.gets.chomp
+    when /^y$/i, /^yes$/i
+      break
+    when /^n$/i, /^no$/i
+      STDERR.puts "Abort converting!"
+      exit -1
+    end
   end
 end
 

data/lib/ladder_converter/kv_code.rb

@@ -44,7 +44,7 @@ module LadderConverter
         when /^D((ADD|SUB|MUL|DIV|INC|DEC)P)$/
           "#{own_mnemonic($1)}.D"
 
-        when 'MPS', 'MRD', 'MPP'
+        when 'MPS', 'MRD', 'MPP', 'NOP'
           mnemonic
 
 
@@ -80,7 +80,9 @@ module LadderConverter
              'LD<=', 'AND<=', 'OR<=',
              'LD>=', 'AND>=', 'OR>=',
              'CJ', 
-             'CALL'
+             'CALL',
+             'FMOV', 'BMOV',
+             'FOR', 'NEXT'
           mnemonic
         else
           n = {
@@ -117,7 +119,7 @@ module LadderConverter
           when /^M8001$/i # 常時OFF
             "CR2003"
           when /^([A-Z]+.+)(Z\d+)/
-            "#{$1}:#{conv_dev $2}"
+            "#{own_device $1}:#{own_device $2}"
           when /^Z(\d+)$/
             "Z#{($1.to_i + 1).to_s.rjust(2, '0')}"
           when /^MR|^DM/i
@@ -132,7 +134,7 @@ module LadderConverter
           when /^D/i
             device.gsub(/^D+/i, "DM")
           when /^K\d+([A-Z]+.+)/i
-            return conv_dev $1
+            return own_device $1
           when /^K\d+$/i
             device.gsub(/^K+/i, "#")
           when /^H(.+)/

data/lib/ladder_converter/ladder_converter.rb

@@ -1,3 +1,3 @@
-require 'plc_code'
-require 'kv_code'
+require 'plc_code'
+require 'kv_code'
 require 'mel2kv'

data/lib/ladder_converter/mel2kv.rb

@@ -7,12 +7,14 @@ class Mel2Kv
   attr_reader :codes
   attr_reader :converted
   attr_reader :src, :dst
+  attr_reader :logging_file
 
   attr_reader :ignore_unknown
 
   def initialize options={}
     @src = options[:src]
     @dst = options[:dst]
+    @logging_file = options[:logging_file]
     @ignore_unknown = options[:ignore_unknown]
     @codes = nil
   end
@@ -21,27 +23,37 @@ class Mel2Kv
     return false unless File.exist? @src
     return true if @codes
 
-    @codes = []
-    has_end = false
-    CSV.open(@src, "rb:BOM|UTF-16:UTF-8", headers:true, skip_lines:Regexp.new(/^[^\t]+$|PC情報:/), col_sep:"\t").each_with_index do |row, i|
-      begin
-        mnemonic = row["命令"]
-        device = row["I/O(デバイス)"]
-        case mnemonic
-        when ""
-          @codes.last.add_device device
-        when 'END', 'FEND'
-          unless has_end
+    begin
+      logfile = File.open(logging_file, "w") rescue nil
+
+      @codes = []
+      has_end = false
+      CSV.open(@src, "rb:BOM|UTF-16:UTF-8", headers:true, skip_lines:Regexp.new(/^[^\t]+$|PC情報:/), col_sep:"\t").each_with_index do |row, i|
+        begin
+          mnemonic = row["命令"]
+          device = row["I/O(デバイス)"]
+          case mnemonic
+          when 'NOP'
+            # Skip
+          when ""
+            @codes.last.add_device device
+          when 'END', 'FEND'
+            unless has_end
+              @codes << KvCode.new(mnemonic, [device])
+              has_end = true
+            end
+          else
             @codes << KvCode.new(mnemonic, [device])
-            has_end = true
           end
-        else
-          @codes << KvCode.new(mnemonic, [device])
+        rescue UnknownCodeError => e
+          mes = "[WARN] SKIPPED! : line #{i+(3+1)} : #{e}"
+          STDERR.puts mes
+          logfile.puts mes if logfile
+          raise unless ignore_unknown
         end
-      rescue UnknownCodeError => e
-        STDERR.puts "[WARN] SKIPPED! : line #{i+(3+1)} : #{e}"
-        raise unless ignore_unknown
       end
+    ensure
+      logfile.close if logfile
     end
   end
 

data/lib/ladder_converter/version.rb

@@ -1,3 +1,3 @@
 module LadderConverter
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ladder_converter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Katsuyoshi Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The Ladder converter is to convert a ladder program of PLC to another maker.