optparse_plus 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb5cd3f950ad3d9c06b4553d5b2597626a4416f7
-  data.tar.gz: f3cba69f07aa05c98fdd3032c7c7909f63d01780
+  metadata.gz: 3693fb720be2610cf8f3e4db42bf283ae69915cc
+  data.tar.gz: 0536ecccb3b06f50370e9cf942016870990c9aa9
 SHA512:
-  metadata.gz: 120ed7f19379852c94720f69b56dda4ab54d3793c5cc2efd3c3c9ecd2bb94cbd53eead0ba4f1f9a9d6334a68fa0ed4d5debb6b5486766fd91b2dee2b78706887
-  data.tar.gz: 32137b706fa2c5a5029ff9ac1fd27542a7c0f60b605d9b8a02070417ed009a0e2d25a0eaaf3e853d29d80f2f45de760ff2468e72986a7a64d3bc0b7291ec4454
+  metadata.gz: a23180b4ab19f2992fae316108b0e9b485bf4af7094451c3019c68591b101892b9939d1398220e3718b300b382c49cb04d29ba664bba34bffc145789691b4e9a
+  data.tar.gz: 6c187ecf02b1edbc83c88d1bfb5426f102b1c2d4987890d7209a5f37f345466a99b5c1d75b59168b9f14ac74487b82b2d0cd0e59f5e73796a9c340142aee7fc7

data/lib/optparse_plus.rb

@@ -16,7 +16,7 @@ module OptparsePlus
     end
 
     def new_with_yaml(config_yaml_source=nil)
-      cur_file = caller[0].split(/:/)[0]
+      cur_file = extract_cur_file_path(caller[0])
       config_yaml_source ||= read_after_program_end(cur_file)
       opt = OptPlus.create_opt(config_yaml_source)
 
@@ -26,6 +26,20 @@ module OptparsePlus
         opt
       end
     end
+
+    def windows?
+      /mswin(?!ce)|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
+    end
+
+    private
+
+    def extract_cur_file_path(caller_info)
+      if windows? and /\A[A-Z]:/i =~ caller_info
+        caller_info.split(/:/, 3)[0, 2].join(':')
+      else
+        caller_info.split(/:/)[0]
+      end
+    end
   end
 
   class OptPlus

data/lib/optparse_plus/version.rb

@@ -1,3 +1,3 @@
 module OptparsePlus
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/optparse_plus_spec.rb

@@ -230,10 +230,17 @@ YAML
     end
 
     describe '#inherit_ruby_options' do
-      it 'can add -E option' do
-        external_encoding = Encoding.default_external
-        internal_encoding = Encoding.default_internal
+      before do
+        @external_encoding = Encoding.default_external
+        @internal_encoding = Encoding.default_internal
+      end
+
+      after do
+        Encoding.default_external = @external_encoding
+        Encoding.default_internal = @internal_encoding
+      end
 
+      it 'can add -E option' do
         Encoding.default_external = 'UTF-8'
         expect(Encoding.default_external).to eq(Encoding::UTF_8)
 
@@ -244,7 +251,35 @@ YAML
         end
 
         expect(Encoding.default_external).to eq(Encoding::Windows_31J)
-        Encoding.default_external = external_encoding
+      end
+
+      it '-E option accepts an internal only arguement such as -E:Windows-31J' do
+        Encoding.default_internal = 'UTF-8'
+        expect(Encoding.default_internal).to eq(Encoding::UTF_8)
+
+        set_argv("-E:Windows-31J")
+        OptionParser.new_with_yaml(@config_yaml_with_banner) do |opt|
+          opt.inherit_ruby_options("E")
+          opt.parse!
+        end
+
+        expect(Encoding.default_internal).to eq(Encoding::Windows_31J)
+      end
+
+      it '-E option can set external and internal encodings at once' do
+        Encoding.default_external = 'UTF-8'
+        Encoding.default_internal = 'UTF-8'
+        expect(Encoding.default_external).to eq(Encoding::UTF_8)
+        expect(Encoding.default_internal).to eq(Encoding::UTF_8)
+
+        set_argv("-EWindows-31J:Windows-31J")
+        OptionParser.new_with_yaml(@config_yaml_with_banner) do |opt|
+          opt.inherit_ruby_options("E")
+          opt.parse!
+        end
+
+        expect(Encoding.default_external).to eq(Encoding::Windows_31J)
+        expect(Encoding.default_internal).to eq(Encoding::Windows_31J)
       end
 
       it 'expect to print help message' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optparse_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - HASHIMOTO, Naoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler