Merge pull request #257 from willmeek/modulesync_rubocop

Modulesync rubocop

Author: tphoney

.gitignore

@@ -1,24 +1,23 @@
-#This file is generated by ModuleSync, do not edit.
-pkg/
-Gemfile.lock
-Gemfile.local
-vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-log/
-junit/
-.vagrant/
+#This file is generated by ModuleSync, do not edit.Z
+*.iml
+.*.sw[op]
+.DS_Store
 .bundle/
-coverage/
-log/
 .idea/
 .metadata
-*.iml
-.*.sw[op]
+.vagrant/
 .yardoc
 .yardwarns
-.DS_Store
+Gemfile.local
+Gemfile.lock
+bin/
+coverage/
+doc/
+junit/
+log/
+pkg/
+spec/fixtures/manifests/
+spec/fixtures/modules/
 tmp/
 vendor/
-doc/
 

.rubocop.yml

@@ -96,5 +96,3 @@ Style/IfUnlessModifier:
   Enabled: false
 Style/SymbolProc:
   Enabled: false
-RSpec/NamedSubject:
- Enabled: false

.rubocop_todo.yml

@@ -1,107 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2017-12-07 14:50:29 +0000 using RuboCop version 0.51.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: normal, rails
-Layout/IndentationConsistency:
-  Exclude:
-    - 'nodeset_generation.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
-Layout/IndentationWidth:
-  Exclude:
-    - 'nodeset_generation.rb'
-
-# Offense count: 27
-Lint/BooleanSymbol:
-  Exclude:
-    - 'lib/puppet/type/ini_setting.rb'
-    - 'lib/puppet/type/ini_subsetting.rb'
-    - 'lib/puppet/util/setting_value.rb'
-
-# Offense count: 3
-# Configuration parameters: CountBlocks.
-Metrics/BlockNesting:
-  Max: 4
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: lowercase, uppercase
-Naming/HeredocDelimiterCase:
-  Exclude:
-    - 'lib/puppet/type/ini_subsetting.rb'
-
-# Offense count: 112
-# Configuration parameters: Blacklist.
-# Blacklist: END, (?-mix:EO[A-Z]{1})
-Naming/HeredocDelimiterNaming:
-  Exclude:
-    - 'lib/puppet/parser/functions/create_ini_settings.rb'
-    - 'spec/acceptance/ini_setting_spec.rb'
-    - 'spec/acceptance/ini_subsetting_spec.rb'
-    - 'spec/unit/puppet/provider/ini_setting/inheritance_spec.rb'
-    - 'spec/unit/puppet/provider/ini_setting/ruby_spec.rb'
-    - 'spec/unit/puppet/provider/ini_subsetting/ruby_spec.rb'
-    - 'spec/unit/puppet/util/ini_file_spec.rb'
-
-# Offense count: 15
-# Configuration parameters: Prefixes.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Exclude:
-    - 'spec/acceptance/ini_setting_spec.rb'
-    - 'spec/unit/puppet/type/ini_setting_spec.rb'
-    - 'spec/unit/puppet/util/external_iterator_spec.rb'
-    - 'spec/unit/puppet/util/ini_file_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: and_return, block
-RSpec/ReturnFromStub:
-  Exclude:
-    - 'spec/unit/puppet/util/ini_file_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions.
-# SupportedStyles: assign_to_condition, assign_inside_condition
-Style/ConditionalAssignment:
-  Exclude:
-    - 'nodeset_generation.rb'
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: for, each
-Style/For:
-  Exclude:
-    - 'nodeset_generation.rb'
-
-# Offense count: 1
-Style/MultipleComparison:
-  Exclude:
-    - 'nodeset_generation.rb'
-
-# Offense count: 22
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'nodeset_generation.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, MinSize, WordRegex.
-# SupportedStyles: percent, brackets
-Style/WordArray:
-  Exclude:
-    - 'nodeset_generation.rb'

Gemfile

@@ -28,10 +28,19 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 # Used for gem conditionals
-supports_windows = false
 ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
 
+# The following gems are not included by default as they require DevKit on Windows.
+# You should probably include them in a Gemfile.local or a ~/.gemfile
+#gem 'pry' #this may already be included in the gemfile
+#gem 'pry-stack_explorer', :require => false
+#if RUBY_VERSION =~ /^2/
+#  gem 'pry-byebug'
+#else
+#  gem 'pry-debugger'
+#end
+
 group :development do
   gem "puppet-module-posix-default-r#{minor_version}",    :require => false, :platforms => "ruby"
   gem "puppet-module-win-default-r#{minor_version}",      :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
@@ -62,7 +71,6 @@ gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
 gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
 gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
 
-
 # Evaluate Gemfile.local if it exists
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)

spec/unit/puppet/util/external_iterator_spec.rb

@@ -2,30 +2,34 @@
 require 'puppet/util/external_iterator'
 
 describe Puppet::Util::ExternalIterator do
-  let(:subject) { described_class.new(%w[a b c]) }
+  subject_class = nil
+  expected_values = nil
 
-  expected_values = [['a', 0], ['b', 1], ['c', 2]]
+  before(:each) do
+    subject_class = described_class.new(%w[a b c])
+    expected_values = [['a', 0], ['b', 1], ['c', 2]]
+  end
 
   context '#next' do
     it 'iterates over the items' do
       expected_values.each do |expected_pair|
-        expect(subject.next).to eq(expected_pair)
+        expect(subject_class.next).to eq(expected_pair)
       end
     end
   end
 
   context '#peek' do
     it 'returns the 0th item repeatedly' do
       (0..2).each do |_i|
-        expect(subject.peek).to eq(expected_values[0])
+        expect(subject_class.peek).to eq(expected_values[0])
       end
     end
 
     it 'does not advance the iterator, but should reflect calls to #next' do # rubocop:disable RSpec/MultipleExpectations : No neat way to further reduce expectations
       expected_values.each do |expected_pair|
-        expect(subject.peek).to eq(expected_pair)
-        expect(subject.peek).to eq(expected_pair)
-        expect(subject.next).to eq(expected_pair)
+        expect(subject_class.peek).to eq(expected_pair)
+        expect(subject_class.peek).to eq(expected_pair)
+        expect(subject_class.next).to eq(expected_pair)
       end
     end
   end