rake-funnel 0.18.0 → 0.19.0

data/lib/rake/funnel/support/msbuild/build_tool.rb

@@ -5,22 +5,45 @@ module Rake
         class BuildTool
           class << self
             def find
-              return 'xbuild' unless Rake::Win32.windows?
+              return 'xbuild'.freeze unless Rake::Win32.windows?
 
-              require 'win32/registry'
+              from_registry.compact.first
+            end
+
+            private
 
-              %w(14.0 12.0 4.0 3.5 2.0).collect { |version|
-                key = "SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\#{version}"
+            KEY = 'SOFTWARE\Microsoft\MSBuild\ToolsVersions'.freeze
 
-                begin
-                  ::Win32::Registry::HKEY_LOCAL_MACHINE.open(key) do |reg|
-                    candidate = File.join(reg['MSBuildToolsPath'] || '', 'msbuild.exe')
-                    next candidate if File.exist?(candidate)
-                  end
-                rescue
-                  next
+            def from_registry
+              return nil unless require_registry
+
+              versions.map do |version|
+                version_key(version) do |reg|
+                  candidate = File.join(reg['MSBuildToolsPath'] || '', 'msbuild.exe')
+                  next candidate if File.exist?(candidate)
                 end
-              }.compact.first
+              end
+            end
+
+            def versions
+              %w(14.0 12.0 4.0 3.5 2.0)
+            end
+
+            def require_registry
+              require 'win32/registry'
+              true
+            rescue LoadError
+              false
+            end
+
+            def version_key(version)
+              key = KEY + '\\' + version
+
+              ::Win32::Registry::HKEY_LOCAL_MACHINE.open(key) do |reg|
+                yield(reg) if block_given?
+              end
+            rescue ::Win32::Registry::Error
+              nil
             end
           end
         end

data/lib/rake/funnel/support/msdeploy/registry_patch.rb

@@ -6,20 +6,19 @@ module Rake
           KEYS = [
             'SOFTWARE\Microsoft\IIS Extensions\MSDeploy\3',
             'SOFTWARE\Wow6432Node\Microsoft\IIS Extensions\MSDeploy\3'
-          ]
-          VERSION_VALUE = 'Version'
-          FAKE_VERSION = '99.0.0.0'
+          ].freeze
+          VERSION_VALUE = 'Version'.freeze
+          FAKE_VERSION = '99.0.0.0'.freeze
 
           def initialize(&block)
-            begin
-              patch.apply!
-              yield block if block_given?
-            ensure
-              patch.revert!
-            end
+            patch.apply!
+            yield block if block_given?
+          ensure
+            patch.revert!
           end
 
           private
+
           def patch
             @patch ||= create_patch
           end
@@ -32,23 +31,23 @@ module Rake
             return nil unless key.created?
 
             keyname = key.keyname
-            proc {
+            proc do
               root.create(File.dirname(keyname)) do |r|
                 r.delete_key(File.basename(keyname), true)
               end
-            }
+            end
           end
 
           def delete_value(key, value)
             keyname = key.keyname
-            proc {
+            proc do
               root.create(keyname) do |r|
                 r.delete_value(value)
               end
-            }
+            end
           end
 
-          def create_patch
+          def create_patch # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
             begin
               require 'win32/registry'
             rescue LoadError
@@ -81,9 +80,7 @@ module Rake
               end
 
               p.reset do
-                resets.compact.each do |reset|
-                  reset.call
-                end
+                resets.compact.each(&:call)
               end
             end
           end

data/lib/rake/funnel/support/patch.rb

@@ -32,6 +32,7 @@ module Rake
         end
 
         private
+
         def noop
           proc {}
         end

data/lib/rake/funnel/support/specs_remover.rb

@@ -18,7 +18,8 @@ module Rake
             end
 
             private
