ladder_drive 0.6.3 → 0.6.7

data/plugins/slack_plugin.rb

@@ -90,6 +90,7 @@ class SlackPlugin < Plugin
           v = nil
           case event[:trigger][:type]
           when "interval"
+
             t = @times[event.object_id] || now
             triggered = t <= now
             if triggered
@@ -97,9 +98,9 @@ class SlackPlugin < Plugin
               t += event[:trigger][:interval] || 300
               @times[event.object_id] = t
             end
-            v = device.send event[:value_type], event[:trigger][:text_length] || 8
+            v = device.send event[:value_type] || :value, event[:trigger][:text_length] || 8
           else
-            v = device.send event[:value_type], event[:text_length] || 8
+            v = device.send event[:value_type] || :value, event[:text_length] || 8
             unless @values[device.name] == v
               @values[device.name] = v
               case event[:trigger][:type]
@@ -122,6 +123,8 @@ class SlackPlugin < Plugin
         end
       rescue => e
         p e
+puts $!
+puts $@
       end
     end
   end
@@ -147,7 +150,15 @@ class SlackPlugin < Plugin
           req["Content-Type"] = "application/json"
 
           format = event[:format] || "__comment__ occured at __time__"
-          format = arg[:value] ? format[:raise] : format[:fall] unless format.is_a? String
+          case format
+          when Hash
+            case arg[:value]
+            when false, nil, 0
+              format = format[:fall]
+            else
+              format = format[:interval] || format[:raise]
+            end
+          end
 
           device_name = arg[:device_name]
           comment = @comments[device_name] || device_name

data/plugins/trello_plugin.rb

@@ -80,42 +80,16 @@ class TrelloPlugin < Plugin
 
     @config[:events].each do |event|
       begin
+        next unless self.triggered?(event)
 
-        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
-
-        next unless triggered
-
-        @worker_queue.push event:event, device_name:device.name, value:v, time: now
+        device = trigger_state_for(event).device
+        v = trigger_state_for(event).value
+        @worker_queue.push event:event, device_name:device.name, value:v, time: Time.now
 
       rescue => e
         p e
+puts $!
+puts $@
       end
     end
   end
@@ -128,6 +102,11 @@ class TrelloPlugin < Plugin
       }
     end
 
+    def label_in_board_with_color board, color
+      l = board.labels.find{|l| l.name == color}
+      l ||= Trello::Label.create board_id:board.id, name:color, color:color
+    end
+
     def thread_proc
       while arg = @worker_queue.pop
         begin
@@ -137,24 +116,33 @@ class TrelloPlugin < Plugin
           next unless board
 
           card_name = event[:card_name].dup || ""
-          card_name.gsub!(/__value__/, arg[:value] || "")
+          card_name.gsub!(/__value__/, arg[:value] || "") if arg[:value].is_a? String
           next if (card_name || "").empty?
 
-          list_name = event[:list_name]
-          next unless list_name
-          list = board.lists.find{|l| l.name == list_name}
-          next unless list
+          card = board.cards.find{|c| c.name == card_name}
+          card ||= Trello::Card.create name:card_name
+
+          # move card into a list
+          list = board.lists.find{|l| l.name == event[:list_name]} if event[:list_name]
+          card.move_to_list list if list
 
-          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
+          # set color label
+          if event[:color]
+            if event[:color][:add]
+              label = label_in_board_with_color board, event[:color][:add]
+              card.add_label label
+            end
+            if event[:color][:remove]
+              label = label_in_board_with_color board, event[:color][:remove]
+              card.remove_label label
+            end
           end
 
         rescue => e
           # TODO: Resend if it fails.
           p e
+puts $!
+puts $@
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ladder_drive
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.7
 platform: ruby
 authors:
 - Katsuyoshi Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,21 +30,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.24
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.24
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.24
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.24
@@ -82,16 +82,42 @@ dependencies:
   name: serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: ambient_iot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: google_drive
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +125,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,6 +135,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: ruby-trello
   requirement: !ruby/object:Gem::Requirement
@@ -121,19 +153,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
+        version: '2.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +236,10 @@ files:
 - lib/ladder_drive/protocol/mitsubishi/mc_protocol.rb
 - lib/ladder_drive/protocol/mitsubishi/mitsubishi.rb
 - lib/ladder_drive/protocol/mitsubishi/qdevice.rb
+- lib/ladder_drive/protocol/omron/c_mode_protocol.rb
+- lib/ladder_drive/protocol/omron/fins_tcp_protocol.rb
+- lib/ladder_drive/protocol/omron/omron.rb
+- lib/ladder_drive/protocol/omron/omron_device.rb
 - lib/ladder_drive/protocol/protocol.rb
 - lib/ladder_drive/tasks/build.rb
 - lib/ladder_drive/uploader.rb
@@ -200,6 +250,7 @@ files:
 - lib/plc/emulator/emu_plc_server.rb
 - lib/plc/emulator/emulator.rb
 - lib/plc/emulator/plc_plugins.rb
+- lib/plc/emulator/plugin_trigger_state.rb
 - lib/plc/keyence/kv/kv-5000/DocumentWindowInfo.xml
 - lib/plc/keyence/kv/kv-5000/KvsMon.ini
 - lib/plc/keyence/kv/kv-5000/LadderDrive.mod
@@ -226,7 +277,14 @@ files:
 - lib/plc/raspberrypi/raspberrypi.rb
 - lib/plc/raspberrypi/raspberrypi_plc.rb
 - lib/plc/raspberrypi/raspberrypi_plc_server.rb
+- plugins/ambient_plugin.rb
 - plugins/blank_plugin.rb
+- plugins/config/ambient.yaml.example
+- plugins/config/google_drive.yaml.example
+- plugins/config/ifttt.yaml.example
+- plugins/config/plc_mapper.yaml.example
+- plugins/config/slack.yaml.example
+- plugins/config/trello.yaml.example
 - plugins/google_drive_plugin.rb
 - plugins/ifttt_plugin.rb
 - plugins/plc_mapper_plugin.rb
@@ -253,15 +311,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The ladder_drive is a simple abstract ladder for PLC (Programmable Logic