Merge pull request #26 from THE-POWERNEWS/develop

fix: MastodonツールのRAILS_ENV受け渡し修正

Author: pooza

Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/pooza/ginseng-core.git
-  revision: 007cc8ecceb2c7a7b4348f13264abe7ac6ab59cb
+  revision: 80891c47bdca2915b44b1aeb5546189fa1e5bdef
   specs:
-    ginseng-core (1.15.12)
+    ginseng-core (1.15.13)
       activesupport (>= 7.0.7.1)
       addressable (>= 2.8.0)
       cgi (>= 0.4.2)

app/lib/writers_base/tool/mastodon_follow_tool.rb

@@ -19,9 +19,8 @@ def description
     private
 
     def tootctl_command(args)
-      command = CommandLine.new(
-        ['sudo', '-u', mastodon_user, 'bundle', 'exec', 'bin/tootctl', *args],
-      )
+      command = CommandLine.new(['bundle', 'exec', 'bin/tootctl', *args])
+      command.user = mastodon_user
       command.env = {'RAILS_ENV' => mastodon_rails_env}
       command.dir = mastodon_dir
       unless test?

app/lib/writers_base/tool/mastodon_maintenance_tool.rb

@@ -21,9 +21,8 @@ def description
     private
 
     def tootctl_command(args)
-      command = CommandLine.new(
-        ['sudo', '-u', mastodon_user, 'bundle', 'exec', 'bin/tootctl', *args],
-      )
+      command = CommandLine.new(['bundle', 'exec', 'bin/tootctl', *args])
+      command.user = mastodon_user
       command.env = {'RAILS_ENV' => mastodon_rails_env}
       command.dir = mastodon_dir
       unless test?

app/lib/writers_base/tool/mastodon_media_cleanup_tool.rb

@@ -21,9 +21,8 @@ def description
     private
 
     def tootctl_command(args)
-      command = CommandLine.new(
-        ['sudo', '-u', mastodon_user, 'bundle', 'exec', 'bin/tootctl', *args],
-      )
+      command = CommandLine.new(['bundle', 'exec', 'bin/tootctl', *args])
+      command.user = mastodon_user
       command.env = {'RAILS_ENV' => mastodon_rails_env}
       command.dir = mastodon_dir
       unless test?

config/application.yaml

@@ -19,7 +19,7 @@ package:
     - tkoishi@b-shock.co.jp
   license: MIT
   url: https://github.com/THE-POWERNEWS/writersbase-tools
-  version: 1.4.7
+  version: 1.4.8
 ruby:
   bin: /usr/bin/ruby3.3
 hourly: []