rake-funnel 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e62b12985fc2bbeb76d573e7085d7baf9a3eae8
-  data.tar.gz: 95eadbea48e9d562e5247b2309422cfdc97e4e0b
+  metadata.gz: d994a7aee19d9d6394f52bd560fceb3e7c1d0dba
+  data.tar.gz: 845d2b7a7862dcb29bfbdc3c06bc7a4620ccb585
 SHA512:
-  metadata.gz: 098b0d7d52d681f269d25379f6512a3de25b223ceb27a1b87fb74592a4351249e3a30d36cfab132544ef4a2c4803633d1e95edccdd4890333b6944a5620e06a9
-  data.tar.gz: 399b67b3b78e6fe13ead61f39ec9d38a71120734e9e6a8841e025255aa11479ab5312870ddd6ee31908c569ec0a2319d8383fd95755e9a6bea6972df7512d333
+  metadata.gz: f473e9b4620d0c95e97a729ae1eb65fd148e5088203218a377ece7900f5283d38f57b57fa04411a669e05b7d185096e045fb63af063f1084eeaf777f8fd3d8b6
+  data.tar.gz: 8dad0dae6e75d942e9e04045ff3d1cdf0d6e953bba0001d3dd87f548f721f29711f0698481eb56addcbca58ab23b57c5acc91da0428952a7b9c0c4d7c464d491

data/.rspec

@@ -1,2 +1,3 @@
+--color
 --require spec_helper
 --tag ~@draft

data/.simplecov

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+require 'coveralls'
+require 'simplecov-teamcity-summary'
+
+SimpleCov.start do
+  track_files('lib/**/*.rb')
+
+  add_filter do |file|
+    relative_path = Pathname.new(file.filename)
+                            .relative_path_from(Pathname.new(SimpleCov.root))
+    relative_path.to_s =~ %r{^spec/}
+  end
+
+  coverage_dir('build/coverage')
+
+  format = [::SimpleCov::Formatter::HTMLFormatter]
+
+  format << Coveralls::SimpleCov::Formatter if Coveralls.will_run?
+  format << SimpleCov::Formatter::TeamcitySummaryFormatter if ENV['TEAMCITY_PROJECT_NAME']
+
+  formatter(::SimpleCov::Formatter::MultiFormatter.new(format))
+end

data/Gemfile

@@ -1,33 +1,41 @@
-require 'rbconfig'
-
 source 'https://rubygems.org'
 
 gemspec
 
-group :development do
+group :coverage do
+  gem 'codeclimate-test-reporter'
+  gem 'coveralls'
+  gem 'simplecov-teamcity-summary'
+end
+
+group :style do
+  gem 'rubocop', '~> 0.46'
+  gem 'rubocop-rspec'
+end
+
+group :test do
+  gem 'rspec', '~> 3.0'
+  gem 'rspec-collection_matchers'
+  gem 'rspec-its'
+end
+
+group :development, :guard do
   gem 'guard-bundler'
   gem 'guard-rspec'
   gem 'guard-rubocop'
 
-  case RbConfig::CONFIG['target_os']
-  when /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i
+  # guard notifications.
+  install_if(-> { Gem.win_platform? }) do
     gem 'ruby_gntp'
     gem 'wdm'
-  when /linux/i
+  end
+
+  install_if(-> { RbConfig::CONFIG['target_os'] =~ /linux/i }) do
     gem 'rb-inotify'
-  when /mac|darwin/i
-    gem 'rb-fsevent'
-    gem 'growl'
   end
-end
 
-group :development, :ci do
-  gem 'rspec', '~> 3.0'
-  gem 'rspec-its'
-  gem 'rspec-collection_matchers'
-  gem 'coveralls'
-  gem 'codeclimate-test-reporter'
-  gem 'rubocop', '~> 0.37.2'
-  gem 'rubocop-rspec'
-  gem 'simplecov-teamcity-summary'
+  install_if(-> { RbConfig::CONFIG['target_os'] =~ /mac|darwin/i }) do
+    gem 'rb-fsevent'
+    gem 'terminal-notifier-guard'
+  end
 end

