source_win_bat 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c46cbace49e6e3914b1f3d5152349714d731635f12c26be4d55b58a590a9651
-  data.tar.gz: 36dcbb2f601fde0b2805b6387ee22205c47d48247e320c92ba6ea059c75ba8f3
+  metadata.gz: 60ef7f12402da3cef3443161f97eef66b580182aa70c2ea20e2f936dc56f9cd3
+  data.tar.gz: 70f32f56ddb5aa0bdded6e72084bb977af84658b4dcabf3cbdc3e288cdc104e4
 SHA512:
-  metadata.gz: 92f80de09376677f864f6817291965309d17c7f9be4a2f733193b381a0141eaade5928c99ce853153539ad97a79a5e7576c0739b5bd40ae00cb228b65db62278
-  data.tar.gz: 7ce72e5a78583ad0124a72efdb50478d33b8f7ffa36b3a7f9824594dc72643451ef24c7fa95781a372d247a0d31e6ff735882d512af9e20c722b04a2115cfedd
+  metadata.gz: 87b0dda50fb66fac4b6c691bebf72d6549561e48092ce04945e083a4dca332ad5530c4bcf91ff43f7d8759d415ffef4789e3ab89f178ab142e00231c1617e698
+  data.tar.gz: 6aa26c86859b485d8033a01ddb5a72b73b5e07306a9b2326e762a63034e6ca11b377719de21694befaa6dd22d4e665b76a913dd87f4e7e97836f36c6ab48a4e6

data/bin/init_sw

@@ -10,36 +10,30 @@ if [[ `uname` != Linux && $? != 0 ]]; then
 else
     sw () {
         local arg
+        local preserves_dump=
+        local shows_cmd=
+        local is_cmd_given=
         local tmp_env tmp_macro tmp_cwd
         local exitstatus
 
+        local opts=()
         for arg in "$@"; do
             if [[ "$arg" = "--" ]]; then
                 shift 1
                 break
             elif [[ "$arg" =~ ^-+.+ ]]; then
                 case "$arg" in
-                    "--help" | "-h" )
-                        cat <<EOS
-sw, or SourceWinBat, is a utility to run Windows batch files from WSL /
-MSYS2 / Cygwin and sync environment variables, and working directories 
-between batch files and their UNIX Bash shell.
-
-  Usage:
-    sw [ [sw_options] -- ] win_bat_file [args...]
-
-  Sw options:
-    -help --help        Show this help message
-
-  Examples:
-    sw echo test
-    sw somebat.bat
-                        
-EOS
-                        return ;;
+                    "--preserve-dump" )
+                        preserves_dump=0
+                        opts+=( "$arg" )
+                        ;;
+                    "--debug" )
+                        preserves_dump=0
+                        opts+=( "$arg" )
+                        ;;
                     * )
-                        echo "Unknown option '$1'" >&2
-                        return 1 ;;
+                        opts+=( "$arg" )
+                        ;;
                 esac
                 shift 1
             else
@@ -50,7 +44,7 @@ EOS
         tmp_env="$(mktemp)"
         tmp_macro="$(mktemp)"
         tmp_cwd="$(mktemp)"
-        ruby -W0 -e "require 'source_win_bat'; SourceWindowsBatch.new.main(ARGV)" "${tmp_env}" "${tmp_macro}" "${tmp_cwd}" "$@"
+        ruby -W0 -e "require 'source_win_bat'; SourceWindowsBatch.new.main(ARGV)" -- "${opts[@]}" -- "${tmp_env}" "${tmp_macro}" "${tmp_cwd}" "$@"
         exitstatus=$?
         if [[ -e "${tmp_env}" ]]; then
             source "${tmp_env}"
@@ -62,7 +56,11 @@ EOS
             source "${tmp_cwd}"
         fi
 
-        ruby -e "begin; File.delete('${tmp_env}', '${tmp_macro}', '${tmp_cwd}'); rescue Errno::ENOENT; end"
+        if [[ -z $preserves_dump ]]; then
+            ruby -e "begin; File.delete('${tmp_env}', '${tmp_macro}', '${tmp_cwd}'); rescue Errno::ENOENT; end"
+        else
+            echo "SW: '${tmp_env}', '${tmp_macro}', '${tmp_cwd}' are preserved"
+        fi
         return $exitstatus
     }
 fi

data/lib/source_win_bat.rb

@@ -6,18 +6,10 @@ require_relative 'unixcompatenv'
 
 class SourceWindowsBatch
   
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 
   def main(argv)
-    if argv.length < 4 || argv[3].chomp.empty?
-      STDERR.puts <<-EOS
-Usage: sw windows_cmd_or_batch [options_for_the_cmd]
-
-Internal Ruby command Usage:
-      #{File.basename(__FILE__)} env_out macro_out cwd_out windows_cmd_or_batch [options_for_the_cmd]
-      EOS
-      exit
-    end
+    options = parse_args!(argv)
 
     unless [:cygwin, :msys, :wsl].include? UnixCompatEnv.compat_env
       raise "You're in an unsupported UNIX compatible environment"
@@ -33,7 +25,9 @@ Internal Ruby command Usage:
     win_cmd = concat_macrodump(win_cmd, macro_tmp_file_in)
     win_cmd = concat_cwddump(win_cmd, cwd_tmp_file_in)
     win_cmd += " & call exit %^SW_EXITSTATUS%"
-    # puts win_cmd
+    if options[:show_cmd]
+      STDERR.puts "SW: " + win_cmd
+    end
     Signal.trap(:INT, "SIG_IGN")
     if UnixCompatEnv.compat_env == :wsl
       # * Skip winpty, assuming the system's WSL supports ConPTY
