ladder_drive 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b8a4c3fda62348e4b5e414860c9f3e9b26c962c
-  data.tar.gz: ed8bdb8780a0ba01078c741457b9c40e769c4743
+  metadata.gz: 4b731ff279520977d619483b357253a15205272c
+  data.tar.gz: a4c34a0845a577d90863425fe580dc88de6b35c9
 SHA512:
-  metadata.gz: 4d66f4ebbfc6ca268290c4915419b8413c71595bab618e45b3e52f0c470a6e1e8a6ab669179c232b5559b5e7d9ff3b52a2d7e0951488fe51f0536a82633d1179
-  data.tar.gz: 2fc3b6a350452c327c1e8d8336cd61812028f7f682e6ad74e84ee2a93cc751beb44666635aced2604c21d1581563680d4a64c62219cf8f571389893afe93d02f
+  metadata.gz: 5e905098c2fb5bc0ec527cce4ebf9987f1ebfd8dbf1957766034b29357f80e051186afbf41ad76b391d7d64caa798ce385038afec52013f8cfe143ebb1f6dbe7
+  data.tar.gz: 6c7e458870f0c73f5383dcd2ca46fbc5480f214892a9fb7ee0d840db16af15c1f30c9f965e86109e66d917b748902d83c1e5b02019da7f7f557a83768613573f

data/lib/ladder_drive/cli.rb

@@ -54,11 +54,23 @@ module LadderDrive
     desc "plugin", "Install the specified plugin."
     def plugin(name)
       root_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
-      plugins_path = File.join(root_dir, "plugins")
-      path = File.join(plugins_path, "#{name}_plugin.rb")
-      if File.exist? path
+
+      # copy plugin
+      plugins_dir = File.join(root_dir, "plugins")
+      plugin_path = File.join(plugins_dir, "#{name}_plugin.rb")
+      if File.exist? plugin_path
         mkdir_p "plugins"
-        cp path, "plugins/#{name}_plugin.rb"
+        cp plugin_path, "plugins/#{name}_plugin.rb"
+      end
+
+      # copy sample settings
+      config_dir = File.join(plugins_dir, "config")
+      config_path = File.join(config_dir, "#{name}.yaml.example")
+      if File.exist? config_path
+        dst_dir = "config/plugins"
+        mkdir_p dst_dir
+        dst_path = "config/plugins/#{name}.yaml.example"
+        cp config_path, dst_path unless File.exist? dst_path
       end
     end
 

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.5"
+  VERSION = "0.6.6"
 end

data/plugins/config/ambient.yaml.example

@@ -0,0 +1,34 @@
+# This is a sample setting for ambient plugin
+# Copy this file to ambient.yaml or rename.
+
+# If you want to disable this plugin, uncomment it.
+#disable: true
+
+# Configure ambient channels
+# Set the Ambient channel, which is to send data you want to.
+channels:
+
+  # set ambient configuration.
+  # We recommend setting write_key from an environment variable.
+  - channel_id: 12824
+    write_key: <%= ENV['AMBIENT_WRITE_KEY'] %>
+
+    # Set trigger conditions
+    # You can use type raise, fall, raise_and_fall, changed, and interval.
+    triggers:
+      - type: raise_and_fall
+        device: M100
+      - type: interval
+        interval: 60
+
+    # Set data to send, if triggered.
+    devices:
+      d1:
+        device: D10
+        value_type: value
+      d2:
+        device: D11
+        value_type: value
+      d3:
+        device: D12
+        value_type: value

data/plugins/config/google_drive.yaml.example

@@ -0,0 +1,39 @@
+# This is a sample setting for google drive plugin
+# Copy this file to google_drive.yaml or rename.
+
+# If you want to disable this plugin, uncomment it.
+#disable: true
+
+# Api configuration.
+client_id: <%= ENV['GOOGLE_CLIENT_ID'] %>
+client_secret: <%= ENV['GOOGLE_CLIENT_SECRET'] %>
+access_token: <%= ENV['GOOGLE_ACCESS_TOKEN'] %>
+refresh_token: <%= ENV['GOOGLE_REFRESH_TOKEN'] %>
+
+# Logging setting
+loggings:
+  - name: temperature
+
+    # Set trigger conditions
+    # You can use type raise, fall, raise_and_fall, changed, and interval.
+    trigger:
+      device: M0
+      type: raise_and_fall
+      value_type: bool
+
+    # Column header
+    columns: D0,D1,D2,D3,D4,D5,D6,D7,D8,D9,D20,M0
+
+    # Devices for logging
+    devices:
+      - device: D0-D9
+        type: value
+      - device: D20
+        type: value
+      - device: M0
+        type: bool
+
+    # Spreadsheet to access
+    spread_sheet:
+      spread_sheet_key: <%= ENV['GOOGLE_SPREADSHEET_KEY'] %>
+      sheet_no: 0

data/plugins/config/ifttt.yaml.example

