procon_bypass_man 0.3.8.1 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e01c23bfc7d0fc483110069cb9762e3d55ea6f85ab1a38b08e67ada436f1826
-  data.tar.gz: 63eaa730de176dad7e85a948ee491b5c396e40955fa310e0945a0289c3c52de4
+  metadata.gz: 8cdec3e27b22b6af2d55b8a55910154cf47f46ae5e3269bd84ed5ba9219adc62
+  data.tar.gz: 6f00204f909f4ac4f46bf3925007e1245b141c643ddc5b943d0545075a04dfb4
 SHA512:
-  metadata.gz: 2b8e16f8619d923b103145ce6436ab2cbde6f50376c532ca5ae1d62ac4890613ec34171cdb2be91bc74a25da15bee15d1897408546245dc1dedd06fd0d2c1f3b
-  data.tar.gz: fad139adb5de34586a2db210c22dbb692a5468a6e4ebfd30c610a24dc30b40239b3391392c92a9958285549c054ab18313e5b3f7c5dbf71dd886c300c737bd99
+  metadata.gz: c74d37d2301deb80ee803f8ecf42e1b52dd7203b341164f89dc912a9ed48adc3a464a3a312bfceca77d07a97ab268431b67cda0fc5565331f2cbbfae5ff00964
+  data.tar.gz: 0ce1eca5b886d04f13b78336a42ec40d2e925d571f4fa6df26e10ede5cf6c5174dce8759cb078f0042d33b7f10aceb5cd1f53ad3ab02b622c387c94f53e56efe

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.10] 2023-11-30
+* マクロを実行するとメモリ使用率が増え続ける不具合を修正しました
+
+## [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
 * 接続に失敗しているときに、手動で別のプロセスとして起動できるようにする(多重起動禁止の制限緩和)
 

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.1)
+    procon_bypass_man (0.3.10)
       action_cable_client
       blue_green_process (= 0.1.4.2)
       pbmenv (>= 0.1.11)
@@ -19,29 +19,48 @@ 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)
-    pbmenv (0.1.12)
+    pbmenv (0.1.13)
     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)
@@ -110,7 +147,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     webrick (1.7.0)
-    websocket (1.2.9)
+    websocket (1.2.10)
     websocket-eventmachine-base (1.2.0)
       eventmachine (~> 1.0)
       websocket (~> 1.0)
@@ -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

@@ -78,7 +78,7 @@ sudo kill -USR2 `cat ./pbm_pid`
   * `message = ProconBypassMan::BootMessage.new; ProconBypassMan::ReportBootJob.perform(body: message.to_hash)`
 
 ### リリース手順
-* project_template/web.rb, project_template/app.rb, lib/procon_bypass_man/version.rb のバージョンをあげる
+* project_template/app.rb.erb, lib/procon_bypass_man/version.rb のバージョンをあげる
 * CHANGELOG.md に日付を書く
 * be rake release
 * githubのreleaseを作成する
@@ -89,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/generate_output_report

@@ -8,11 +8,4 @@ require "pry"
 # Usage:
 #  $ `generate_output_report x zl y` のように、引数にボタン名を渡す
 
-no_action_binary = ["30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000"].pack("H*")
-user_operation = ProconBypassMan::Procon::UserOperation.new(no_action_binary)
-
-ARGV.map { |x| x.to_sym }.each do |button|
-  user_operation.press_button(button)
-end
-
-puts user_operation.binary.unpack.first
+puts OutputReportGenerator.new(ARGV).execute

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/docs/setup_raspi_by_mitamae.md

@@ -5,15 +5,15 @@
     * sshをできる状態で焼いておく
 * SDカードをRaspberry Pi4本体に挿して起動する
 * sshする
-* wget -O - "https://github.com/itamae-kitchen/mitamae/releases/latest/download/mitamae-armhf-linux.tar.gz" | tar xvz
-* wget https://raw.githubusercontent.com/splaplapla/procon_bypass_man/master/docs/setup_raspi.mitamae.rb -O setup_raspi.mitamae.rb
-* sudo ./mitamae-armhf-linux local setup_raspi.mitamae.rb -l debug
-* sudo reboot
-* sudo sh /usr/share/pbm/shared/add_procon_gadget.sh の実行する
+* `wget -O - "https://github.com/itamae-kitchen/mitamae/releases/latest/download/mitamae-armhf-linux.tar.gz" | tar xvz`
+* `wget https://raw.githubusercontent.com/splaplapla/procon_bypass_man/master/docs/setup_raspi.mitamae.rb -O setup_raspi.mitamae.rb`
+* `sudo ./mitamae-armhf-linux local setup_raspi.mitamae.rb -l debug`
+* `sudo reboot`
+* `sudo sh /usr/share/pbm/shared/add_procon_gadget.sh` の実行する
   * 何も表示されなければOK
 * PCとRaspberry Pi4を接続し、プロコンとして認識していることを確認する
