procon_bypass_man 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1933db5fe8c39267f980712a5477a457277cdd3ce9148a81966c1e1d818805e8
-  data.tar.gz: 404ce5c7ada74a92afb5abf2b2f583c3fe1c87bbc4d3ae2372e0ff3f961d9245
+  metadata.gz: 9799933aa6f27812290fd75a4538b7ac0f334f548593a7365840c2a7256dd7ea
+  data.tar.gz: 7f8f101cc58b668d38297d220cfcdd06e650429bf1d8540e7f75d4cb66e374c9
 SHA512:
-  metadata.gz: eeeb32ff42fc02d2b40b19be2a1eba55a9fc5ffc6a3f08af47b4ed86bb67edba60dc7ef409f892ba9ef21953a349abda01a28d04f4a4f99f0032382a68c2f904
-  data.tar.gz: 811f537dd6ea2659678911678022c02734a2a21ef099d7ed140067a56e88edf0fabc4aec8264c052e8e8e9759c54085a17ab7a72c668a338560250b880395e2f
+  metadata.gz: 38af52cac3890ad462b1dfa99e2d8f278a74631561174a368789cb7ea779382c138baf17fd17ebf6eef815bdd40534af0618d811ee8bbd6c1907142ed06ddc94
+  data.tar.gz: 4b26dbfe8ac913f3cb957a8a93fdb535c8b9b3d8162a9c1837a9f3075390a54fbda3739f4986a91c84775ce633d7b0f1202320e3f7cf2903a8d79bcc9f3ec60d

data/.rubocop.yml

@@ -16,8 +16,16 @@ Layout:
 Naming:
   Enabled: false
 
+Layout/AccessModifierIndentation:
+  Enabled: true
+
+Layout/IndentationConsistency:
+  Enabled: true
+
 Lint/ConstantDefinitionInBlock:
-    Enabled: false
+    Enabled: true
+    Exclude:
+      - 'spec/**/*.rb'
 Lint/UselessAssignment:
     Enabled: false
 Lint/EmptyBlock:

data/.solargraph.yml

@@ -0,0 +1,23 @@
+include:
+- "**/*.rb"
+exclude:
+- spec/**/*
+- test/**/*
+- vendor/**/*
+- ".bundle/**/*"
+require:
+  - pbmenv
+  - resolv-replace
+domains: []
+reporters:
+- rubocop
+- require_not_found
+formatter:
+  rubocop:
+    cops: safe
+    except: []
+    only: []
+    extra_args: []
+require_paths: []
+plugins: []
+max_files: 5000

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.3.9] 2023-07-15
+* Lボタンを押すだけで簡単スニーキング(スプラ3)ができるようになりました
+  * 例: `left_analog_stick_cap cap: 1100, if_pressed: [:l], combined_press_is_pressed: [:zl], force_neutral: [:l]`
+
+## [0.3.8.1] 2023-05-08
+* 接続に失敗しているときに、手動で別のプロセスとして起動できるようにする(多重起動禁止の制限緩和)
+
 ## [0.3.8] 2023-05-03
 * TCP/IP経由でPBMに入力ができるようになりました
 * 多重起動ができないようにしました

data/Gemfile

@@ -5,18 +5,19 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in procon_bypass_man.gemspec
 gemspec
 
+gem "pry"
 gem "rake"
 gem "rspec"
-gem "pry"
-gem "timecop"
 gem "rubocop", require: false
+gem "serialport" # シリアル通信をする時に必要。通常はいらない
 gem "sinatra", require: false
-gem "webrick", require: false
+gem "solargraph", require: false
 gem "stackprof", require: false
-gem "serialport" # シリアル通信をする時に必要。通常はいらない
+gem "timecop"
+gem "webrick", require: false
 
 if Gem::Version.new(RUBY_VERSION) > Gem::Version.new("2.6.0")
-  gem 'typeprof', require: false
   gem 'rbs', require: false
   gem "steep", require: false
+  gem 'typeprof', require: false
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.3.8)
+    procon_bypass_man (0.3.9)
       action_cable_client
       blue_green_process (= 0.1.4.2)
       pbmenv (>= 0.1.11)
@@ -19,22 +19,40 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
+    backport (1.2.0)
+    benchmark (0.2.1)
     blue_green_process (0.1.4.2)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
+    e2mmap (0.1.0)
     eventmachine (1.2.7)
     ffi (1.15.4)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.6)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     language_server-protocol (3.16.0.3)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)
+    mini_portile2 (2.8.2)
     minitest (5.14.4)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.15.2-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.15.2-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.2-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.21.0)
     parser (3.0.3.2)
       ast (~> 2.4.1)
@@ -42,6 +60,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.7.1)
     rack (2.2.3.1)
     rack-protection (2.2.0)
       rack
@@ -53,6 +72,8 @@ GEM
     rbs (1.7.1)
     rbtree (0.4.6)
     regexp_parser (2.2.0)
+    reverse_markdown (2.1.1)
+      nokogiri
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -87,6 +108,21 @@ GEM
       rack (~> 2.2)
       rack-protection (= 2.2.0)
       tilt (~> 2.0)
