Merge pull request #5 from socrata-cookbooks/jdh-resolve-rubocop-offe…

…nses Resolve new RuboCop offenses
socrata-cookbooks · Feb 20, 2016 · dbd3dba · dbd3dba
2 parents ea74518 + 6a2c8a5
commit dbd3dba
Show file tree

Hide file tree

Showing 24 changed files with 38 additions and 49 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,8 +14,8 @@ group :test do
   gem 'rake'
   gem 'rubocop'
   gem 'foodcritic'
-  gem 'rspec', '>= 3'
-  gem 'chefspec', '>= 4'
+  gem 'rspec'
+  gem 'chefspec'
   gem 'simplecov'
   gem 'simplecov-console'
   gem 'coveralls'
@@ -28,8 +28,7 @@ group :test do
 end
 
 group :integration do
-  gem 'serverspec', '>= 2'
-  gem 'cucumber'
+  gem 'serverspec'
 end
 
 group :deploy do
@@ -38,5 +37,5 @@ end
 
 group :production do
   gem 'chef', '>= 11'
-  gem 'berkshelf', '>= 3'
+  gem 'berkshelf'
 end
diff --git a/README.md b/README.md
@@ -142,7 +142,7 @@ License & Authors
 =================
 - Author: Jonathan Hartman <jonathan.hartman@socrata.com>
 
-Copyright 2015 Socrata, Inc.
+Copyright 2015-2016, Socrata, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Attributes:: default
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/matchers.rb b/libraries/matchers.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: matchers
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/provider_x2go_client.rb b/libraries/provider_x2go_client.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: provider_x2go_client
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/provider_x2go_client_app.rb b/libraries/provider_x2go_client_app.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: provider_x2go_client_app
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -65,8 +65,10 @@ def whyrun_supported?
       # @raise [NotImplementedError] if not defined for this provider
       #
       def install!
-        fail(NotImplementedError,
-             "`install!` method must be implemented for #{self.class} provider")
+        raise(
+          NotImplementedError,
+          "`install!` method must be implemented for #{self.class} provider"
+        )
       end
 
       #
@@ -75,8 +77,10 @@ def install!
       # @raise [NotImplementedError] if not defined for this provider
       #
       def remove!
-        fail(NotImplementedError,
-             "`remove!` method must be implemented for #{self.class} provider")
+        raise(
+          NotImplementedError,
+          "`remove!` method must be implemented for #{self.class} provider"
+        )
       end
     end
   end

diff --git a/libraries/provider_x2go_client_app_debian.rb b/libraries/provider_x2go_client_app_debian.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: provider_x2go_client_app_debian
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/provider_x2go_client_app_fedora.rb b/libraries/provider_x2go_client_app_fedora.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: provider_x2go_client_app_fedora
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/provider_x2go_client_app_mac_os_x.rb b/libraries/provider_x2go_client_app_mac_os_x.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: provider_x2go_client_app_mac_os_x
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ class X2goClientApp < LWRPBase
       #
       # @author Jonathan Hartman <jonathan.hartman@socrata.com>
       class MacOsX < X2goClientApp
-        PATH ||= '/Applications/x2goclient.app'
+        PATH ||= '/Applications/x2goclient.app'.freeze
 
         include Chef::DSL::IncludeRecipe
 

diff --git a/libraries/provider_x2go_client_app_rhel.rb b/libraries/provider_x2go_client_app_rhel.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: provider_x2go_client_app_rhel
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/provider_x2go_client_app_ubuntu.rb b/libraries/provider_x2go_client_app_ubuntu.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: provider_x2go_client_app_ubuntu
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/provider_x2go_client_app_windows.rb b/libraries/provider_x2go_client_app_windows.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: provider_x2go_client_app_windows
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,9 +28,9 @@ class X2goClientApp < LWRPBase
       #
       # @author Jonathan Hartman <jonathan.hartman@socrata.com>
       class Windows < X2goClientApp
