Skip to content

Commit

Permalink
merge revision(s) be7c91d: [Backport #20515]
Browse files Browse the repository at this point in the history
	Do not pollute toplevel namespace
  • Loading branch information
k0kubun committed May 30, 2024
1 parent 8f5b1bb commit ea196a3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
15 changes: 7 additions & 8 deletions spec/ruby/library/shellwords/shellwords_spec.rb
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
require_relative '../../spec_helper'
require 'shellwords'
include Shellwords

describe "Shellwords#shellwords" do
it "honors quoted strings" do
shellwords('a "b b" a').should == ['a', 'b b', 'a']
Shellwords.shellwords('a "b b" a').should == ['a', 'b b', 'a']
end

it "honors escaped double quotes" do
shellwords('a "\"b\" c" d').should == ['a', '"b" c', 'd']
Shellwords.shellwords('a "\"b\" c" d').should == ['a', '"b" c', 'd']
end

it "honors escaped single quotes" do
shellwords("a \"'b' c\" d").should == ['a', "'b' c", 'd']
Shellwords.shellwords("a \"'b' c\" d").should == ['a', "'b' c", 'd']
end

it "honors escaped spaces" do
shellwords('a b\ c d').should == ['a', 'b c', 'd']
Shellwords.shellwords('a b\ c d').should == ['a', 'b c', 'd']
end

it "raises ArgumentError when double quoted strings are misquoted" do
-> { shellwords('a "b c d e') }.should raise_error(ArgumentError)
-> { Shellwords.shellwords('a "b c d e') }.should raise_error(ArgumentError)
end

it "raises ArgumentError when single quoted strings are misquoted" do
-> { shellwords("a 'b c d e") }.should raise_error(ArgumentError)
-> { Shellwords.shellwords("a 'b c d e") }.should raise_error(ArgumentError)
end

# https://bugs.ruby-lang.org/issues/10055
it "matches POSIX sh behavior for backslashes within double quoted strings" do
shellsplit('printf "%s\n"').should == ['printf', '%s\n']
Shellwords.shellsplit('printf "%s\n"').should == ['printf', '%s\n']
end
end
2 changes: 1 addition & 1 deletion version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 2
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 81
#define RUBY_PATCHLEVEL 82

#include "ruby/version.h"
#include "ruby/internal/abi.h"
Expand Down

0 comments on commit ea196a3

Please sign in to comment.