-            def remove(projects, references, specs)
+
+            def remove(projects, references, specs) # rubocop:disable Metrics/MethodLength
               Dir[*projects].map do |project|
                 Trace.message("Processing #{project} with references #{references} and specs #{specs}")
 
@@ -45,25 +46,25 @@ module Rake
             end
 
             def remove_references(references, xml)
-              deleted = references.map { |ref|
+              deleted = references.flat_map do |ref|
                 query = "/Project//Reference[starts-with(lower-case(@Include), '#{ref.downcase}')]"
                 xml.elements.delete_all(query)
-              }
-                .flatten
-                .tap { |d| Trace.message("Removed references: #{d.inspect}") }
+              end
 
-              deleted.map { |d|
+              deleted.each { |d| Trace.message("Removed references: #{d.inspect}") }
+
+              deleted = deleted.flat_map do |d|
                 d.get_elements('/HintPath').map(&:text)
-              }
-                .flatten
-                .tap { |d| Trace.message("HintPaths: #{d}") }
+              end
+
+              deleted.each { |d| Trace.message("HintPaths: #{d}") }
             end
 
             def remove_specs(specs, xml)
-              deleted = specs.map { |glob|
+              deleted = specs.map do |glob|
                 query = "/Project//Compile[matches(lower-case(@Include), '#{glob}')]"
                 xml.elements.delete_all(query)
-              }
+              end
 
               deleted
                 .flatten
@@ -116,6 +117,7 @@ module Rake
             end
 
             private
+
             def paket_references_for(project)
               project_specific = project + '.paket.references'
               global = File.join(File.dirname(project), 'paket.references')
@@ -145,6 +147,7 @@ module Rake
           end
 
           private
+
           def list(args)
             ([] << args).flatten.compact
           end

data/lib/rake/funnel/support/template_engine.rb

@@ -12,6 +12,7 @@ module Rake
           end
 
           private
+
           def replace_at_markers(template)
             tags = /(@\w[\w\.]+\w@)/
 

data/lib/rake/funnel/support/timing/report.rb

@@ -8,14 +8,14 @@ module Rake
           class Column
             attr_reader :header
 
-            def initialize(stats: [], header: '', accessor: -> (_) { '' })
+            def initialize(stats: [], header: '', accessor: ->(_) { '' })
               @stats = stats
               @header = header
               @accessor = accessor
             end
 
             def width
-              longest_value = @stats.map { |s| @accessor.call(s) }.max_by { |m| m.length } || ''
+              longest_value = @stats.map { |s| @accessor.call(s) }.max_by(&:length) || ''
               width = longest_value.length
               width = @header.length if width < @header.length
               width
@@ -45,19 +45,20 @@ module Rake
           end
 
           def columns
-            @columns ||= ([
-              Column.new(stats: @stats, header: 'Target', accessor: -> (timing) { timing[:task].name }),
-              Column.new(stats: @stats, header: 'Duration', accessor: -> (timing) { format(timing[:time]) })
-            ])
+            @columns ||= begin [
+              Column.new(stats: @stats, header: 'Target', accessor: ->(timing) { timing[:task].name }),
+              Column.new(stats: @stats, header: 'Duration', accessor: ->(timing) { format(timing[:time]) })
+            ] end
           end
 
           private
-          def header
+
+          def header # rubocop:disable Metrics/AbcSize
             puts '-' * HEADER_WIDTH
             puts 'Build time report'
             puts '-' * HEADER_WIDTH
 
-            puts columns.map { |c| c.format_header }.join(' ' * SPACE)
+            puts columns.map(&:format_header).join(' ' * SPACE)
             puts columns.map { |c| c.format_header.gsub(/./, '-') }.join(' ' * SPACE)
           end
 
@@ -67,7 +68,7 @@ module Rake
             end
           end
 
-          def footer
+          def footer # rubocop:disable Metrics/AbcSize
             puts '-' * HEADER_WIDTH
             puts 'Total'.ljust(columns[0].width) + ' ' * SPACE + format(Time.now - @stats.started_at)
             status_message
