procon_bypass_man 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5780c7567981a37aef9f32801868f1e59db9d70e47f5cb65dc302cc16a22252e
-  data.tar.gz: e1f6d212b9076c0e081e720f3f3c75217183d3bdb4cbab660ab14abc61a35671
+  metadata.gz: 21149148015d5d8194ba9b0dc35fc1699ba1fe4eff6aaf1dd0956e0b35856e14
+  data.tar.gz: 6af893ef0a8ff0fdad56b53d9bd117f6cbd39ec7bdb5c216d44cf2d773b9974f
 SHA512:
-  metadata.gz: 4ea7163f5d33b68c1cfe9e65c15bbe40414435ecf6c5c3fdadc9c70e29eb77f8fa4bbd8897cc8306f2d9cb8b42d231cce240973828f30e8e24771a66235c7304
-  data.tar.gz: d829cdf3cd7d3428247a55eb2e5140344d79d6c0b48321a4a7bdcbc3f3e122c66066fa31839bc260016643375b104847f9c8435dfe151f9afa027990b98df630
+  metadata.gz: 7185d5bf2246b3c1e2ae00eb08e170db017e78b7ed43fecde3757f2fc99bf1132f01b4e541ba669b9fc2ef39ee17e035368eabe7d4b973728c8ae49fd2873a0a
+  data.tar.gz: 6c3152904d3f4af9e3e3e4f519d4fbe3391cf7d727c3ee42966d9492672bb9ead227ce451e8b97088d8b5e27176e9427939009ff59873fac507cbdabeb7fa61a

data/.circleci/config.yml

@@ -15,6 +15,9 @@ jobs:
       - run:
           name: bundle install
           command: bundle install --jobs 4
+      - run:
+          name: rubocop
+          command: bundle exec rubocop
       - run:
           name: run test
           command: bundle exec rspec

data/.rubocop.yml

@@ -0,0 +1,24 @@
+AllCops:
+  NewCops: enable
+  SuggestExtensions: false
+  Include:
+    - 'lib/**/*.rb'
+    - 'spec/**/*.rb'
+Style:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+    
+Layout:
+  Enabled: false
+
+Naming:
+  Enabled: false
+
+Lint/ConstantDefinitionInBlock:
+    Enabled: false
+Lint/UselessAssignment:
+    Enabled: false
+Lint/EmptyBlock:
+    Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.1.6] - 2021-08-19
+- 設定ファイルを読み込むと内容のmd5を `pbm_root_dir/.setting_yaml_digest` へ出力するようにしました
+
 ## [0.1.5] - 2021-07-29
 - siwtch, proコンが電源OFF時にCPU使いまくるのを修正した
 - 連打中に無視するボタンを複数登録できるようにした

data/Gemfile

@@ -9,3 +9,4 @@ gem "rake", "~> 13.0"
 gem "rspec"
 gem "pry"
 gem "timecop"
+gem "rubocop", require: false

data/Gemfile.lock

@@ -1,18 +1,25 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.5)
+    procon_bypass_man (0.1.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.2)
     coderay (1.1.3)
     diff-lcs (1.4.4)
     method_source (1.0.0)
+    parallel (1.20.1)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    rainbow (3.0.0)
     rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -26,7 +33,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
+    rubocop (1.18.4)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.8.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
     timecop (0.9.4)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   arm-linux
@@ -38,6 +58,7 @@ DEPENDENCIES
   pry
   rake (~> 13.0)
   rspec
+  rubocop
   timecop
 
 BUNDLED WITH

data/README.md

@@ -25,12 +25,12 @@ Switch <-- (PBM): ZR連打
 
 ## Usage
 * USBガジェットモードで起動するRaspberry Pi4を用意する
-  * https://github.com/splaspla-hacker/procon_bypass_man/blob/master/docs/setup_raspi.md
+  * https://github.com/splaplapla/procon_bypass_man/blob/master/docs/setup_raspi.md
 * Raspberry Pi4で https://github.com/jiikko/procon_bypass_man_sample をclone して実行ファイルを動かす
-  * 実行ファイルと設定ファイルについては https://github.com/splaspla-hacker/procon_bypass_man/wiki に詳細を書いていますが、まず動かすためにはcloneしたほうが早いです
+  * 実行ファイルと設定ファイルについては https://github.com/splaplapla/procon_bypass_man/wiki に詳細を書いていますが、まず動かすためにはcloneしたほうが早いです
 
 ## Plugins
