source_win_bat 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13570792e56f831dce6bdc6c882950bfa681bedeb3e06bc6ef6ad4ef06b7a853
-  data.tar.gz: 0a68d985177b5f751b7fd7ebdf06440cda0269ec03347b261615ac919a80da3b
+  metadata.gz: 2c46cbace49e6e3914b1f3d5152349714d731635f12c26be4d55b58a590a9651
+  data.tar.gz: 36dcbb2f601fde0b2805b6387ee22205c47d48247e320c92ba6ea059c75ba8f3
 SHA512:
-  metadata.gz: db9581bba734ea26bad073cce02811c74ff748037e99165a57f07c81dad7590537b9af04bb445db084e249e7d73fb6e3d500e36ce863eac5778c29373cedfbd9
-  data.tar.gz: 2e8c8d97f2285224a2608dafda5045c36ce67790c30d26a0b70e030f97ba439c20f49657ec6400ee06b16be0493c72ff214596ac15083ebe23057792498f6746
+  metadata.gz: 92f80de09376677f864f6817291965309d17c7f9be4a2f733193b381a0141eaade5928c99ce853153539ad97a79a5e7576c0739b5bd40ae00cb228b65db62278
+  data.tar.gz: 7ce72e5a78583ad0124a72efdb50478d33b8f7ffa36b3a7f9824594dc72643451ef24c7fa95781a372d247a0d31e6ff735882d512af9e20c722b04a2115cfedd

data/Rakefile

@@ -47,7 +47,12 @@ task :test do
     end
     cd2test = "cd \"$(#{convpath_win2compat} '#{tests_winpath}')\"; "
     rubylib = "RUBYLIB=\"$(#{convpath_win2compat} '#{lib_winpath}')\" "
-    prove = "prove -e /bin/bash -j4 test_*.bash; "
+    if ENV['TEST']
+      testcases = ENV['TEST']
+    else
+      testcases = "test_*.bash"
+    end
+    prove = "prove -e /bin/bash -j4 #{testcases}; "
 
     cmd_in_env = cd2test + rubylib + prove
     if env == UnixCompatEnv.compat_env

data/lib/source_win_bat.rb

@@ -6,7 +6,7 @@ require_relative 'unixcompatenv'
 
 class SourceWindowsBatch
   
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 
   def main(argv)
     if argv.length < 4 || argv[3].chomp.empty?
@@ -102,14 +102,31 @@ Internal Ruby command Usage:
     wslenvs
   end
 
+  def whitelist_block?(envvar_name)
+    return false if !ENV["SWB_WHITELIST"]
+    ENV["SWB_WHITELIST"].split(":").each do |name_regexp|
+      return false if Regexp.new(name_regexp) =~ envvar_name
+    end
+    true
+  end
+
+  def blacklist_block?(envvar_name)
+    return false if !ENV["SWB_BLACKLIST"]
+    ENV["SWB_BLACKLIST"].split(":").each do |name_regexp|
+      return true if Regexp.new(name_regexp) =~ envvar_name
+    end
+    false
+  end
+
   def prepare_env_vars
     return {} if UnixCompatEnv.compat_env != :wsl
 
     wslenvs = Hash[]
     ENV.each do |envvar_name, _|
+      next if whitelist_block?(envvar_name) || blacklist_block?(envvar_name)
       wslenvs[envvar_name] = ""
     end
-    wslenvs.merge!(parse_wslenv(ENV['WSLENV']))
+    wslenvs.merge!(parse_wslenv(ENV['WSLENV'])) if ENV['WSLENV']
     # We don't use '/l' option, but convert paths by ourselves instead.
     # See the comment that starts with 'How PATH in WSLENV is handled'
     wslenvs['PATH'] = ""
