ladder_drive 0.6.3 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ebbe6a801c62fb7bf390b50e904186de6c8a54d4
-  data.tar.gz: 65bc6883680145868f3bec1b333d76760fee2eb0
+SHA256:
+  metadata.gz: 4b46aba6a1c2e5ec981226750e08bd8bf08bc30e8a26f6a225f2dcfd921e0262
+  data.tar.gz: 49c7ea2044feb923c3c2f905e20a653ec313195b04de2368ed1fca629cd800db
 SHA512:
-  metadata.gz: 2a78ed56aecb16bb8a4bdf5275acdf6b5f551cc62bce2efd6512160e79aa5c0d9757eb9eed6419f419bb5eba4f13fcc44e6ead4d4b9cc6cdb4cb4277b8ad150b
-  data.tar.gz: 885041e935159cc775be45f6f8d0d46a148f74739c7b24fea1ccf8c4f4e5627f3be0b0b1cbbdd2fb92c6176defefadb949e55cf8e25848a76d10dde54c577f49
+  metadata.gz: b7c62e3002101eccb744165505c4b86cda09e0584bafd47dea8d85c94a50c6f0f02f5e5ac8b40fbfad648b9b1073be578e9b6003262f8a76395544083d7364a5
+  data.tar.gz: ff89eac27a06e14e4fd1150a206a2602e9d70d0e73f279cbdad539a9f6b991122e3531e89cdc1c6fbed8782fa0c1faf272516ca2bc4234a793e1bdc014df578a

data/Gemfile

@@ -3,9 +3,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ladder_drive.gemspec
 gemspec
 
-gem "test-unit"
+group :test do
+  gem "test-unit"
+  gem "test-unit-rr"
+end
 
-gem "activesupport", '~> 5.0'
+gem "activesupport", '>= 4.0'
 
 gem 'pi_piper', ">=  2.0.0"
 gem "ffi", "~> 1.9.24"
@@ -13,3 +16,5 @@ gem "ffi", "~> 1.9.24"
 gem 'serialport'
 gem 'google_drive'
 gem "ruby-trello"
+gem 'ambient_iot', ">= 0.1.1"
+gem 'dotenv'

data/Gemfile.lock

@@ -1,125 +1,170 @@
 PATH
   remote: .
   specs:
-    ladder_drive (0.6.1)
-      activesupport (~> 5.0)
-      ffi (~> 1.9.24, >= 1.9.24)
+    ladder_drive (0.6.6)
+      activesupport (~> 6.0)
+      ambient_iot (~> 0.1, >= 0.1.1)
+      dotenv (~> 2.1)
+      ffi (~> 1.9, >= 1.9.24)
+      google_drive (~> 3.0, >= 3.0.3)
       pi_piper (~> 2.0, >= 2.0.0)
-      serialport
+      ruby-trello (~> 2.1)
+      serialport (~> 1.3, >= 1.3.1)
       thor (~> 0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    concurrent-ruby (1.1.5)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    domain_name (0.5.20180417)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ambient_iot (0.1.1)
+    concurrent-ruby (1.1.9)
+    declarative (0.0.20)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.6)
     eventmachine (1.0.9)