data/README.md

@@ -4,7 +4,7 @@
 
 rake-funnel is my set of rake tasks, mostly targeted at .NET development.
 
-* Tested against Ruby 2.0.0, 2.1.0 through 2.2.1 and ruby-head
+* Tested against Ruby 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0 and ruby-head
 * Ruby < 2.0 is not supported
 
 ## Installation

data/lib/rake/funnel/ambiguous_file_error.rb

@@ -22,6 +22,7 @@ module Rake
       end
 
       private
+
       def inspect_description
         [description] if description
       end

data/lib/rake/funnel/execution_error.rb

@@ -21,6 +21,7 @@ module Rake
       end
 
       private
+
       def inspect_description
         [description] if description
       end

data/lib/rake/funnel/extensions/common_path.rb

@@ -7,8 +7,8 @@ module Rake
       module CommonPath
         def common_path
           list = to_a
-            .compact
-            .map { |x| components(x) }
+                 .compact
+                 .map { |x| components(x) }
 
           min = list.min_by(&:length)
 
@@ -17,17 +17,18 @@ module Rake
         end
 
         private
+
         def components(path)
           paths = []
           Pathname.new(path).descend do |p|
             paths << p
           end
 
-          paths = paths.inject([]) { |components, p|
+          paths = paths.inject([]) do |components, p|
             relative = p.relative_path_from(components.last[:absolute]) if components.any?
 
             components << { absolute: p, relative: relative || p }
-          }
+          end
 
           paths.map { |component| component[:relative].to_s }
         end

data/lib/rake/funnel/extensions/shell.rb

@@ -12,13 +12,14 @@ module Rake
 
           run(cmd, log_file, error_lines) do |success, readable_cmd, result, log|
             if block
-              block.call(success, readable_cmd, result, log)
+              yield(success, readable_cmd, result, log)
               return
             end
           end
         end
 
         private
+
         def run(cmd, log_file, error_lines)
           cmd, readable_cmd = normalize(cmd)
 
@@ -32,7 +33,7 @@ module Rake
 
             yield(success, *result) if block_given?
 
-            fail Rake::Funnel::ExecutionError.new(*result) unless success
+            raise Rake::Funnel::ExecutionError.new(*result) unless success
           end
         end
 

data/lib/rake/funnel/integration/progress_report.rb

@@ -29,11 +29,12 @@ module Rake
         end
 
         private
+
         def patch
           @patch ||= create_patch
         end
 
-        def create_patch
+        def create_patch # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           Rake::Funnel::Support::Patch.new(self) do |p|
             p.setup do |context|
               Rake::Task.class_eval do
@@ -49,7 +50,7 @@ module Rake
                     error = e
                   ensure
                     context.finished.call(self, args, error) if context.finished
-                    fail error if error
+                    raise error if error
                   end
                 end
 

data/lib/rake/funnel/integration/sync_output.rb

@@ -8,6 +8,7 @@ module Rake
         end
 
         private
+
         def sync(stream)
           stream.sync = true
         rescue => e

data/lib/rake/funnel/integration/teamcity/nunit_plugin.rb

@@ -3,7 +3,7 @@ module Rake
     module Integration
       module TeamCity
         class NUnitPlugin
-          ENV_VAR = 'teamcity.dotnet.nunitaddin'
+          ENV_VAR = 'teamcity.dotnet.nunitaddin'.freeze
 
           class << self
             def setup(nunit_executable)
@@ -16,6 +16,7 @@ module Rake
             end
 
             private
+
             def get_addin_dir(source)
               return nil unless source
 

data/lib/rake/funnel/integration/teamcity/progress_report.rb

@@ -7,7 +7,7 @@ module Rake
         class ProgressReport < Rake::Funnel::Integration::ProgressReport
           include Rake::Funnel::Integration
 
-          def initialize
+          def initialize # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
             super do
               task_starting do |task, _args|
                 next unless TeamCity.running?

