ladder_drive 0.6.4 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78f994329616c81aa08af6f821851a9cfa302382
-  data.tar.gz: cdd5b03d754155febbc0e0b77f4e23a09910a447
+SHA256:
+  metadata.gz: fadb0c39709c720b91a91ed6b977a7583abd7dc6962dc4805a700c8dfef0c0b4
+  data.tar.gz: cee86c1d967c1198bd3bedeb215b7ace6f417e6757e84f65d92e6950851bb31e
 SHA512:
-  metadata.gz: c92d94494040f7d972110d07d116df9fdea309c979fde59a58da644e4f9d41a775ec680c16a8e82be9267705f6dae9f6ca7967b4c595c03dcbf1cbd41158081f
-  data.tar.gz: d5343de39d9760831bda75adb6dfc7e6f30cb485f7c6f137a67dcd651583ecc517c415de040963cbe6cab29f5a968d1fdd7a9837fc9ebdc69ace1dfedbc8b07d
+  metadata.gz: 3bfd5997a940904d6aa25b87e6bfa5765cb408cea83c840a04da5ddd426eb8d793863e205a0b2681d504d2122a84496d35db46a0f41f333494c1ee7b7391fba7
+  data.tar.gz: abbfb718c68c7088e97cc33a35b91e929e1b33ac243e3b65b144d7402192f9b61434eb94e58d6dc1413c4def5e522a218c80a7583c81814be1ddee5da91f5b6d

data/Gemfile

@@ -6,7 +6,6 @@ gemspec
 group :test do
   gem "test-unit"
   gem "test-unit-rr"
-  #gem "test-unit-notify"
 end
 
 gem "activesupport", '>= 4.0'
@@ -18,3 +17,4 @@ gem 'serialport'
 gem 'google_drive'
 gem "ruby-trello"
 gem 'ambient_iot', ">= 0.1.1"
+gem 'dotenv'

data/Gemfile.lock

@@ -1,135 +1,168 @@
 PATH
   remote: .
   specs:
-    ladder_drive (0.6.4)
-      activesupport (~> 5.0)
-      ffi (~> 1.9.24, >= 1.9.24)
-      google_drive (~> 3.0)
+    ladder_drive (0.6.7)
+      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)
       ruby-trello (~> 2.1)
-      serialport
+      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)
+      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.5)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
+    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.30.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)
+      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.3)
-      google-api-client (>= 0.11.0, < 0.31.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.2.1)
-    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_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
+    mime-types-data (3.2021.0704)
+    mini_mime (1.1.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.1)
+    nokogiri (1.12.4-x86_64-darwin)
+      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.1.1)
-    rake (10.5.0)
-    representable (3.0.4)
+    power_assert (2.0.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rake (13.0.6)
+    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)
-    rr (1.2.1)
-    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.3)
+    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
+  x86_64-darwin-19
 
 DEPENDENCIES
   activesupport (>= 4.0)
   ambient_iot (>= 0.1.1)
-  bundler (~> 1.11)
+  bundler (~> 2.1)
+  dotenv
   ffi (~> 1.9.24)
   google_drive
   ladder_drive!
   pi_piper (>= 2.0.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   ruby-trello
   serialport
   test-unit
   test-unit-rr
 
 BUNDLED WITH
-   1.17.3
+   2.2.26

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,13 +14,16 @@ 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'
 
@@ -29,7 +32,7 @@ Gem::Specification.new do |spec|
   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 "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.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,6 +25,7 @@ require 'active_support/core_ext/string/inflections'
 require 'yaml'
 require 'json'
 require 'protocol/protocol'
+require 'erb'
 
 include LadderDrive::Protocol::Mitsubishi
 include LadderDrive::Protocol::Keyence
@@ -46,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/protocol/keyence/kv_device.rb

@@ -49,7 +49,7 @@ module Keyence
 
       def suffixes_for_dec; SUFFIXES_FOR_DEC; end
       def suffixes_for_dec_hex; SUFFIXES_FOR_DEC_HEX; end
-      def suffixeds_for_hex; SUFFIXES_FOR_HEX; end
+      def suffixes_for_hex; SUFFIXES_FOR_HEX; end
       def suffixes_for_bit; SUFFIXES_FOR_BIT; end
 
   end

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

@@ -124,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

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

@@ -169,7 +169,7 @@ module Mitsubishi
       res = []
       len = 0
       begin
-        Timeout.timeout(1.0) do
+        Timeout.timeout(TIMEOUT) do
           loop do
             c = @socket.read(1)
             next if c.nil? || c == ""

data/lib/ladder_drive/protocol/omron/fins_tcp_protocol.rb

@@ -48,6 +48,8 @@ module Omron
     ETHERNET_CP1L   = 2
     ETHERNET_CP1H   = 3
 
+    TIMEOUT = 5.0
+
     def initialize options={}
       super
       @socket = nil
@@ -201,7 +203,7 @@ p e
       res = []
       len = 0
       begin
-        Timeout.timeout(5.0) do
+        Timeout.timeout(TIMEOUT) do
           loop do
             c = @socket.getc
             next if c.nil? || c == ""

data/lib/ladder_drive/protocol/protocol.rb

@@ -58,6 +58,8 @@ module Protocol
       end
     end
 
+    TIMEOUT = 1.0
+
     # abstract methods
 
     def open; 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.4"
+  VERSION = "0.6.8"
 end

data/lib/ladder_drive.rb

@@ -24,5 +24,8 @@
 dir = File.expand_path(File.dirname(__FILE__))
 $:.unshift dir unless $:.include? dir
 
+require 'dotenv'
+Dotenv.load
+
 require "plc/plc"
 require "ladder_drive/ladder_drive"