+    solargraph (0.48.0)
+      backport (~> 1.2)
+      benchmark
+      bundler (>= 1.17.2)
+      diff-lcs (~> 1.4)
+      e2mmap
+      jaro_winkler (~> 1.5)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      parser (~> 3.0)
+      reverse_markdown (>= 1.0.5, < 3)
+      rubocop (>= 0.52)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9, >= 0.9.24)
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
@@ -102,6 +138,7 @@ GEM
       terminal-table (>= 2, < 4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
+    thor (1.2.2)
     tilt (2.0.10)
     timecop (0.9.4)
     typeprof (0.20.4)
@@ -118,6 +155,7 @@ GEM
     websocket-eventmachine-client (1.3.0)
       websocket-eventmachine-base (~> 1.0)
     websocket-native (1.0.0)
+    yard (0.9.34)
     zeitwerk (2.5.1)
 
 PLATFORMS
@@ -137,6 +175,7 @@ DEPENDENCIES
   rubocop
   serialport
   sinatra
+  solargraph
   stackprof
   steep
   timecop

data/README.md

@@ -18,7 +18,7 @@ https://user-images.githubusercontent.com/1664497/171327108-f12f56a5-fc36-48da-9
     * 他のシリーズは未確認です
 * データ通信が可能なUSBケーブル
 
-## 使うソフトウェア
+## 必要なソフトウェア
 * ruby 2.5 以上
 
 ## プラグイン
@@ -41,6 +41,10 @@ https://user-images.githubusercontent.com/1664497/171327108-f12f56a5-fc36-48da-9
     * キーリマップ, 連射, マクロ, 外部ツールからの入力
         * リマップは1つのキーを別のキーに割り当てます
     * 連射中には特定のキーの入力を無視したり、複数のキーをトリガーに連射することができます
+    * スプラ2, 3の自動ドット打ち
+        * https://zenn.dev/jiikko/articles/fcec13200487d5
+    * オートトリガー
+        * https://zenn.dev/jiikko/articles/e794f89afe8896
 * どうしてsudoが必要なの？
     * 操作するdeviceファイルの所有者がrootだからです
 * 市販されているサードパーティ製連射機との違いは？
@@ -85,7 +89,7 @@ sudo kill -USR2 `cat ./pbm_pid`
 * procon_bypassの運営・開発・サーバー費用に充てさせていただきます。また、問い合わせに優先して対応します。
 
 ## Links
-* https://discord.gg/bEcRNKf4ep
+* https://discord.gg/GjaywxVZHY
   * 質問などご意見をdiscordでも受け付けています
 
 ## License

data/bin/console

@@ -12,8 +12,7 @@ require "pry"
 # require "pry"
 # Pry.start
 
-require "irb"
-
 ProconBypassMan.config.logger = Logger.new($stdout)
 
-IRB.start(__FILE__)
+opts = Pry::CLI.parse_options
+Pry::CLI.start(opts)

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/procon_bypass_man/buttons_setting_configuration/layer.rb

@@ -172,7 +172,7 @@ module ProconBypassMan
         end
       end
 
-      def left_analog_stick_cap(cap: nil, if_pressed: nil, force_neutral: nil)
+      def left_analog_stick_cap(cap: nil, if_pressed: nil, force_neutral: nil, combined_press_is_pressed: nil)
         case cap
         when Integer
           # OK
@@ -203,6 +203,15 @@ module ProconBypassMan
           return
         end
 
+        begin
+          if(combined_press_is_pressed = ParamNormalizer::IfPressedAllowsFalsy.new(combined_press_is_pressed).to_value!)
+            hash[:combined_press_is_pressed] = combined_press_is_pressed
+          end
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. left_analog_stick_capのcombined_press_is_pressedにはボタンを渡してください."
+          return
+        end
+
         left_analog_stick_caps << hash
       end
 

data/lib/procon_bypass_man/procon.rb

@@ -226,6 +226,9 @@ class ProconBypassMan::Procon
         config[:force_neutral]&.each do |force_neutral_button|
           user_operation.unpress_button(force_neutral_button)
         end
+        config[:combined_press_is_pressed]&.each do |button|
+          user_operation.press_button(button)
+        end
         user_operation.apply_left_analog_stick_cap(cap: config[:cap])
       end
     end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -116,6 +116,8 @@ module ProconBypassMan
     rescue ProconBypassMan::DeviceConnection::TimeoutError
       ProconBypassMan::SendErrorCommand.execute(error: "接続に失敗しました。プロコンとRaspberry Piのケーブルを差し直して、再実行してください。\n改善しない場合は、app.logの中身を添えて不具合報告をお願いします。")
       ProconBypassMan::DeviceStatus.change_to_connected_but_sleeping!
+      FileUtils.rm_rf(ProconBypassMan.pid_path) # NOTE: この状態になったときに手動で起動できるようにする(多重起動禁止回避)
+
       %w(TERM INT).each do |sig|
         Kernel.trap(sig) { exit 0 }
       end

data/procon_bypass_man.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "pbmenv", ">= 0.1.11" # enable_pbm_cloud連携機能でPbmenv.install, .cleanを使っている.
   spec.add_dependency "action_cable_client"
-  spec.add_dependency "sorted_set"
   spec.add_dependency "blue_green_process", '0.1.4.2'
+  spec.add_dependency "pbmenv", ">= 0.1.11" # enable_pbm_cloud連携機能でPbmenv.install, .cleanを使っている.
+  spec.add_dependency "sorted_set"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

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.8'
+    gem 'procon_bypass_man', '0.3.9'
     # 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.8'
+    gem 'procon_bypass_man', '0.3.9'
     # 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

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pbmenv
+  name: action_cable_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.11
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.11
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: action_cable_client
+  name: blue_green_process
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4.2
 - !ruby/object:Gem::Dependency
-  name: sorted_set
+  name: pbmenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
-  name: blue_green_process
+  name: sorted_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4.2
+        version: '0'
 description: A programmable converter for Nintendo Switch Pro Controller
 email:
 - n905i.1214@gmail.com
@@ -81,6 +81,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".solargraph.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -94,6 +95,7 @@ files:
 - bin/dev_api_server.rb
 - bin/generate_default_app
 - bin/generate_output_report
+- bin/rspec
 - bin/setup
 - bin/validate_external_input
 - docs/getting_started.md