summaryrefslogtreecommitdiff
path: root/spec/unit/knife
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-01-13 11:44:32 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-01-13 11:44:32 -0800
commitaf4afcc712d24dbc85a9c020a124acadeed295d2 (patch)
tree08a71e81175177fee945d09bb831d5ae37a24606 /spec/unit/knife
parent1edd3dba71b4531bb1a570dd7e387620e8ee61de (diff)
downloadchef-af4afcc712d24dbc85a9c020a124acadeed295d2.tar.gz
autocorrecting Style/TrailingCommalcg/trailing_comma
chefstyle -a fixed 1044 occurrances
Diffstat (limited to 'spec/unit/knife')
-rw-r--r--spec/unit/knife/client_create_spec.rb2
-rw-r--r--spec/unit/knife/client_edit_spec.rb2
-rw-r--r--spec/unit/knife/cookbook_create_spec.rb24
-rw-r--r--spec/unit/knife/cookbook_download_spec.rb8
-rw-r--r--spec/unit/knife/cookbook_metadata_spec.rb6
-rw-r--r--spec/unit/knife/cookbook_show_spec.rb20
-rw-r--r--spec/unit/knife/cookbook_site_share_spec.rb4
-rw-r--r--spec/unit/knife/cookbook_upload_spec.rb2
-rw-r--r--spec/unit/knife/core/bootstrap_context_spec.rb2
-rw-r--r--spec/unit/knife/core/gem_glob_loader_spec.rb6
-rw-r--r--spec/unit/knife/core/hashed_command_loader_spec.rb6
-rw-r--r--spec/unit/knife/core/object_loader_spec.rb2
-rw-r--r--spec/unit/knife/core/ui_spec.rb4
-rw-r--r--spec/unit/knife/data_bag_from_file_spec.rb2
-rw-r--r--spec/unit/knife/environment_compare_spec.rb4
-rw-r--r--spec/unit/knife/environment_list_spec.rb2
-rw-r--r--spec/unit/knife/index_rebuild_spec.rb2
-rw-r--r--spec/unit/knife/key_create_spec.rb8
-rw-r--r--spec/unit/knife/key_edit_spec.rb10
-rw-r--r--spec/unit/knife/key_list_spec.rb4
-rw-r--r--spec/unit/knife/key_show_spec.rb2
-rw-r--r--spec/unit/knife/node_edit_spec.rb2
-rw-r--r--spec/unit/knife/node_list_spec.rb2
-rw-r--r--spec/unit/knife/role_list_spec.rb2
-rw-r--r--spec/unit/knife/ssh_spec.rb6
25 files changed, 67 insertions, 67 deletions
diff --git a/spec/unit/knife/client_create_spec.rb b/spec/unit/knife/client_create_spec.rb
index a1dcc564e2..9066505dfd 100644
--- a/spec/unit/knife/client_create_spec.rb
+++ b/spec/unit/knife/client_create_spec.rb
@@ -29,7 +29,7 @@ describe Chef::Knife::ClientCreate do
{
"name" => "adam",
"validator" => false,
- "admin" => false
+ "admin" => false,
}
end
diff --git a/spec/unit/knife/client_edit_spec.rb b/spec/unit/knife/client_edit_spec.rb
index ad56d9212d..75b0ef8c92 100644
--- a/spec/unit/knife/client_edit_spec.rb
+++ b/spec/unit/knife/client_edit_spec.rb
@@ -33,7 +33,7 @@ describe Chef::Knife::ClientEdit do
"validator" => false,
"admin" => false,
"chef_type" => "client",
- "create_key" => true
+ "create_key" => true,
}
}
diff --git a/spec/unit/knife/cookbook_create_spec.rb b/spec/unit/knife/cookbook_create_spec.rb
index 3354432d39..8619c8f64b 100644
--- a/spec/unit/knife/cookbook_create_spec.rb
+++ b/spec/unit/knife/cookbook_create_spec.rb
@@ -56,7 +56,7 @@ describe Chef::Knife::CookbookCreate do
@dir = Dir.tmpdir
@knife.config = {
:cookbook_path => @dir,
- :cookbook_copyright => "Opscode, Inc"
+ :cookbook_copyright => "Opscode, Inc",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
@@ -71,7 +71,7 @@ describe Chef::Knife::CookbookCreate do
@knife.config = {
:cookbook_path => @dir,
:cookbook_copyright => "Opscode, Inc",
- :cookbook_email => "nuo@opscode.com"
+ :cookbook_email => "nuo@opscode.com",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
@@ -87,7 +87,7 @@ describe Chef::Knife::CookbookCreate do
:cookbook_path => @dir,
:cookbook_copyright => "Opscode, Inc",
:cookbook_email => "nuo@opscode.com",
- :cookbook_license => "apachev2"
+ :cookbook_license => "apachev2",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "apachev2")
@@ -103,7 +103,7 @@ describe Chef::Knife::CookbookCreate do
:cookbook_path => @dir,
:cookbook_copyright => "Opscode, Inc",
:cookbook_email => "nuo@opscode.com",
- :cookbook_license => false
+ :cookbook_license => false,
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
@@ -119,7 +119,7 @@ describe Chef::Knife::CookbookCreate do
:cookbook_path => @dir,
:cookbook_copyright => "Opscode, Inc",
:cookbook_email => "nuo@opscode.com",
- :cookbook_license => "false"
+ :cookbook_license => "false",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
@@ -135,7 +135,7 @@ describe Chef::Knife::CookbookCreate do
:cookbook_path => @dir,
:cookbook_copyright => "Opscode, Inc",
:cookbook_email => "nuo@opscode.com",
- :cookbook_license => "gplv2"
+ :cookbook_license => "gplv2",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "gplv2")
@@ -151,7 +151,7 @@ describe Chef::Knife::CookbookCreate do
:cookbook_path => @dir,
:cookbook_copyright => "Opscode, Inc",
:cookbook_email => "nuo@opscode.com",
- :cookbook_license => "gplv3"
+ :cookbook_license => "gplv3",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "gplv3")
@@ -167,7 +167,7 @@ describe Chef::Knife::CookbookCreate do
:cookbook_path => @dir,
:cookbook_copyright => "Opscode, Inc",
:cookbook_email => "nuo@opscode.com",
- :cookbook_license => "mit"
+ :cookbook_license => "mit",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
@@ -184,7 +184,7 @@ describe Chef::Knife::CookbookCreate do
:cookbook_copyright => "Opscode, Inc",
:cookbook_email => "nuo@opscode.com",
:cookbook_license => "mit",
- :readme_format => "rdoc"
+ :readme_format => "rdoc",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
@@ -201,7 +201,7 @@ describe Chef::Knife::CookbookCreate do
:cookbook_copyright => "Opscode, Inc",
:cookbook_email => "nuo@opscode.com",
:cookbook_license => "mit",
- :readme_format => "mkd"
+ :readme_format => "mkd",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
@@ -218,7 +218,7 @@ describe Chef::Knife::CookbookCreate do
:cookbook_copyright => "Opscode, Inc",
:cookbook_email => "nuo@opscode.com",
:cookbook_license => "mit",
- :readme_format => "txt"
+ :readme_format => "txt",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
@@ -235,7 +235,7 @@ describe Chef::Knife::CookbookCreate do
:cookbook_copyright => "Opscode, Inc",
:cookbook_email => "nuo@opscode.com",
:cookbook_license => "mit",
- :readme_format => "foo"
+ :readme_format => "foo",
}
@knife.name_args=["foobar"]
expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
diff --git a/spec/unit/knife/cookbook_download_spec.rb b/spec/unit/knife/cookbook_download_spec.rb
index 8b85e52b75..64b754d173 100644
--- a/spec/unit/knife/cookbook_download_spec.rb
+++ b/spec/unit/knife/cookbook_download_spec.rb
@@ -52,18 +52,18 @@ describe Chef::Knife::CookbookDownload do
{'path' => 'recipes/foo.rb',
'url' => 'http://example.org/files/foo.rb'},
{'path' => 'recipes/bar.rb',
- 'url' => 'http://example.org/files/bar.rb'}
+ 'url' => 'http://example.org/files/bar.rb'},
],
:templates => [
{'path' => 'templates/default/foo.erb',
'url' => 'http://example.org/files/foo.erb'},
{'path' => 'templates/default/bar.erb',
- 'url' => 'http://example.org/files/bar.erb'}
+ 'url' => 'http://example.org/files/bar.erb'},
],
:attributes => [
{'path' => 'attributes/default.rb',
- 'url' => 'http://example.org/files/default.rb'}
- ]
+ 'url' => 'http://example.org/files/default.rb'},
+ ],
}
@cookbook_mock = double('cookbook')
diff --git a/spec/unit/knife/cookbook_metadata_spec.rb b/spec/unit/knife/cookbook_metadata_spec.rb
index 861d85f1f7..bd54d4278b 100644
--- a/spec/unit/knife/cookbook_metadata_spec.rb
+++ b/spec/unit/knife/cookbook_metadata_spec.rb
@@ -57,7 +57,7 @@ describe Chef::Knife::CookbookMetadata do
@bar.version = '2.0.0'
@cookbook_loader = {
"foo" => @foo,
- "bar" => @bar
+ "bar" => @bar,
}
expect(@cookbook_loader).to receive(:load_cookbooks).and_return(@cookbook_loader)
expect(@knife).to receive(:generate_metadata).with('foo')
@@ -123,7 +123,7 @@ describe Chef::Knife::CookbookMetadata do
end
{ Chef::Exceptions::ObsoleteDependencySyntax => 'obsolote dependency',
- Chef::Exceptions::InvalidVersionConstraint => 'invalid version constraint'
+ Chef::Exceptions::InvalidVersionConstraint => 'invalid version constraint',
}.each_pair do |klass, description|
it "should print an error and exit when an #{description} syntax exception is encountered" do
exception = klass.new("#{description} blah")
@@ -157,7 +157,7 @@ describe Chef::Knife::CookbookMetadata do
end
{ Chef::Exceptions::ObsoleteDependencySyntax => 'obsolote dependency',
- Chef::Exceptions::InvalidVersionConstraint => 'invalid version constraint'
+ Chef::Exceptions::InvalidVersionConstraint => 'invalid version constraint',
}.each_pair do |klass, description|
it "should print an error and exit when an #{description} syntax exception is encountered" do
expect(File).to receive(:exist?).with("#{@cookbook_dir}/foobar/metadata.json").
diff --git a/spec/unit/knife/cookbook_show_spec.rb b/spec/unit/knife/cookbook_show_spec.rb
index a06e53b9a1..6c77db013f 100644
--- a/spec/unit/knife/cookbook_show_spec.rb
+++ b/spec/unit/knife/cookbook_show_spec.rb
@@ -49,8 +49,8 @@ describe Chef::Knife::CookbookShow do
"versions" => [
{ "version" => "0.10.0", "url" => "http://url/cookbooks/cookbook_name/0.10.0" },
{ "version" => "0.9.0", "url" => "http://url/cookbookx/cookbook_name/0.9.0" },
- { "version" => "0.8.0", "url" => "http://url/cookbooks/cookbook_name/0.8.0" }
- ]
+ { "version" => "0.8.0", "url" => "http://url/cookbooks/cookbook_name/0.8.0" },
+ ],
}
}
end
@@ -92,8 +92,8 @@ describe Chef::Knife::CookbookShow do
:name => "default.rb",
:path => "recipes/default.rb",
:checksum => "1234",
- :url => "http://example.org/files/default.rb"
- }
+ :url => "http://example.org/files/default.rb",
+ },
]
}
@cookbook_response.manifest = @manifest
@@ -117,8 +117,8 @@ describe Chef::Knife::CookbookShow do
:name => "default.rb",
:path => "recipes/default.rb",
:checksum => "1234",
- :url => "http://example.org/files/default.rb"
- }
+ :url => "http://example.org/files/default.rb",
+ },
]
}
@response = "Example recipe text"
@@ -143,28 +143,28 @@ describe Chef::Knife::CookbookShow do
:path => "files/host-examplehost.example.org/afile.rb",
:checksum => "1111",
:specificity => "host-examplehost.example.org",
- :url => "http://example.org/files/1111"
+ :url => "http://example.org/files/1111",
},
{
:name => "afile.rb",
:path => "files/ubuntu-9.10/afile.rb",
:checksum => "2222",
:specificity => "ubuntu-9.10",
- :url => "http://example.org/files/2222"
+ :url => "http://example.org/files/2222",
},
{
:name => "afile.rb",
:path => "files/ubuntu/afile.rb",
:checksum => "3333",
:specificity => "ubuntu",
- :url => "http://example.org/files/3333"
+ :url => "http://example.org/files/3333",
},
{
:name => "afile.rb",
:path => "files/default/afile.rb",
:checksum => "4444",
:specificity => "default",
- :url => "http://example.org/files/4444"
+ :url => "http://example.org/files/4444",
},
]
}
diff --git a/spec/unit/knife/cookbook_site_share_spec.rb b/spec/unit/knife/cookbook_site_share_spec.rb
index 1b2ffd10fb..14ade10e09 100644
--- a/spec/unit/knife/cookbook_site_share_spec.rb
+++ b/spec/unit/knife/cookbook_site_share_spec.rb
@@ -55,13 +55,13 @@ describe Chef::Knife::CookbookSiteShare do
allow(@knife).to receive(:do_upload).and_return(true)
@category_response = {
"name" => "cookbook_name",
- "category" => "Testing Category"
+ "category" => "Testing Category",
}
@bad_category_response = {
"error_code" => "NOT_FOUND",
"error_messages" => [
"Resource does not exist."
- ]
+ ],
}
end
diff --git a/spec/unit/knife/cookbook_upload_spec.rb b/spec/unit/knife/cookbook_upload_spec.rb
index fb94886cad..ecee34f308 100644
--- a/spec/unit/knife/cookbook_upload_spec.rb
+++ b/spec/unit/knife/cookbook_upload_spec.rb
@@ -134,7 +134,7 @@ E
{
'test_cookbook1' => Chef::CookbookVersion.new('test_cookbook1', '/tmp/blah'),
'test_cookbook2' => Chef::CookbookVersion.new('test_cookbook2', '/tmp/blah'),
- 'test_cookbook3' => Chef::CookbookVersion.new('test_cookbook3', '/tmp/blah')
+ 'test_cookbook3' => Chef::CookbookVersion.new('test_cookbook3', '/tmp/blah'),
}
end
diff --git a/spec/unit/knife/core/bootstrap_context_spec.rb b/spec/unit/knife/core/bootstrap_context_spec.rb
index ac44e2915f..1d93f64e32 100644
--- a/spec/unit/knife/core/bootstrap_context_spec.rb
+++ b/spec/unit/knife/core/bootstrap_context_spec.rb
@@ -26,7 +26,7 @@ describe Chef::Knife::Core::BootstrapContext do
{
:validation_key => File.join(CHEF_SPEC_DATA, 'ssl', 'private_key.pem'),
:chef_server_url => 'http://chef.example.com:4444',
- :validation_client_name => 'chef-validator-testing'
+ :validation_client_name => 'chef-validator-testing',
}
end
diff --git a/spec/unit/knife/core/gem_glob_loader_spec.rb b/spec/unit/knife/core/gem_glob_loader_spec.rb
index 465eea2656..89de9f98e4 100644
--- a/spec/unit/knife/core/gem_glob_loader_spec.rb
+++ b/spec/unit/knife/core/gem_glob_loader_spec.rb
@@ -47,7 +47,7 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
gems = [ double('knife-ec2-0.5.12') ]
gem_files = [
'/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/ec2_base.rb',
- '/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/ec2_otherstuff.rb'
+ '/usr/lib/ruby/gems/knife-ec2-0.5.12/lib/chef/knife/ec2_otherstuff.rb',
]
expect($LOAD_PATH).to receive(:map).and_return([])
if Gem::Specification.respond_to? :latest_specs
@@ -135,7 +135,7 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
# `SubcommandLoader::MATCHES_CHEF_GEM` should make it clear why we want
# to test these two cases.
"/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-bar-1.0.0/lib/chef/knife/chef-bar.rb",
- "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/bar-chef-1.0.0/lib/chef/knife/bar-chef.rb"
+ "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/bar-chef-1.0.0/lib/chef/knife/bar-chef.rb",
]
end
@@ -153,7 +153,7 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
"/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-foo-#{Chef::VERSION}/lib/chef/knife/chef-foo.rb",
"/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/foo-chef-#{Chef::VERSION}/lib/chef/knife/foo-chef.rb",
"/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-bar-1.0.0/lib/chef/knife/chef-bar.rb",
- "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/bar-chef-1.0.0/lib/chef/knife/bar-chef.rb"
+ "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/bar-chef-1.0.0/lib/chef/knife/bar-chef.rb",
]
end
diff --git a/spec/unit/knife/core/hashed_command_loader_spec.rb b/spec/unit/knife/core/hashed_command_loader_spec.rb
index 00e7ba377b..1a6c2f42b7 100644
--- a/spec/unit/knife/core/hashed_command_loader_spec.rb
+++ b/spec/unit/knife/core/hashed_command_loader_spec.rb
@@ -27,7 +27,7 @@ describe Chef::Knife::SubcommandLoader::HashedCommandLoader do
"_autogenerated_command_paths" => {
"plugins_paths" => {
"cool_a" => ["/file/for/plugin/a"],
- "cooler_b" => ["/file/for/plugin/b"]
+ "cooler_b" => ["/file/for/plugin/b"],
},
"plugins_by_category" => {
"cool" => [
@@ -35,8 +35,8 @@ describe Chef::Knife::SubcommandLoader::HashedCommandLoader do
],
"cooler" => [
"cooler_b"
- ]
- }
+ ],
+ },
}
}
}
diff --git a/spec/unit/knife/core/object_loader_spec.rb b/spec/unit/knife/core/object_loader_spec.rb
index 67fa858029..0b572cc1f0 100644
--- a/spec/unit/knife/core/object_loader_spec.rb
+++ b/spec/unit/knife/core/object_loader_spec.rb
@@ -41,7 +41,7 @@ describe Chef::Knife::Core::ObjectLoader do
{
'nodes' => Chef::Node,
'roles' => Chef::Role,
- 'environments' => Chef::Environment
+ 'environments' => Chef::Environment,
}.each do |repo_location, chef_class|
describe "when the file is a #{chef_class}" do
diff --git a/spec/unit/knife/core/ui_spec.rb b/spec/unit/knife/core/ui_spec.rb
index ab420518a3..2c3b067e4f 100644
--- a/spec/unit/knife/core/ui_spec.rb
+++ b/spec/unit/knife/core/ui_spec.rb
@@ -405,8 +405,8 @@ EOM
"versions" => [
{ "version" => "3.0.0", "url" => "http://url/cookbooks/3.0.0" },
{ "version" => "2.0.0", "url" => "http://url/cookbooks/2.0.0" },
- { "version" => "1.0.0", "url" => "http://url/cookbooks/1.0.0" }
- ]
+ { "version" => "1.0.0", "url" => "http://url/cookbooks/1.0.0" },
+ ],
}
}
end
diff --git a/spec/unit/knife/data_bag_from_file_spec.rb b/spec/unit/knife/data_bag_from_file_spec.rb
index dc65a3e64c..ddf877d9f7 100644
--- a/spec/unit/knife/data_bag_from_file_spec.rb
+++ b/spec/unit/knife/data_bag_from_file_spec.rb
@@ -75,7 +75,7 @@ describe Chef::Knife::DataBagFromFile do
let(:plain_data) { {
"id" => "item_name",
"greeting" => "hello",
- "nested" => { "a1" => [1, 2, 3], "a2" => { "b1" => true }}
+ "nested" => { "a1" => [1, 2, 3], "a2" => { "b1" => true }},
} }
let(:enc_data) { Chef::EncryptedDataBagItem.encrypt_data_bag_item(plain_data, secret) }
diff --git a/spec/unit/knife/environment_compare_spec.rb b/spec/unit/knife/environment_compare_spec.rb
index 81ec19d7af..14dc5c52cf 100644
--- a/spec/unit/knife/environment_compare_spec.rb
+++ b/spec/unit/knife/environment_compare_spec.rb
@@ -24,14 +24,14 @@ describe Chef::Knife::EnvironmentCompare do
@environments = {
"cita" => "http://localhost:4000/environments/cita",
- "citm" => "http://localhost:4000/environments/citm"
+ "citm" => "http://localhost:4000/environments/citm",
}
allow(@knife).to receive(:environment_list).and_return(@environments)
@constraints = {
"cita" => { "foo" => "= 1.0.1", "bar" => "= 0.0.4" },
- "citm" => { "foo" => "= 1.0.1", "bar" => "= 0.0.2" }
+ "citm" => { "foo" => "= 1.0.1", "bar" => "= 0.0.2" },
}
allow(@knife).to receive(:constraint_list).and_return(@constraints)
diff --git a/spec/unit/knife/environment_list_spec.rb b/spec/unit/knife/environment_list_spec.rb
index 6488a073b6..1d5462257d 100644
--- a/spec/unit/knife/environment_list_spec.rb
+++ b/spec/unit/knife/environment_list_spec.rb
@@ -28,7 +28,7 @@ describe Chef::Knife::EnvironmentList do
@environments = {
"production" => "http://localhost:4000/environments/production",
"development" => "http://localhost:4000/environments/development",
- "testing" => "http://localhost:4000/environments/testing"
+ "testing" => "http://localhost:4000/environments/testing",
}
allow(Chef::Environment).to receive(:list).and_return @environments
end
diff --git a/spec/unit/knife/index_rebuild_spec.rb b/spec/unit/knife/index_rebuild_spec.rb
index d8a0dd72d7..6c1ff7b98e 100644
--- a/spec/unit/knife/index_rebuild_spec.rb
+++ b/spec/unit/knife/index_rebuild_spec.rb
@@ -93,7 +93,7 @@ describe Chef::Knife::IndexRebuild do
let(:api_info) do
{"flavor" => "osc",
"version" => "11.0.0",
- "erchef" => "1.2.3"
+ "erchef" => "1.2.3",
}
end
let(:server_specific_stubs!) do
diff --git a/spec/unit/knife/key_create_spec.rb b/spec/unit/knife/key_create_spec.rb
index 5998e10274..039dba7a44 100644
--- a/spec/unit/knife/key_create_spec.rb
+++ b/spec/unit/knife/key_create_spec.rb
@@ -125,7 +125,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
actor_field_name => "charmander",
"public_key" => public_key,
"expiration_date" => valid_expiration_date,
- "key_name" => key_name
+ "key_name" => key_name,
}
}
before do
@@ -144,7 +144,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
let(:expected_hash) {
{
actor_field_name => "charmander",
- "public_key" => public_key
+ "public_key" => public_key,
}
}
before do
@@ -162,7 +162,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
{
actor_field_name => "charmander",
"name" => "charmander-key",
- "create_key" => true
+ "create_key" => true,
}
}
before do
@@ -180,7 +180,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
{
actor_field_name => "charmander",
"public_key" => public_key,
- "private_key" => "super_private"
+ "private_key" => "super_private",
}
}
diff --git a/spec/unit/knife/key_edit_spec.rb b/spec/unit/knife/key_edit_spec.rb
index 538b91de2d..06b31ce71c 100644
--- a/spec/unit/knife/key_edit_spec.rb
+++ b/spec/unit/knife/key_edit_spec.rb
@@ -130,7 +130,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
let(:expected_hash) {
{
actor_field_name => "charmander",
- "name" => new_keyname
+ "name" => new_keyname,
}
}
before do
@@ -161,7 +161,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
actor_field_name => "charmander",
"public_key" => public_key,
"name" => new_keyname,
- "expiration_date" => "infinity"
+ "expiration_date" => "infinity",
}
}
before do
@@ -181,7 +181,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
let(:expected_hash) {
{
actor_field_name => "charmander",
- "create_key" => true
+ "create_key" => true,
}
}
@@ -200,7 +200,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
let(:expected_hash) {
{
actor_field_name => "charmander",
- "public_key" => public_key
+ "public_key" => public_key,
}
}
before do
@@ -219,7 +219,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
{
actor_field_name => "charmander",
"public_key" => public_key,
- "private_key" => "super_private"
+ "private_key" => "super_private",
}
}
diff --git a/spec/unit/knife/key_list_spec.rb b/spec/unit/knife/key_list_spec.rb
index aabe02ac02..775a7cdfb1 100644
--- a/spec/unit/knife/key_list_spec.rb
+++ b/spec/unit/knife/key_list_spec.rb
@@ -195,7 +195,7 @@ describe Chef::Knife::KeyList do
[
{"uri"=>"https://api.opscode.piab/users/charmander/keys/non-expired1", "name"=>"non-expired1", "expired"=>false},
{"uri"=>"https://api.opscode.piab/users/charmander/keys/non-expired2", "name"=>"non-expired2", "expired"=>false},
- {"uri"=>"https://api.opscode.piab/users/mary/keys/out-of-date", "name"=>"out-of-date", "expired"=>true}
+ {"uri"=>"https://api.opscode.piab/users/mary/keys/out-of-date", "name"=>"out-of-date", "expired"=>true},
]
}
end
@@ -208,7 +208,7 @@ describe Chef::Knife::KeyList do
[
{"uri"=>"https://api.opscode.piab/organizations/pokemon/clients/charmander/keys/non-expired1", "name"=>"non-expired1", "expired"=>false},
{"uri"=>"https://api.opscode.piab/organizations/pokemon/clients/charmander/keys/non-expired2", "name"=>"non-expired2", "expired"=>false},
- {"uri"=>"https://api.opscode.piab/organizations/pokemon/clients/mary/keys/out-of-date", "name"=>"out-of-date", "expired"=>true}
+ {"uri"=>"https://api.opscode.piab/organizations/pokemon/clients/mary/keys/out-of-date", "name"=>"out-of-date", "expired"=>true},
]
}
end
diff --git a/spec/unit/knife/key_show_spec.rb b/spec/unit/knife/key_show_spec.rb
index 5a0d839e4f..f4923ef235 100644
--- a/spec/unit/knife/key_show_spec.rb
+++ b/spec/unit/knife/key_show_spec.rb
@@ -83,7 +83,7 @@ describe Chef::Knife::KeyShow do
actor_field_name => "charmander",
"name" => "charmander-key",
"public_key" => "some-public-key",
- "expiration_date" => "infinity"
+ "expiration_date" => "infinity",
}
}
diff --git a/spec/unit/knife/node_edit_spec.rb b/spec/unit/knife/node_edit_spec.rb
index 58e2da2a1c..be42a15ee7 100644
--- a/spec/unit/knife/node_edit_spec.rb
+++ b/spec/unit/knife/node_edit_spec.rb
@@ -32,7 +32,7 @@ describe Chef::Knife::NodeEdit do
@knife.config = {
:editor => 'cat',
:attribute => nil,
- :print_after => nil
+ :print_after => nil,
}
@knife.name_args = [ "adam" ]
@node = Chef::Node.new()
diff --git a/spec/unit/knife/node_list_spec.rb b/spec/unit/knife/node_list_spec.rb
index 71edea78f7..ec694cb040 100644
--- a/spec/unit/knife/node_list_spec.rb
+++ b/spec/unit/knife/node_list_spec.rb
@@ -26,7 +26,7 @@ describe Chef::Knife::NodeList do
allow(@knife).to receive(:output).and_return(true)
@list = {
"foo" => "http://example.com/foo",
- "bar" => "http://example.com/foo"
+ "bar" => "http://example.com/foo",
}
allow(Chef::Node).to receive(:list).and_return(@list)
allow(Chef::Node).to receive(:list_by_environment).and_return(@list)
diff --git a/spec/unit/knife/role_list_spec.rb b/spec/unit/knife/role_list_spec.rb
index 808a04d204..65c4f94ff2 100644
--- a/spec/unit/knife/role_list_spec.rb
+++ b/spec/unit/knife/role_list_spec.rb
@@ -25,7 +25,7 @@ describe Chef::Knife::RoleList do
allow(@knife).to receive(:output).and_return(true)
@list = {
"foo" => "http://example.com/foo",
- "bar" => "http://example.com/foo"
+ "bar" => "http://example.com/foo",
}
allow(Chef::Role).to receive(:list).and_return(@list)
end
diff --git a/spec/unit/knife/ssh_spec.rb b/spec/unit/knife/ssh_spec.rb
index 723280bead..197dc4ca77 100644
--- a/spec/unit/knife/ssh_spec.rb
+++ b/spec/unit/knife/ssh_spec.rb
@@ -71,7 +71,7 @@ describe Chef::Knife::Ssh do
configure_query([@node_foo, @node_bar])
expect(@knife).to receive(:session_from_list).with([
['foo.example.org', nil],
- ['bar.example.org', nil]
+ ['bar.example.org', nil],
])
@knife.configure_session
end
@@ -87,7 +87,7 @@ describe Chef::Knife::Ssh do
configure_query([@node_foo, @node_bar])
expect(@knife).to receive(:session_from_list).with([
['ec2-10-0-0-1.compute-1.amazonaws.com', nil],
- ['ec2-10-0-0-2.compute-1.amazonaws.com', nil]
+ ['ec2-10-0-0-2.compute-1.amazonaws.com', nil],
])
@knife.configure_session
end
@@ -105,7 +105,7 @@ describe Chef::Knife::Ssh do
configure_query([@node_foo, @node_bar])
expect(@knife).to receive(:session_from_list).with([
['foo.example.org', nil],
- ['bar.example.org', nil]
+ ['bar.example.org', nil],
])
@knife.configure_session
end