wocker 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6efba3d71f2df1617beacc71656a84032c8a3a0a18060546ef2d526623b494d
-  data.tar.gz: '069c7c304426606cfc6f233661402f5f3ad5ad4d3a03cd2e28d3c63319375389'
+  metadata.gz: 78228e75f44a2e31255cd8110088c85b1269f7d4eee8907115f48e4fc78584fc
+  data.tar.gz: 45abe1fae8763d5e56139308fd391a002783173e2ff4e44fe53b48f002602a5f
 SHA512:
-  metadata.gz: e3bd45b678c597ef96837a63361b3c785bcb604042ae748a4432838dafea19096a840f8cd3249de6f7833b3d4d19c25f6315b6d74c10822eb641405f764dd5ea
-  data.tar.gz: bf7b9ff80bbb2e790dc9cfaee4870caf0fb6cb9909aefb5c5b9a2f7697a8552ab815aaddd31f38aa85bbee608d5ff497b6e915d5782f30f45067c36c1f8d535b
+  metadata.gz: 04a2941a2b2ceae193f29be4b029d5c4f6dc0eb03a5d5bbe6ef637f4f2e513ee1da411ed8811e170c785d36f38cdaf27b5af44e38772851ea16866246713f085
+  data.tar.gz: 2c6e256283272555e00c80f41a938e7ef1657312ea4cd1ee98008af396701f0bf295ac4c611d5bae44d975207cdbee034962c9f065432d03e6d73d51f6108b89

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    wocker (0.3.2)
+    wocker (0.3.3)
       clamp
+      kommando
 
 GEM
   remote: https://rubygems.org/
   specs:
     clamp (1.3.0)
     diff-lcs (1.3)
+    kommando (0.1.2)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)

data/lib/wocker/cli/exec_command.rb

@@ -1,18 +1,68 @@
 # frozen_string_literal: true
+require "kommando"
+require "fileutils"
+
+# frozen_string_literal: true
+require "kommando"
+require "fileutils"
 
 module Wocker
   module Cli
     class ExecCommand < Clamp::Command
       parameter "COMMAND ...", "command"
       option "--workdir", "WORKDIR", "workdir"
+      option ["--interactive", "-i"], :flag, "interactive"
+      option ["--detach", "-d"], :flag, "detach"
 
       def execute
-        command_list.insert 0, "cd"
-        current_workdir = workdir || Wockerfile.workdir || "/vagrant"
-        command_list.insert 1, "#{current_workdir};"
+        best_guess_workdir = workdir || Wockerfile.workdir || "/vagrant"
+        best_guess_workdir_cmdfied = best_guess_workdir.gsub("/", "\\")
+        best_workdir_cmd = "C:\\#{best_guess_workdir_cmdfied}"
 
         cmd = command_list.join " "
-        Wocker::Vagrant.run "winrm", "-c", cmd
+        if detach?
+          if workdir
+            STDERR.puts "workdir not supported with detach"
+            exit 1
+          end
+
+          interactive_flags = "-i 1" if interactive?
+
+          psexec_wrapper_cmd = "psexec -accepteula -nobanner -d -s #{interactive_flags} #{cmd} >nul 2>&1"
+          Wocker::Vagrant.run "winrm", "-s", "cmd", "-c", psexec_wrapper_cmd
+        elsif interactive?
+          File.unlink "wocker-exec-out" if File.exist? "wocker-exec-out"
+
+          psexec_wrapper_cmd = "psexec -accepteula -nobanner -s -i 1 cmd.exe /C \"cd #{best_workdir_cmd} & #{cmd} >C:\\vagrant\\wocker-exec-out 2>&1\" >nul 2>&1"
+
+          psexec_thr = Thread.new do
+            Wocker::Vagrant.run "winrm", "-s", "cmd", "-c", psexec_wrapper_cmd
+          end
+          FileUtils.touch "wocker-exec-out"
+          log_tail_k = Kommando.run_async "tail -f wocker-exec-out", output: true
+
+          require 'io/console'
+          loop do
+            c = STDIN.getch
+            p c
+            break if c == "\u0003"
+            if c == "\r"
+              `wocker keyboard write enter`
+            else
+              `wocker keyboard write #{c}`
+            end
+
+            sleep 0.1
+          end
+
+          psexec_thr.join
+          log_tail_k.kill
+
+          File.unlink "wocker-exec-out" if File.exist? "wocker-exec-out"
+
+        else
+          Wocker::Vagrant.run "winrm", "-c", "cd #{best_guess_workdir}; #{cmd}"
+        end
       end
     end
   end

data/lib/wocker/version.rb

@@ -1,3 +1,3 @@
 module Wocker
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/wocker.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "clamp"
+  spec.add_dependency "kommando"
 
   spec.add_development_dependency "bundler", "~> 1.0"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wocker
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Matti Paksula
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kommando
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement