Merge pull request #31 from OpenVoxProject/standardize_tasks

Standardize rake tasks

Author: nmburgan

.rubocop.yml

@@ -378,11 +378,5 @@ Style/LambdaCall:
 Style/LineEndConcatenation:
   Enabled: true
 
-Style/MapCompactWithConditionalBlock:
-  Enabled: true
-
 Style/MapToHash:
   Enabled: true
-
-Style/MapToSet:
-  Enabled: true

.rubocop_todo.yml

@@ -51,21 +51,12 @@ Lint/ConstantDefinitionInBlock:
     - 'lib/puppet/type/schedule.rb'
     - 'lib/puppet/type/tidy.rb'
 
-Lint/ConstantOverwrittenInRescue: # new in 1.31
-  Enabled: false
-
 Lint/DeprecatedConstants: # new in 1.8
   Enabled: false
 
 Lint/DuplicateBranch: # new in 1.3
   Enabled: false
 
-Lint/DuplicateMagicComment: # new in 1.37
-  Enabled: false
-
-Lint/DuplicateMatchPattern: # new in 1.50
-  Enabled: false
-
 Lint/DuplicateRegexpCharacterClassElement: # new in 1.1
   Enabled: false
 
@@ -81,21 +72,12 @@ Lint/EmptyInPattern: # new in 1.16
 Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
   Enabled: false
 
-Lint/ItWithoutArgumentsInBlock: # new in 1.59
-  Enabled: false
-
 Lint/LambdaWithoutLiteralBlock: # new in 1.8
   Enabled: false
 
-Lint/LiteralAssignmentInCondition: # new in 1.58
-  Enabled: false
-
 Lint/MissingSuper:
   Enabled: false
 
-Lint/MixedCaseRange: # new in 1.53
-  Enabled: false
-
 Lint/NestedMethodDefinition:
   Exclude:
     - 'lib/puppet/pops/types/p_binary_type.rb'
@@ -110,9 +92,6 @@ Lint/NestedMethodDefinition:
     - 'lib/puppet/pops/types/types.rb'
     - 'lib/puppet/type.rb'
 
-Lint/NonAtomicFileOperation: # new in 1.31
-  Enabled: false
-
 Lint/NoReturnInBeginEndBlocks: # new in 1.2
   Enabled: false
 
@@ -125,9 +104,6 @@ Lint/OrAssignmentToConstant: # new in 1.9
 Lint/RedundantDirGlobSort: # new in 1.8
   Enabled: false
 
-Lint/RedundantRegexpQuantifiers: # new in 1.53
-  Enabled: false
-
 # Unsure how the changes in portage.rb from Lint/RedundantSplatExpansion impact
 # the code
 Lint/RedundantSplatExpansion:
@@ -137,9 +113,6 @@ Lint/RedundantSplatExpansion:
 Lint/RefinementImportMethods: # new in 1.27
   Enabled: false
 
-Lint/RequireRangeParentheses: # new in 1.32
-  Enabled: false
-
 Lint/RequireRelativeSelfPath: # new in 1.22
   Enabled: false
 
@@ -199,9 +172,6 @@ Lint/UnmodifiedReduceAccumulator: # new in 1.1
 Lint/UnusedMethodArgument:
   Enabled: false
 
-Lint/UselessRescue: # new in 1.43
-  Enabled: false
-
 Lint/UselessRuby2Keywords: # new in 1.23
   Enabled: false
 
@@ -294,6 +264,9 @@ Performance/UnfreezeString:
 Style/AccessModifierDeclarations:
   Exclude:
     - 'lib/puppet/util/suidmanager.rb'
+    - 'lib/puppet/util/command_line/trollop.rb'
+    - 'lib/puppet/util/windows/com.rb'
+    - 'lib/puppet/util/windows/monkey_patches/process.rb'
 
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
@@ -791,3 +764,66 @@ Style/ZeroLengthPredicate:
 # URISchemes: http, https
 Layout/LineLength:
   Max: 582
+
+Style/CaseLikeIf:
+  Exclude:
+    - 'lib/puppet/provider/package/pip.rb'
+    - 'lib/puppet/provider/package/portupgrade.rb'
+    - 'lib/puppet/transaction/report.rb'
+
+Style/EmptyCaseCondition:
+  Exclude:
+    - 'lib/puppet/type.rb'
+
+Gemspec/DateAssignment: # new in 1.10
+  Enabled: false
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: false
+Naming/BlockForwarding: # new in 1.24
+  Enabled: false
+Security/CompoundHash: # new in 1.28
+  Enabled: false
+Security/IoMethods: # new in 1.22
+  Enabled: false
+Style/ArgumentsForwarding: # new in 1.1
+  Enabled: false
+Style/EndlessMethod: # new in 1.8
+  Enabled: false
+Style/HashExcept: # new in 1.7
+  Enabled: false
+Style/InPatternThen: # new in 1.16
+  Enabled: false
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: false
+Style/NegatedIfElseCondition: # new in 1.2
+  Enabled: false
+Style/NestedFileDirname: # new in 1.26
+  Enabled: false
+Style/NilLambda: # new in 1.3
+  Enabled: false
+Style/NumberedParameters: # new in 1.22
+  Enabled: false
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: false
+Style/ObjectThen: # new in 1.28
+  Enabled: false
+Style/OpenStructUse: # new in 1.23
+  Enabled: false
+Style/QuotedSymbols: # new in 1.16
+  Enabled: false
+Style/RedundantArgument: # new in 1.4
+  Enabled: false
+Style/RedundantInitialize: # new in 1.27
+  Enabled: false
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: false
+Style/SelectByRegexp: # new in 1.22
+  Enabled: false
+Style/StringChars: # new in 1.12
+  Enabled: false
+Style/SwapValues: # new in 1.1
+  Enabled: false
+Performance/MapMethodChain: # new in 1.19
+  Enabled: false
+RSpec/ChangeByZero: # new in 2.11.0
+  Enabled: false

Rakefile

@@ -5,9 +5,28 @@ require 'rake'
 require 'rubygems'
 require 'rubygems/package_task'
 
-def run_command(cmd)
-  output, status = Open3.capture2e(cmd)
-  abort "Command failed! Command: #{cmd}, Output: #{output}" unless status.exitstatus.zero?
+RED = "\033[31m"
+GREEN = "\033[32m"
+RESET = "\033[0m"
+
+def run_command(cmd, silent: true, print_command: false, report_status: false)
+  puts "#{GREEN}Running #{cmd}#{RESET}" if print_command
+  output = ''
+  Open3.popen2e(cmd) do |_stdin, stdout_stderr, thread|
+    stdout_stderr.each do |line|
+      puts line unless silent
+      output += line
+    end
+    exitcode = thread.value.exitstatus
+    unless exitcode.zero?
+      err = "#{RED}Command failed! Command: #{cmd}, Exit code: #{exitcode}"
+      # Print details if we were running silent
+      err += "\nOutput:\n#{output}" if silent
+      err += RESET
+      abort err
+    end
+    puts "#{GREEN}Command finished with status #{exitcode}#{RESET}" if report_status
+  end
   output.chomp
 end
 

lib/puppet/application/agent.rb

@@ -412,7 +412,6 @@ def log_config
     end
   end
 
-  # rubocop:disable Lint/RedundantStringCoercion
   def fingerprint
     Puppet::Util::Log.newdestination(:console)
     cert_provider = Puppet::X509::CertProvider.new
@@ -432,7 +431,6 @@ def fingerprint
     Puppet.log_exception(e, _("Failed to generate fingerprint: %{message}") % { message: e.message })
     exit(1)
   end
-  # rubocop:enable Lint/RedundantStringCoercion
 
   def onetime(daemon)
     begin

lib/puppet/provider/aix_object.rb

@@ -131,7 +131,7 @@ def numeric_mapping(info = {})
 
       # AIX will do the right validation to ensure numeric attributes
       # can't be set to non-numeric values, so no need for the extra clutter.
-      info[:attribute_to_property] = lambda do |value| # rubocop:disable Style/SymbolProc
+      info[:attribute_to_property] = lambda do |value|
         value.to_i
       end
 

lib/puppet/provider/package/apt.rb

@@ -157,13 +157,11 @@ def install
     cmd += install_options if @resource[:install_options]
     cmd << :install
 
-    # rubocop:disable Style/RedundantCondition
     if source
       cmd << source
     else
       cmd << str
     end
-    # rubocop:enable Style/RedundantCondition
 
     unhold if properties[:mark] == :hold
     begin

lib/puppet/provider/package/yum.rb

