summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-10-23 19:10:47 -0700
committerGitHub <noreply@github.com>2018-10-23 19:10:47 -0700
commit3f2897db77211a946c71251e37661677da45b51a (patch)
tree445480455c8ef150fa355eeb473d1766b757a8e1
parente1a267f533e2690698df58dd1c6e72443be489d5 (diff)
parent12b2e1d6eea25d4c589f37d1ddbed45d5a20d51f (diff)
downloadmixlib-shellout-3f2897db77211a946c71251e37661677da45b51a.tar.gz
Merge pull request #167 from chef/slim
Don't ship the gemfile/rakefile/gemspecs in the gem
-rw-r--r--.travis.yml2
-rw-r--r--lib/mixlib/shellout/windows.rb2
-rw-r--r--mixlib-shellout.gemspec6
-rw-r--r--spec/mixlib/shellout/windows_spec.rb10
4 files changed, 9 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 36aba90..7b32643 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ rvm:
- 2.2.10
- 2.3.7
- 2.4.4
- - 2.5.1
+ - 2.5.3
branches:
only:
- master
diff --git a/lib/mixlib/shellout/windows.rb b/lib/mixlib/shellout/windows.rb
index 75cfd51..27adbbd 100644
--- a/lib/mixlib/shellout/windows.rb
+++ b/lib/mixlib/shellout/windows.rb
@@ -221,7 +221,7 @@ module Mixlib
end
# cmd does not parse multiple quotes well unless the whole thing is wrapped up in quotes.
- # https://github.com/opscode/mixlib-shellout/pull/2#issuecomment-4837859
+ # https://github.com/chef/mixlib-shellout/pull/2#issuecomment-4837859
# http://ss64.com/nt/syntax-esc.html
def run_under_cmd(command)
[ ENV["COMSPEC"], "cmd /c \"#{command}\"" ]
diff --git a/mixlib-shellout.gemspec b/mixlib-shellout.gemspec
index bbbe0df..0145759 100644
--- a/mixlib-shellout.gemspec
+++ b/mixlib-shellout.gemspec
@@ -10,16 +10,14 @@ Gem::Specification.new do |s|
s.description = s.summary
s.author = "Chef Software Inc."
s.email = "info@chef.io"
- s.homepage = "https://www.chef.io/"
+ s.homepage = "https://github.com/chef/mixlib-shellout"
s.required_ruby_version = ">= 2.2"
s.add_development_dependency "rspec", "~> 3.0"
s.add_development_dependency "chefstyle"
- s.bindir = "bin"
- s.executables = []
s.require_path = "lib"
- s.files = %w{Gemfile Rakefile LICENSE README.md} + Dir.glob("*.gemspec") +
+ s.files = %w{LICENSE README.md} +
Dir.glob("lib/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
end
diff --git a/spec/mixlib/shellout/windows_spec.rb b/spec/mixlib/shellout/windows_spec.rb
index 4a94eb4..d4edabc 100644
--- a/spec/mixlib/shellout/windows_spec.rb
+++ b/spec/mixlib/shellout/windows_spec.rb
@@ -18,7 +18,7 @@ describe "Mixlib::ShellOut::Windows", :windows_only do
context "when unquoted" do
with_command(%q{ruby -e 'prints "foobar"'}) { is_expected.not_to be_truthy }
- # https://github.com/opscode/mixlib-shellout/pull/2#issuecomment-4825574
+ # https://github.com/chef/mixlib-shellout/pull/2#issuecomment-4825574
with_command(%q{"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\NETFX 4.0 Tools\gacutil.exe" /i "C:\Program Files (x86)\NUnit 2.6\bin\framework\nunit.framework.dll"}) { is_expected.not_to be_truthy }
with_command(%q{ruby -e 'exit 1' | ruby -e 'exit 0'}) { is_expected.to be_truthy }
@@ -255,7 +255,7 @@ describe "Mixlib::ShellOut::Windows", :windows_only do
is_expected.to eql([ 'C:\Windows\system32/ping.EXE', "ping" ])
end
- # https://github.com/opscode/mixlib-shellout/pull/2 with bat file
+ # https://github.com/chef/mixlib-shellout/pull/2 with bat file
with_command('"C:\Program Files\Application\Start.bat"', filename: 'C:\Program Files\Application\Start.bat') do
is_expected.to eql([ comspec, 'cmd /c ""C:\Program Files\Application\Start.bat""' ])
end
@@ -266,7 +266,7 @@ describe "Mixlib::ShellOut::Windows", :windows_only do
is_expected.to eql([ comspec, 'cmd /c ""C:\Program Files\Application\Start.bat" /i "C:\Program Files (x86)\NUnit 2.6\bin\framework\nunit.framework.dll""' ])
end
- # https://github.com/opscode/mixlib-shellout/pull/2 with cmd file
+ # https://github.com/chef/mixlib-shellout/pull/2 with cmd file
with_command('"C:\Program Files\Application\Start.cmd"', filename: 'C:\Program Files\Application\Start.cmd') do
is_expected.to eql([ comspec, 'cmd /c ""C:\Program Files\Application\Start.cmd""' ])
end
@@ -277,7 +277,7 @@ describe "Mixlib::ShellOut::Windows", :windows_only do
is_expected.to eql([ comspec, 'cmd /c ""C:\Program Files\Application\Start.cmd" /i "C:\Program Files (x86)\NUnit 2.6\bin\framework\nunit.framework.dll""' ])
end
- # https://github.com/opscode/mixlib-shellout/pull/2 with unquoted exe file
+ # https://github.com/chef/mixlib-shellout/pull/2 with unquoted exe file
with_command('C:\RUBY192\bin\ruby.exe', filename: 'C:\RUBY192\bin\ruby.exe') do
is_expected.to eql([ 'C:\RUBY192\bin\ruby.exe', 'C:\RUBY192\bin\ruby.exe' ])
end
@@ -288,7 +288,7 @@ describe "Mixlib::ShellOut::Windows", :windows_only do
is_expected.to eql([ 'C:\RUBY192\bin\ruby.exe', 'C:\RUBY192\bin\ruby.exe -e "print \'fee fie foe fum\'"' ])
end
- # https://github.com/opscode/mixlib-shellout/pull/2 with quoted exe file
+ # https://github.com/chef/mixlib-shellout/pull/2 with quoted exe file
exe_with_spaces = 'C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\NETFX 4.0 Tools\gacutil.exe'
with_command("\"#{exe_with_spaces}\"", filename: exe_with_spaces) do
is_expected.to eql([ exe_with_spaces, "\"#{exe_with_spaces}\"" ])