summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkzwin <kz@example.org>2017-08-28 21:18:22 -0400
committerkzwin <kz@example.org>2017-08-28 21:18:22 -0400
commit216465dfa93958ea2980ec495ee4ddee8a4455cf (patch)
treeb3932ffd7a94997dcaf69b65a6d4880f2745bd6d
parentec06f57d26e1cfd363324a32767370d4cf03cf47 (diff)
downloadchef-216465dfa93958ea2980ec495ee4ddee8a4455cf.tar.gz
linted
-rw-r--r--lib/chef/provider/git.rb4
-rw-r--r--spec/unit/provider/git_spec.rb32
2 files changed, 18 insertions, 18 deletions
diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb
index 7999a16b31..29714ecf43 100644
--- a/lib/chef/provider/git.rb
+++ b/lib/chef/provider/git.rb
@@ -106,9 +106,9 @@ class Chef
end
def git_gem_version
- output = git('--version').stdout
+ output = git("--version").stdout
match = GIT_VERSION_PATTERN.match(output)
- match or raise ArgumentError, "unparsable git version number #{output}"
+ raise ArgumentError, "unparsable git version number #{output}" unless match
@git_gem_version ||= Gem::Version.new(match[1])
end
diff --git a/spec/unit/provider/git_spec.rb b/spec/unit/provider/git_spec.rb
index 9c0bd8796a..a84b22ea26 100644
--- a/spec/unit/provider/git_spec.rb
+++ b/spec/unit/provider/git_spec.rb
@@ -83,32 +83,32 @@ describe Chef::Provider::Git do
expect(@provider.new_resource).to equal(@resource)
end
- context 'cast git version into gem version object' do
- it 'returns correct version with standard git' do
+ context "cast git version into gem version object" do
+ it "returns correct version with standard git" do
expect(@provider).to receive(:shell_out!)
- .with('git --version', log_tag: 'git[web2.0 app]')
- .and_return(double('ShellOut result', stdout: 'git version 2.14.1'))
- expect(@provider.git_gem_version).to eq Gem::Version.new('2.14.1')
+ .with("git --version", log_tag: "git[web2.0 app]")
+ .and_return(double("ShellOut result", stdout: "git version 2.14.1"))
+ expect(@provider.git_gem_version).to eq Gem::Version.new("2.14.1")
end
- it 'returns correct version with Apple git' do
+ it "returns correct version with Apple git" do
expect(@provider).to receive(:shell_out!)
- .with('git --version', log_tag: 'git[web2.0 app]')
- .and_return(double('ShellOut result', stdout: 'git version 2.11.0 (Apple Git-81)'))
- expect(@provider.git_gem_version).to eq Gem::Version.new('2.11.0')
+ .with("git --version", log_tag: "git[web2.0 app]")
+ .and_return(double("ShellOut result", stdout: "git version 2.11.0 (Apple Git-81)"))
+ expect(@provider.git_gem_version).to eq Gem::Version.new("2.11.0")
end
- it 'maintains deprecated method name' do
+ it "maintains deprecated method name" do
expect(@provider).to receive(:shell_out!)
- .with('git --version', log_tag: 'git[web2.0 app]')
- .and_return(double('ShellOut result', stdout: 'git version 1.2.3'))
- expect(@provider.git_minor_version).to eq Gem::Version.new('1.2.3')
+ .with("git --version", log_tag: "git[web2.0 app]")
+ .and_return(double("ShellOut result", stdout: "git version 1.2.3"))
+ expect(@provider.git_minor_version).to eq Gem::Version.new("1.2.3")
end
- it 'does not know how to handle other version' do
+ it "does not know how to handle other version" do
expect(@provider).to receive(:shell_out!)
- .with('git --version', log_tag: 'git[web2.0 app]')
- .and_return(double('ShellOut result', stdout: 'git version home-grown-git-99'))
+ .with("git --version", log_tag: "git[web2.0 app]")
+ .and_return(double("ShellOut result", stdout: "git version home-grown-git-99"))
expect { @provider.git_gem_version }.to raise_error(ArgumentError, /unparsable git version/)
end
end