rubysl-shellwords 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7218a87d72d7ebbf3905a49f386ca8e8ff85b3d3
-  data.tar.gz: 1bf9fa5994639347dc7f5ea40c7fc3e5ce4b5aa9
+  metadata.gz: 2d71edb30e8412d218b68afe89ee55a81e33aeb6
+  data.tar.gz: f2742881190d760358018f1f23f504c0592b65eb
 SHA512:
-  metadata.gz: 0be3c1d16ecb39bb9a64ace53f6156f953b754c41579471752bbfdc2164b55d082715697a4df271d18c3627be530bf5be999a55a40a7e27dd9ab06f40f730db9
-  data.tar.gz: 29b72f1bbc93adcdf7011f757fceded2e35fd49e464052bb6dd3d7203488db7dc7362be297cb9a057edb2acf14d422fb4fdebbe6d890f9ad6b4ff7acc9719775
+  metadata.gz: ae06b7fe5b9af89b5b8100734b3ce7a1857e5a1760ff440160f551611192e3fffa1bd567ca91cab9213cf8c6d750885f3840de1ef2dffe3f601edfef73fc4581
+  data.tar.gz: aa2a7a6c9e907a30355e8eff5c36860750b16ce33317106509c8b0645b19af5d2764ea015bbbe9adcaef7211f2e56edbbb1071b6b0828adea58207ff19183795

data/.travis.yml

@@ -3,5 +3,5 @@ env:
   - RUBYLIB=lib
 script: bundle exec mspec
 rvm:
-  - 1.8.7
-  - rbx-nightly-18mode
+  - 1.9.3
+  - rbx-nightly-19mode

data/lib/rubysl/shellwords/shellwords.rb

@@ -30,32 +30,16 @@ module Shellwords
   #   argv #=> ["here", "are", "two words"]
   #
   def shellsplit(line)
-    line = String.new(line) rescue
-      raise(ArgumentError, "Argument must be a string")
-    line.lstrip!
     words = []
-    until line.empty?
-      field = ''
-      loop do
-	if line.sub!(/\A"(([^"\\]|\\.)*)"/, '') then
-	  snippet = $1.gsub(/\\(.)/, '\1')
-	elsif line =~ /\A"/ then
-	  raise ArgumentError, "Unmatched double quote: #{line}"
-	elsif line.sub!(/\A'([^']*)'/, '') then
-	  snippet = $1
-	elsif line =~ /\A'/ then
-	  raise ArgumentError, "Unmatched single quote: #{line}"
-	elsif line.sub!(/\A\\(.)?/, '') then
-	  snippet = $1 || '\\'
-	elsif line.sub!(/\A([^\s\\'"]+)/, '') then
-	  snippet = $1
-	else
-	  line.lstrip!
-	  break
-	end
-	field.concat(snippet)
+    field = ''
+    line.scan(/\G\s*(?>([^\s\\\'\"]+)|'([^\']*)'|"((?:[^\"\\]|\\.)*)"|(\\.?)|(\S))(\s|\z)?/m) do
+      |word, sq, dq, esc, garbage, sep|
+      raise ArgumentError, "Unmatched double quote: #{line.inspect}" if garbage
+      field << (word || sq || (dq || esc).gsub(/\\(?=.)/, ''))
+      if sep
+        words << field
+        field = ''
       end
-      words.push(field)
     end
     words
   end

data/lib/rubysl/shellwords/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module Shellwords
-    VERSION = "1.0.1"
+    VERSION = "2.0.0"
   end
 end

data/rubysl-shellwords.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = "~> 2.0"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-shellwords
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,9 +81,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='