-* https://github.com/splaspla-hacker/procon_bypass_man-splatoon2
+* https://github.com/splaplapla/procon_bypass_man-splatoon2
 
 ## FAQ
 * どうやって動かすの?
@@ -38,7 +38,7 @@ Switch <-- (PBM): ZR連打
 * どうやって使うの？
     * ケーブルでそれらを接続した状態で、Raspberry Pi4にsshして本プログラムを起動することで使用します
 * ラズベリーパイ4のセットアップ方法は？
-    * https://github.com/splaspla-hacker/procon_bypass_man/tree/master/docs/setup_raspi.md
+    * https://github.com/splaplapla/procon_bypass_man/tree/master/docs/setup_raspi.md
 * モード, マクロの違いは？
     * modeはProconの入力をそのまま再現するため機能。レイヤーを切り替えるまで繰り返し続ける
     * マクロは特定のキーを順番に入れていく機能。キーの入力が終わったらマクロは終了する
@@ -52,10 +52,10 @@ Switch <-- (PBM): ZR連打
     * 操作するdeviceファイルの所有者がrootだから
 
 ## TODO
-* 設定ファイルをwebから反映できる
 * ラズパイのプロビジョニングを楽にしたい
 * レコーディング機能(プロコンの入力をマクロとして登録ができる)
 * マクロにdelayを入れれるようにする
+* 設定ファイル マクロの引数に、ボタンを取れるようにする
 
 ## 開発系
 ```ruby

data/examples/practical/app.rb

@@ -8,8 +8,8 @@ require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  gem 'procon_bypass_man', github: 'splaspla-hacker/procon_bypass_man', branch: "edge"
-  gem 'procon_bypass_man-splatoon2', github: 'splaspla-hacker/procon_bypass_man-splatoon2', branch: "0.1.0"
+  gem 'procon_bypass_man', github: 'splaplapla/procon_bypass_man', branch: "edge"
+  gem 'procon_bypass_man-splatoon2', github: 'splaplapla/procon_bypass_man-splatoon2', branch: "0.1.0"
 end
 
 ProconBypassMan.tap do |pbm|

data/lib/procon_bypass_man.rb

@@ -40,12 +40,13 @@ module ProconBypassMan
     ProconBypassMan.logger.error "設定ファイルが不正です。設定ファイルの読み込みに失敗しました"
     puts "設定ファイルが不正です。設定ファイルの読み込みに失敗しました"
     FileUtils.rm_rf(ProconBypassMan.pid_path)
+    FileUtils.rm_rf(ProconBypassMan.digest_path)
     exit 1
   rescue EternalConnectionError
     ProconBypassMan.logger.error "接続の見込みがないのでsleepしまくります"
     puts "接続の見込みがないのでsleepしまくります"
     FileUtils.rm_rf(ProconBypassMan.pid_path)
-    sleep(999999999999999999)
+    sleep(999999999)
   rescue FirstConnectionError
     puts "接続を確立できませんでした。やりなおします。"
     retry
@@ -86,4 +87,8 @@ module ProconBypassMan
   def self.root=(path)
     @@root = path
   end
+
+  def self.digest_path
+    "#{root}/.setting_yaml_digest"
+  end
 end

data/lib/procon_bypass_man/configuration.rb

@@ -4,7 +4,6 @@ require "procon_bypass_man/configuration/layer"
 
 module ProconBypassMan
   class Configuration
-    include Validator
 
     attr_accessor :layers,
       :setting_path,
@@ -19,13 +18,12 @@ module ProconBypassMan
       @@context[@@current_context_key] ||= new
     end
 
-    def self.switch_context(key)
-      @@context[key] ||= new
+    def self.switch_new_context(key)
+      @@context[key] = new
       previous_key = @@current_context_key
       if block_given?
         @@current_context_key = key
         value = yield(@@context[key])
-        @@context[key].reset!
         @@current_context_key = previous_key
         return value
       else

data/lib/procon_bypass_man/configuration/loader.rb

@@ -1,24 +1,22 @@
 module ProconBypassMan
   class Configuration
     module Loader
+      require 'digest/md5'
+
       def self.load(setting_path: )
-        validation_instance = ProconBypassMan::Configuration.switch_context(:validation) do |instance|
-          begin
-            yaml = YAML.load_file(setting_path) or raise "読み込みに失敗しました"
-            instance.instance_eval(yaml["setting"])
-          rescue SyntaxError
-            instance.errors[:base] << "Rubyのシンタックスエラーです"
-            next(instance)
-          rescue Psych::SyntaxError
-            instance.errors[:base] << "yamlのシンタックスエラーです"
-            next(instance)
+        ProconBypassMan::Configuration.switch_new_context(:validation) do |validation_instance|
+          yaml = YAML.load_file(setting_path) or raise "読み込みに失敗しました"
+          validation_instance.instance_eval(yaml["setting"])
+          validator = Validator.new(validation_instance)
+          if validator.valid?
+            next
+          else
+            raise ProconBypassMan::CouldNotLoadConfigError, validator.errors
           end
-          instance.valid?
-          next(instance)
-        end
-
-        if !validation_instance.errors.empty?
-          raise ProconBypassMan::CouldNotLoadConfigError, validation_instance.errors
+        rescue SyntaxError
+          raise ProconBypassMan::CouldNotLoadConfigError, "Rubyのシンタックスエラーです"
+        rescue Psych::SyntaxError
+          raise ProconBypassMan::CouldNotLoadConfigError, "yamlのシンタックスエラーです"
         end
 
         yaml = YAML.load_file(setting_path)
@@ -33,6 +31,9 @@ module ProconBypassMan
           ProconBypassMan.logger.warn "不明なバージョンです。failoverします"
           ProconBypassMan::Configuration.instance.instance_eval(yaml["setting"])
         end
+
+        File.write(ProconBypassMan.digest_path, Digest::MD5.hexdigest(yaml["setting"]))
+
         ProconBypassMan::Configuration.instance
       end
 

data/lib/procon_bypass_man/configuration/validator.rb

@@ -1,6 +1,11 @@
 module ProconBypassMan
   class Configuration
-    module Validator
+    class Validator
+      def initialize(config)
+        @layers = config.layers
+        @prefix_keys = config.prefix_keys
+      end
+
       # @return [Boolean]
       def valid?
         @errors = Hash.new {|h,k| h[k] = [] }
@@ -38,7 +43,7 @@ module ProconBypassMan
       end
 
       def validate_require_prefix_keys
-        if prefix_keys.empty?
+        if @prefix_keys.empty?
           @errors[:prefix_keys] ||= []
           @errors[:prefix_keys] << "prefix_keys_for_changing_layerに値が入っていません。"
         end
@@ -48,24 +53,20 @@ module ProconBypassMan
         @layers.each do |layer_key, value|
           unverified_buttons = []
           # teplevel target button
-          value.instance_eval { @flips.keys }.map(&:to_sym).each { |b| unverified_buttons << b }
-          value.instance_eval { @remaps.keys }.map(&:to_sym).each { |b| unverified_buttons << b }
+          value.flips.keys.map(&:to_sym).each { |b| unverified_buttons << b }
+          value.remaps.keys.map(&:to_sym).each { |b| unverified_buttons << b }
           # internal target button
-          value.instance_eval {
-            @flips.flat_map { |flip_button, flip_option|
-              flip_option.flat_map { |flip_option_key, flip_option_target_button|
-                next if flip_option_key == :flip_interval
-                next if flip_option_target_button.is_a?(FalseClass) || flip_option_target_button.is_a?(TrueClass)
-                flip_option_target_button
-              }
+          value.flips.flat_map { |_flip_button, flip_option|
+            flip_option.flat_map { |flip_option_key, flip_option_target_button|
+              next if flip_option_key == :flip_interval
+              next if flip_option_target_button.is_a?(FalseClass) || flip_option_target_button.is_a?(TrueClass)
+              flip_option_target_button
             }
           }.compact.each { |b| unverified_buttons << b }
-          value.instance_eval {
-            @remaps.flat_map { |button, option|
-              option.flat_map { |flip_option_key, flip_option_target_button|
-                next if flip_option_target_button.is_a?(FalseClass) || flip_option_target_button.is_a?(TrueClass)
-                flip_option_target_button
-              }
+          value.remaps.flat_map { |_button, option|
+            option.flat_map { |_flip_option_key, flip_option_target_button|
+              next if flip_option_target_button.is_a?(FalseClass) || flip_option_target_button.is_a?(TrueClass)
+              flip_option_target_button
             }
           }.compact.each { |b| unverified_buttons << b }
           unless(nunsupport_buttons = (unverified_buttons - ProconBypassMan::Procon::ButtonCollection::BUTTONS)).length.zero?
@@ -78,8 +79,8 @@ module ProconBypassMan
         @layers.each do |layer_key, value|
           flip_buttons = []
           remap_buttons = []
-          value.instance_eval { @flips.keys }.map(&:to_sym).each { |b| flip_buttons << b }
-          value.instance_eval { @remaps.keys }.map(&:to_sym).each { |b| remap_buttons << b }
+          value.flips.keys.map(&:to_sym).each { |b| flip_buttons << b }
+          value.remaps.keys.map(&:to_sym).each { |b| remap_buttons << b }
           if(duplicated_buttons = flip_buttons & remap_buttons).length > 0
             @errors[:layers] << "レイヤー#{layer_key}で、連打とリマップの定義が重複しているボタン#{duplicated_buttons.join(", ")}があります"
           end

data/lib/procon_bypass_man/device_connector.rb

@@ -29,7 +29,7 @@ class ProconBypassMan::DeviceConnector
     s
   end
 
-  def self.connect(throw_error_if_timeout: true, enable_at_exit: false)
+  def self.connect
     s = new(throw_error_if_timeout: true, enable_at_exit: false)
     s.add([
       ["0000"],

data/lib/procon_bypass_man/procon/pressed_button_helper.rb

@@ -13,7 +13,7 @@ module ProconBypassMan::Procon::PushedButtonHelper
     @@compiled = false
     def compile_if_not_compile_yet!
       unless @@compiled
-        ::ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.each do |button, value|
+        ::ProconBypassMan::Procon::ButtonCollection::BUTTONS_MAP.each do |button, _value|
           define_method "pressed_#{button}?" do
             pressed_button?(button)
           end

data/lib/procon_bypass_man/runner.rb

@@ -28,7 +28,7 @@ class ProconBypassMan::Runner
       main_loop_pid = fork { main_loop }
 
       begin
-        while readable_io = IO.select([self_read])
+        while(readable_io = IO.select([self_read]))
           signal = readable_io.first[0].gets.strip
           handle_signal(signal)
         end
@@ -51,6 +51,7 @@ class ProconBypassMan::Runner
         @gadget&.close
         @procon&.close
         FileUtils.rm_rf(ProconBypassMan.pid_path)
+        FileUtils.rm_rf(ProconBypassMan.digest_path)
         exit 1
       end
     end
@@ -119,7 +120,7 @@ class ProconBypassMan::Runner
 
     ProconBypassMan.logger.info "子プロセスでgraceful shutdownの準備ができました"
     begin
-      while readable_io = IO.select([self_read])
+      while(readable_io = IO.select([self_read]))
         signal = readable_io.first[0].gets.strip
         handle_signal(signal)
       end
@@ -135,7 +136,7 @@ class ProconBypassMan::Runner
   def first_negotiation
     return if $will_terminate_token
 
-    @gadget, @procon = ProconBypassMan::DeviceConnector.connect(throw_error_if_timeout: true, enable_at_exit: false)
+    @gadget, @procon = ProconBypassMan::DeviceConnector.connect
   rescue ProconBypassMan::Timer::Timeout
     ::ProconBypassMan.logger.error "デバイスとの通信でタイムアウトが起きて接続ができませんでした。"
     @gadget&.close

data/lib/procon_bypass_man/version.rb

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

data/procon_bypass_man.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "extension for Nintendo Switch Pro Controller"
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/splaspla-hacker/procon_bypass_man"
+  spec.homepage      = "https://github.com/splaplapla/procon_bypass_man"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - jiikko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies: []
 description: extension for Nintendo Switch Pro Controller
 email:
@@ -20,6 +20,7 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -57,12 +58,12 @@ files:
 - lib/procon_bypass_man/timer.rb
 - lib/procon_bypass_man/version.rb
 - procon_bypass_man.gemspec
-homepage: https://github.com/splaspla-hacker/procon_bypass_man
+homepage: https://github.com/splaplapla/procon_bypass_man
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/splaspla-hacker/procon_bypass_man
-  source_code_uri: https://github.com/splaspla-hacker/procon_bypass_man
+  homepage_uri: https://github.com/splaplapla/procon_bypass_man
+  source_code_uri: https://github.com/splaplapla/procon_bypass_man
 post_install_message:
 rdoc_options: []
 require_paths: