wslc-wip 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 996355115196c1437d3e06148ccc257c8d39dc5c98905643b979ff032de1775c
-  data.tar.gz: c10bb414811f0e7ab33d3fcf5a80f360d8b4f61aa374120d03c394eca22b1429
+  metadata.gz: aacee07e7929d736a13e1a7a4812a52155431b311913a4e5fa25409f6c772f60
+  data.tar.gz: 31de690c5b1040a9d0cb0c12890f20cf8d07f1d3d57e74d44140d8af30d7e0f0
 SHA512:
-  metadata.gz: b613505166cfdc3389ab84c7bdc4c226bdbc3c1943d75b4b9c1b2a31aea9e80f5e858aa6d4e2d68028aa66686c9239d1089841dbab55534a23c5bc42768e7bba
-  data.tar.gz: 1a25e8fe70e97205d198560c48eb69cdeafc8a29716f43b2534636fb1f3fc7eb04da41907081e633eb5ec509d6e1fb383bbddae532b21324d649ee75b4b8b2b5
+  metadata.gz: 13e7a7c473c92063c6c9bc505ea72b03a8fab8269a6deb0ae2f27fb6309a2848477257b3d759b917eb2e6ddf86dc3b3144fbb98031e6548ece4ae2eaf14f166e
+  data.tar.gz: 494a24787a32f87479e8c984617e1928c54b43864b9a247da042281b138cd48795970e05ebb69b9805b31a8dd239a0c190f5554f9f427b29f81c1b9a42b669d9

data/README.md

@@ -45,6 +45,8 @@ defaults:
     - "3000:3000"
   volumes:
     - ".:/app"
+up:
+  command: server # `wip up` がコンテナ作成時にイメージへ渡す常駐コマンド（未指定ならイメージの既定 CMD）
 commands:
   rails:
     type: exec
@@ -82,6 +84,8 @@ commands:
 | `wip doctor` | WSL2、相互運用、WSLC、設定、アーキテクチャ、Git を診断 |
 | `wip config` | デフォルト適用済み設定（秘密値をマスク） |
 | `wip build -- --no-cache` | build 定義でイメージをビルド |
+| `wip up [-d]` | `defaults.container` を起動（無ければ `up.command` 付きで作成）。`-d` でバックグラウンド実行 |
+| `wip down` | `defaults.container` を停止・削除 |
 | `wip exec [--no-interactive] COMMAND...` | 既存コンテナ内で実行 |
 | `wip run [--no-interactive] COMMAND...` | `--rm` の新規コンテナで実行 |
 | `wip shell` | 定義済み shell、または `bash`、`sh` の順に起動 |

data/lib/wip/cli.rb

@@ -51,6 +51,19 @@ module Wip
       execute(builder.build(settings: load_config.command('build') || {}, extra: extra))
     end
 
+    desc 'up', 'Start the configured container, creating it if necessary'
+    option :detach, type: :boolean, default: false, aliases: '-d'
+    def up
+      code = execute(builder.start(detach: options[:detach]), exit_on_failure: false)
+      execute(builder.up(detach: options[:detach])) if code != 0
+    end
+
+    desc 'down', 'Stop and remove the configured container'
+    def down
+      execute(builder.down, exit_on_failure: false)
+      execute(builder.remove, exit_on_failure: false)
+    end
+
     desc 'exec COMMAND...', 'Execute a command in the running container'
     option :interactive, type: :boolean, default: true
     def exec(*command)
@@ -69,7 +82,8 @@ module Wip
       configured = load_config.command('shell')
       return execute(builder.custom('shell', [])) if configured
 
-      code = execute(builder.exec(['bash'], settings: { 'interactive' => true }, interactive: true))
+      code = execute(builder.exec(['bash'], settings: { 'interactive' => true }, interactive: true),
+                     exit_on_failure: false)
       execute(builder.exec(['sh'], settings: { 'interactive' => true }, interactive: true)) if code != 0
     end
     map 'shell' => :shell_command
@@ -88,9 +102,9 @@ module Wip
     def resolver = CommandResolver.new
     def builder = CommandBuilder.new(wslc: resolver.resolve(load_config.wslc_command), config: load_config)
 
-    def execute(command)
+    def execute(command, exit_on_failure: true)
       code = CommandRunner.new.run(command)
-      exit(code) unless code.zero?
+      exit(code) if exit_on_failure && !code.zero?
       code
     end
   end

data/lib/wip/command_builder.rb

@@ -26,6 +26,30 @@ module Wip
       command.concat(options(values)).push(required(values, 'image')).concat(arguments)
     end
 
+    def up(detach: false)
+      values = @config.defaults
+      command = [@wslc, 'run', '--name', required(values, 'container')]
+      command << '-d' if detach
+      command << '-it' if !detach && tty?(true)
+      command.concat(options(values)).push(required(values, 'image'))
+      command.concat(Shellwords.split(@config.up_command.to_s)) if @config.up_command
+      command
+    end
+
+    def start(detach: false)
+      command = [@wslc, 'start', required(@config.defaults, 'container')]
+      command.push('-a', '-i') unless detach
+      command
+    end
+
+    def down
+      [@wslc, 'stop', required(@config.defaults, 'container')]
+    end
+
+    def remove
+      [@wslc, 'remove', '-f', required(@config.defaults, 'container')]
+    end
+
     def build(settings:, extra: [])
       values = @config.defaults.merge(settings)
       context = values['context'] || '.'

data/lib/wip/config.rb

@@ -17,6 +17,7 @@ module Wip
     def wslc_command = @raw.dig('wslc', 'command') || 'auto'
     def commands = @raw['commands'] || {}
     def defaults = DEFAULTS.merge(@raw['defaults'] || {})
+    def up_command = @raw.dig('up', 'command')
 
     def command(name)
       entry = commands[name.to_s]
@@ -27,6 +28,7 @@ module Wip
 
     def to_h(redact: true)
       value = { 'version' => 1, 'wslc' => { 'command' => wslc_command }, 'defaults' => defaults,
+                'up' => { 'command' => up_command },
                 'commands' => commands.transform_values { |entry| defaults.merge('type' => 'exec').merge(entry) } }
       redact ? redact_secrets(value) : value
     end
@@ -36,6 +38,7 @@ module Wip
     def validate!
       raise ConfigError, "Unsupported configuration version: #{@raw['version']}" unless (@raw['version'] || 1) == 1
       raise ConfigError, 'commands must be a mapping' unless commands.is_a?(Hash)
+      raise ConfigError, 'up must be a mapping' if @raw.key?('up') && !@raw['up'].is_a?(Hash)
 
       commands.each { |name, entry| validate_command!(name, entry) }
     end

data/lib/wip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wip
-  VERSION = '0.1.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wslc-wip
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Wip contributors