data/lib/rake/funnel/integration/teamcity/service_messages.rb

@@ -4,14 +4,19 @@ module Rake
       module TeamCity
         class ServiceMessages
           class << self
-            def method_missing(method, *args, &_block)
+            def respond_to_missing?(_method, _include_private = false)
+              true
+            end
+
+            def method_missing(method, *args, &_block) # rubocop:disable Style/MethodMissing
               return unless Rake::Funnel::Integration::TeamCity.running?
 
               message_name = method.camelize
-              publish message_name, args[0]
+              publish(message_name, args[0])
             end
 
             private
+
             def publish(message_name, args)
               args = [message_name] << escaped_array_of(args)
               args = args.flatten.reject(&:nil?)
@@ -19,7 +24,7 @@ module Rake
               puts "##teamcity[#{args.join(' ')}]"
             end
 
-            def escape(string)
+            def escape(string) # rubocop:disable Metrics/MethodLength
               string
                 .to_s
                 .gsub(/\|/, '||')

data/lib/rake/funnel/integration/teamcity/teamcity.rb

@@ -2,8 +2,8 @@ module Rake
   module Funnel
     module Integration
       module TeamCity
-        PROJECT_ENV_VAR = 'TEAMCITY_PROJECT_NAME'
-        JRE_ENV_VAR = 'TEAMCITY_JRE'
+        PROJECT_ENV_VAR = 'TEAMCITY_PROJECT_NAME'.freeze
+        JRE_ENV_VAR = 'TEAMCITY_JRE'.freeze
 
         class << self
           def running?
@@ -14,7 +14,7 @@ module Rake
             running? && Object.const_defined?('Rake') && Rake.const_defined?('TeamCityApplication')
           end
 
-          def with_java_runtime(&block)
+          def with_java_runtime
             return unless block_given?
 
             begin
@@ -22,13 +22,14 @@ module Rake
 
               ENV['PATH'] = ([] << ENV['PATH'] << teamcity_jre).compact.join(File::PATH_SEPARATOR)
 
-              block.call
+              yield
             ensure
               ENV['PATH'] = original_path
             end
           end
 
           private
+
           def teamcity_jre
             return nil unless ENV.include?(JRE_ENV_VAR)
             File.join(ENV[JRE_ENV_VAR], 'bin')

data/lib/rake/funnel/support/argument_mapper/styles/default.rb

@@ -12,14 +12,15 @@ module Rake
             end
 
             def generate_from(model)
-              model.map { |switch|
-                switch.values.flatten.map { |value|
+              model.map do |switch|
+                switch.values.flatten.map do |value|
                   [top_level(switch), nested(value)].reject(&:empty?)
-                }
-              }.flatten(2)
+                end
+              end.flatten(2)
             end
 
             private
+
             def top_level(switch)
               [prefix, switch.switch]
             end

data/lib/rake/funnel/support/argument_mapper/styles/msbuild.rb

@@ -13,19 +13,20 @@ module Rake
             end
 
             def generate_from(model)
-              model.map { |switch|
-                switch.values.flatten.map { |value|
+              model.flat_map do |switch|
+                switch.values.flatten.map do |value|
                   top_level(switch) + nested(value)
-                }
-              }.flatten(1)
+                end
+              end
             end
 
             private
+
             def top_level(switch)
               [prefix, switch.switch]
             end
 
-            def nested(value)
+            def nested(value) # rubocop:disable Metrics/AbcSize
               res = []
               res << separator unless value.key.nil? && value.value.nil?
               res << value.key

data/lib/rake/funnel/support/argument_mapper/styles/msdeploy.rb

@@ -14,27 +14,28 @@ module Rake
             end
 
             def generate_from(model)
-              model.map { |switch|
-                switch.values.map { |item|
-                  if item.is_a?(Enumerable)
-                    values = item.map.with_index { |nested, index| nested(nested, index) }
-                  else
-                    values = nested(item)
-                  end
+              model.flat_map do |switch|
+                switch.values.map do |item|
+                  values = if item.is_a?(Enumerable)
+                             item.map.with_index { |nested, index| nested(nested, index) }
+                           else
+                             nested(item)
+                           end
 
                   (top_level(switch) + values).flatten
-                }
-              }.flatten(1)
+                end
+              end
             end
 
             private