@@ -78,7 +79,7 @@ module Rake
             Time.at(seconds).utc.strftime('%H:%M:%S')
           end
 
-          def status_message
+          def status_message # rubocop:disable Metrics/AbcSize
             status = @opts[:failed] ? 'Failed' : 'OK'
             status = 'Status'.ljust(columns[0].width) + ' ' * SPACE + status
 

data/lib/rake/funnel/support/version_info.rb

@@ -16,11 +16,9 @@ module Rake
 
         class << self
           def parse(context)
-            VersionInfo.new({
-                assembly_version: assembly_version(context),
-                assembly_file_version: assembly_file_version(context),
-                assembly_informational_version: assembly_informational_version(context)
-              })
+            VersionInfo.new(assembly_version: assembly_version(context),
+                            assembly_file_version: assembly_file_version(context),
+                            assembly_informational_version: assembly_informational_version(context))
           end
 
           def read_version_from(file)
@@ -28,12 +26,13 @@ module Rake
           end
 
           private
+
           def default_version(context)
             context[:version].to_s || '0'
           end
 
           def pad(version, parts)
-            numerics = version.split('.').take(parts).map { |part| part.to_i }
+            numerics = version.split('.').take(parts).map(&:to_i)
 
             template = Array.new(parts) { 0 }.map.with_index do |part, index|
               numerics[index] || part
@@ -58,7 +57,7 @@ module Rake
             nil
           end
 
-          def assembly_informational_version(context)
+          def assembly_informational_version(context) # rubocop:disable Metrics/MethodLength
             version = default_version(context)
             numeric_version = pad(version, 3)
             alpha_version = version.sub(/^[\d\.]*/, '')
@@ -85,9 +84,9 @@ module Rake
           def metadata(context)
             metadata = context.fetch(:metadata, {}).reject { |k, _| k == :pre }
 
-            metadata = metadata.map { |key, value|
+            metadata = metadata.map do |key, value|
               [key.to_s, value.to_s] if value
-            }.compact
+            end.compact
 
             return nil if metadata.empty?
             metadata.join('.')

data/lib/rake/funnel/support/zipper.rb

@@ -17,6 +17,7 @@ module Rake
           end
 
           private
+
           def configure_zip
             ::Zip.unicode_names = true
             ::Zip.default_compression = Zlib::BEST_COMPRESSION

data/lib/rake/funnel/tasks/assembly_version.rb

@@ -19,22 +19,23 @@ module Rake
         end
 
         private
+
         def setup_ivars(args)
           @name = args.shift || :version
 
           @language = :cs
           @source = :FromVersionFiles
           @source_args = {}
-          @target_path = proc { |language, version_info, source|
+          @target_path = proc do |language, version_info, source|
             next_to_source(language, version_info, source)
-          }
+          end
         end
 
         def define(args, &task_block)
           desc 'Generate version info' unless Rake.application.last_description
 
           task(name, *args) do |_, task_args|
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             writer = AssemblyVersionWriter.new(source, source_args)
             writer.write(target_path, language)

data/lib/rake/funnel/tasks/bin_path.rb

@@ -13,17 +13,18 @@ module Rake
         end
 
         private
+
         def setup_ivars(args)
           @name = args.shift || :bin_path
           @search_pattern = %w(tools/* tools/*/bin packages/**/tools)
           @path_modifier = proc { |paths| paths }
         end
 
