procon_bypass_man 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cdec3e27b22b6af2d55b8a55910154cf47f46ae5e3269bd84ed5ba9219adc62
-  data.tar.gz: 6f00204f909f4ac4f46bf3925007e1245b141c643ddc5b943d0545075a04dfb4
+  metadata.gz: 7599b3687d6efc95875555ba97158421b94422f350b9bb049e80476aaffb9efa
+  data.tar.gz: fc62c5c839586c5149d89c3391bcaa0feb2bfbfa2662a0a20e6c9225a3a76c2b
 SHA512:
-  metadata.gz: c74d37d2301deb80ee803f8ecf42e1b52dd7203b341164f89dc912a9ed48adc3a464a3a312bfceca77d07a97ab268431b67cda0fc5565331f2cbbfae5ff00964
-  data.tar.gz: 0ce1eca5b886d04f13b78336a42ec40d2e925d571f4fa6df26e10ede5cf6c5174dce8759cb078f0042d33b7f10aceb5cd1f53ad3ab02b622c387c94f53e56efe
+  metadata.gz: fd12efc1f2f10b8177177bd7aa179da834991939a4cd460d0b10b2e03c476482d5de747de588a98a05e917a0eef44bc17c58b1e14a699ea693a34cdff246be11
+  data.tar.gz: a60c477422fe598bb50cd0773e94a8de9fee9607a7bd32ffd7d25bc6ea466a930a6a9e311f2615ecf995d7d9b91fd9be599f52abce31f109200a6bf42fabe61e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## unrelease
+* 起動時の安定性向上
+* systemd unit pbm.serviceのRestart=noにしました
+
 ## [0.3.10] 2023-11-30
 * マクロを実行するとメモリ使用率が増え続ける不具合を修正しました
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.3.10)
+    procon_bypass_man (0.3.11)
       action_cable_client
       blue_green_process (= 0.1.4.2)
       pbmenv (>= 0.1.11)

data/lib/procon_bypass_man/device_connection/command.rb

@@ -5,7 +5,7 @@ class ProconBypassMan::DeviceConnection::Command
   def self.execute!(retry_count: 0)
     begin
       gadget, procon = ProconBypassMan::DeviceConnection::Executer.execute!
-    rescue ProconBypassMan::DeviceConnection::TimeoutErrorInConditionalRoute
+    rescue ProconBypassMan::DeviceConnection::TimeoutErrorInConditionalRoute, ProconBypassMan::SafeTimeout::Timeout
       if retry_count >= MAX_RETRY_COUNT
         ProconBypassMan::SendErrorCommand.execute(error: "リトライしましたが、接続できませんでした")
         raise ProconBypassMan::DeviceConnection::TimeoutError
@@ -17,8 +17,6 @@ class ProconBypassMan::DeviceConnection::Command
       retry
     rescue ProconBypassMan::DeviceConnection::NotFoundProconError => e
       raise
-    rescue ProconBypassMan::SafeTimeout::Timeout
-      raise ProconBypassMan::DeviceConnection::TimeoutError
     end
 
     ProconBypassMan::DeviceConnection::PreBypass.new(gadget: gadget, procon: procon).execute!

data/lib/procon_bypass_man/device_connection/executor.rb

@@ -113,6 +113,7 @@ class ProconBypassMan::DeviceConnection::Executer
     end
   rescue ProconBypassMan::SafeTimeout::Timeout, Timeout::Error => e
     ProconBypassMan.logger.error "timeoutになりました(#{e.message})"
+    procon.write_nonblock(['8006'].pack("H*")) # 再実行時のケーブルの再接続を不要にするワークアラウンド. リセットしているらしい
     compressed_buffer_text = ProconBypassMan::CompressArray.new(debug_log_buffer).compress.join("\n")
     ProconBypassMan::SendErrorCommand.execute(error: compressed_buffer_text, stdout: false)
     raise ProconBypassMan::SafeTimeout::Timeout if @throw_error_if_timeout

data/lib/procon_bypass_man/device_connection/procon_setting_overrider.rb

@@ -2,7 +2,6 @@ class ProconBypassMan::DeviceConnection::ProconSettingOverrider
   attr_accessor :procon, :output_report_watcher, :output_report_generator
 
   SUB_COMMAND_HOME_LED_ON = "38"
-  SUB_COMMAND_VIBRATION = "48"
 
   SUB_COMMAND_ARG_HOME_LED_ON = "1FF0FF"
 

data/lib/procon_bypass_man/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProconBypassMan
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

data/lib/procon_bypass_man.rb

@@ -74,7 +74,6 @@ Thread.abort_on_exception = true
 
 module ProconBypassMan
   extend ProconBypassMan::Configuration::ClassMethods
-  extend ProconBypassMan::NeverExitAccidentally
 
   class CouldNotLoadConfigError < StandardError; end
   class NotFoundProconError < StandardError; end

data/project_template/app.rb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.10'
+    gem 'procon_bypass_man', '0.3.11'
     # uncomment if you want to use master branch
     # gem 'procon_bypass_man', github: 'splaplapla/procon_bypass_man', branch: 'master'
     # uncomment if you want to use serial communication feature

data/project_template/app.rb.erb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.3.10'
+    gem 'procon_bypass_man', '0.3.11'
     # uncomment if you want to use master branch
     # gem 'procon_bypass_man', github: 'splaplapla/procon_bypass_man', branch: 'master'
     # uncomment if you want to use serial communication feature

data/project_template/systemd_units/pbm.service

@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 WorkingDirectory=/usr/share/pbm/current
 ExecStart=/bin/bash -c "/home/pi/.rbenv/versions/3.0.1/bin/ruby /usr/share/pbm/current/app.rb"
-Restart=always
+Restart=no
 Nice=-20
 
 [Install]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - jiikko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: action_cable_client