-        PATH ||= ::File.expand_path('/Program Files (x86)/x2goclient')
+        PATH ||= ::File.expand_path('/Program Files (x86)/x2goclient').freeze
         URL ||= 'http://code.x2go.org/releases/' \
-                'X2GoClient_latest_mswin32-setup.exe'
+                'X2GoClient_latest_mswin32-setup.exe'.freeze
 
         provides :x2go_client_app, platform_family: 'windows'
 

diff --git a/libraries/resource_x2go_client.rb b/libraries/resource_x2go_client.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: resource_x2go_client
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/resource_x2go_client_app.rb b/libraries/resource_x2go_client_app.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Library:: resource_x2go_client_app
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/metadata.rb b/metadata.rb
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'x2go-client'
 maintainer       'Jonathan Hartman'
 maintainer_email 'jonathan.hartman@socrata.com'
@@ -23,4 +22,3 @@
 supports         'centos'
 supports         'scientific'
 supports         'fedora'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: x2go-client
 # Recipe:: default
 #
-# Copyright 2015 Socrata, Inc.
+# Copyright 2015-2016, Socrata, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/spec/support/cookbooks/apt/metadata.rb b/spec/support/cookbooks/apt/metadata.rb
@@ -1,11 +1,9 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'apt'
 maintainer       'test'
 maintainer_email 'example@example.com'
 license          'apache2'
 description      'apt'
 long_description 'apt'
 version          '0.0.1'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/spec/support/cookbooks/dmg/metadata.rb b/spec/support/cookbooks/dmg/metadata.rb
@@ -1,11 +1,9 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'dmg'
 maintainer       'test'
 maintainer_email 'example@example.com'
 license          'apache2'
 description      'dmg'
 long_description 'dmg'
 version          '0.0.1'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/spec/support/cookbooks/windows/metadata.rb b/spec/support/cookbooks/windows/metadata.rb
@@ -1,11 +1,9 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'windows'
 maintainer       'test'
 maintainer_email 'example@example.com'
 license          'apache2'
 description      'windows'
 long_description 'windows'
 version          '0.0.1'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/spec/support/cookbooks/xquartz/metadata.rb b/spec/support/cookbooks/xquartz/metadata.rb
@@ -1,11 +1,9 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'xquartz'
 maintainer       'test'
 maintainer_email 'example@example.com'
 license          'apache2'
 description      'xquartz'
 long_description 'xquartz'
 version          '0.0.1'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/spec/support/cookbooks/yum-epel/metadata.rb b/spec/support/cookbooks/yum-epel/metadata.rb
@@ -1,11 +1,9 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'yum-epel'
 maintainer       'test'
 maintainer_email 'example@example.com'
 license          'apache2'
 description      'yum-epel'
 long_description 'yum-epel'
 version          '0.0.1'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/test/fixtures/cookbooks/x2go-client_test/metadata.rb b/test/fixtures/cookbooks/x2go-client_test/metadata.rb
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'x2go-client_test'
 maintainer       'Jonathan Hartman'
 maintainer_email 'jonathan.hartman@socrata.com'
@@ -19,4 +18,3 @@
 supports         'centos'
 supports         'scientific'
 supports         'fedora'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/test/integration/default/serverspec/spec_helper.rb b/test/integration/default/serverspec/spec_helper.rb
@@ -2,7 +2,7 @@
 
 require 'serverspec'
 
-if RUBY_PLATFORM.match(/mswin|mingw32|windows/)
+if RUBY_PLATFORM =~ /mswin|mingw32|windows/
   set :os, family: 'windows'
   set :backend, :cmd
 else

diff --git a/test/integration/uninstall/serverspec/spec_helper.rb b/test/integration/uninstall/serverspec/spec_helper.rb
@@ -2,7 +2,7 @@
 
 require 'serverspec'
 
-if RUBY_PLATFORM.match(/mswin|mingw32|windows/)
+if RUBY_PLATFORM =~ /mswin|mingw32|windows/
   set :os, family: 'windows'
   set :backend, :cmd
 else