RubyGems - procon_bypass_man - Versions diffs - 0.1.14 → 0.1.15 - Mend

procon_bypass_man 0.1.14 → 0.1.15

Files changed (31) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 346ad7fa333241bf5464ac38fce07caec0e0a021def6e2d456b7dc49a1f70b0a
-  data.tar.gz: 5f9f6d94706fd00c9ecc738f9626c5a2e6418039997f487f856d2298a6a9df1c
+  metadata.gz: 7820b087d86ac7338128dbfdebba48f8e3100d4a2163894962296e6526ea6b6e
+  data.tar.gz: 43d3bd4d0b3d18a61edc2df29320ad345f6d9313de79b6bb732a2bf526a18e5a
 SHA512:
-  metadata.gz: 792586a96060eb9adb8e7c0cf31bd56663da6343fa753709158890d47aed1025e87f24f670d176dea543d71cf6de2c6e8bb200b3bf109981f99e0f73b8eaa932
-  data.tar.gz: 8e82db2b88efb8d5752797eab1e203379d30edf6e71fcda3ff35bdba8e46e27923e5da313442be366c50e6c38b8a0583296a36e94c35f078d648fb18f59c2a0d
+  metadata.gz: 78f98474a1a3d6bf7a6a6420c36c51bc4c9ba835d35361b5bcd45623b3c9c5e3b8ef173d341bd026d324f78787bc020b6536e6deff658c8f073767d3ff0f664e
+  data.tar.gz: 341d4645b6650594533dcf23b32e24a8e5acd8413fea428d21fa2d2a2b4af1636d312a1ebc3472d5dbcbce193157a4da459eb1314619c27342b93dd30b8a96b3

data/.github/workflows/release.yml ADDED Viewed

@@ -0,0 +1,33 @@
+name: Publish to RubyGems
+on:
+  [workflow_dispatch]
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Set up Ruby 2.6
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+        bundler-cache: true
+    - name: Publish to RubyGems
+      run: |
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Action"
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${RUBYGEMS_API_TOKEN}\n" > $HOME/.gem/credentials
+        bundle exec rake release
+      env:
+        RUBYGEMS_API_TOKEN: "${{secrets.RUBYGEMS_API_TOKEN}}"
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

data/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,7 @@
+## [0.1.15] - 2021-12-08
+- 外部サーバから設定ファイルのリストアができるようになりました
+- splatoon2 pluginのネームスペースを変更しました
 ## [0.1.14] - 2021-12-02
 - 外部サーバからOSの再起動やprocon_bypass_manのバージョンアップができるようになりました

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.1.14)
+    procon_bypass_man (0.1.15)
       pbmenv
 GEM
@@ -31,7 +31,7 @@ GEM
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
-    pbmenv (0.1.5)
+    pbmenv (0.1.6)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)

data/lib/procon_bypass_man/commands/run_remote_pbm_action_dispatch_command.rb CHANGED Viewed

@@ -10,6 +10,8 @@ class ProconBypassMan::RunRemotePbmActionDispatchCommand
       ProconBypassMan::RemotePbmAction::StopPbmAction.new(pbm_job_uuid: uuid).run!(job_args: {})
     when ProconBypassMan::RemotePbmAction::ACTION_REBOOT_OS
       ProconBypassMan::RemotePbmAction::RebootOsAction.new(pbm_job_uuid: uuid).run!(job_args: {})
+    when ProconBypassMan::RemotePbmAction::ACTION_RESTORE_SETTING
+      ProconBypassMan::RemotePbmAction::RestorePbmSettingAction.new(pbm_job_uuid: uuid).run!(job_args: job_args)
     else
       ProconBypassMan::SendErrorCommand.execute(error: "#{action}は対応していないアクションです")
     end

