ladder_drive 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bd6ed103f79bb7083b861a6464f83c668dcbb5c14808d3e702cc5a4206c9c6b
-  data.tar.gz: e7c1f12717307d569f203f8c054413cf97c69e66c832247846f675f0405b9d4f
+  metadata.gz: 89e93e6ad6630128bf1a0996dd9de4c399e246acbb1c92615eb92fc83f0ec206
+  data.tar.gz: 5cb779d24babb0d23284276765c79e6edb27bbf1901d946eceb1a88a7b1cca99
 SHA512:
-  metadata.gz: f6b4b164bbeba262f1c57334955ea09e423662b6e63a1b502f953211df9640645731a3970316e376f4545f046a75db2c3c5a0d3705d16725dd033ce3156e3483
-  data.tar.gz: a0525951ac3a7d82a1b767806a0b59e2c5a7f95b55621e7ab7fd456689659d3f537f5c90f2baa3cc5cd618c536c66510ccb97cc2bc29b751a5b74a0e2b314518
+  metadata.gz: ea1e43769ad3deb7845a208c501906b2db81f04c9223ce7152f35d663ff5529cb44f2f8ebd0920f37443cb963715280bf8a69ac7efab3319504d218adc721b23
+  data.tar.gz: 59dae9cd3d5080ee2d7ce616951d05e1cf387c2e7920b8f3a2a2ce0411492ed662ae5da91517c69f99c9969fd3f82256049839e89f135bc5de99a89e59647091

data/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     ladder_drive (0.6.0)
       activesupport (~> 4.2, >= 4.2.7)
       ffi (~> 1.9.24, >= 1.9.24)
-      pi_piper (>= 2.0.0)
+      pi_piper (~> 2.0, >= 2.0.0)
       thor (~> 0)
 
 GEM
@@ -110,16 +110,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
+  activesupport (~> 4.2, >= 4.2.7)
   bundler (~> 1.11)
-  ffi
+  ffi (~> 1.9.24)
   google_drive
   ladder_drive!
-  pi_piper
+  pi_piper (>= 2.0.0)
   rake (~> 10.0)
   ruby-trello
   serialport
   test-unit
 
 BUNDLED WITH
-   1.16.6
+   1.17.2

data/README_jp.md