+
             def top_level(switch)
               [prefix, quote(switch.switch)]
             end
 
-            def nested(value, index = 0)
+            def nested(value, index = 0) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
               res = []
-              res << value_list_separator unless index == 0
+              res << value_list_separator unless index.zero?
               res << separator unless value.key.nil? && value.value.nil? || index != 0
               res << quote(value.key)
               res << value_separator unless value.key.nil? || value.value.nil?
@@ -44,7 +45,7 @@ module Rake
 
             def quote(value)
               value = value.gsub(/"/, '""') if value.is_a?(String)
-              return %{"#{value}"} if value =~ /\s/
+              return %("#{value}") if value =~ /\s/
               value
             end
           end

data/lib/rake/funnel/support/argument_mapper/styles/nunit.rb

@@ -13,19 +13,20 @@ module Rake
             end
 
             def generate_from(model)
-              model.map { |switch|
-                switch.values.flatten.map { |value|
+              model.flat_map do |switch|
+                switch.values.flatten.map do |value|
                   top_level(switch) + nested(value)
-                }
-              }.flatten(1)
+                end
+              end
             end
 
             private
+
             def top_level(switch)
               [prefix, switch.switch]
             end
 
-            def nested(value)
+            def nested(value) # rubocop:disable Metrics/AbcSize
               res = []
               res << separator unless value.key.nil? && value.value.nil?
               res << value.key

data/lib/rake/funnel/support/assembly_version/from_version_files.rb

@@ -14,7 +14,7 @@ module Rake
           end
 
           def each
-            block_given? or return enum_for(__method__)
+            block_given? || (return enum_for(__method__))
 
             files.each do |file|
               Rake.rake_output_message("Reading #{file}")
@@ -29,6 +29,7 @@ module Rake
           end
 
           private
+
           def files
             Finder.new(search_pattern, self, 'No version files found.').all_or_default
           end

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

@@ -32,6 +32,7 @@ module Rake
         end
 
         private
+
         def evaluate_erb(language, version_info, target)
           template = template_for(language)
 

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

@@ -3,32 +3,39 @@ module Rake
     module Support
       class BinaryVersionReader
         class << self
-          KNOWN_ATTRIBUTES = [:company_name, :file_description, :file_version, :legal_copyright, :product_name, :product_version, :assembly_version]
-          SEPARATOR = "\0"
+          KNOWN_ATTRIBUTES = %i(company_name
+                                file_description
+                                file_version
+                                legal_copyright
+                                product_name
+                                product_version
+                                assembly_version).freeze
+          SEPARATOR = "\0".freeze
           TERMINATOR = "\0" * 3
 
           def read_from(assembly)
             binary = File.binread(assembly)
 
-            attributes = KNOWN_ATTRIBUTES.map { |attr|
+            attributes = KNOWN_ATTRIBUTES.map do |attr|
               read_attribute(binary, attr)
-            }
+            end
 
-            hash = attributes.inject({}) { |memo, attr|
+            hash = attributes.inject({}) do |memo, attr|
               memo.merge(attr)
-            }
+            end
 
             VersionInfo.new(hash)
           end
 
           private
+
           def read_attribute(binary, attr)
             binary_attr = attr.pascalize.gsub(/(.)/) { |match| match + SEPARATOR }
 
             data = binary.match(/#{binary_attr}#{SEPARATOR}+(.*?)#{TERMINATOR}/)
             return {} if data.nil?
 
-            { "#{attr}" => data[1].gsub(/#{SEPARATOR}/, '') }
+            { attr.to_s => data[1].gsub(/#{SEPARATOR}/, '') }
           end
         end
       end

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

@@ -20,6 +20,7 @@ module Rake
           end
 
           private
+
           def target_path(file, common_path, target)
             target_relative = Pathname.new(file).relative_path_from(Pathname.new(common_path)).to_s
             File.join(target, target_relative)

data/lib/rake/funnel/support/environments/loader.rb

@@ -13,7 +13,19 @@ module Rake
               store.reset!
 
               store.env = config[:name]
+              load(config, store)
 
+              customizer.call(store) if customizer && customizer.respond_to?(:call)
+
+              store.lock!
+
+              Rake.rake_output_message('')
+              Rake.rake_output_message(store.inspect)
+            end
+
+            private
+
+            def load(config, store)
               operation = 'Loading'
               config.fetch(:config_files, []).each do |file|
                 Rake.rake_output_message("#{operation} #{file}")
@@ -21,16 +33,9 @@ module Rake
 
                 yaml = File.read(file)
                 yaml = evaluate_erb(yaml, file)
-                yaml = YAML.load(yaml) || {}
+                yaml = YAML.load(yaml) || {} # rubocop:disable Security/YAMLLoad
                 store.configure_from_hash(yaml)
               end
-
-              customizer.call(store) if customizer && customizer.respond_to?(:call)
-
-              store.lock!
-
-              Rake.rake_output_message('')
-              Rake.rake_output_message(store.inspect)
             end
 
             def evaluate_erb(yaml, filename)

data/lib/rake/funnel/support/internal/finder.rb

@@ -11,7 +11,7 @@ module Rake
         end
 
         def each
-          block_given? or return enum_for(__method__)
+          block_given? || (return enum_for(__method__))
           all_or_default.each { |x| yield x }
         end
 
@@ -40,6 +40,7 @@ module Rake
         end
 
         private
+
         def first_sln
           return candidates.first if candidates.one?
 

data/lib/rake/funnel/support/internal/instantiate_symbol.rb

@@ -11,20 +11,25 @@ module Rake
           attr_reader :module
 
           private
+
           def instantiate(mod)
             @module = mod
           end
         end
 
         private
-        def create(sym, *args)
+
+        def create(sym, *args) # rubocop:disable Metrics/AbcSize
           return sym unless sym.is_a?(Symbol)
 
           found = [sym, sym.pascalize.to_sym]
-            .select { |candidate| mod.constants.include?(candidate) }
-            .first
+                  .select { |candidate| mod.constants.include?(candidate) }
+                  .first
 
-          raise NameError, "Unknown type to instantiate: #{sym.inspect}. Available types are: #{available.inspect}" if found.nil?
+          if found.nil?
+            raise NameError,
+                  "Unknown type to instantiate: #{sym.inspect}. Available types are: #{available.inspect}"
+          end
 
           type = mod.const_get(found)
           type.new(*args)

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

@@ -16,8 +16,8 @@ module Rake
           @style = create(style)
         end
 
-        def map(args = {})
-          model = (args || {}).map { |switch, value|
+        def map(args = {}) # rubocop:disable Metrics/MethodLength
+          model = (args || {}).map do |switch, value|
             value = [value] unless value.is_a?(Array)
 
             values = value.map do |val|
@@ -25,20 +25,21 @@ module Rake
             end
 
             Switch.new(switch, values)
-          }.flatten
+          end.flatten
 
           @style
             .generate_from(model)
-            .map { |args| args.map { |arg| camel_case_symbols(arg) } }
+            .map { |arguments| arguments.map { |arg| camel_case_symbols(arg) } }
             .map(&:join)
         end
 
         private
+
         def get_values(value)
           if value.is_a?(Enumerable)
-            pairs = value.map { |k, v|
+            pairs = value.map do |k, v|
               KeyValuePair.new(k, v)
-            }
+            end
 
             return Array.new(pairs) if value.is_a?(Array)
             pairs

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

@@ -6,9 +6,7 @@ module Rake
           def invocation(executable, *args)
             exe_args = ([executable] << args).flatten.compact
 
-            if Rake::Win32.windows?
-              return exe_args
-            end
+            return exe_args if Rake::Win32.windows?
 
             executable = exe_args.shift
             found = Which.which(executable) || executable