tallakt-plcutil 0.1.2 → 0.2.0

data/.gitignore

@@ -1 +1,2 @@
 *swp
+pkg/tallakt-plcutil-0.1.0.gem pkg/tallakt-plcutil-0.1.1.gem pkg/tallakt-plcutil-0.1.2.gem

data/History.txt

@@ -1,3 +1,9 @@
+== 0.2.0 2010-10-12
+
+* 1 enhancement
+	* Added the pl7tointouch command line tool
+
+
 == 0.0.4 2009-06-12
 
 * 1 minor enhancement

data/Manifest.txt

@@ -4,23 +4,26 @@ Manifest.txt
 README.rdoc
 Rakefile
 TODO
+VERSION
 bin
 bin/awlpp
 bin/intouchpp
+bin/pl7tointouch
 bin/s7tointouch
 lib
-lib/plcutil
-lib/plcutil/siemens
-lib/plcutil/siemens/awlfile.rb
-lib/plcutil/siemens/awl_pretty_print_runner.rb
-lib/plcutil/siemens/sdffile.rb
-lib/plcutil/siemens/step7_to_intouch_runner.rb
-lib/plcutil/wonderware
-lib/plcutil/wonderware/intouchfile.rb
-lib/plcutil/wonderware/intouch_pretty_print_runner.rb
-lib/plcutil/wonderware/standard_sections.yaml
-lib/plcutil.rb
-plcutil.gemspec
+lib/tallakt-plcutil
+lib/tallakt-plcutil/schneider
+lib/tallakt-plcutil/schneider/pl7_to_intouch_runner.rb
+lib/tallakt-plcutil/siemens
+lib/tallakt-plcutil/siemens/awlfile.rb
+lib/tallakt-plcutil/siemens/awl_pretty_print_runner.rb
+lib/tallakt-plcutil/siemens/sdffile.rb
+lib/tallakt-plcutil/siemens/step7_to_intouch_runner.rb
+lib/tallakt-plcutil/wonderware
+lib/tallakt-plcutil/wonderware/intouchfile.rb
+lib/tallakt-plcutil/wonderware/intouch_pretty_print_runner.rb
+lib/tallakt-plcutil/wonderware/standard_sections.yaml
+lib/tallakt-plcutil.rb
 script
 script/console
 script/console.cmd
@@ -28,9 +31,12 @@ script/destroy
 script/destroy.cmd
 script/generate
 script/generate.cmd
+tallakt-plcutil.gemspec
 test
+test/helper.rb
 test/input_files
 test/input_files/step7_v5.4
 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
+test/test_tallakt-plcutil.rb

data/README.rdoc

@@ -23,6 +23,10 @@ Convert a siemens IO list into a Wonderware Intouch (non IAS) DB import file
 
   s7tointouch -s SYMLIST.DBF -a SIEMENSPLC 00000007.AWL
 
+Convert a PL7 text export file to intouch CSV import file
+
+  pl7tointouch -i exported.txt -o importme.csv 
+
 The commands support the --help parameter for a full list of parameters
 
 
@@ -32,7 +36,7 @@ The commands support the --help parameter for a full list of parameters
 
 == INSTALL:
 
-  sudo gem sources -a http://gems.github.com
+  sudo gem gemcutter
   sudo gem install tallakt-plcutil
 
 

data/TODO

@@ -1,4 +1 @@
-- Create gemspec
-- README describing usage
-- RDoc comments
-- RSpec tests
+

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/pl7tointouch

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'tallakt-plcutil/schneider/pl7_to_intouch_runner'
+
+# try: pl7tointouch --help
+PlcUtil::PL7ToIntouchRunner.new ARGV
+

data/lib/tallakt-plcutil/schneider/pl7_to_intouch_runner.rb