@@ -184,12 +184,6 @@ OUT M1
 <!-- [![](http://img.youtube.com/vi/qGbicGLB7Gs/0.jpg)](https://youtu.be/qGbicGLB7Gs) -->
 
 
-```warning: constant ::Fixnum is deprecated``` の表示が出る場合は次の様にしてみてください。
-
-```sh
-$ RUBYOPT="-W0" rake
-```
-
 ## Raspberry Pi
 
 Raspberry Pi上で動作させることもできます。

data/ladder_drive.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.7'
   spec.add_runtime_dependency 'ffi', '~> 1.9.24', '>= 1.9.24'
   spec.add_runtime_dependency 'pi_piper', '~> 2.0', '>= 2.0.0'
+  spec.add_runtime_dependency 'serialport'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"

data/lib/ladder_drive/cli.rb

@@ -33,7 +33,7 @@ module LadderDrive
     def create(name)
       if File.exist? name
         puts "ERROR: #{name} already exists."
-        exit -1
+        exit(-1)
       end
 
       # copy from template file
@@ -58,7 +58,7 @@ module LadderDrive
       path = File.join(plugins_path, "#{name}_plugin.rb")
       if File.exist? path
         mkdir_p "plugins"
-        cp path, "plugins/#{name}_plugins.rb"
+        cp path, "plugins/#{name}_plugin.rb"
       end
     end
 

data/lib/ladder_drive/console.rb

@@ -30,7 +30,6 @@ module LadderDrive
     include Singleton
 
     def run
-      l = true
       trap(:INT) { puts "\n> " }
 
       display_title

data/lib/ladder_drive/plc_device.rb

@@ -54,7 +54,7 @@ module LadderDrive
       @suffix = nil
       @value = 0
       case a
-      when Fixnum
+      when Integer
         @suffix = ESC_SUFFIXES[a]
         @number = b
       when String, Symbol
@@ -127,7 +127,7 @@ module LadderDrive
 
     def bool
       case @value
-      when Fixnum
+      when Integer
         @value != 0
       else
         !!@value

data/lib/ladder_drive/protocol/keyence/kv_protocol.rb

@@ -29,6 +29,7 @@ module Keyence
 
     def initialize options={}
       super
+      @socket = nil
       @host = options[:host] || "192.168.0.10"
       @port = options[:port] || 8501
       prepare_device_map
@@ -148,6 +149,7 @@ module Keyence
 
     def available_bits_range suffix=nil
       case suffix
+      # FIXME: duplicated
       when "TM"
         1..512
       when "TM"
@@ -167,13 +169,13 @@ module Keyence
 
     def available_words_range suffix=nil
       case suffix
+      # FIXME: duplicated
       when "TM"
         1..256
       when "TM"
         1..12
       when "T", "TC", "TS", "C", "CC", "CS"
         1..120
-        1..120
       when "CTH"
         1..2
       when "CTC"

data/lib/ladder_drive/protocol/mitsubishi/fx_protocol.rb

@@ -51,6 +51,7 @@ module Mitsubishi
       @baudrate = 19200
       @station_no = 0
       @wait_time = 0
+      @comm = nil
       #prepare_device_map
     end
 

data/lib/ladder_drive/protocol/mitsubishi/mc_protocol.rb

@@ -29,6 +29,7 @@ module Mitsubishi
 
     def initialize options={}
       super
+      @socket = nil
       @host = options[:host] || "192.168.0.10"
       @port = options[:port] || 5010
       prepare_device_map

data/lib/ladder_drive/protocol/protocol.rb

@@ -29,13 +29,17 @@ module Protocol
 
   class Protocol
 
-    attr_accessor :host, :port, :log_level
+    attr_accessor :host, :port
 
     def initialize options={}
       @logger = Logger.new(STDOUT)
       self.log_level = options[:log_level] || :info
     end
 
+    def log_level
+      @log_level
+    end
+
     def log_level= level
       @log_level = level.is_a?(String) ? level.to_sym : level
       case @log_level

data/lib/ladder_drive/uploader.rb

@@ -31,7 +31,6 @@ module LadderDrive
 
     attr_accessor :protocol
     attr_accessor :source
-    attr_accessor :data
 
     def initialize options={}
       @protocol = options[:protocol] if options[:protocol]

data/lib/ladder_drive/version.rb

@@ -22,5 +22,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module LadderDrive
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/plc/emulator/emu_device.rb

@@ -31,7 +31,7 @@ module Emulator
   class EmuDevice < PlcDevice
 
     attr_reader :in_value, :out_value
-    attr_accessor :plc
+    attr_reader :plc
 
     def initialize a, b = nil
       super

data/lib/plc/emulator/emu_plc.rb

@@ -63,6 +63,7 @@ module Emulator
       end
       @lock = Mutex.new
       @config = config
+      @pending_save = nil
       reset
       load_plugins
     end
@@ -341,12 +342,12 @@ module Emulator
         (SIZE_OF_BIT_STACK - 1).downto 0 do |i|
           values << stack_device(i).word
         end
-        v = values.pop
+        value = values.pop
         values.each_with_index do |v, i|
           stack_device(i).word = v
         end
         stack_count_device.word -= 1
-        v
+        value
       end
       # ----------------
 

data/lib/plc/emulator/plc_plugins.rb

@@ -85,11 +85,10 @@ class Plugin
   class << self
 
     def devices_with_plc_from_str plc, dev_str
-      devices = dev_str.split(",").map{|e| e.split("-")}.map do |devs|
+      dev_str.split(",").map{|e| e.split("-")}.map do |devs|
         devs = devs.map{|d| plc.device_by_name d.strip}
         d1 = devs.first
         d2 = devs.last
-        d = d1
         [d2.number - d1.number + 1, 1].max.times.inject([]){|a, i| a << d1; d1 += 1; a}
       end.flatten
     end
@@ -118,7 +117,7 @@ class Plugin
   end
 
   def disabled?
-    config[:disable]
+    config.empty? || config[:disable]
   end
 
   def run_cycle plc

data/plugins/google_drive_plugin.rb

@@ -65,127 +65,154 @@ DOC
 require 'net/https'
 require 'google_drive'
 
-def plugin_google_drive_init plc
-  @plugin_google_drive_config = load_plugin_config 'google_drive'
-  return if @plugin_google_drive_config[:disable]
-
-  @plugin_google_drive_values = {}
-  @plugin_google_drive_times = {}
-  @plugin_google_drive_worker_queue = Queue.new
-
-  begin
-    # generate config file for google drive session
-    tmp_dir = File.expand_path "tmp"
-    session_path = File.join(tmp_dir, "google_drive_session.json")
-    unless File.exist? session_path
-      mkdir_p tmp_dir
-      conf =
-        [:client_id, :client_secret, :refresh_token].inject({}) do |h, key|
-          v = @plugin_google_drive_config[key]
-          h[key] = v if v
-          h
-        end
-      File.write session_path, JSON.generate(conf)
-    end
+module LadderDrive
+module Emulator
 
-    # create google drive session
-    @plugin_google_drive_session = GoogleDrive::Session.from_config(session_path)
+class GoogleDrivePlugin < Plugin
 
-    # start worker thread
-    Thread.start {
-      plugin_google_drive_worker_loop
-    }
-  rescue => e
-    p e
-    @plugin_google_drive_session = nil
-  end
-end
+  def initialize plc
+    super #plc
+    return if disabled?
 
-def plugin_google_drive_exec plc
-  return if @plugin_google_drive_config[:disable]
-  return unless @plugin_google_drive_session
+    @values = {}
+    @times = {}
+    @worker_queue = Queue.new
 
-  @plugin_google_drive_config[:loggings].each do |logging|
     begin
-      # check triggered or not
-      triggered = false
-      case logging[:trigger][:type]
-      when "interval"
-        now = Time.now
-        t = @plugin_google_drive_times[logging.object_id] || now
-        triggered = t <= now
-        if triggered
-          t += logging[:trigger][:interval] || 300
-          @plugin_google_drive_times[logging.object_id] = t
-        end
-      else
-        d = plc.device_by_name logging[:trigger][:device]
-        v = d.send logging[:trigger][:value_type], logging[:trigger][:text_length] || 8
-        unless @plugin_google_drive_values[logging.object_id] == v
-          @plugin_google_drive_values[logging.object_id] = v
-          case logging[:trigger][:type]
-          when "raise"
-            triggered = !!v
-          when "fall"
-            triggered = !v
-          else
-            triggered = true
+      # generate config file for google drive session
+      tmp_dir = File.expand_path "tmp"
+      session_path = File.join(tmp_dir, "google_drive_session.json")
+      unless File.exist? session_path
+        mkdir_p tmp_dir
+        conf =
+          [:client_id, :client_secret, :access_token, :refresh_token].inject({}) do |h, key|
+            v = config[key]
+            h[key] = v if v
+            h
           end
-        end
+        File.write session_path, JSON.generate(conf)
       end
 
-      next unless triggered
+      # create google drive session
+      @session = GoogleDrive::Session.from_config(session_path)
 
-      # gether values
-      values = logging[:devices].map do |config|
-        d1, d2 = config[:device].split("-").map{|d| plc.device_by_name d}
-        devices = [d1]
-        if d2
-          d = d1 + 1
-          devices += [d2.number - d1.number, 0].max.times.inject([]){|a, i| a << d; d += 1; a}
-        end
-        devices.map{|d| d.send config[:type], config[:length] || 8}
-      end.flatten
-      @plugin_google_drive_worker_queue.push logging:logging, values:values, time:Time.now
+      # start worker thread
+      setup if @session
     rescue => e
       p e
+      @session = nil
+      exit(1)
     end
-  end if @plugin_google_drive_config[:loggings]
-end
 
-def plugin_google_drive_worker_loop
-  while arg = @plugin_google_drive_worker_queue.pop
-    begin
-      logging = arg[:logging]
-      spread_sheet = @plugin_google_drive_session.spreadsheet_by_key(logging[:spread_sheet][:spread_sheet_key])
+  end
 
-      # get worksheet
-      worksheet = begin
-        if logging[:spread_sheet][:sheet_name]
-          spread_sheet.worksheet_by_title logging[:spread_sheet][:sheet_name]
+  def run_cycle plc
+    return if disabled?
+    return unless @session
+
+    config[:loggings].each do |logging|
+      begin
+        # check triggered or not
+        triggered = false
+        case logging[:trigger][:type]
+        when "interval"
+          now = Time.now
+          t = @times[logging.object_id] || now
+          triggered = t <= now
+          if triggered
+            t += logging[:trigger][:interval] || 300
+            @times[logging.object_id] = t
+          end
         else
-          spread_sheet.worksheets[logging[:spread_sheet][:sheet_no] || 0]
+          d = plc.device_by_name logging[:trigger][:device]
+          v = d.send logging[:trigger][:value_type], logging[:trigger][:text_length] || 8
+          unless @values[logging.object_id] == v
+            @values[logging.object_id] = v
+            case logging[:trigger][:type]
+            when "raise"
+              triggered = !!v
+            when "fall"
+              triggered = !v
+            else
+              triggered = true
+            end
+          end
         end
+
+        next unless triggered
+
+        # gether values
+        values = logging[:devices].map do |config|
+          d1, d2 = config[:device].split("-").map{|d| plc.device_by_name d}
+          devices = [d1]
+          if d2
+            d3 = d1 + 1
+            devices += [d2.number - d1.number, 0].max.times.inject([]){|a, i| a << d3; d3 += 1; a}
+          end
+          devices.map{|d| d.send config[:type], config[:length] || 8}
+        end.flatten
+        @worker_queue.push logging:logging, values:values, time:Time.now
+      rescue => e
+        #p e, caller
       end
+    end if config[:loggings]
+  end
+
+  private
+
+    def setup
+      Thread.start {
+        thread_proc
+      }
+    end
+
+    def thread_proc
+      while arg = @worker_queue.pop
+        begin
+          logging = arg[:logging]
+          spread_sheet = @session.spreadsheet_by_key(logging[:spread_sheet][:spread_sheet_key])
+
+          # get worksheet
+          worksheet = begin
+            if logging[:spread_sheet][:sheet_name]
+              spread_sheet.worksheet_by_title logging[:spread_sheet][:sheet_name]
+            else
+              spread_sheet.worksheets[logging[:spread_sheet][:sheet_no] || 0]
+            end
+          end
+
+          # write columns if needs
+          if worksheet.num_rows == 0
+            worksheet[1, 1] = "Time"
+            logging[:columns].split(",").each_with_index do |t, i|
+              worksheet[1, i + 2] = t
+            end
+          end
 
-      # write columns if needs
-      if worksheet.num_rows == 0
-        worksheet[1, 1] = "Time"
-        logging[:columns].split(",").each_with_index do |t, i|
-          worksheet[1, i + 2] = t
+          # write values
+          r = worksheet.num_rows + 1
+          worksheet[r, 1] = arg[:time]
+          arg[:values].each_with_index do |v, i|
+            worksheet[r, i + 2] = v
+          end if arg[:values]
+          worksheet.save
+        rescue => e
+          # TODO: Resend if it fails.
+          #p e, caller
         end
       end
-
-      # write values
-      r = worksheet.num_rows + 1
-      worksheet[r, 1] = arg[:time]
-      arg[:values].each_with_index do |v, i|
-        worksheet[r, i + 2] = v
-      end if arg[:values]
-      worksheet.save
-    rescue => e
-      # TODO: Resend if it fails.
-      p e
     end
-  end
+
+end
+
+end
+end
+
+
+def plugin_google_drive_init plc
+  @google_drive_plugin = LadderDrive::Emulator::GoogleDrivePlugin.new plc
+end
+
+def plugin_google_drive_exec plc
+  @google_drive_plugin.run_cycle plc
 end

data/plugins/ifttt_plugin.rb

@@ -57,78 +57,111 @@ DOC
 
 require 'net/https'
 
-def plugin_ifttt_init plc
-  @plugin_ifttt_config = load_plugin_config 'ifttt'
-  return if @plugin_ifttt_config[:disable]
-
-  @plugin_ifttt_values = {}
-  @plugin_ifttt_times = {}
-  @plugin_ifttt_worker_queue = Queue.new
-  Thread.start {
-    plugin_ifttt_worker_loop
-  }
-end
+module LadderDrive
+module Emulator
 
-def plugin_ifttt_exec plc
-  return if @plugin_ifttt_config[:disable]
-  return unless @plugin_ifttt_config[:web_hook_key]
-
-  @plugin_ifttt_config[:events].each do |event|
-    begin
-      triggered = false
-      case event[:trigger][:type]
-      when "interval"
-        now = Time.now
-        t = @plugin_ifttt_times[event.object_id] || now
-        triggered = t <= now
-        if triggered
-          t += event[:trigger][:interval] || 300
-          @plugin_ifttt_times[event.object_id] = t
-        end
-      else
-        d = plc.device_by_name event[:trigger][:device]
-        v = d.send event[:trigger][:value_type], event[:trigger][:text_length] || 8
-        unless @plugin_ifttt_values[event.object_id] == v
-          @plugin_ifttt_values[event.object_id] = v
-          case event[:trigger][:type]
-          when "raise"
-            triggered = !!v
-          when "fall"
-            triggered = !v
-          else
-            triggered = true
+class IftttPlugin < Plugin
+
+  def initialize plc
+    super #plc
+    return if disabled?
+
+    @values = {}
+    @times = {}
+    @worker_queue = Queue.new
+    setup
+  end
+
+  def run_cycle plc
+    return if disabled?
+    config[:events].each do |event|
+      begin
+        triggered = false
+        case event[:trigger][:type]
+        when "interval"
+          now = Time.now
+          t = @times[event.object_id] || now
+          triggered = t <= now
+          if triggered
+            t += event[:trigger][:interval] || 300
+            @times[event.object_id] = t
+          end
+        else
+          d = plc.device_by_name event[:trigger][:device]
+          v = d.send event[:trigger][:value_type], event[:trigger][:text_length] || 8
+          unless @values[event.object_id] == v
+            @values[event.object_id] = v
+            case event[:trigger][:type]
+            when "raise"
+              triggered = !!v
+            when "fall"
+              triggered = !v
+            else
+              triggered = true
+            end
           end
         end
+
+        next unless triggered
+
+        @worker_queue.push event:event[:name], payload:event[:params].dup || {}, value:v
+      rescue => e
+        p e
       end
+    end if config[:events]
+  end
+
+  def disabled?
+    return false unless super
+    unless config[:web_hook_key]
+      puts "ERROR: IftttPlugin requires web_hook_key."
+      false
+    else
+      super
+    end
+  end
 
-      next unless triggered
 
-      @plugin_ifttt_worker_queue.push event:event[:name], payload:event[:params].dup || {}, value:v
-    rescue => e
-      p e
+  private
+
+    def setup
+      Thread.start {
+        thread_proc
+      }
     end
-  end if @plugin_ifttt_config[:events]
-end
 
-def plugin_ifttt_worker_loop
-  while arg = @plugin_ifttt_worker_queue.pop
-    begin
-      uri = URI.parse("https://maker.ifttt.com/trigger/#{arg[:event]}/with/key/#{@plugin_ifttt_config[:web_hook_key]}")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      req = Net::HTTP::Post.new(uri.path)
-      payload = arg[:payload]
-      payload.keys.each do |key|
-        payload[key] = arg[:value] if payload[key] == "__value__"
-      end
-      req.set_form_data(payload)
+    def thread_proc
+      while arg = @worker_queue.pop
+        begin
+          uri = URI.parse("https://maker.ifttt.com/trigger/#{arg[:event]}/with/key/#{config[:web_hook_key]}")
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+          req = Net::HTTP::Post.new(uri.path)
+          payload = arg[:payload]
+          payload.keys.each do |key|
+            payload[key] = arg[:value] if payload[key] == "__value__"
+          end
+          req.set_form_data(payload)
 
-      http.request(req)
-    rescue => e
-      # TODO: Resend if it fails.
-      p e
+          http.request(req)
+        rescue => e
+          # TODO: Resend if it fails.
+          p e
+        end
+      end
     end
-  end
+
+end
+
+end
+end
+
+def plugin_ifttt_init plc
+  @ifttt_plugin = LadderDrive::Emulator::IftttPlugin.new plc
+end
+
+def plugin_ifttt_exec plc
+  @ifttt_plugin.run_cycle plc
 end

data/plugins/plc_mapper_plugin.rb

@@ -54,13 +54,15 @@ class PlcMapperPlugin < Plugin
 
   def initialize plc
     super #plc
+    return if disabled?
     @lock = Mutex.new
     @values_for_reading = {}
     @values_for_writing = {}
-    setup
+    setup unless config.empty? || config[:disable]
   end
 
   def run_cycle plc
+    return if disabled?
     return false unless super
     @lock.synchronize {
       # set values from plcs to ladder drive.
@@ -81,8 +83,8 @@ class PlcMapperPlugin < Plugin
 
     def setup
       config[:plcs].each do |plc_config|
-        Thread.start(plc_config) {|plc_config|
-          mapping_thread_proc plc_config
+        Thread.start(plc_config) {|config|
+          mapping_thread_proc config
         }
       end
     end
@@ -102,7 +104,9 @@ class PlcMapperPlugin < Plugin
       mappings.map do |h|
         a = []
         h.each do |k, v|
-          devs = v.split("-").map{|d| protocol.device_by_name d.strip}
+          devs = v.split("-").map{|d|
+            protocol.device_by_name d.strip
+          }
           d1 = devs.first
           d2 = devs.last
           a << k
@@ -125,6 +129,7 @@ class PlcMapperPlugin < Plugin
         Time.at t
       end
 
+      alerted = false
       loop do
         begin
           now = Time.now
@@ -133,8 +138,10 @@ class PlcMapperPlugin < Plugin
             next_time += interval
           end
           sleep next_time - Time.now
-        rescue => e
-          puts e, caller
+          alerted = false
+        rescue
+          puts "#{config[:description]} is not reachable." unless alerted
+          alerted = true
         end
       end
     end

data/plugins/slack_plugin.rb

@@ -43,113 +43,139 @@ DOC
 
 require 'net/https'
 
-def plugin_slack_init plc
-  @plugin_slack_config = load_plugin_config 'slack'
-
-  @plugin_slack_values = {}
-  @plugin_slack_times = {}
-  @plugin_slack_worker_queue = Queue.new
-
-  # collect comments
-  @plugin_slack_comments = {}
-  @plugin_slack_config[:device_comments].each do |k, v|
-    d = plc.device_by_name(k)
-    @plugin_slack_comments[d.name] = v if d
-  end if @plugin_slack_config[:device_comments]
-
-  Thread.start {
-    plugin_slack_worker_loop
-  }
-end
 
-def plugin_slack_exec plc
-  return if @plugin_slack_config[:disable]
-
-  @plugin_slack_config[:events].each do |event|
-    next unless event[:devices]
-    next unless event[:webhook_url]
-    begin
-
-      # gether values
-      devices = event[:devices].split(",").map{|e| e.split("-")}.map do |devs|
-        devs = devs.map{|d| plc.device_by_name d.strip}
-        d1 = devs.first
-        d2 = devs.last
-        d = d1
-        [d2.number - d1.number + 1, 1].max.times.inject([]){|a, i| a << d1; d1 += 1; a}
-      end.flatten
-
-      interval_triggered = false
-      now = Time.now
-      devices.each do |device|
-        triggered = false
-        v = nil
-        case event[:trigger][:type]
-        when "interval"
-          t = @plugin_slack_times[event.object_id] || now
-          triggered = t <= now
-          if triggered
-            interval_triggered = true
-            t += event[:trigger][:interval] || 300
-            @plugin_slack_times[event.object_id] = t
-          end
-          v = device.send event[:value_type], event[:trigger][:text_length] || 8
-        else
-          v = device.send event[:value_type], event[:text_length] || 8
-          unless @plugin_slack_values[device.name] == v
-            @plugin_slack_values[device.name] = v
-            case event[:trigger][:type]
-            when "raise"
-              triggered = !!v
-            when "fall"
-              triggered = !v
-            else
-              triggered = true
+module LadderDrive
+module Emulator
+
+class SlackPlugin < Plugin
+
+  def initialize plc
+    super #plc
+    return if disabled?
+
+    @values = {}
+    @times = {}
+    @worker_queue = Queue.new
+
+    # collect comments
+    @comments = {}
+    config[:device_comments].each do |k, v|
+      d = plc.device_by_name(k)
+      @comments[d.name] = v if d
+    end if config[:device_comments]
+    setup
+  end
+
+  def run_cycle plc
+    return if disabled?
+    return unless config[:events]
+
+    config[:events].each do |event|
+      next unless event[:devices]
+      next unless event[:webhook_url]
+      begin
+
+        # gether values
+        devices = event[:devices].split(",").map{|e| e.split("-")}.map do |devs|
+          devs = devs.map{|d| plc.device_by_name d.strip}
+          d1 = devs.first
+          d2 = devs.last
+          [d2.number - d1.number + 1, 1].max.times.inject([]){|a, i| a << d1; d1 += 1; a}
+        end.flatten
+
+        interval_triggered = false
+        now = Time.now
+        devices.each do |device|
+          triggered = false
+          v = nil
+          case event[:trigger][:type]
+          when "interval"
+            t = @times[event.object_id] || now
+            triggered = t <= now
+            if triggered
+              interval_triggered = true
+              t += event[:trigger][:interval] || 300
+              @times[event.object_id] = t
+            end
+            v = device.send event[:value_type], event[:trigger][:text_length] || 8
+          else
+            v = device.send event[:value_type], event[:text_length] || 8
+            unless @values[device.name] == v
+              @values[device.name] = v
+              case event[:trigger][:type]
+              when "raise"
+                triggered = !!v
+              when "fall"
+                triggered = !v
+              else
+                triggered = true
+              end
             end
           end
+
+          next unless triggered || interval_triggered
+
+          @worker_queue.push event:event,
+                                          device_name:device.name,
+                                          value:v,
+                                          time: now
         end
+      rescue => e
+        p e
+      end
+    end
+  end
+
+  private
 
-        next unless triggered || interval_triggered
+    def setup
+      Thread.start {
+        thread_proc
+      }
+    end
 
-        @plugin_slack_worker_queue.push event:event,
-                                        device_name:device.name,
-                                        value:v,
-                                        time: now
+    def thread_proc
+      while arg = @worker_queue.pop
+        begin
+          event = arg[:event]
+          uri = URI.parse(event[:webhook_url])
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+          req = Net::HTTP::Post.new(uri.path)
+          req["Content-Type"] = "application/json"
+
+          format = event[:format] || "__comment__ occured at __time__"
+          format = arg[:value] ? format[:raise] : format[:fall] unless format.is_a? String
+
+          device_name = arg[:device_name]
+          comment = @comments[device_name] || device_name
+          value = arg[:value].to_s
+          time = arg[:time].iso8601
+
+          payload = {text:format.gsub(/__device_comment__/, comment).gsub(/__value__/, value).gsub(/__time__/, time).gsub(/__device_name__/, device_name)
+                    }
+          req.body = payload.to_json
+
+          http.request(req)
+        rescue => e
+          # TODO: Resend if it fails.
+          p e
+        end
       end
-    rescue => e
-      p e
     end
-  end if @plugin_slack_config[:events]
+
 end
 
-def plugin_slack_worker_loop
-  while arg = @plugin_slack_worker_queue.pop
-    begin
-      event = arg[:event]
-      uri = URI.parse(event[:webhook_url])
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      req = Net::HTTP::Post.new(uri.path)
-      req["Content-Type"] = "application/json"
-
-      format = event[:format] || "__comment__ occured at __time__"
-      format = arg[:value] ? format[:raise] : format[:fall] unless format.is_a? String
-
-      device_name = arg[:device_name]
-      comment = @plugin_slack_comments[device_name] || device_name
-      value = arg[:value].to_s
-      time = arg[:time].iso8601
-
-      payload = {text:format.gsub(/__device_comment__/, comment).gsub(/__value__/, value).gsub(/__time__/, time).gsub(/__device_name__/, device_name)
-                }
-      req.body = payload.to_json
-
-      http.request(req)
-    rescue => e
-      # TODO: Resend if it fails.
-      p e
-    end
-  end
+end
+end
+
+
+def plugin_slack_init plc
+  @slack_plugin = LadderDrive::Emulator::SlackPlugin.new plc
+end
+
+def plugin_slack_exec plc
+  @slack_plugin.run_cycle plc
 end

data/plugins/trello_plugin.rb

@@ -52,105 +52,122 @@ require 'trello'
 
 # @see https://qiita.com/tbpgr/items/60fc13aca8afd153e37b
 
-=begin
-Dotenv.load
 
-b =  Trello::Board.all.find{|b| b.name == "工程モニター"}
-pp b.lists.map{|l| {id:l.id, name:l.name, cards:l.cards.map{|c| {id:c.id, name:c.name}}}}
-=end
+module LadderDrive
+module Emulator
 
+class TrelloPlugin < Plugin
 
-def plugin_trello_init plc
-  @plugin_trello_config = load_plugin_config 'trello'
+  def initialize plc
+    super #plc
+    return if disabled?
 
-  @plugin_trello_values = {}
-  @plugin_trello_times = {}
-  @plugin_trello_worker_queue = Queue.new
+    @values = {}
+    @times = {}
+    @worker_queue = Queue.new
 
-  @plugin_trello_configured = Trello.configure do |config|
-    config.consumer_key = @plugin_trello_config[:consumer_key]
-    config.consumer_secret = @plugin_trello_config[:consumer_secret]
-    config.oauth_token = @plugin_trello_config[:oauth_token]
+    @configured = Trello.configure do |config|
+      config.consumer_key = self.config[:consumer_key]
+      config.consumer_secret = self.config[:consumer_secret]
+      config.oauth_token = self.config[:oauth_token]
+    end
+    setup
   end
 
-  Thread.start {
-    plugin_trello_worker_loop
-  }
-end
+  def run_cycle plc
+    return if disabled?
+    return if config[:events].nil?
 
-def plugin_trello_exec plc
-  return if @plugin_trello_config[:disable]
-#  return unless @plugin_trello_configured
-
-  @plugin_trello_config[:events].each do |event|
-    begin
-
-      triggered = false
-      now = Time.now
-      device = nil
-
-      case event[:trigger][:type]
-      when "interval"
-        t = @plugin_trello_times[event.object_id] || now
-        triggered = t <= now
-        if triggered
-          interval_triggered = true
-          t += event[:trigger][:interval] || 300
-          @plugin_trello_times[event.object_id] = t
-        end
-      else
-        device = plc.device_by_name event[:trigger][:device]
-        v = device.send event[:trigger][:value_type], event[:trigger][:text_length] || 8
-        unless @plugin_trello_values[device.name] == v
-          @plugin_trello_values[device.name] = v
-          case event[:trigger][:type]
-          when "raise"
-            triggered = !!v
-          when "fall"
-            triggered = !v
-          else
+    @config[:events].each do |event|
+      begin
+
+        triggered = false
+        now = Time.now
+        device = nil
+
+        case event[:trigger][:type]
+        when "interval"
+          t = @times[event.object_id] || now
+          triggered = t <= now
+          if triggered
             triggered = true
+            t += event[:trigger][:interval] || 300
+            @times[event.object_id] = t
+          end
+        else
+          device = plc.device_by_name event[:trigger][:device]
+          v = device.send event[:trigger][:value_type], event[:trigger][:text_length] || 8
+          unless @values[device.name] == v
+            @values[device.name] = v
+            case event[:trigger][:type]
+            when "raise"
+              triggered = !!v
+            when "fall"
+              triggered = !v
+            else
+              triggered = true
+            end
           end
         end
-      end
 
-      next unless triggered
+        next unless triggered
 
-      @plugin_trello_worker_queue.push event:event, device_name:device.name, value:v, time: now
+        @worker_queue.push event:event, device_name:device.name, value:v, time: now
 
-    rescue => e
-      p e
+      rescue => e
+        p e
+      end
     end
-  end if @plugin_trello_config[:events]
-end
+  end
+
+  private
 
-def plugin_trello_worker_loop
-  while arg = @plugin_trello_worker_queue.pop
-    begin
-      event = arg[:event]
+    def setup
+      Thread.start {
+        thread_proc
+      }
+    end
 
-      board =  Trello::Board.all.find{|b| b.name == event[:board_name]}
-      next unless board
+    def thread_proc
+      while arg = @worker_queue.pop
+        begin
+          event = arg[:event]
 
-      card_name = event[:card_name].dup || ""
-      card_name.gsub!(/__value__/, arg[:value] || "")
-      next if (card_name || "").empty?
+          board =  Trello::Board.all.find{|b| b.name == event[:board_name]}
+          next unless board
 
-      list_name = event[:list_name]
-      next unless list_name
-      list = board.lists.find{|l| l.name == list_name}
-      next unless list
+          card_name = event[:card_name].dup || ""
+          card_name.gsub!(/__value__/, arg[:value] || "")
+          next if (card_name || "").empty?
 
-      card = board.lists.map{|l| l.cards.map{|c| c}}.flatten.find{|c| c.name == card_name}
-      if card
-        card.move_to_list list
-      else
-        card = Trello::Card.create name:card_name, list_id:list.id
-      end
+          list_name = event[:list_name]
+          next unless list_name
+          list = board.lists.find{|l| l.name == list_name}
+          next unless list
 
-    rescue => e
-      # TODO: Resend if it fails.
-      p e
+          card = board.lists.map{|l| l.cards.map{|c| c}}.flatten.find{|c| c.name == card_name}
+          if card
+            card.move_to_list list
+          else
+            card = Trello::Card.create name:card_name, list_id:list.id
+          end
+
+        rescue => e
+          # TODO: Resend if it fails.
+          p e
+        end
+      end
     end
-  end
+
+end
+
+end
+end
+
+def plugin_trello_init plc
+  @trello_plugin = LadderDrive::Emulator::TrelloPlugin.new plc
+end
+
+def plugin_trello_exec plc
+  @trello_plugin.run_cycle plc
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ladder_drive
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Katsuyoshi Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -48,42 +48,56 @@ dependencies:
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.24
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.24
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.24
 - !ruby/object:Gem::Dependency
   name: pi_piper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: serialport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -224,8 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The ladder_drive is a simple abstract ladder for PLC (Programmable Logic