@@ -110,7 +110,6 @@ def self.latest_package_version(package, disablerepo, enablerepo, disableexclude
   # @param disableexcludes [Array<String>] A list of repository excludes to disable for this query
   # @return [Hash<String, Array<Hash<String, String>>>] All packages that were
   #   found with a list of found versions for each package.
-  # rubocop:disable Layout/SingleLineBlockChain
   def self.check_updates(disablerepo, enablerepo, disableexcludes)
     args = [command(:cmd), 'check-update']
     args.concat(disablerepo.map { |repo| ["--disablerepo=#{repo}"] }.flatten)
@@ -130,7 +129,6 @@ def self.check_updates(disablerepo, enablerepo, disableexcludes)
     end
     updates
   end
-  # rubocop:enable Layout/SingleLineBlockChain
 
   def self.parse_updates(str)
     # Strip off all content that contains Obsoleting, Security: or Update
@@ -229,7 +227,6 @@ def best_version(should)
     end
   end
 
-  # rubocop:disable Layout/SingleLineBlockChain
   def available_versions(package_name, disablerepo, enablerepo, disableexcludes)
     args = [command(:cmd), 'list', package_name, '--showduplicates']
     args.concat(disablerepo.map { |repo| ["--disablerepo=#{repo}"] }.flatten)
@@ -239,11 +236,9 @@ def available_versions(package_name, disablerepo, enablerepo, disableexcludes)
     output = execute("#{args.compact.join(' ')} | sed -e '1,/Available Packages/ d' | awk '{print $2}'")
     output.split("\n")
   end
-  # rubocop:enable Layout/SingleLineBlockChain
 
   def install
     wanted = @resource[:name]
-    error_level = self.class.error_level
     update_command = self.class.update_command
     # If not allowing virtual packages, do a query to ensure a real package exists
     unless @resource.allow_virtual?

lib/puppet/resource.rb

@@ -453,12 +453,10 @@ def to_hierayaml
       attr.unshift(:ensure)
     end
 
-    # rubocop:disable Lint/FormatParameterMismatch
     attributes = attr.collect { |k|
       v = parameters[k]
       "    %-#{attr_max}s: %s\n" % [k, Puppet::Parameter.format_value_for_display(v)]
     }.join
-    # rubocop:enable Lint/FormatParameterMismatch
 
     "  %s:\n%s" % [title, attributes]
   end
@@ -490,12 +488,10 @@ def to_manifest
       attr.unshift(:ensure)
     end
 
-    # rubocop:disable Lint/FormatParameterMismatch
     attributes = attr.collect { |k|
       v = parameters[k]
       "  %-#{attr_max}s => %s,\n" % [k, Puppet::Parameter.format_value_for_display(v)]
     }.join
-    # rubocop:enable Lint/FormatParameterMismatch
 
     escaped = title.gsub(/'/, "\\\\'")
     "%s { '%s':\n%s}" % [type.to_s.downcase, escaped, attributes]

tasks/tag.rake

@@ -1,34 +1,34 @@
 namespace :vox do
-    desc 'Update version, create tag, and push to origin'
-    task :tag, [:tag] do |_, args|
-        abort 'You must provide a tag.' if args[:tag].nil? || args[:tag].empty?
-        version = args[:tag]
-        abort "#{version} does not appear to be a valid version string in x.y.z format" unless Gem::Version.correct?(version)
+  desc 'Update version, create tag, and push to origin'
+  task :tag, [:tag] do |_, args|
+    abort 'You must provide a tag.' if args[:tag].nil? || args[:tag].empty?
+    version = args[:tag]
+    abort "#{version} does not appear to be a valid version string in x.y.z format" unless Gem::Version.correct?(version)
 
-        # Update lib/puppet/version.rb and puppet.gemspec
-        puts "Setting version to #{version}"
-        data = File.read('lib/puppet/version.rb')
-        data = data.sub(/PUPPETVERSION = '\d+\.\d+\.\d+'/, "PUPPETVERSION = '#{version}'")
-        File.write('lib/puppet/version.rb', data)
-        data = File.read('puppet.gemspec')
-        data = data.sub(/spec.version = "\d+\.\d+\.\d+"/, "spec.version = \"#{version}\"")
-        File.write('puppet.gemspec', data)
-        run_command("git add lib/puppet/version.rb && git add puppet.gemspec && git commit -m 'Set version to #{version}'", true)
+    # Update lib/puppet/version.rb and puppet.gemspec
+    puts "Setting version to #{version}"
+    data = File.read('lib/puppet/version.rb')
+    data = data.sub(/PUPPETVERSION = '\d+\.\d+\.\d+'/, "PUPPETVERSION = '#{version}'")
+    File.write('lib/puppet/version.rb', data)
+    data = File.read('puppet.gemspec')
+    data = data.sub(/spec.version = "\d+\.\d+\.\d+"/, "spec.version = \"#{version}\"")
+    File.write('puppet.gemspec', data)
+    run_command("git add lib/puppet/version.rb && git add puppet.gemspec && git commit -m 'Set version to #{version}'")
 
-        # Run git command to get short SHA and one line description of the commit on HEAD
-        branch = run_command('git rev-parse --abbrev-ref HEAD', true)
-        sha = run_command('git rev-parse --short HEAD', true)
-        msg = run_command('git log -n 1 --pretty=%B', true)
+    # Run git command to get short SHA and one line description of the commit on HEAD
+    branch = run_command('git rev-parse --abbrev-ref HEAD')
+    sha = run_command('git rev-parse --short HEAD')
+    msg = run_command('git log -n 1 --pretty=%B')
 
-        puts "Branch: #{branch}"
-        puts "SHA: #{sha}"
-        puts "Commit: #{msg}"
+    puts "Branch: #{branch}"
+    puts "SHA: #{sha}"
+    puts "Commit: #{msg}"
 
-        run_command("git tag -a #{version} -m '#{version}'")
+    run_command("git tag -a #{version} -m '#{version}'")
 
-        unless !ENV['NOPUSH'].nil?
-            puts "Pushing to origin"
-            run_command("git push origin && git push origin #{version}")
-        end
+    unless !ENV['NOPUSH'].nil?
+      puts "Pushing to origin"
+      run_command("git push origin && git push origin #{version}")
     end
-end
+  end
+end