-        def define(args, &task_block)
+        def define(args, &task_block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           desc 'Add local binaries to PATH environment variable' unless Rake.application.last_description
 
           task(name, *args) do |_, task_args|
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             next unless paths.any?
 

data/lib/rake/funnel/tasks/copy.rb

@@ -15,6 +15,7 @@ module Rake
         end
 
         private
+
         def setup_ivars(args)
           @name = args.shift || :copy
 
@@ -26,7 +27,7 @@ module Rake
           desc 'Copy files' unless Rake.application.last_description
 
           task(name, *args) do |_, task_args|
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             Copier.copy(files, target)
           end

data/lib/rake/funnel/tasks/environments.rb

@@ -16,6 +16,7 @@ module Rake
         end
 
         private
+
         def setup_ivars(_args)
           @store = configatron
           @default_env = nil
@@ -25,7 +26,7 @@ module Rake
         end
 
         def define(args, &task_block)
-          task_block.call(*[self].slice(0, task_block.arity)) if task_block
+          yield(*[self].slice(0, task_block.arity)) if task_block
 
           environments.each do |env|
             desc "Configure for the #{env[:name]} environment"
@@ -38,7 +39,7 @@ module Rake
           default_environment_setup
         end
 
-        def environments
+        def environments # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           default = File.join(base_dir, config_ext(default_config))
           local = File.join(base_dir, config_ext(local_config))
 
@@ -60,17 +61,17 @@ module Rake
           "#{name}.yaml"
         end
 
-        def default_environment_setup
+        def default_environment_setup # rubocop:disable Metrics/MethodLength
           return unless default_env
 
-          top_level_envs = top_level_env_tasks
-          if top_level_envs.empty?
+          envs = top_level_env_tasks
+          if envs.empty?
             task = Rake.application.current_scope.path_with_task_name(default_env)
             prepend_task(task)
           else
-            top_level_envs.each do |task|
-              Rake.application.top_level_tasks.delete(task)
-              prepend_task(task)
+            envs.each do |env|
+              Rake.application.top_level_tasks.delete(env)
+              prepend_task(env)
             end
           end
         end
@@ -80,7 +81,10 @@ module Rake
         end
 
         def top_level_env_tasks
-          expect_user_defined = environments.map { |env| Rake.application.current_scope.path_with_task_name(env[:name]) }
+          expect_user_defined = environments.map do |env|
+            Rake.application.current_scope.path_with_task_name(env[:name])
+          end
+
           Rake.application.top_level_tasks.select { |t| expect_user_defined.include?(t) }
         end
       end

data/lib/rake/funnel/tasks/msbuild.rb

@@ -8,6 +8,7 @@ module Rake
         include Rake::Funnel::Support::MSBuild
 
         attr_accessor :name, :msbuild, :project_or_solution, :args, :search_pattern
+        attr_writer :project_or_solution
 
         def initialize(*args, &task_block)
           setup_ivars(args)
@@ -19,11 +20,8 @@ module Rake
           Finder.new(@project_or_solution || search_pattern, self, 'No projects or more than one project found.')
         end
 
-        def project_or_solution=(value)
-          @project_or_solution = value
-        end
-
         private
+
         def setup_ivars(args)
           @name = args.shift || :compile
 
@@ -32,11 +30,11 @@ module Rake
           @search_pattern = %w(**/*.sln)
         end
 
-        def define(args, &task_block)
+        def define(args, &task_block) # rubocop:disable Metrics/MethodLength
           desc 'Compile MSBuild projects' unless Rake.application.last_description
 
           task(name, *args) do |_, task_args|
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             cmd = [
               msbuild,

data/lib/rake/funnel/tasks/msdeploy.rb

@@ -16,6 +16,7 @@ module Rake
         end
 
         private
+
         def setup_ivars(args)
           @name = args.shift || :msdeploy
 
@@ -24,16 +25,16 @@ module Rake
           @log_file = "#{@name}.log"
         end
 
-        def define(args, &task_block)
+        def define(args, &task_block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           desc 'Deploy application' unless Rake.application.last_description
 
           task(name, *args) do |_, task_args|
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             mapper = Mapper.new(:MSDeploy)
             cmd = [quote(msdeploy), mapper.map(@args)]
-              .flatten
-              .join(' ')
+                  .flatten
+                  .join(' ')
 
             RegistryPatch.new do
               shell(cmd, log_file: log_file, error_lines: /^(error|[\w\.]*exception)/i)
@@ -45,7 +46,7 @@ module Rake
 
         def quote(value)
           value = value.gsub(/"/, '""') if value.is_a?(String)
-          return %Q{"#{value}"} if value =~ /\s/
+          return %("#{value}") if value =~ /\s/
           value
         end
       end

data/lib/rake/funnel/tasks/nunit.rb

@@ -15,6 +15,7 @@ module Rake
         end
 
         private
+
         def setup_ivars(args)
           @name = args.shift || :test
 
@@ -23,11 +24,11 @@ module Rake
           @files = %w(build/specs/**/*.dll build/specs/**/*.exe)
         end
 
-        def define(args, &task_block)
+        def define(args, &task_block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           desc "Test #{test_assemblies.all_or_default.join(', ')}" unless Rake.application.last_description
 
           task(name, *args) do |_, task_args|
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             Rake::Funnel::Integration::TeamCity::NUnitPlugin.setup(nunit)
 

data/lib/rake/funnel/tasks/paket.rb

@@ -15,6 +15,7 @@ module Rake
         end
 
         private
+
         def setup_ivars(args)
           @name = args.shift || :paket
 
@@ -29,7 +30,7 @@ module Rake
           desc 'Restore packages' unless Rake.application.last_description
 
           task(name, *args) do |_, task_args|
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             sh(*bootstrapper_cmd) unless File.exist?(paket)
             sh(*paket_cmd)

data/lib/rake/funnel/tasks/quick_template.rb

@@ -16,6 +16,7 @@ module Rake
         end
 
         private
+
         def setup_ivars(args)
           @name = args.shift || :template
 
@@ -23,10 +24,10 @@ module Rake
           @context = binding
         end
 
-        def define(args, &task_block)
+        def define(args, &task_block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           desc 'Generate templates' unless Rake.application.last_description
           task(name, *args) do |_, task_args|
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             templates.all_or_default.each do |template|
               target = result_filename(template)

data/lib/rake/funnel/tasks/side_by_side_specs.rb

@@ -15,6 +15,7 @@ module Rake
         end
 
         private
+
         def setup_ivars(args)
           @name = args.shift || :compile
 
@@ -28,7 +29,7 @@ module Rake
         def define(args, &task_block)
           desc 'Remove tests from projects' unless Rake.application.last_description
           task(name, *args) do |_, task_args|
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             next unless enabled
 

data/lib/rake/funnel/tasks/timing.rb

@@ -20,19 +20,20 @@ module Rake
         end
 
         private
+
         def setup_ivars(args)
           @name = args.shift || :timing
 
           @stats = Statistics.new
         end
 
-        def define(_args, &task_block)
+        def define(_args, &task_block) # rubocop:disable Metrics/AbcSize
           patches.each(&:apply!)
 
           desc 'Output task timing information' unless Rake.application.last_description
 
           task name, :failed do |_, task_args|
-            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+            yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             Report.new(@stats, task_args).render
           end
@@ -47,9 +48,9 @@ module Rake
           @patches ||= [report, benchmark]
         end
 
-        def report
+        def report # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           Rake::Funnel::Support::Patch.new do |p|
-            report_invoker = -> (opts) { Report.new(@stats, opts).render }
+            report_invoker = ->(opts) { Report.new(@stats, opts).render }
 
             p.setup do
               Rake::Application.class_eval do
@@ -75,9 +76,9 @@ module Rake
           end
         end
 
-        def benchmark
+        def benchmark # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           Rake::Funnel::Support::Patch.new do |p|
-            benchmark_invoker = -> (task, &block) { @stats.benchmark(task, &block) }
+            benchmark_invoker = ->(task, &block) { @stats.benchmark(task, &block) }
 
             p.setup do
               Rake::Task.class_eval do