@@ -0,0 +1,135 @@
+#!/usr/bin/ruby
+
+require 'optparse'
+require 'tallakt-plcutil/wonderware/intouchfile'
+require 'ostruct'
+
+module PlcUtil
+	# Command line tool to read and output an awl file
+	class PL7ToIntouchRunner
+		def initialize(command_line_arguments)
+      # standard command line options
+			@intouchoptions = {}
+			@output = nil
+			@input = nil
+			@symlistfile = nil
+      @access_name = nil
+      @pl7_tags = []
+      @prefix = nil
+      @alarm = false
+      @caps = false
+      @alarm_group = '$System'
+
+      # Parse command line options
+			option_parser.parse! command_line_arguments
+
+
+			if @input
+				File.open @input do |f|
+					read_pl7_file f
+				end
+			else
+				read_pl7_file $stdin
+			end
+
+      # Write to intouch file
+			if @output
+				File.open @output, 'w' do |f|
+					print_to_file f
+				end
+			else
+				print_to_file $stdout
+			end
+		end
+
+
+    def read_pl7_file(io)
+      io.each_line do |l|
+        mres = l.match /^%M(W)?(\d+)(:X(\d+))?\t(\S+)\t(\S+)(\t\"?([^\t"]*))?/
+        if mres
+          item = OpenStruct.new
+          item.is_word = mres[1]
+          item.index = mres[2].to_i
+          item.bit_index = mres[4] && mres[4].to_i
+          item.tagname = mres[5]
+          item.comment = mres[8]
+          @pl7_tags << item
+        end
+      end
+
+    end
+		
+    def make_alarm(io)
+      io.alarm_state = 'On'
+      io.alarm_comment = io.comment
+      io.group = @alarm_group
+    end
+
+		def print_to_file(f)
+      @intouchfile = IntouchFile.new nil, @intouchoptions
+
+      @pl7_tags.each do |item|
+        data = {:item_use_tagname => 'No', :comment => item.comment }
+        tag = (@prefix || '') + item.tagname
+        tag = tag.upcase if @caps
+
+        if item.bit_index
+          @intouchfile.new_io_disc(tag, data) do |io|
+            io.item_name = '%d:%02d' % [400001 + item.index, 16 - item.bit_index]
+            make_alarm(io) if @alarm
+          end
+        elsif item.is_word
+          @intouchfile.new_io_int(tag, data) do |io|
+            io.item_name = '%d S' % (item.index + 400001)
+          end
+        else
+          @intouchfile.new_io_disc(tag, data) do |io|
+            io.item_name = (item.index + 1).to_s
+            make_alarm(io) if @alarm
+          end
+        end
+      end
+
+      @intouchfile.write_csv f
+		end
+
+
+		def option_parser
+			OptionParser.new do |opts|
+				opts.banner = "Usage: pl7tointouch [options]"
+				opts.on("-a", "--access ACCESSNAME", String, "Set access name for all tags") do |access_name|
+          @intouchoptions[:access_name] = access_name
+				end
+				opts.on("-o", "--output FILE", String, "Output to specified file instead of", "standard output") do |output|
+					@output = output
+				end
+				opts.on("-i", "--input FILE", String, "Input from specified file instead of", "standard input") do |input|
+					@input = input
+				end
+				opts.on("--alarm", "Mark bit tags as alarms") do
+					@alarm = true
+				end
+				opts.on("-g", "--alarm-group GROUP", String, "Select intouch alarm group") do |alg|
+					@alarm_group = alg
+          @alarm = true
+				end
+				opts.on("--caps", "tag name in capital letters") do
+					@caps = true
+				end
+				opts.on("-p", "--prefix PREFIX", String, "Add PREFIX to tagname") do |prefix|
+					@prefix = prefix
+				end
+				opts.on_tail("-h", "--help", "Show this message") do
+					puts opts
+					exit
+				end
+        # --alarm --alarmgroup 
+			end	
+		end
+		
+		def show_help
+			puts option_parser
+		end
+	end
+end
+

data/tallakt-plcutil.gemspec

@@ -0,0 +1,79 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{tallakt-plcutil}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tallak Tveide"]
+  s.date = %q{2010-10-12}
+  s.description = %q{Ruby library for using Siemens and Intouch files}
+  s.email = %q{tallak@tveide.net}
+  s.executables = ["awlpp", "intouchpp", "pl7tointouch", "s7tointouch"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc",
+     "TODO"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "LICENSE",
+     "Manifest.txt",
+     "README.rdoc",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "bin/awlpp",
+     "bin/intouchpp",
+     "bin/pl7tointouch",
+     "bin/s7tointouch",
+     "lib/tallakt-plcutil.rb",
+     "lib/tallakt-plcutil/schneider/pl7_to_intouch_runner.rb",
+     "lib/tallakt-plcutil/siemens/awl_pretty_print_runner.rb",
+     "lib/tallakt-plcutil/siemens/awlfile.rb",
+     "lib/tallakt-plcutil/siemens/sdffile.rb",
+     "lib/tallakt-plcutil/siemens/step7_to_intouch_runner.rb",
+     "lib/tallakt-plcutil/wonderware/intouch_pretty_print_runner.rb",
+     "lib/tallakt-plcutil/wonderware/intouchfile.rb",
+     "lib/tallakt-plcutil/wonderware/standard_sections.yaml",
+     "script/console",
+     "script/console.cmd",
+     "script/destroy",
+     "script/destroy.cmd",
+     "script/generate",
+     "script/generate.cmd",
+     "tallakt-plcutil.gemspec",
+     "test/helper.rb",
+     "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",
+     "test/test_tallakt-plcutil.rb"
+  ]
+  s.homepage = %q{http://github.com/tallakt/plcutil}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Ruby PLC file library}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_tallakt-plcutil.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+  end
+end
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tallakt-plcutil
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tallak Tveide
@@ -9,30 +14,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +01:00
+date: 2010-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Ruby library for using Siemens and Intouch files
 email: tallak@tveide.net
 executables: 
 - awlpp
 - intouchpp
+- pl7tointouch
 - s7tointouch
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
+- TODO
 files: 
 - .gitignore
 - History.txt
@@ -44,8 +53,10 @@ files:
 - VERSION
 - bin/awlpp
 - bin/intouchpp
+- bin/pl7tointouch
 - bin/s7tointouch
 - lib/tallakt-plcutil.rb
+- lib/tallakt-plcutil/schneider/pl7_to_intouch_runner.rb
 - lib/tallakt-plcutil/siemens/awl_pretty_print_runner.rb
 - lib/tallakt-plcutil/siemens/awlfile.rb
 - lib/tallakt-plcutil/siemens/sdffile.rb
@@ -59,6 +70,7 @@ files:
 - script/destroy.cmd
 - script/generate
 - script/generate.cmd
+- tallakt-plcutil.gemspec
 - test/helper.rb
 - test/input_files/step7_v5.4/00000001.AWL
 - test/input_files/step7_v5.4/S7_pro2.zip
@@ -77,18 +89,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby PLC file library