@@ -0,0 +1,24 @@
+# This is a sample setting for ifttt plugin
+# Copy this file to ifttt.yaml or rename.
+
+# If you want to disable this plugin, uncomment it.
+#disable: true
+
+# Set webhook key of Webhooks service for IFTTT.
+# To see your webhook key, to open https://ifttt.com/maker_webhook
+# and click the Documentation link.
+# We recommend setting web_hook_key from an environment variable.
+web_hook_key: <%= ENV['IFTTT_WEBHOOK_KEY'] %>
+
+# Set trigger event of webhook.
+# Set event name to name attribute.
+# Pass values to the params to display information.
+events:
+  - name: rubyworldconference2019
+    trigger:
+      type: raise
+      device: M100
+    params:
+      value1: Abnormal temperature
+      value2: Something additional information.
+      value3: and more.

data/plugins/config/plc_mapper.yaml.example

@@ -0,0 +1,36 @@
+# This is a sample setting for Plc mapper plugin
+# Copy this file to plc_mapper.yaml or rename.
+
+# If you want to disable this plugin, uncomment it.
+#disable: true
+
+# This is a sample setting for Plc mapper plugin
+plcs:
+  - description: Machine A-123
+
+    # Set connection conditions between PLC
+    protocol: mc_protocol
+    host: 192.168.1.10
+    port: 5010
+    interval: 10
+
+    # Set address mapping.
+    mapping:
+
+      # Read from PLC to set Ladder drive.
+      # plc: PLC address area
+      # ld: Ladder drive area
+      read:
+        - plc: M1000-M1099
+          ld: M0
+        - plc: D1000-D1099
+          ld: D0
+      # Read from Ladder drive to set PLC.
+      # plc: PLC address area
+      # ld: Ladder drive area
+      write:
+        # LadderDrive address: PLC address
+        - plc: M100-M199
+          ld: M1100
+        - plc: D100-D199
+          ld: D1100

data/plugins/config/slack.yaml.example

@@ -0,0 +1,36 @@
+# This is a sample setting for Slack plugin
+# Copy this file to slack.yaml or rename.
+
+# If you want to disable this plugin, uncomment it.
+#disable: true
+
+# Define comment for a device
+device_comments:
+  M210: Full error
+  D10: Running
+
+# Event setting
+events:
+
+  # Set webhook url for IFTTT.
+  # We recommend setting web_hook_key from an environment variable.
+  - webhook_url: <%= ENV['SLACK_WEBHOOK_NOTIFICATION_URL'] %>
+
+    # Set trigger conditions
+    # You can use type raise, fall, raise_and_fall, changed, and interval.
+    trigger:
+      type: raise_and_fall
+
+    # String format to send Slack.
+    format:
+      raise: __device_comment__ has occurred at __time__ .
+      fall: __device_comment__ was reset at __time__ .
+    devices: M210
+
+  - webhook_url: <%= ENV['SLACK_WEBHOOK_URL'] %>
+    trigger:
+      type: raise_and_fall
+    format:
+      raise: Start __device_comment__ at __time__ .
+      fall: Stop __device_comment__ at __time__ .
+    devices: M100

data/plugins/config/trello.yaml.example

@@ -0,0 +1,41 @@
+# This is a sample setting for Trello plugin
+# Copy this file to trello.yaml or rename.
+
+# If you want to disable this plugin, uncomment it.
+#disable: true
+
+# Connection configuration.
+consumer_key: <%= ENV['TRELLO_CONSUMER_KEY'] %>
+consumer_secret: <%= ENV['TRELLO_CONSUMMER_SECRET'] %>
+oauth_token: <%= ENV['TRELLO_OAUTH_TOKEN'] %>
+
+events:
+
+  # Set trigger conditions
+  # You can use type raise, fall, raise_and_fall, changed, and interval.
+  - trigger:
+      device: M100
+      type: raise
+
+    # Board name
+    board_name: Floor 1
+    # List name.
+    # If you set it, move the card into this list.
+    list_name: RUNNING
+    # Card name.
+    card_name: Machine A
+
+    # color label
+    color:
+      # Add color label
+      add: green
+
+  - trigger:
+      device: M100
+      type: fall
+    board_name: Floor 1
+    list_name: STOPPING
+    card_name: Machine A
+    color:
+      # Remove color label
+      remove: green

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,7 +98,7 @@ class SlackPlugin < Plugin
               t += event[:trigger][:interval] || 300
               @times[event.object_id] = t
             end
-            v = device.send event[:value_type] || :device, event[:trigger][:text_length] || 8
+            v = device.send event[:value_type] || :value, event[:trigger][:text_length] || 8
           else
             v = device.send event[:value_type] || :value, event[:text_length] || 8
             unless @values[device.name] == v
@@ -149,7 +150,15 @@ puts $@
           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

@@ -102,6 +102,11 @@ puts $@
       }
     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
@@ -114,16 +119,23 @@ puts $@
           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.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
+          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
+
+          # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ladder_drive
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Katsuyoshi Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -279,6 +279,12 @@ files:
 - 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