-* sudo gem i pbmenv
-* sudo pbmenv install latest
+* `sudo gem i pbmenv`
+* `sudo pbmenv install latest`
 
 Raspberry Piのセットアップは以上です。  
 次は、SwitchとRaspberry Piとプロコンにケーブルを接続した上で、次のコマンドをshellに入力し、procon_bypass_manの動作確認を行なってください。  

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/value_objects/binary/base.rb

@@ -4,7 +4,7 @@ class ProconBypassMan::Domains::Binary::Base
     @binary = binary
   end
 
-  # @return [String] バイナリ
+  # @return [String]
   def binary
     raise NotImplementedError
   end

data/lib/procon_bypass_man/procon.rb

@@ -9,7 +9,6 @@ class ProconBypassMan::Procon
   require "procon_bypass_man/procon/value_objects/rumble_binary"
   require "procon_bypass_man/procon/value_objects/binary"
   require "procon_bypass_man/procon/value_objects/bypass_mode"
-  require "procon_bypass_man/procon/consts"
   require "procon_bypass_man/procon/performance_measurement"
   require "procon_bypass_man/procon/performance_measurement/queue_over_process"
   require "procon_bypass_man/procon/mode_registry"
@@ -215,6 +214,8 @@ class ProconBypassMan::Procon
       end
       user_operation.press_button_only_or_tilt_sticks(step)
       return user_operation.binary.raw
+    else
+      BlueGreenProcess::SharedVariable.extend_run_on_this_process = false
     end
 
     current_layer.disables.each do |button|
@@ -226,6 +227,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/support/output_report_generator.rb

@@ -0,0 +1,18 @@
+class OutputReportGenerator
+  NO_ACTION = ["30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000"].pack("H*").freeze
+
+  # @param [Array<Symbol, String>, NilClass] pressed_buttons
+  def initialize(*pressed_buttons)
+    @buttons = pressed_buttons || []
+  end
+
+  # @return [String]
+  def execute
+    user_operation = ProconBypassMan::Procon::UserOperation.new(NO_ACTION.dup)
+    [@buttons].flatten.sort.uniq.each do |button|
+      user_operation.press_button(button.to_sym)
+    end
+
+    user_operation.binary.unpack.first
+  end
+end

data/lib/procon_bypass_man/version.rb

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

data/lib/procon_bypass_man.rb

@@ -46,6 +46,7 @@ require_relative "procon_bypass_man/support/watchdog"
 require_relative "procon_bypass_man/support/forever"
 require_relative "procon_bypass_man/support/simple_tcp_server"
 require_relative "procon_bypass_man/support/proccess_cheacker"
+require_relative "procon_bypass_man/support/output_report_generator"
 require_relative "procon_bypass_man/procon_display"
 require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"

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.1'
+    gem 'procon_bypass_man', '0.3.10'
     # 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.1'
+    gem 'procon_bypass_man', '0.3.10'
     # 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/sig/main.rbs

@@ -339,12 +339,6 @@ class ProconBypassMan::Procon::ButtonCollection
   def self.load: (untyped button_key) -> untyped
 end
 
-class ProconBypassMan::Procon
-  module Data
-    NO_ACTION: untyped
-  end
-end
-
 class ProconBypassMan::Procon
   class FlipCache
     def self.fetch: (key: untyped key, expires_in: untyped expires_in) { () -> untyped } -> untyped

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.3.8.1
+  version: 0.3.10
 platform: ruby
 authors:
 - jiikko
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-11-30 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
@@ -214,7 +216,6 @@ files:
 - lib/procon_bypass_man/procon/analog_stick_manipulator.rb
 - lib/procon_bypass_man/procon/button.rb
 - lib/procon_bypass_man/procon/button_collection.rb
-- lib/procon_bypass_man/procon/consts.rb
 - lib/procon_bypass_man/procon/flip_cache.rb
 - lib/procon_bypass_man/procon/layer_changer.rb
 - lib/procon_bypass_man/procon/macro.rb
@@ -282,6 +283,7 @@ files:
 - lib/procon_bypass_man/support/load_agv.rb
 - lib/procon_bypass_man/support/never_exit_accidentally.rb
 - lib/procon_bypass_man/support/on_memory_cache.rb
+- lib/procon_bypass_man/support/output_report_generator.rb
 - lib/procon_bypass_man/support/proccess_cheacker.rb
 - lib/procon_bypass_man/support/procon_performance_http_client.rb
 - lib/procon_bypass_man/support/remote_macro_http_client.rb
@@ -321,7 +323,7 @@ metadata:
   homepage_uri: https://github.com/splaplapla/procon_bypass_man
   source_code_uri: https://github.com/splaplapla/procon_bypass_man
   changelog_uri: https://github.com/splaplapla/procon_bypass_man/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -336,8 +338,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A programmable converter for Nintendo Switch Pro Controller
 test_files: []

data/lib/procon_bypass_man/procon/consts.rb

@@ -1,5 +0,0 @@
-class ProconBypassMan::Procon
-  module Consts
-    NO_ACTION = "30f28100800078c77448287509550274ff131029001b0022005a0271ff191028001e00210064027cff1410280020002100000000000000000000000000000000".freeze
-  end
-end