-    faraday (0.15.4)
+    faraday (1.7.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     ffi (1.9.25)
-    google-api-client (0.28.7)
+    google-apis-core (0.4.1)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.10.0)
-      httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.10)
-    google_drive (3.0.2)
-      google-api-client (>= 0.11.0, < 0.29.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+      webrick
+    google-apis-drive_v3 (0.13.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-sheets_v4 (0.9.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google_drive (3.0.7)
+      google-apis-drive_v3 (>= 0.5.0, < 1.0.0)
+      google-apis-sheets_v4 (>= 0.4.0, < 1.0.0)
       googleauth (>= 0.5.0, < 1.0.0)
       nokogiri (>= 1.5.3, < 2.0.0)
-    googleauth (0.8.1)
-      faraday (~> 0.12)
+    googleauth (0.17.0)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
-    http-cookie (1.0.3)
+      signet (~> 0.14)
+    http-accept (1.7.0)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.6.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json (2.2.0)
-    jwt (2.1.0)
-    memoist (0.16.0)
-    mime-types (3.2.2)
+    json (2.5.1)
+    jwt (2.2.3)
+    memoist (0.16.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
+    mime-types-data (3.2021.0704)
+    mini_mime (1.1.1)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
     netrc (0.11.0)
-    nokogiri (1.10.3)
-      mini_portile2 (~> 2.4.0)
-    oauth (0.5.4)
-    os (1.0.0)
+    nokogiri (1.12.3)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    oauth (0.5.6)
+    os (1.1.1)
     pi_piper (2.0.0)
       eventmachine (= 1.0.9)
       ffi
-    power_assert (1.1.4)
-    public_suffix (3.0.3)
+    power_assert (2.0.0)
+    public_suffix (4.0.6)
+    racc (1.5.2)
     rake (10.5.0)
-    representable (3.0.4)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
-    ruby-trello (2.1.0)
+    rexml (3.2.5)
+    rr (3.0.7)
+    ruby-trello (2.3.1)
       activemodel (>= 3.2.0)
       addressable (~> 2.3)
-      json
+      json (>= 2.3.0)
       oauth (>= 0.4.5)
       rest-client (>= 1.8.0)
+    ruby2_keywords (0.0.5)
     serialport (1.3.1)
-    signet (0.11.0)
+    signet (0.15.0)
       addressable (~> 2.3)
-      faraday (~> 0.9)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    test-unit (3.3.2)
+    test-unit (3.4.4)
       power_assert
+    test-unit-rr (1.0.5)
+      rr (>= 1.1.1)
+      test-unit (>= 2.5.2)
     thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    trailblazer-option (0.1.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
+    webrick (1.7.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  bundler (~> 1.11)
-  ffi
+  activesupport (>= 4.0)
+  ambient_iot (>= 0.1.1)
+  bundler
+  dotenv
+  ffi (~> 1.9.24)
   google_drive
   ladder_drive!
-  pi_piper
+  pi_piper (>= 2.0.0)
   rake (~> 10.0)
   ruby-trello
   serialport
   test-unit
+  test-unit-rr
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/README.md

@@ -298,6 +298,7 @@ $ ladder_drive plugin plugin_name
 |plc_mapper|Share other PLCs data with Ladder drive device.|
 |slack|Cast the data to the Slack.|
 |trello|Move the card of Trello to specified list.|
+|ambient|Writing data to Ambient.|
 
 
 

data/README_jp.md

@@ -36,8 +36,7 @@ $ cd my_project
 
 ファイルの構成は下の様になっています。
 plc以下にLadderDriveを実行するPLCプロジェクトの雛形があります。
-現在はエミュレーターと三菱電機のiQ-RシリーズR08CPUのみの対応となっています。
-他メーカーや他の機種は今後追加する予定です。
+現在はエミュレーターと三菱電機のiQ-RシリーズR08CPU、キーエンスKV-5000のみの対応となっています。
 
 
 ```
@@ -310,6 +309,7 @@ Ladder DriveをIoT Gateway として機能させるプラグインになりま
 |plc_mapper|複数のPLCのデータをLadder Driveのメモリーに展開します。|
 |slack|Slackにデータの変化を記録します。|
 |trello|trelloのカードを指定のリストに移動します。|
+|ambient|Ambientにデータの変化を記録します。|
 
 これらの用意されているプラグインをインストールするには
 

data/ladder_drive.gemspec

@@ -14,21 +14,25 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ito-soft-design/ladder_drive"
   spec.license       = "MIT"
 
-  spec.add_runtime_dependency 'thor', '~> 0'
-  spec.add_runtime_dependency 'activesupport', '~> 5.0'#, '>= 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.add_runtime_dependency 'google_drive', '~> 3.0'
-  spec.add_runtime_dependency 'ruby-trello', '~>2.1'
+  spec.add_runtime_dependency 'thor',           '~> 0'
+  spec.add_runtime_dependency 'activesupport',  '~> 6.0'
+  spec.add_runtime_dependency 'ffi',            '~> 1.9', '>= 1.9.24'
+  spec.add_runtime_dependency 'pi_piper',       '~> 2.0', '>= 2.0.0'
 
+  spec.add_runtime_dependency 'serialport',     '~> 1.3', '>= 1.3.1'
+  spec.add_runtime_dependency 'ambient_iot',    '~> 0.1', '>= 0.1.1'
+  spec.add_runtime_dependency 'google_drive',   '~> 3.0', '>= 3.0.3'
+  spec.add_runtime_dependency 'ruby-trello',    '~>2.1'
+  spec.add_runtime_dependency 'dotenv',    '~>2.1'
+
+  spec.required_ruby_version = '>= 2.3.3'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
 
 end

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/config.rb

@@ -25,9 +25,11 @@ require 'active_support/core_ext/string/inflections'
 require 'yaml'
 require 'json'
 require 'protocol/protocol'
+require 'erb'
 
 include LadderDrive::Protocol::Mitsubishi
 include LadderDrive::Protocol::Keyence
+include LadderDrive::Protocol::Omron
 include LadderDrive::Protocol::Emulator
 
 module LadderDrive
@@ -45,7 +47,8 @@ module LadderDrive
       def load path
         h = {}
         if File.exist?(path)
-          h = YAML.load(File.read(path))
+          erb = ERB.new File.read(path)
+          h = YAML.load(erb.result(binding))
           h = JSON.parse(h.to_json, symbolize_names: true)
         end
         new h || {}

data/lib/ladder_drive/config_target.rb

@@ -27,6 +27,7 @@ require 'protocol/protocol'
 
 include LadderDrive::Protocol::Mitsubishi
 include LadderDrive::Protocol::Keyence
+include LadderDrive::Protocol::Omron
 include LadderDrive::Protocol::Emulator
 
 module LadderDrive

data/lib/ladder_drive/plc_device.rb

@@ -125,6 +125,17 @@ module LadderDrive
       suffixes_for_input.include? @suffix
     end
 
+   def value
+     case @value
+     when true
+       1
+     when false, nil
+       0
+     else
+       @value
+     end
+   end
+
     def bool
       case @value
       when Integer

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

@@ -50,11 +50,6 @@ module Keyence
       @socket = nil
     end
 
-    def get_bit_from_device device
-      device = device_by_name device
-      get_bits_from_device(1, device).first
-    end
-
     def get_bits_from_device count, device
       c = (count + 15) / 16
       words = get_words_from_device c, device
@@ -89,11 +84,6 @@ module Keyence
     alias :set_bit_to_device :set_bits_to_device
 
 
-    def get_word_from_device device
-      device = device_by_name device
-      get_words_from_device(1, device).first
-    end
-
     def get_words_from_device(count, device)
       device = local_device device
       packet = "RDS #{device.name}.H #{count}\r\n"
@@ -134,7 +124,7 @@ module Keyence
     def receive
       res = ""
       begin
-        Timeout.timeout(0.1) do
+        Timeout.timeout(TIMEOUT) do
           res = @socket.gets
         end
       rescue Timeout::Error

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

@@ -42,7 +42,6 @@ module Mitsubishi
     NAK = "\u0015"
 
     DELIMITER = "\r\n"
-    TIMEOUT = 1.0
 
     def initialize options={}
       super
@@ -79,11 +78,6 @@ module Mitsubishi
       @comm = nil
     end
 
-    def get_bit_from_device device
-      device = device_by_name device
-      get_bits_from_device(1, device).first
-    end
-
     def get_bits_from_device count, device
       raise ArgumentError.new("A count #{count} must be between #{available_bits_range.first} and #{available_bits_range.last} for #{__method__}") unless available_bits_range.include? count
 
@@ -130,11 +124,6 @@ module Mitsubishi
       end
     end
 
-    def get_word_from_device device
-      device = device_by_name device
-      get_words_from_device(1, device).first
-    end
-
     def get_words_from_device(count, device)
       raise ArgumentError.new("A count #{count} must be between #{available_words_range.first} and #{available_words_range.last} for #{__method__}") unless available_words_range.include? count