@@ -60,8 +54,10 @@ Internal Ruby command Usage:
       conv_setenv_stmts(env_tmp_file_in, argv[0], :bash, codepage)
       conv_doskey_stmts(macro_tmp_file_in, argv[1], :bash, codepage)
       gen_chdir_cmds(cwd_tmp_file_in, argv[2], :bash, codepage)
-      [env_tmp_file_in, macro_tmp_file_in, cwd_tmp_file_in].each do |f|
-        File.delete f
+      if !options[:preserve_dump]
+        [env_tmp_file_in, macro_tmp_file_in, cwd_tmp_file_in].each do |f|
+          File.delete f
+        end
       end
     rescue Errno::ENOENT
       # ignore
@@ -72,6 +68,89 @@ Internal Ruby command Usage:
 
   private
 
+  def parse_args!(argv)
+    options = {}
+    while argv.length > 0 && argv[0].start_with?("-")
+      arg = argv.shift
+      case arg 
+      when "--"
+        next
+      when "--show-cmd"
+        options[:show_cmd] = true
+      when "--preserve-dump"
+        options[:preserve_dump] = true
+      when "--debug"
+        options[:show_cmd] = true
+        options[:preserve_dump] = true
+      when "--help", "-h"
+        puts help
+        exit
+      when "--version", "-v"
+        STDERR.puts "SourceWinBat Version #{VERSION}"
+        exit
+      else
+        STDERR.puts "Unknown option '#{arg}'"
+        exit 1
+      end
+    end
+    if argv.length < 4 || argv[3].chomp.empty?
+      STDERR.puts "Error: No Windows command is given\n---"
+      STDERR.puts help
+      exit 1
+    end
+
+    options
+  end
+
+  def help
+    <<EOS
+sw, or SourceWinBat, is a utility to run Windows batch files from WSL /
+MSYS2 / Cygwin and sync environment variables, and working directories 
+between batch files and their UNIX Bash shell.
+
+  Usage:
+    sw [ [sw_options] -- ] win_bat_file [args...]
+
+  Sw options:
+    -h --help           Show this help message
+    -v --version        Show the version information
+    --preserve-dump     Preserve the environment dump files of cmd.exe for
+                        debugging
+    --show-cmd          Show the command executed in cmd.exe for debugging
+    --debug             Enable '--preserve-dump' and '--show-cmd' options
+
+  Examples:
+    sw echo test
+    sw somebat.bat
+
+You can control some behavior of SourceWinBat by defining following environment
+variables.
+
+  Blacklisting and Whitelisting Environment Variable Not to be Synced:
+
+    SWB_BLACKLIST       Define comma-separated environment variable names with 
+                        regular expressions. All environment variables included
+                        in this list will not be synced by SourceWinBat.
+
+    SWB_WHITELIST       Define variable names in the same manner as that of 
+                        SWB_BLACKLIST. All environment variables that are NOT
+                        included in the list will NOT be synced by SourceWinBat.
+
+    Examples:
+
+      export SWB_BLACKLIST="foo:bar:baz_.*"
+
+        "foo", "bar", and any variables name of which start with "baz_" will not
+        be synced
+
+      export SWB_BLACKLIST="sync_taboo"
+      export SWB_WHITELIST="sync_.*"
+
+        Only variables name of which start with "sync_" will be synced,
+        except "sync_taboo".
+EOS
+  end
+
   def detect_ansi_codepage
     if !STDOUT.isatty && UnixCompatEnv.compat_env == :wsl
       # cmd.exe seems to use UTF-8 when Stdout is redirected in WSL. TODO: Is it always fixed?
@@ -254,7 +333,7 @@ Internal Ruby command Usage:
           key, body = /([^=]*)=(.*)$/.match(doskey_stmt)[1..2]
 
           is_key_valid = /^[a-zA-Z][0-9a-zA-Z]*$/ =~ key
-          return nil unless is_key_valid
+          next if !is_key_valid
 
           body_substituted = escape_singlequote(body.chomp)
             .gsub(/(?<param>\$[1-9]|\$\$|\$\*)/, '\'"\k<param>"\'')

data/source_win_bat.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'source_win_bat'
-  s.version     = '0.2.0'
-  s.date        = '2019-01-05'
+  s.version     = '0.3.0'
+  s.date        = '2019-02-06'
   s.summary     = "'source' Windows bat files in your UNIX compatible shell in Windows"
   s.description = <<EOS
 sw, or SourceWinBat, is a utility to run Windows batch files from WSL /

data/test/setcwd.cmd

@@ -1,5 +1,6 @@
 @echo off
 
+C:
 cd C:\
 pushd C:\Windows
 pushd C:\Windows\system32

data/test/test_ansicpchars.bash

@@ -16,7 +16,7 @@ sw echo %jp% > /dev/null  # Re-import $jp from Windows
 sw set jp2=あいうえお > /dev/null
 [[ $(echo $jp2) = "あいうえお" ]]; tap_okif $?
 
-
+cd $(to_unix_path "C:\\")
 tmp="$(to_unix_path "$(sw echo %TEMP% | strip)")/sw_日本語ディレクトリ"
 rm -rf "$tmp"
 mkdir "$tmp"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: source_win_bat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Takaya Saeki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies: []
 description: "sw, or SourceWinBat, is a utility to run Windows batch files from WSL
   /\nMSYS2 / Cygwin and sync environment variables, doskeys, and working \ndirectories