wslc-wip 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c029c0b9ac521978ed14280f2a1729c7660072ab9167a14cc64d9c009b3e0574
-  data.tar.gz: 338e9ceacddd365347fad3e205ba2fd2d33925b53bf923d88f0d044df3f82aea
+  metadata.gz: bc4331f98464658b13ec0ac51737183931ce6ed5320d15cf64b2313b50aa7999
+  data.tar.gz: 3d9cac0a97bd2abb2a0c30f5c5bc5a8c626320d900f4ac7cd46aca682368b56c
 SHA512:
-  metadata.gz: 2c2a9d8f03bb83e506990e5c9c621f782d99681dc292277f50a4e6cde0d1f98cf1a853641abd328ba4431fe892d05a986e00d220aab51d652b66dcd6c2d68246
-  data.tar.gz: afa6e3ffc70cc339d6c45c72a78ef0006b39cf7573252ed997029a823680cb63c1290fc7fdbf11f289393c903bde4db7686a72c1637edf3eb0d04a6a25165c08
+  metadata.gz: 8568791708d1e6b87b85c209568d47580daf0008253dc41b824c9a4377d35f08c2b1005a6082b7ab3eefeaf2cc7ead6ce8357a31047bc17dda0b9f6afcc70266
+  data.tar.gz: 827d83e3244bc9269b12139f5e4554f7b0e2137b1a2a54ac3258799a2c531d355e9a3405ec4bbffff1b134b7b39cbcde0a13a1ba06df35f93cc995b45e4637b7

data/README.md

@@ -82,6 +82,8 @@ commands:
 | `wip doctor` | WSL2、相互運用、WSLC、設定、アーキテクチャ、Git を診断 |
 | `wip config` | デフォルト適用済み設定（秘密値をマスク） |
 | `wip build -- --no-cache` | build 定義でイメージをビルド |
+| `wip up [-d]` | `defaults.container` を起動（無ければ作成）。`-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

@@ -9,6 +9,20 @@ module Wip
     class_option :config, type: :string, desc: 'Path to wip.yml'
     default_task :dispatch
 
+    def self.exit_on_failure? = true
+
+    # Thor only falls back to the default task when no command name is given at
+    # all; an unrecognized first argument (e.g. a custom wip.yml command name)
+    # would otherwise raise "Could not find command". Route those to `dispatch`.
+    def self.dispatch(meth, given_args, given_opts, config)
+      name = given_args.first
+      if meth.nil? && name && !name.to_s.start_with?('-') && find_command_possibilities(name).empty?
+        return super('dispatch', given_args, given_opts, config)
+      end
+
+      super
+    end
+
     desc 'version', 'Show wip and WSLC versions'
     def version
       puts "wip #{VERSION}"
@@ -37,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)
@@ -55,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
@@ -74,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,28 @@ 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'))
+    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/version.rb

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

metadata

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