Merge pull request #300 from shortdudey123/fix_travis

Fix TravisCI builds

.rubocop.yml

@@ -1,13 +1,18 @@
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.1
+  Exclude:
+    - '.bundle/**/*'
+  TargetRubyVersion: 2.3
 
 Lint/PercentStringArray:
   Enabled: false
 
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/CyclomaticComplexity:
   Enabled: false
 
@@ -30,6 +35,9 @@ Metrics/PerceivedComplexity:
 Style/Documentation:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 Style/LeadingCommentSpace:
   Enabled: true
   Exclude:

.travis.yml

@@ -6,4 +6,7 @@ sudo: false
 branches:
   only:
     - master
-bundler_args: --without=integration
+bundler_args: --without=integration --path=.bundle
+script:
+  - bundle exec rake style
+  - bundle exec rake spec

Gemfile

@@ -13,14 +13,14 @@ source 'https://rubygems.org'
 # end
 
 group :testing do
+  gem 'berkshelf'
   gem 'chefspec'
   gem 'foodcritic'
   gem 'rake'
   gem 'rubocop'
 end
 
 group :integration do
-  gem 'berkshelf'
   gem 'busser-serverspec'
   gem 'kitchen-vagrant'
   gem 'serverspec'

Rakefile

@@ -32,13 +32,6 @@ end
 desc 'Run all style checks'
 task style: ['style:chef', 'style:ruby']
 
-require 'kitchen'
-desc 'Run Test Kitchen integration tests'
-task :integration do
-  Kitchen.logger = Kitchen.default_file_logger
-  sh 'kitchen test -c'
-end
-
 desc 'Destroy test kitchen instances'
 task :destroy do
   Kitchen.logger = Kitchen.default_file_logger
@@ -59,6 +52,13 @@ task default: [:style, :spec, :integration]
 begin
   require 'kitchen/rake_tasks'
   Kitchen::RakeTasks.new
+
+  require 'kitchen'
+  desc 'Run Test Kitchen integration tests'
+  task :integration do
+    Kitchen.logger = Kitchen.default_file_logger
+    sh 'kitchen test -c'
+  end
 rescue LoadError
   puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
 end

providers/configure.rb

@@ -86,7 +86,7 @@ def configure
       maxmemory = (node_memory_kb * 1024 * percent_factor / new_resource.servers.length).round.to_s
     end
 
-    descriptors = if current['ulimit'] == 0
+    descriptors = if current['ulimit'].zero?
                     current['maxclients'] + 32
                   elsif current['ulimit'] > current['maxclients']
                     current['ulimit']

providers/sentinel.rb

@@ -105,10 +105,10 @@ def configure
             master_ip:                    current['master_ip'] || current[:masterip],
             master_port:                  current['master_port'] || current[:masterport],
             quorum_count:                 current['quorum_count'] || current[:quorum_count],
-            :'auth-pass' =>               current['auth-pass'] || current[:authpass],
-            :'down-after-milliseconds' => current['down-after-milliseconds'] || current[:downaftermil],
-            :'parallel-syncs' =>          current['parallel-syncs'] || current[:parallelsyncs],
-            :'failover-timeout' =>        current['failover-timeout'] || current[:failovertimeout]
+            auth_pass:                    current['auth-pass'] || current[:authpass],
+            down_after_milliseconds:      current['down-after-milliseconds'] || current[:downaftermil],
+            parallel_syncs:               current['parallel-syncs'] || current[:parallelsyncs],
+            failover_timeout:             current['failover-timeout'] || current[:failovertimeout]
           }
         ]
       else
@@ -119,7 +119,7 @@ def configure
       if current['data_bag_name'] && current['data_bag_item'] && current['data_bag_key']
         bag = Chef::EncryptedDataBagItem.load(current['data_bag_name'], current['data_bag_item'])
         masters.each do |master|
-          master['auth-pass'] = bag[current['data_bag_key']]
+          master['auth_pass'] = bag[current['data_bag_key']]
         end
       end
 

resources/configure.rb

@@ -29,8 +29,8 @@
 attribute :user, kind_of: String, default: 'redis'
 attribute :group, kind_of: String, default: 'redis'
 
-attribute :default_settings, kind_of:  Hash
-attribute :servers, kind_of:  Array
+attribute :default_settings, kind_of: Hash
+attribute :servers, kind_of: Array
 
 def initialize(name, run_context = nil)
   super

templates/default/sentinel.conf.erb

@@ -71,7 +71,7 @@ port <%=@sentinel_port%>
 # sentinel auth-pass mymaster MySUPER--secret-0123passw0rd
 <% @masters.each do |current| %>
 <% calc_name = String(current['master_name'] || @name || 'master_name') %>
-<%= "sentinel auth-pass #{calc_name} #{current['auth-pass']}" unless current['auth-pass'].nil? %>
+<%= "sentinel auth-pass #{calc_name} #{current['auth_pass']}" unless current['auth_pass'].nil? %>
 <% end %>
 # sentinel down-after-milliseconds <master-name> <milliseconds>
 #
@@ -83,7 +83,7 @@ port <%=@sentinel_port%>
 # Default is 30 seconds.
 <% @masters.each do |current| %>
 <% calc_name = String(current['master_name'] || @name || 'master_name') %>
-<%= "sentinel down-after-milliseconds #{calc_name} #{current['down-after-milliseconds']}" unless current['down-after-milliseconds'].nil?  %>
+<%= "sentinel down-after-milliseconds #{calc_name} #{current['down_after_milliseconds']}" unless current['down_after_milliseconds'].nil?  %>
 <% end %>
 # sentinel parallel-syncs <master-name> <numslaves>
 #
@@ -93,7 +93,7 @@ port <%=@sentinel_port%>
 # time while performing the synchronization with the master.
 <% @masters.each do |current| %>
 <% calc_name = String(current['master_name'] || @name || 'master_name') %>
-<%= "sentinel parallel-syncs #{calc_name} #{current['parallel-syncs']}" unless current['parallel-syncs'].nil? %>
+<%= "sentinel parallel-syncs #{calc_name} #{current['parallel_syncs']}" unless current['parallel_syncs'].nil? %>
 <% end %>
 # sentinel failover-timeout <master-name> <milliseconds>
 #
@@ -111,7 +111,7 @@ port <%=@sentinel_port%>
 # Default is 15 minutes.
 <% @masters.each do |current| %>
 <% calc_name = String(current['master_name'] || @name || 'master_name') %>
-<%= "sentinel failover-timeout #{calc_name} #{current['failover-timeout']}" unless current['failover-timeout'].nil? %>
+<%= "sentinel failover-timeout #{calc_name} #{current['failover_timeout']}" unless current['failover_timeout'].nil? %>
 <% end %>
 # SCRIPTS EXECUTION
 #