data/lib/procon_bypass_man/plugin/splatoon2/macro/fast_return.rb ADDED Viewed

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module FastReturn
+          def self.name
+            :fast_return
+          end
+          def self.steps
+            [:x, :down, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_left_key.rb ADDED Viewed

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module JumpToLeftKey
+          def self.name
+            :jump_to_left_key
+          end
+          def self.steps
+            [:x, :left, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_right_key.rb ADDED Viewed

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module JumpToRightKey
+          def self.name
+            :jump_to_right_key
+          end
+          def self.steps
+            [:x, :right, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_up_key.rb ADDED Viewed

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Macro
+        module JumpToUpKey
+          def self.name
+            :jump_to_up_key
+          end
+          def self.steps
+            [:x, :up, :a, :a].freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/mode/guruguru.rb ADDED Viewed

@@ -0,0 +1,59 @@
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      module Mode
+        module Guruguru
+          def self.binaries
+            [ "309481408000362d684658750968f71cfe2c0e51000001480053f71ffedf0d4b000a013d00caf6ecfd4c0d480003011c00000000000000000000000000000000",
+              "30978140800037dd6748687509fdf6adfded0d6d0081005d00eef68dfdef0d6d00830059001bf791fd140e720090005400000000000000000000000000000000",
+              "309a8140800038cd67495875099af821fe120e40006400880042f8fcfdfd0d470067008900d4f7e0fdf20d4e006a008c00000000000000000000000000000000",
+              "309c8140800036ed67466875099bf878fe4a0e35005b004c00c1f875fe400e35005d004c00c4f856fe2d0e390063006c00000000000000000000000000000000",
+              "30a081408000371d6847587509b9f71bfee70d22002c002300e3f73afe150e2b003500280014f854fe300e2d0038002900000000000000000000000000000000",
+              "30a38140800039fd6743587509def70ffea10d1a0031001f00d1f70ffeb10d19002c002200c5f711feb80d18002c002500000000000000000000000000000000",
+              "30a58140800037dd6746687509d8f70bfe980d270035001200ddf70dfe980d240038001900dff70ffe9b0d1f0035001a00000000000000000000000000000000",
+              "30a98140800037ed67484875099cf7edfdb00d310020000d009ef7eefda30d310022000c00adf7f2fd980d300028000a00000000000000000000000000000000",
+              "30ac8140800036ed67484875099cf709fed40d3a002400160097f7fafdd30d39002200150096f7f0fdc80d380022001400000000000000000000000000000000",
+              "30ae8140800038fd674558750987f72efed40d360021001c0089f729fed50d39002400180092f715fed10d390022001800000000000000000000000000000000",
+              "30b18140800037dd6747487509b8f705fea90d19001d002000c5f70dfeb00d210019002200bff71efec20d280018002400000000000000000000000000000000",
+              "30b48140800038fd684868750980f7e9fdd40d0200080024007df7f1fdba0d060011001e0084f7f8fdaa0d12001a001a00000000000000000000000000000000",
+              "30b7814080003fdd694958750918f6a9fd510f0d00d1ff370024f7b0fda90e0100ecff30006cf7d1fd210efffff5ff2c00000000000000000000000000000000",
+              "30ba81408080482d744768750963f71ffe190f5e00d9fea100ccf62dfe650f510009ff980015f702fe580f4b002eff8400000000000000000000000000000000",
+              "30bd814080802f7d864758750974f70efe4c0f5e00c0fea000d1f726fe1c0f5d00c5fea30028f859fe0e0f5c00cafea800000000000000000000000000000000",
+              "30bf8140808057cc984758750961f73afe630f99009dfeae0050f738fe710f7500adfea40050f721fe720f6e00b2fea300000000000000000000000000000000",
+              "30c281408080f479bd483875092ef8b6feab0f0a0180feba00f1f798fe900f000181febd00c2f77dfe7c0fdb008efebd00000000000000000000000000000000",
+              "30c581408080ad87d846487509e1f80000a6107e0178fea2004ef88dff54106c0185fea70063f826ffe60f520182feae00000000000000000000000000000000",
+              "30c8810080800797d84868750995f8e1fe4b0f7a0161fe88000df96dffd00f700149fe990035f9cdff361088016afea000000000000000000000000000000000",
+              "30cb810080804586d848487509cef672fe8a0f6d0217ff42002df63cfe280f1d0219ff410059f61cfe070fed01f5fe4a00000000000000000000000000000000",
+              "30d08100808002c5d745687509d8f5aaff830f5e03e6fe3e01fbf55bffc30f3f03e4fe100158f600ff3e102903e5fee700000000000000000000000000000000",
+              "30d3810080807b94d14838750991f6cd00690f9903f0fff10147f6e200560f7e038fffc60101f6c900560f71033bffa901000000000000000000000000000000",
+              "30d681008080b743ca475875095af7f2009c0fca03a400320242f7ca00950fb503820028020af7b000820fa4034e001a02000000000000000000000000000000",
+              "30d9810080805be3c047587509e7f77a03c70f0e04bb00410258f79801940f0004b800410251f74401910fd803b3003602000000000000000000000000000000",
+              "30dc810080808a02b245587509c0fbd5086a10710475020a03b0fb8d085d106c042102e8027efb660876106a04bc01af02000000000000000000000000000000",
+              "30de8100808036d2a14568750970fbbf09ad103704af038003a9fb600989105c0459036103c2fb2a097210690412034603000000000000000000000000000000",
+              "30e281008000cbb18d4738750989f8b40b2812380341044c0429f99e0bef11510340043704f2f93c0b7911b0033704f003000000000000000000000000000000",
+              "30e581008000c9c18945587509a5f7ca0a2e13e400c6024c0547f7fd0a941264011703270578f74a0b6012e40168030205000000000000000000000000000000",
+              "30e781008000c6618948687509acf86909e813d0fe2801a1057cf8cf09ed130fff6301990516f8710aaa13ccff13028205000000000000000000000000000000",
+              "30ea81008000c77189475875093af93b0762136efbaeff19060cf90107b113a9fb99ff0906e1f85b07b113bafc9fffcd05000000000000000000000000000000",
+              "30ed81008000c791894568750950f9ce047c1432f900026007a5f9a6051f146ef9bb013707bff99206a813fef9ce00c606000000000000000000000000000000",
+              "30ef81008000c6d1894558750944f8ad0358143ef81c02f10780f8b403841484f84102d107ccf801049314bcf84202ad07000000000000000000000000000000",
+              "30f381008000c761884868750914f72105e4134cf6d001c00743f71a05f11391f6bf01e407a0f7c904fa13faf6b3011008000000000000000000000000000000",
+              "30f681008000c7718344587509eaf54a04c812a6f40002500627f66d041313f2f40d02940682f6a60468133ef51a02d806000000000000000000000000000000",
+              "30f881008000c4e1814668750b5cf5f803b51125f3b5000d0560f50f04e8118cf33c015d057df525042c1210f4b101cc05000000000000000000000000000000",
+              "30fb81008000c5e1814458750b19f65a02a410acf29effb804e2f5db02df10b7f2c0ffbf04a9f55c032011dcf22400d804000000000000000000000000000000",
+              "30fe8100800035e2814858750b81f65c00f80f8df231fe940471f6e6001f1088f2a6fe92044ef6b1015a1092f21fffa004000000000000000000000000000000",
+              "3001810080004b03814868750b69f6e6fdad0ffef20efdd40479f678feb40fd9f249fdc40484f6f4fec00fb0f29ffdad04000000000000000000000000000000",
+              "30048100800079e47d4858750b17f64cfb5f0f46f46afb430529f6c4fb710ff1f3d4fb300538f64bfc830fbbf315fc1d05000000000000000000000000000000",
+              "300781008000a7057e4668750bb1f5d3f9fb0e8ef5ccf96405cdf5fcf90c0f44f52dfa6505e1f52dfa210f29f550fa6305000000000000000000000000000000",
+              "30098100800041f67d4668750bcdf4b0f9ab0e21f602f955057ef5adf9d00ee1f559f95f05b1f5d3f9fb0e8ef5ccf96405000000000000000000000000000000",
+              "300d810080003d877c4838750b84f458f7dd0c89f6d0f8fc0436f4e2f7620d83f614f8430526f4c0f8a00e71f666f85c05000000000000000000000000000000",
+              "30108100800058e77a4668750bf7f2c3f57c0c9cf6abfa0a0470f30ef6790c89f65dfa420414f476f67e0c80f6d0f98a04000000000000000000000000000000",
+              "30128100800059f77a4658750b7ef249f5580cd9f69bfaa40389f269f56c0cd1f6a9fab503a3f286f5760cacf6c9faeb03000000000000000000000000000000",
+              "3016810080005b177b4868750ba9f298f4450b2cf774fa3102b8f2a5f47a0b24f765fa6e02b8f2b8f4b10b1df755faac02000000000000000000000000000000",
+              "30198100800057777a4558750b39f258f4480a80f73efaf40016f26af4940a5ef76bfa37014ef275f4d40a46f780fa8401000000000000000000000000000000",
+            ].map(&:freeze).freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/plugin/splatoon2/version.rb ADDED Viewed

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+module ProconBypassMan
+  module Plugin
+    module Splatoon2
+      VERSION = "0.1.2"
+    end
+  end
+end

data/lib/procon_bypass_man/plugin.rb ADDED Viewed

@@ -0,0 +1,11 @@
+require_relative "plugin/splatoon2/version"
+require_relative "plugin/splatoon2/macro/fast_return"
+require_relative "plugin/splatoon2/macro/jump_to_right_key"
+require_relative "plugin/splatoon2/macro/jump_to_up_key"
+require_relative "plugin/splatoon2/macro/jump_to_left_key"
+require_relative "plugin/splatoon2/mode/guruguru"
+module ProconBypassMan
+  module Plugin
+  end
+end

data/lib/procon_bypass_man/remote_pbm_action/change_pbm_version_action.rb CHANGED Viewed

@@ -16,6 +16,10 @@ module ProconBypassMan
       def before_action_callback
         be_processed
       end
+      def after_action_callback
+        # no-op
+      end
     end
   end
 end

data/lib/procon_bypass_man/remote_pbm_action/reboot_os_action.rb CHANGED Viewed

@@ -12,6 +12,10 @@ module ProconBypassMan
       def before_action_callback
         be_processed
       end
+      def after_action_callback
+        # no-op
+      end
     end
   end
 end

data/lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb ADDED Viewed

@@ -0,0 +1,28 @@
+module ProconBypassMan
+  module RemotePbmAction
+    class RestorePbmSettingAction < BaseAction
+      def action_content(args: )
+        require "pbmenv"
+        ProconBypassMan.logger.info "execute RestorePbmSettingAction!"
+        setting = args["setting"] or raise(ProconBypassMan::RemotePbmAction::NeedPbmVersionError, "settingが必要です, #{args.inspect}")
+        File.write(
+          ProconBypassMan::ButtonsSettingConfiguration.instance.setting_path,
+          setting.to_yaml,
+        )
+        ProconBypassMan.hot_reload!
+      end
+      private
+      def before_action_callback
+        be_in_progress
+      end
+      def after_action_callback
+        be_processed
+      end
+    end
+  end
+end

data/lib/procon_bypass_man/remote_pbm_action/stop_pbm_action.rb CHANGED Viewed

@@ -12,6 +12,10 @@ module ProconBypassMan
       def before_action_callback
         be_processed
       end
+      def after_action_callback
+        # no-op
+      end
     end
   end
 end

data/lib/procon_bypass_man/remote_pbm_action.rb CHANGED Viewed

@@ -4,12 +4,13 @@ module ProconBypassMan
     require "procon_bypass_man/remote_pbm_action/change_pbm_version_action"
     require "procon_bypass_man/remote_pbm_action/reboot_os_action"
     require "procon_bypass_man/remote_pbm_action/stop_pbm_action"
+    require "procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb"
     require "procon_bypass_man/remote_pbm_action/lib/update_remote_pbm_action_status_command"
     ACTION_CHANGE_PBM_VERSION = "change_pbm_version"
     ACTION_REBOOT_OS = "reboot_os"
     ACTION_STOP_PBM = "stop_pbm"
-    ACTION_RESTORE_SETTING = "restore_setting" # TODO
+    ACTION_RESTORE_SETTING = "restore_pbm_setting"
     ACTIONS = [
       ACTION_CHANGE_PBM_VERSION,

data/lib/procon_bypass_man/runner.rb CHANGED Viewed

@@ -27,7 +27,7 @@ class ProconBypassMan::Runner
     loop do
       $will_terminate_token = false
-      # TODO forkしないでThreadでいいのでは？
+      # NOTE メインプロセスではThreadをいくつか起動しているので念のためパフォーマンスを優先するためにforkしていく
       main_loop_pid = Kernel.fork { ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute }
       begin

data/lib/procon_bypass_man/support/report_http_client.rb CHANGED Viewed

@@ -1,10 +1,10 @@
 module ProconBypassMan
   class ReportHttpClient < HttpClient
     def post(body: , event_type: )
-      if body.is_a?(String)
-        b = { text: body }
-      else
+      if body.is_a?(Hash)
         b = body
+      else
+        b = { text: body }
       end
       super(request_body: {

data/lib/procon_bypass_man/version.rb CHANGED Viewed

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

data/lib/procon_bypass_man.rb CHANGED Viewed

@@ -33,7 +33,7 @@ require_relative "procon_bypass_man/procon/analog_stick"
 require_relative "procon_bypass_man/procon/analog_stick_cap"
 require_relative "procon_bypass_man/value_objects/remote_pbm_action_object"
 require_relative "procon_bypass_man/scheduler"
-require_relative "procon_bypass_man/splatoon2"
+require_relative "procon_bypass_man/plugin"
 STDOUT.sync = true
 Thread.abort_on_exception = true
@@ -42,35 +42,21 @@ module ProconBypassMan
   extend ProconBypassMan::Configuration::ClassMethods
   class CouldNotLoadConfigError < StandardError; end
-  class FirstConnectionError < StandardError; end
   class NotFoundProconError < StandardError; end
-  class EternalConnectionError < StandardError; end
-  def self.buttons_setting_configure(setting_path: nil, &block)
-    unless setting_path
-      logger.warn "setting_pathが未設定です。設定ファイルのライブリロードが使えません。"
-    end
-    if block_given?
-      ProconBypassMan::ButtonsSettingConfiguration.instance.instance_eval(&block)
-    else
-      ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
-    end
-  end
+  class ConnectionError < StandardError; end
+  class FirstConnectionError < ConnectionError; end
+  class EternalConnectionError < ConnectionError; end
   # @return [void]
-  def self.run(setting_path: nil, &block)
+  def self.run(setting_path: nil)
     ProconBypassMan::Scheduler.start!
     ProconBypassMan::Background::JobRunner.start!
     ProconBypassMan.logger.info "PBMを起動しています"
     puts "PBMを起動しています"
-    buttons_setting_configure(setting_path: setting_path, &block)
+    ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting_path)
     initialize_pbm
-    File.write(pid_path, $$)
-    ProconBypassMan::WriteSessionIdCommand.execute
     gadget, procon = ProconBypassMan::ConnectDeviceCommand.execute!
-    ProconBypassMan::DeviceStatus.change_to_running!
     Runner.new(gadget: gadget, procon: procon).run
   rescue ProconBypassMan::CouldNotLoadConfigError
     ProconBypassMan::SendErrorCommand.execute(error: "設定ファイルが不正です。設定ファイルの読み込みに失敗しました")
@@ -84,14 +70,18 @@ module ProconBypassMan
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
     exit 1
-  rescue ProconBypassMan::EternalConnectionError
-    ProconBypassMan::SendErrorCommand.execute(error: "接続の見込みがないのでsleepしまくります")
-    ProconBypassMan::DeviceStatus.change_to_connected_but_sleeping!
-    FileUtils.rm_rf(ProconBypassMan.pid_path)
-    eternal_sleep
-  rescue ProconBypassMan::FirstConnectionError
-    ProconBypassMan::SendErrorCommand.execute(error: "接続を確立できませんでした。やりなおします。")
-    retry
+  rescue ProconBypassMan::ConnectionError
+    begin
+      raise
+    rescue ProconBypassMan::EternalConnectionError
+      ProconBypassMan::SendErrorCommand.execute(error: "接続の見込みがないのでsleepしまくります")
+      ProconBypassMan::DeviceStatus.change_to_connected_but_sleeping!
+      FileUtils.rm_rf(ProconBypassMan.pid_path)
+      eternal_sleep
+    rescue ProconBypassMan::FirstConnectionError
+      ProconBypassMan::SendErrorCommand.execute(error: "接続を確立できませんでした。やりなおします。")
+      retry
+    end
   end
   def self.configure(&block)
@@ -116,9 +106,17 @@ module ProconBypassMan
   def self.initialize_pbm
     ProconBypassMan::WriteDeviceIdCommand.execute
+    ProconBypassMan::WriteSessionIdCommand.execute
+    File.write(pid_path, $$)
+    ProconBypassMan::DeviceStatus.change_to_running!
   end
   def self.eternal_sleep
     sleep(999999999)
   end
+  # @return [Void]
+  def self.hot_reload!
+    Process.kill(:USR2, pid)
+  end
 end

data/project_template/app.rb CHANGED Viewed

@@ -5,7 +5,7 @@ require 'bundler/inline'
 gemfile do
   source 'https://rubygems.org'
   git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-  gem 'procon_bypass_man', '0.1.14'
+  gem 'procon_bypass_man', '0.1.15'
 end
 ProconBypassMan.configure do |config|

data/project_template/setting.yml CHANGED Viewed

@@ -1,12 +1,12 @@
 version: 1.0
 setting: |-
-  fast_return = ProconBypassMan::Splatoon2::Macro::FastReturn
-  guruguru = ProconBypassMan::Splatoon2::Mode::Guruguru
+  fast_return = ProconBypassMan::Plugin::Splatoon2::Macro::FastReturn
+  guruguru = ProconBypassMan::Plugin::Splatoon2::Mode::Guruguru
   install_macro_plugin fast_return
-  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToUpKey
-  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToRightKey
-  install_macro_plugin ProconBypassMan::Splatoon2::Macro::JumpToLeftKey
+  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToUpKey
+  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToRightKey
+  install_macro_plugin ProconBypassMan::Plugin::Splatoon2::Macro::JumpToLeftKey
   install_mode_plugin guruguru
   prefix_keys_for_changing_layer [:zr, :zl, :l]
@@ -18,9 +18,9 @@ setting: |-
     flip :a, if_pressed: [:a]
     flip :down, if_pressed: :down
     macro fast_return.name, if_pressed: [:y, :b, :down]
-    macro ProconBypassMan::Splatoon2::Macro::JumpToUpKey, if_pressed: [:y, :b, :up]
-    macro ProconBypassMan::Splatoon2::Macro::JumpToRightKey, if_pressed: [:y, :b, :right]
-    macro ProconBypassMan::Splatoon2::Macro::JumpToLeftKey, if_pressed: [:y, :b, :left]
+    macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToUpKey, if_pressed: [:y, :b, :up]
+    macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToRightKey, if_pressed: [:y, :b, :right]
+    macro ProconBypassMan::Plugin::Splatoon2::Macro::JumpToLeftKey, if_pressed: [:y, :b, :left]
     remap :l, to: :zr
   end
   layer :right, mode: guruguru.name

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - jiikko
-autorequire:
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -88,6 +89,13 @@ files:
 - lib/procon_bypass_man/device_connector.rb
 - lib/procon_bypass_man/device_status.rb
 - lib/procon_bypass_man/io_monitor.rb
+- lib/procon_bypass_man/plugin.rb
+- lib/procon_bypass_man/plugin/splatoon2/macro/fast_return.rb
+- lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_left_key.rb
+- lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_right_key.rb
+- lib/procon_bypass_man/plugin/splatoon2/macro/jump_to_up_key.rb
+- lib/procon_bypass_man/plugin/splatoon2/mode/guruguru.rb
+- lib/procon_bypass_man/plugin/splatoon2/version.rb
 - lib/procon_bypass_man/processor.rb
 - lib/procon_bypass_man/procon.rb
 - lib/procon_bypass_man/procon/analog_stick.rb
@@ -106,16 +114,10 @@ files:
 - lib/procon_bypass_man/remote_pbm_action/change_pbm_version_action.rb
 - lib/procon_bypass_man/remote_pbm_action/lib/update_remote_pbm_action_status_command.rb
 - lib/procon_bypass_man/remote_pbm_action/reboot_os_action.rb
+- lib/procon_bypass_man/remote_pbm_action/restore_pbm_setting.rb
 - lib/procon_bypass_man/remote_pbm_action/stop_pbm_action.rb
 - lib/procon_bypass_man/runner.rb
 - lib/procon_bypass_man/scheduler.rb
-- lib/procon_bypass_man/splatoon2.rb
-- lib/procon_bypass_man/splatoon2/macro/fast_return.rb
-- lib/procon_bypass_man/splatoon2/macro/jump_to_left_key.rb
-- lib/procon_bypass_man/splatoon2/macro/jump_to_right_key.rb
-- lib/procon_bypass_man/splatoon2/macro/jump_to_up_key.rb
-- lib/procon_bypass_man/splatoon2/mode/guruguru.rb
-- lib/procon_bypass_man/splatoon2/version.rb
 - lib/procon_bypass_man/support/callbacks.rb
 - lib/procon_bypass_man/support/compress_array.rb
 - lib/procon_bypass_man/support/http_client.rb
@@ -145,7 +147,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
@@ -160,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.30
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: An extension for Nintendo Switch Pro Controller
 test_files: []

data/lib/procon_bypass_man/splatoon2/macro/fast_return.rb DELETED Viewed

@@ -1,15 +0,0 @@
-module ProconBypassMan
-  module Splatoon2
-    module Macro
-      module FastReturn
-        def self.name
-          :fast_return
-        end
-        def self.steps
-          [:x, :down, :a, :a].freeze
-        end
-      end
-    end
-  end
-end

data/lib/procon_bypass_man/splatoon2/macro/jump_to_left_key.rb DELETED Viewed

@@ -1,15 +0,0 @@
-module ProconBypassMan
-  module Splatoon2
-    module Macro
-      module JumpToLeftKey
-        def self.name
-          :jump_to_left_key
-        end
-        def self.steps
-          [:x, :left, :a, :a].freeze
-        end
-      end
-    end
-  end
-end

data/lib/procon_bypass_man/splatoon2/macro/jump_to_right_key.rb DELETED Viewed

@@ -1,15 +0,0 @@
-module ProconBypassMan
-  module Splatoon2
-    module Macro
-      module JumpToRightKey
-        def self.name
-          :jump_to_right_key
-        end
-        def self.steps
-          [:x, :right, :a, :a].freeze
-        end
-      end
-    end
-  end
-end

data/lib/procon_bypass_man/splatoon2/macro/jump_to_up_key.rb DELETED Viewed

@@ -1,15 +0,0 @@
-module ProconBypassMan
-  module Splatoon2
-    module Macro
-      module JumpToUpKey
-        def self.name
-          :jump_to_up_key
-        end
-        def self.steps
-          [:x, :up, :a, :a].freeze
-        end
-      end
-    end
-  end
-end

data/lib/procon_bypass_man/splatoon2/mode/guruguru.rb DELETED Viewed

@@ -1,57 +0,0 @@
-module ProconBypassMan
-  module Splatoon2
-    module Mode
-      module Guruguru
-        def self.binaries
-          [ "309481408000362d684658750968f71cfe2c0e51000001480053f71ffedf0d4b000a013d00caf6ecfd4c0d480003011c00000000000000000000000000000000",
-            "30978140800037dd6748687509fdf6adfded0d6d0081005d00eef68dfdef0d6d00830059001bf791fd140e720090005400000000000000000000000000000000",
-            "309a8140800038cd67495875099af821fe120e40006400880042f8fcfdfd0d470067008900d4f7e0fdf20d4e006a008c00000000000000000000000000000000",
-            "309c8140800036ed67466875099bf878fe4a0e35005b004c00c1f875fe400e35005d004c00c4f856fe2d0e390063006c00000000000000000000000000000000",
-            "30a081408000371d6847587509b9f71bfee70d22002c002300e3f73afe150e2b003500280014f854fe300e2d0038002900000000000000000000000000000000",
-            "30a38140800039fd6743587509def70ffea10d1a0031001f00d1f70ffeb10d19002c002200c5f711feb80d18002c002500000000000000000000000000000000",
-            "30a58140800037dd6746687509d8f70bfe980d270035001200ddf70dfe980d240038001900dff70ffe9b0d1f0035001a00000000000000000000000000000000",
-            "30a98140800037ed67484875099cf7edfdb00d310020000d009ef7eefda30d310022000c00adf7f2fd980d300028000a00000000000000000000000000000000",
-            "30ac8140800036ed67484875099cf709fed40d3a002400160097f7fafdd30d39002200150096f7f0fdc80d380022001400000000000000000000000000000000",
-            "30ae8140800038fd674558750987f72efed40d360021001c0089f729fed50d39002400180092f715fed10d390022001800000000000000000000000000000000",
-            "30b18140800037dd6747487509b8f705fea90d19001d002000c5f70dfeb00d210019002200bff71efec20d280018002400000000000000000000000000000000",
-            "30b48140800038fd684868750980f7e9fdd40d0200080024007df7f1fdba0d060011001e0084f7f8fdaa0d12001a001a00000000000000000000000000000000",
-            "30b7814080003fdd694958750918f6a9fd510f0d00d1ff370024f7b0fda90e0100ecff30006cf7d1fd210efffff5ff2c00000000000000000000000000000000",
-            "30ba81408080482d744768750963f71ffe190f5e00d9fea100ccf62dfe650f510009ff980015f702fe580f4b002eff8400000000000000000000000000000000",
-            "30bd814080802f7d864758750974f70efe4c0f5e00c0fea000d1f726fe1c0f5d00c5fea30028f859fe0e0f5c00cafea800000000000000000000000000000000",
-            "30bf8140808057cc984758750961f73afe630f99009dfeae0050f738fe710f7500adfea40050f721fe720f6e00b2fea300000000000000000000000000000000",
-            "30c281408080f479bd483875092ef8b6feab0f0a0180feba00f1f798fe900f000181febd00c2f77dfe7c0fdb008efebd00000000000000000000000000000000",
-            "30c581408080ad87d846487509e1f80000a6107e0178fea2004ef88dff54106c0185fea70063f826ffe60f520182feae00000000000000000000000000000000",
-            "30c8810080800797d84868750995f8e1fe4b0f7a0161fe88000df96dffd00f700149fe990035f9cdff361088016afea000000000000000000000000000000000",
-            "30cb810080804586d848487509cef672fe8a0f6d0217ff42002df63cfe280f1d0219ff410059f61cfe070fed01f5fe4a00000000000000000000000000000000",
-            "30d08100808002c5d745687509d8f5aaff830f5e03e6fe3e01fbf55bffc30f3f03e4fe100158f600ff3e102903e5fee700000000000000000000000000000000",
-            "30d3810080807b94d14838750991f6cd00690f9903f0fff10147f6e200560f7e038fffc60101f6c900560f71033bffa901000000000000000000000000000000",
-            "30d681008080b743ca475875095af7f2009c0fca03a400320242f7ca00950fb503820028020af7b000820fa4034e001a02000000000000000000000000000000",
-            "30d9810080805be3c047587509e7f77a03c70f0e04bb00410258f79801940f0004b800410251f74401910fd803b3003602000000000000000000000000000000",
-            "30dc810080808a02b245587509c0fbd5086a10710475020a03b0fb8d085d106c042102e8027efb660876106a04bc01af02000000000000000000000000000000",
-            "30de8100808036d2a14568750970fbbf09ad103704af038003a9fb600989105c0459036103c2fb2a097210690412034603000000000000000000000000000000",
-            "30e281008000cbb18d4738750989f8b40b2812380341044c0429f99e0bef11510340043704f2f93c0b7911b0033704f003000000000000000000000000000000",
-            "30e581008000c9c18945587509a5f7ca0a2e13e400c6024c0547f7fd0a941264011703270578f74a0b6012e40168030205000000000000000000000000000000",
-            "30e781008000c6618948687509acf86909e813d0fe2801a1057cf8cf09ed130fff6301990516f8710aaa13ccff13028205000000000000000000000000000000",
-            "30ea81008000c77189475875093af93b0762136efbaeff19060cf90107b113a9fb99ff0906e1f85b07b113bafc9fffcd05000000000000000000000000000000",
-            "30ed81008000c791894568750950f9ce047c1432f900026007a5f9a6051f146ef9bb013707bff99206a813fef9ce00c606000000000000000000000000000000",
-            "30ef81008000c6d1894558750944f8ad0358143ef81c02f10780f8b403841484f84102d107ccf801049314bcf84202ad07000000000000000000000000000000",
-            "30f381008000c761884868750914f72105e4134cf6d001c00743f71a05f11391f6bf01e407a0f7c904fa13faf6b3011008000000000000000000000000000000",
-            "30f681008000c7718344587509eaf54a04c812a6f40002500627f66d041313f2f40d02940682f6a60468133ef51a02d806000000000000000000000000000000",
-            "30f881008000c4e1814668750b5cf5f803b51125f3b5000d0560f50f04e8118cf33c015d057df525042c1210f4b101cc05000000000000000000000000000000",
-            "30fb81008000c5e1814458750b19f65a02a410acf29effb804e2f5db02df10b7f2c0ffbf04a9f55c032011dcf22400d804000000000000000000000000000000",
-            "30fe8100800035e2814858750b81f65c00f80f8df231fe940471f6e6001f1088f2a6fe92044ef6b1015a1092f21fffa004000000000000000000000000000000",
-            "3001810080004b03814868750b69f6e6fdad0ffef20efdd40479f678feb40fd9f249fdc40484f6f4fec00fb0f29ffdad04000000000000000000000000000000",
-            "30048100800079e47d4858750b17f64cfb5f0f46f46afb430529f6c4fb710ff1f3d4fb300538f64bfc830fbbf315fc1d05000000000000000000000000000000",
-            "300781008000a7057e4668750bb1f5d3f9fb0e8ef5ccf96405cdf5fcf90c0f44f52dfa6505e1f52dfa210f29f550fa6305000000000000000000000000000000",
-            "30098100800041f67d4668750bcdf4b0f9ab0e21f602f955057ef5adf9d00ee1f559f95f05b1f5d3f9fb0e8ef5ccf96405000000000000000000000000000000",
-            "300d810080003d877c4838750b84f458f7dd0c89f6d0f8fc0436f4e2f7620d83f614f8430526f4c0f8a00e71f666f85c05000000000000000000000000000000",
-            "30108100800058e77a4668750bf7f2c3f57c0c9cf6abfa0a0470f30ef6790c89f65dfa420414f476f67e0c80f6d0f98a04000000000000000000000000000000",
-            "30128100800059f77a4658750b7ef249f5580cd9f69bfaa40389f269f56c0cd1f6a9fab503a3f286f5760cacf6c9faeb03000000000000000000000000000000",
-            "3016810080005b177b4868750ba9f298f4450b2cf774fa3102b8f2a5f47a0b24f765fa6e02b8f2b8f4b10b1df755faac02000000000000000000000000000000",
-            "30198100800057777a4558750b39f258f4480a80f73efaf40016f26af4940a5ef76bfa37014ef275f4d40a46f780fa8401000000000000000000000000000000",
-          ].map(&:freeze).freeze
-        end
-      end
-    end
-  end
-end

data/lib/procon_bypass_man/splatoon2/version.rb DELETED Viewed

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-module ProconBypassMan
-  module Splatoon2
-    VERSION = "0.1.1"
-  end
-end

data/lib/procon_bypass_man/splatoon2.rb DELETED Viewed

@@ -1,11 +0,0 @@
-require_relative "splatoon2/version"
-require_relative "splatoon2/macro/fast_return"
-require_relative "splatoon2/macro/jump_to_right_key"
-require_relative "splatoon2/macro/jump_to_up_key"
-require_relative "splatoon2/macro/jump_to_left_key"
-require_relative "splatoon2/mode/guruguru"
-module ProconBypassMan
-  module Splatoon2
-  end
-end