rake-funnel 0.22.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba6054ccf746282d7b18f44405a4a1f24e3f2dabc36dfc1ce5b8a5fd90bbc9b1
-  data.tar.gz: ad1ba7b758b76396150182661dcf4936b133f3b52007e2ceb582dd0339e9af7c
+  metadata.gz: 4cecd55f933fca2c61e35adfe6bd550e5a0c3c8dbb932208a3f6498511bc7998
+  data.tar.gz: c052b41fb1fa1ae8d74b6f6a04731cb3508006555f6d9779d9b15979023ec425
 SHA512:
-  metadata.gz: 51eaeeef60d39328f4a0b6ef35b66560b5d5f0b8d61291282aae964bffcd4043d22432dd261d5879a8324535058f2284fc680b7b852277d5dc761f0abb91213a
-  data.tar.gz: afe151343b40f3c2510a575140c4a42df399196d58e98f6ef4e88c199ea6b1e7138575cc43e2fa962299b4abfaf5994791737926a74f2d5f59cec9d74e6b066f
+  metadata.gz: b8ba97a294274e61e52921b729905401432e5e2b697d80d0c00a7bca488dd90e57dad7c9749afc2231e973d103ef93ece71d4a9734a32c7a793febab84f2d383
+  data.tar.gz: c2ab4ab69a5c344d5b16f902cd870bdb8525a0165afa84d75e575426ec6b6160f13e792613cc57478fcbc4f4c101f0d68312765dcc8b6b425bd1feddd2633f35

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+# 0.24.0 / 2021-01-04
+
+* [FEATURE] Support paket.references with whitespace in front of package names,
+  i.e. grouped packages.
+
+# 0.23.0 / 2020-02-29
+
+* [FEATURE] Support rake < 14.
+
+# 0.22.3 / 2019-01-08
+
+* [BUGFIX] Support Ruby 2.6.0's ERB initializer.
+
+# 0.22.2 / 2018-05-28
+
+* [BUGFIX] Write output using atomic `print`.
+
+# 0.22.1 / 2018-05-28
+
+* [BUGFIX] Fix a bug with overridden methods from rake.
+
 # 0.22.0 / 2018-05-05
 
 * [FEATURE] Support [vswhere](https://github.com/Microsoft/vswhere) to locate

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
@@ -9,7 +11,7 @@ group :coverage do
 end
 
 group :style do
-  gem 'rubocop', '~> 0.46'
+  gem 'rubocop', '< 0.50'
   gem 'rubocop-rspec'
 end
 
@@ -19,7 +21,7 @@ group :test do
   gem 'rspec-its'
 end
 
-group :development, :guard do
+group :guard do
   gem 'guard-bundler'
   gem 'guard-rspec'
   gem 'guard-rubocop'

data/README.md

@@ -1,10 +1,10 @@
 # rake-funnel
 
-[![Gem Version](https://badge.fury.io/rb/rake-funnel.svg)](http://badge.fury.io/rb/rake-funnel) [![Build Status](https://travis-ci.org/agross/rake-funnel.png?branch=master)](https://travis-ci.org/agross/rake-funnel) [![Dependency Status](https://gemnasium.com/agross/rake-funnel.svg)](https://gemnasium.com/agross/rake-funnel) [![Code Climate](https://codeclimate.com/github/agross/rake-funnel.png)](https://codeclimate.com/github/agross/rake-funnel) [![Coverage Status](https://coveralls.io/repos/agross/rake-funnel/badge.svg)](https://coveralls.io/r/agross/rake-funnel)
+[![Gem Version](https://badge.fury.io/rb/rake-funnel.svg)](http://badge.fury.io/rb/rake-funnel) [![Build Status](https://travis-ci.org/agross/rake-funnel.svg?branch=master)](https://travis-ci.org/agross/rake-funnel) [![Code Climate](https://codeclimate.com/github/agross/rake-funnel.png)](https://codeclimate.com/github/agross/rake-funnel) [![Coverage Status](https://coveralls.io/repos/agross/rake-funnel/badge.svg)](https://coveralls.io/r/agross/rake-funnel)
 
 rake-funnel is my set of rake tasks, mostly targeted at .NET development.
 
-* Tested against Ruby 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0 and ruby-head
+* Tested against Ruby 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0, 2.6.0, 2.7.0 and ruby-head
 * Ruby < 2.0 is not supported
 
 ## Installation

data/lib/rake/funnel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 
 module Rake

data/lib/rake/funnel/ambiguous_file_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     class AmbiguousFileError < StandardError
@@ -33,6 +35,7 @@ module Rake
 
       def inspect_candidates
         return if (candidates || []).empty?
+
         ['Candidates:', candidates.map { |c| "  - #{c}" }]
       end
     end

data/lib/rake/funnel/execution_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     class ExecutionError < StandardError

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dir["#{File.dirname(__FILE__)}/case/*.rb"].each do |path|
   require path
 end

data/lib/rake/funnel/extensions/case/camel_case.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Extensions

data/lib/rake/funnel/extensions/case/pascal_case.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Extensions

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'abbrev'
 require 'pathname'
 
@@ -39,6 +41,7 @@ module Rake
 
             path.zip(min).each do |left, right|
               next if left != right
+
               longest_prefix << right
             end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'smart_colored'
 require 'smart_colored/extend'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rexml/document'
 
 module Rake
@@ -6,11 +8,11 @@ module Rake
       module REXML
         module Functions
           def lower_case(string)
-            string.first.to_s.downcase
+            string(string).downcase
           end
 
           def matches(string, test)
-            File.fnmatch?(test, string.first.to_s, File::FNM_CASEFOLD)
+            File.fnmatch?(test, string(string), File::FNM_CASEFOLD)
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 require 'open3'
 require 'smart_colored/extend'
@@ -20,10 +22,10 @@ module Rake
 
         private
 
-        def run(cmd, log_file, error_lines)
+        def run(cmd, log_file, error_lines) # rubocop:disable Metrics/AbcSize
           cmd, readable_cmd = normalize(cmd)
 
-          Rake.rake_output_message(readable_cmd)
+          $stderr.print(readable_cmd + "\n")
 
           Open3.popen2e(*cmd) do |_, stdout_and_stderr, wait_thread|
             log, error_logged = log_output(stdout_and_stderr, log_file, error_lines)
@@ -70,14 +72,14 @@ module Rake
         end
 
         def to_stdout(line)
-          $stdout.puts(line.rstrip.green)
+          $stdout.print(line.rstrip.green + "\n")
           :success
         end
 
         def to_stderr(line, error_lines)
           return unless error_lines && line =~ error_lines
 
-          Kernel.warn(line.rstrip.bold.red)
+          $stderr.print(line.rstrip.bold.red + "\n")
           :error
         end
       end

data/lib/rake/funnel/framework.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 [
   "#{File.dirname(__FILE__)}/*.rb",
   "#{File.dirname(__FILE__)}/extensions/*.rb",

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 
 module Rake
@@ -8,7 +10,8 @@ module Rake
 
         def initialize
           task_starting do |task, _args|
-            puts "\n[#{task.name}]".bold.cyan unless Rake::Funnel::Integration::TeamCity.running?
+            name = "[#{task.name}]".bold.cyan
+            print "\n#{name}\n" unless Rake::Funnel::Integration::TeamCity.running?
           end
 
           yield self if block_given?
@@ -40,16 +43,16 @@ module Rake
               Rake::Task.class_eval do
                 old_execute = instance_method(:execute)
 
-                define_method(:execute) do |args|
-                  context.starting.call(self, args) if context.starting
+                define_method(:execute) do |*args|
+                  context.starting.call(self, *args) if context.starting
 
                   error = nil
                   begin
-                    old_execute.bind(self).call(args)
-                  rescue => e # rubocop:disable Style/RescueStandardError
+                    old_execute.bind(self).call(*args)
+                  rescue => e
                     error = e
                   ensure
-                    context.finished.call(self, args, error) if context.finished
+                    context.finished.call(self, *args, error) if context.finished
                     raise error if error
                   end
                 end
@@ -60,8 +63,8 @@ module Rake
 
             p.reset do |memo|
               Rake::Task.class_eval do
-                define_method(:execute) do |args|
-                  memo.bind(self).call(args)
+                define_method(:execute) do |*args|
+                  memo.bind(self).call(*args)
                 end
               end
             end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Integration
@@ -11,8 +13,8 @@ module Rake
 
         def sync(stream)
           stream.sync = true
-        rescue => e # rubocop:disable Style/RescueStandardError
-          Rake.rake_output_message "Failed to set up sync output #{e}"
+        rescue => e
+          $stderr.print "Failed to set up sync output #{e}\n"
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dir["#{File.dirname(__FILE__)}/teamcity/*.rb"].each do |path|
   require path
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Integration
@@ -28,7 +30,7 @@ module Rake
               version = Rake::Funnel::Support::BinaryVersionReader.read_from(nunit)
 
               unless version.file_version
-                Rake.rake_output_message("Could read version from NUnit executable in #{nunit}")
+                $stderr.print("Could read version from NUnit executable in #{nunit}\n")
                 return
               end
 
@@ -39,7 +41,7 @@ module Rake
               addin_files = Dir.glob("#{addins}-#{version}.*")
 
               if addin_files.none?
-                Rake.rake_output_message("Could not find TeamCity NUnit addin for version #{version} in #{addins}")
+                $stderr.print("Could not find TeamCity NUnit addin for version #{version} in #{addins}\n")
                 return
               end
 
@@ -47,7 +49,7 @@ module Rake
             end
 
             def copy_addin_files(nunit, addin_files, version)
-              Rake.rake_output_message("Installing TeamCity NUnit addin for version #{version} in #{nunit}")
+              $stderr.print("Installing TeamCity NUnit addin for version #{version} in #{nunit}\n")
 
               destination = File.join(File.dirname(nunit), 'addins')
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 
 module Rake

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Integration
@@ -21,7 +23,7 @@ module Rake
               args = [message_name] << escaped_array_of(args)
               args = args.flatten.reject(&:nil?)
 
-              puts "##teamcity[#{args.join(' ')}]"
+              print "##teamcity[#{args.join(' ')}]\n"
             end
 
             def escape(string) # rubocop:disable Metrics/MethodLength
@@ -42,6 +44,7 @@ module Rake
               return [] if args.nil?
 
               return "'#{escape(args)}'" unless args.is_a?(Hash)
+
               args.map { |key, value| "#{key.camelize}='#{escape(value.to_s)}'" }
             end
           end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Integration
@@ -32,6 +34,7 @@ module Rake
 
           def teamcity_jre
             return nil unless ENV.include?(JRE_ENV_VAR)
+
             File.join(ENV[JRE_ENV_VAR], 'bin')
           end
         end

data/lib/rake/funnel/support/argument_mapper/key_value_pair.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Support

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dir[File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), '*.rb')].each do |path|
   require path
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Support

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Support

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Support
@@ -45,7 +47,8 @@ module Rake
 
             def quote(value)
               value = value.gsub(/"/, '""') if value.is_a?(String)
-              return %("#{value}") if value =~ /\s/
+              return %("#{value}") if value.to_s =~ /\s/
+
               value
             end
           end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Support

data/lib/rake/funnel/support/argument_mapper/switch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Support

data/lib/rake/funnel/support/argument_mapper/value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Support

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rake
   module Funnel
     module Support
@@ -17,7 +19,7 @@ module Rake
             block_given? || (return enum_for(__method__))
 
             files.each do |file|
-              Rake.rake_output_message("Reading #{file}")
+              $stderr.print("Reading #{file}\n")
 
               version_info = VersionInfo.parse(
                 version: VersionInfo.read_version_from(file),

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erb'
 
 Dir[File.join(File.dirname(__FILE__), 'assembly_version', '*.rb')].each do |path|
@@ -25,7 +27,7 @@ module Rake
 
               contents = evaluate_erb(language, version_info, target)
 
-              Rake.rake_output_message("Writing #{target}")
+              $stderr.print("Writing #{target}\n")
               File.write(target, contents)
             end
           end