Merge pull request #104 from drenalin23/drenalin/ruby-update

ruby update and rubocop fixes
realityforge · Mar 15, 2018 · 256fa1c · 256fa1c
2 parents c6a4075 + c4ea27a
commit 256fa1c
Show file tree

Hide file tree

Showing 31 changed files with 40 additions and 13 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.2.4
+ruby-2.3.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.4
+  - 2.3.0
 
 sudo: required
 services: docker

diff --git a/Gemfile b/Gemfile
@@ -4,24 +4,24 @@ gem 'berkshelf'
 gem 'stove'
 
 group :test do
-  gem 'rake',               '~> 11.2.2'
-  gem 'test-kitchen',       '~> 1.10.2'
-  gem 'foodcritic',         '~> 7.0.1'
-  gem 'rubocop',            '~> 0.41.2'
-  gem 'chefspec',           '~> 4.7.0'
-  gem 'buff-extensions',    '~> 1.0.0'
+  gem 'rake'
+  gem 'test-kitchen'
+  gem 'foodcritic'
+  gem 'rubocop'
+  gem 'chefspec'
+  gem 'buff-extensions'
 end
 
 group :vagrant do
-  gem 'kitchen-vagrant',    '~> 0.20.0'
+  gem 'kitchen-vagrant'
 end
 
 group :development do
-  gem 'knife-cookbook-doc', '~> 0.7.0'
+  gem 'knife-cookbook-doc'
   gem 'kitchen-openstack'
   gem 'kitchen-transport-rsync'
 end
 
 group :integration_docker do
-  gem 'kitchen-docker', '~> 2.3'
+  gem 'kitchen-docker'
 end
diff --git a/Rakefile b/Rakefile
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 
 require 'rake'
 require 'rake/testtask'

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 
 #<> Kibana major version
 default['kibana']['version'] = 5

diff --git a/libraries/version.rb b/libraries/version.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 
 class Kibana
   # All to find correct url to download kibana

diff --git a/metadata.rb b/metadata.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 
 name 'kibana'
 maintainer 'Peter Donald'

diff --git a/recipes/_service.rb b/recipes/_service.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 
 template node['kibana']['service']['template_file'] do
   cookbook node['kibana']['service']['cookbook']

diff --git a/recipes/apache.rb b/recipes/apache.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 
 =begin
 #<

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 
 =begin
 #<

diff --git a/recipes/kibana3.rb b/recipes/kibana3.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 
 include_recipe 'kibana'
 

diff --git a/recipes/kibana4.rb b/recipes/kibana4.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 
 include_recipe 'kibana'
 

diff --git a/recipes/nginx.rb b/recipes/nginx.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 include_recipe 'chef_nginx'
 
 template File.join(node['nginx']['dir'], 'sites-available', 'kibana') do

diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # matcher for install_ark
 def install_ark(resource_name)
   ChefSpec::Matchers::ResourceMatcher.new(:ark, :install, resource_name)

diff --git a/test/integration/kibana3_apache/serverspec/default_spec.rb b/test/integration/kibana3_apache/serverspec/default_spec.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'kibana' do

diff --git a/test/integration/kibana3_apache/serverspec/spec_helper.rb b/test/integration/kibana3_apache/serverspec/spec_helper.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 require 'serverspec'
 
 # Required by serverspec

diff --git a/test/integration/kibana3_nginx/serverspec/default_spec.rb b/test/integration/kibana3_nginx/serverspec/default_spec.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'kibana' do

diff --git a/test/integration/kibana3_nginx/serverspec/spec_helper.rb b/test/integration/kibana3_nginx/serverspec/spec_helper.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 require 'serverspec'
 
 # Required by serverspec

diff --git a/test/integration/kibana3_source/serverspec/default_spec.rb b/test/integration/kibana3_source/serverspec/default_spec.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'kibana' do

diff --git a/test/integration/kibana3_source/serverspec/spec_helper.rb b/test/integration/kibana3_source/serverspec/spec_helper.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 require 'serverspec'
 
 # Required by serverspec

diff --git a/test/integration/kibana4_apache/serverspec/default_spec.rb b/test/integration/kibana4_apache/serverspec/default_spec.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'kibana' do

diff --git a/test/integration/kibana4_apache/serverspec/spec_helper.rb b/test/integration/kibana4_apache/serverspec/spec_helper.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 require 'serverspec'
 
 # Required by serverspec

diff --git a/test/integration/kibana4_nginx/serverspec/default_spec.rb b/test/integration/kibana4_nginx/serverspec/default_spec.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'kibana' do

diff --git a/test/integration/kibana4_nginx/serverspec/spec_helper.rb b/test/integration/kibana4_nginx/serverspec/spec_helper.rb
@@ -1,4 +1,5 @@
 # Encoding: utf-8
+# frozen_string_literal: true
 require 'serverspec'
 
 # Required by serverspec

diff --git a/test/unit/spec/_service_spec.rb b/test/unit/spec/_service_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chefspec'
 require_relative 'spec_helper'
 

diff --git a/test/unit/spec/apache_spec.rb b/test/unit/spec/apache_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chefspec'
 require_relative 'spec_helper'
 

diff --git a/test/unit/spec/default_spec.rb b/test/unit/spec/default_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chefspec'
 require_relative 'spec_helper'
 

diff --git a/test/unit/spec/kibana3_spec.rb b/test/unit/spec/kibana3_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chefspec'
 require_relative 'spec_helper'
 

diff --git a/test/unit/spec/kibana4_spec.rb b/test/unit/spec/kibana4_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chefspec'
 require_relative 'spec_helper'
 

diff --git a/test/unit/spec/nginx_spec.rb b/test/unit/spec/nginx_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chefspec'
 require_relative 'spec_helper'
 

diff --git a/test/unit/spec/spec_helper.rb b/test/unit/spec/spec_helper.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
@@ -27,7 +28,6 @@
   version: '7.0'
 }.freeze
 
-def stub_resources
-end
+def stub_resources; end
 
 at_exit { ChefSpec::Coverage.report! }