@@ -161,22 +178,6 @@ Internal Ruby command Usage:
     str.gsub(/'/, '"\'"')
   end
 
-  def conv_to_host_cmds(in_file, out_file, conv_method, env)
-    unless File.exist?(in_file)
-      return
-    end
-    File.open(out_file, "w") do |out|
-      File.open(in_file) do |f|
-        f.each_line do |line|
-          line.force_encoding("ASCII-8BIT")
-          converted = conv_method.call(line, env)
-          out.puts converted if converted
-        end
-      end
-    end
-  end
-
-
   def to_compat_pathlist(path, shell)
     raise "Unsupporeted" unless shell == :bash
     path.split(";")
@@ -216,6 +217,7 @@ Internal Ruby command Usage:
 
         is_var_valid = /^[a-zA-Z_][_0-9a-zA-Z]*$/ =~ var
         next if !is_var_valid
+        next if whitelist_block?(var) || blacklist_block?(var)
 
         if var == "PATH"
           val = to_compat_pathlist(val, shell)
@@ -234,7 +236,7 @@ Internal Ruby command Usage:
         #     Leave the PATH's WSLENV flag as is
         wslenvs = Hash[*envs.flat_map {|env| [env, ""]}]
         wslenvs.delete('PATH')
-        wslenvs.merge!(parse_wslenv(ENV['WSLENV']))
+        wslenvs.merge!(parse_wslenv(ENV['WSLENV'])) if ENV['WSLENV']
 
         if wslenvs.length > 0
           f_out.puts("export WSLENV='#{serialize_wslenvs(wslenvs)}'")

data/source_win_bat.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'source_win_bat'
-  s.version     = '0.1.0'
+  s.version     = '0.2.0'
   s.date        = '2019-01-05'
   s.summary     = "'source' Windows bat files in your UNIX compatible shell in Windows"
   s.description = <<EOS
@@ -12,6 +12,6 @@ EOS
   s.email       = 'abc.tkys+pub@gmail.com'
   s.files       = `git ls-files`.split("\n")
   s.executables = ["init_sw"]
-  s.homepage    = 'http://rubygems.org/gems/source_win_bat'
+  s.homepage    = 'https://github.com/nullpo-head/source-win-bat'
   s.license     = 'MIT'
 end

data/test/test_ansicpchars.bash

@@ -1,6 +1,12 @@
 #!/bin/bash
 
 source ./setup_test.bash
+if [[ "$(uname)" != Linux ]]; then
+  # Cygwin and MSYS2 currently fail in this test
+  tap_tests 0
+  exit 0
+fi
+
 tap_tests 6
 
 export jp=日本語

data/test/test_exit.bash

@@ -9,5 +9,5 @@ sw exit 0
 sw exit 42
 [[ $? = 42 ]]; tap_okif $? "Test exitcode is propagated 2"
 
-sw exit.cmd
+sw exit_42.cmd
 [[ $? = 42 ]]; tap_okif $? "Test exitcode is propagated 3"

data/test/test_whiteblacklist.bash

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+source ./setup_test.bash
+tap_tests 9
+
+export SWB_BLACKLIST="SWB_FOO:SWB_BLACK_.*:SWB_BAR"
+[[ -z "$(sw set SWB_FOO=FOO; echo $SWB_FOO)" ]]; tap_okif $?
+[[ -z "$(sw set SWB_BLACK_FOO=FOO; echo $SWB_BLACK_FOO)" ]]; tap_okif $?
+[[ -z "$(sw set SWB_BAR=BAR; echo $SWB_BAR)" ]]; tap_okif $?
+[[ $(sw set SWB_BAZ=BAZ; echo $SWB_BAZ) = BAZ ]]; tap_okif $?
+
+
+export SWB_WHITELIST="SWB_W1:SWB_WHITE_.*:SWB_W2"
+export SWB_W1="foo"
+export SWB_WHITE_FOO="foo foo"
+export SWB_W2="bar"
+[[ $(sw set SWB_W1=foo; echo $SWB_W1) = foo ]]; tap_okif $?
+[[ $(sw set SWB_WHITE_FOO=foo; echo $SWB_WHITE_FOO) = foo ]]; tap_okif $?
+[[ $(sw set SWB_W2=bar; echo $SWB_W2) = bar ]]; tap_okif $?
+[[ -z "$(sw set SWB_W3=baz; echo $SWB_W3)" ]]; tap_okif $?
+
+export SWB_W1=
+export SWB_BLACKLIST="${SWB_BLACLIST}:SWB_W1"
+[[ -z "$(sw set SWB_W1=W1; echo $SWB_W1)" ]]; tap_okif $?

data/test/test_wslenvunsetbug.bash

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+source ./setup_test.bash
+tap_tests 1
+
+unset WSLENV
+if sw echo test > /dev/null; then tap_ok; else tap_notok; fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: source_win_bat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Takaya Saeki
@@ -25,8 +25,9 @@ files:
 - bin/init_sw
 - lib/source_win_bat.rb
 - lib/unixcompatenv.rb
+- source_win_bat-0.1.0.gem
 - source_win_bat.gemspec
-- test/exit.cmd
+- test/exit_42.cmd
 - test/setcwd.cmd
 - test/setdoskey.cmd
 - test/setenv.cmd
@@ -38,7 +39,9 @@ files:
 - test/test_setcwd.bash
 - test/test_setdoskey.bash
 - test/test_setenv.bash
-homepage: http://rubygems.org/gems/source_win_bat
+- test/test_whiteblacklist.bash
+- test/test_wslenvunsetbug.bash
+homepage: https://github.com/nullpo-head/source-win-bat
 licenses:
 - MIT
 metadata: {}