rake-funnel 0.3.2.pre → 0.4.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1da41cf4992ddeaf2f023b7d1775bbb536245d91
-  data.tar.gz: 427f5aefb6590394971f58dd1d0fb158ddc34a89
+  metadata.gz: a8f5640c14dff5bf858d39fc9ae5bac6be7871ee
+  data.tar.gz: 03a44a3c45f0a6f9ccaf71a2ac87e4c73accab58
 SHA512:
-  metadata.gz: 54408b65fb95277d9c595710480504bb60bfe0974da277b5e8bbf85393c4e827d4ad37b482692804434fba1f8d1a95e0ce3042fea9f43a33311f966cd0b68043
-  data.tar.gz: a50098c401447487a386793457e1f2dedc5b03500ee1a8e1dd07366dd0f71910c96a558d4d5be5f3edb192a57c409837f5a296116c49015245c3afe66a512f22
+  metadata.gz: 8759d1624ab1c1f6cb18693966e263cde514d516ce02d2250fe2da279b32561b13ad3e68785349ca5041d8beaba3622d2dac9aa1b34d43d6e8b665a20461c6c1
+  data.tar.gz: 99aaf5c647d45208a2056514b824e2795f7c90e053be7c7d665cb44eccc0384f4fca5520e6a024bec8ca9a37ea13a35ebce2a886d70fd849e65c6e4f8b39cb08

data/.rspec

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

data/Gemfile

@@ -7,6 +7,7 @@ gemspec
 group :development do
   gem 'guard-bundler', require: false
   gem 'guard-rspec', require: false
+  gem 'guard-rubocop', require: false
 
   case RbConfig::CONFIG['target_os']
   when /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i
@@ -26,4 +27,7 @@ group :development, :ci do
   gem 'rspec-collection_matchers', require: false
   gem 'coveralls', require: false
   gem 'codeclimate-test-reporter', require: false
+  gem 'rubocop', require: false
+  gem 'rubocop-rspec', require: false
+  gem 'simplecov-teamcity-summary', require: false
 end

data/README.md

@@ -1,10 +1,10 @@
 # rake-funnel
 
-[![Gem Version](https://badge.fury.io/rb/rake-funnel.png)](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.png)](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.png)](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.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)
 
 rake-funnel is my set of rake tasks, mostly targeted at .NET development.
 
-* Tested against Ruby 2.0.0, 2.1.0 and 2.2.0 and ruby-head
+* Tested against Ruby 2.0.0, 2.1.0 through 2.2.1 and ruby-head
 * Ruby < 2.0 is not supported
 
 ## Installation

data/lib/rake/funnel/ambiguous_file_error.rb

@@ -1,29 +1,31 @@
-module Rake::Funnel
-  class AmbiguousFileError < StandardError
-    attr_reader :task_name, :search_pattern, :candidates, :description
-
-    def initialize(message, task_name, search_pattern, candidates)
-      description = "Could not run task '#{task_name}'. #{message}"
-      super(description)
-
-      @description = description
-      @task_name = task_name
-      @search_pattern = search_pattern
-      @candidates = candidates
-    end
-
-    def to_s
-      msg = []
-      (msg << description) if description
-      (msg << "Search pattern used: #{@search_pattern}") if @search_pattern
-      unless (@candidates || []).empty?
-        msg << 'Candidates:'
-        msg << @candidates.map { |c| "  - #{c}" }
-      end
-
-      msg = [super.to_s] if msg.empty?
-
-      msg.join("\n")
-    end
-  end
-end
+module Rake
+  module Funnel
+    class AmbiguousFileError < StandardError
+      attr_reader :task_name, :search_pattern, :candidates, :description
+
+      def initialize(message, task_name, search_pattern, candidates)
+        description = "Could not run task '#{task_name}'. #{message}"
+        super(description)
+
+        @description = description
+        @task_name = task_name
+        @search_pattern = search_pattern
+        @candidates = candidates
+      end
+
+      def to_s
+        msg = []
+        (msg << description) if description
+        (msg << "Search pattern used: #{@search_pattern}") if @search_pattern
+        unless (@candidates || []).empty?
+          msg << 'Candidates:'
+          msg << @candidates.map { |c| "  - #{c}" }
+        end
+
+        msg = [super.to_s] if msg.empty?
+
+        msg.join("\n")
+      end
+    end
+  end
+end

data/lib/rake/funnel/execution_error.rb

@@ -1,26 +1,28 @@
-module Rake::Funnel
-  class ExecutionError < StandardError
-    attr_reader :command, :exit_code, :output, :description
-
-    def initialize(command = nil, exit_code = nil, output = nil, description = nil)
-      super(description)
-
-      @description = description
-      @command = command
-      @exit_code = exit_code
-      @output = output
-    end
-
-    def to_s
-      msg = []
-      (msg << description << nil) if description
-      (msg << 'Error executing:' << command << nil) if command
-      (msg << "Exit code: #{exit_code}" << nil) if exit_code
-      (msg << 'Command output (last 10 lines):' << output.split("\n").last(10) << nil) if output
-
-      msg = [super.to_s] if msg.empty?
-
-      msg.join("\n")
-    end
-  end
-end
+module Rake
+  module Funnel
+    class ExecutionError < StandardError
+      attr_reader :command, :exit_code, :output, :description
+
+      def initialize(command = nil, exit_code = nil, output = nil, description = nil)
+        super(description)
+
+        @description = description
+        @command = command
+        @exit_code = exit_code
+        @output = output
+      end
+
+      def to_s
+        msg = []
+        (msg << description << nil) if description
+        (msg << 'Error executing:' << command << nil) if command
+        (msg << "Exit code: #{exit_code}" << nil) if exit_code
+        (msg << 'Command output (last 10 lines):' << output.split("\n").last(10) << nil) if output
+
+        msg = [super.to_s] if msg.empty?
+
+        msg.join("\n")
+      end
+    end
+  end
+end

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

@@ -1,19 +1,24 @@
-module Rake::Funnel::Extensions
-  module CamelCase
-    def camelize
-      self
-        .to_s
-        .split('_')
-        .inject([]) { |buffer, e| buffer.push(buffer.empty? ? e : e.capitalize) }
-        .join
-    end
-  end
-end
-
-class String
-  include Rake::Funnel::Extensions::CamelCase
-end
-
-class Symbol
-  include Rake::Funnel::Extensions::CamelCase
-end
+module Rake
+  module Funnel
+    module Extensions
+      module Case
+        module CamelCase
+          def camelize
+            to_s
+              .split('_')
+              .inject([]) { |buffer, e| buffer.push(buffer.empty? ? e : e.capitalize) }
+              .join
+          end
+        end
+      end
+    end
+  end
+end
+
+class String
+  include Rake::Funnel::Extensions::Case::CamelCase
+end
+
+class Symbol
+  include Rake::Funnel::Extensions::Case::CamelCase
+end

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

@@ -1,19 +1,24 @@
-module Rake::Funnel::Extensions
-  module PascalCase
-    def pascalize
-      self
-        .to_s
-        .split('_')
-        .inject([]) { |buffer, e| buffer.push(e.slice(0, 1).capitalize + e.slice(1..-1)) }
-        .join
-    end
-  end
-end
-
-class String
-  include Rake::Funnel::Extensions::PascalCase
-end
-
-class Symbol
-  include Rake::Funnel::Extensions::PascalCase
-end
+module Rake
+  module Funnel
+    module Extensions
+      module Case
+        module PascalCase
+          def pascalize
+            to_s
+              .split('_')
+              .inject([]) { |buffer, e| buffer.push(e.slice(0, 1).capitalize + e.slice(1..-1)) }
+              .join
+          end
+        end
+      end
+    end
+  end
+end
+
+class String
+  include Rake::Funnel::Extensions::Case::PascalCase
+end
+
+class Symbol
+  include Rake::Funnel::Extensions::Case::PascalCase
+end

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

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

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

@@ -1,52 +1,60 @@
-require 'abbrev'
-require 'pathname'
-
-module Rake::Funnel::Extensions
-  module CommonPath
-    def common_path
-      list = self
-        .to_a
-        .compact
-        .map { |x| components(x) }
-
-      min = list.min_by { |x| x.length }
-
-      matches = list.map do |path|
-        longest_prefix = []
-
-        path.zip(min).each do |left, right|
-          if left != right
-            next
-          end
-          longest_prefix << right
-        end
-
-        File.join(longest_prefix)
-      end
-
-      matches.min_by { |x| x.length } || ''
-    end
-
-    private
-    def components(path)
-      paths = []
-      Pathname.new(path).descend do |p|
-        paths << p
-      end
-
-      paths.inject([]) { |components, path|
-        relative = path.relative_path_from(components.last[:absolute]) if components.any?
-
-        components << { absolute: path, relative: relative || path }
-      }.map { |component| component[:relative].to_s }
-    end
-  end
-end
-
-class Array
-  include Rake::Funnel::Extensions::CommonPath
-end
-
-class Rake::FileList
-  include Rake::Funnel::Extensions::CommonPath
-end
+require 'abbrev'
+require 'pathname'
+
+module Rake
+  module Funnel
+    module Extensions
+      module CommonPath
+        def common_path
+          list = to_a
+            .compact
+            .map { |x| components(x) }
+
+          min = list.min_by(&:length)
+
+          matches = find_matches(list, min)
+          matches.min_by(&:length) || ''
+        end
+
+        private
+        def components(path)
+          paths = []
+          Pathname.new(path).descend do |p|
+            paths << p
+          end
+
+          paths = paths.inject([]) { |components, p|
+            relative = p.relative_path_from(components.last[:absolute]) if components.any?
+
+            components << { absolute: p, relative: relative || p }
+          }
+
+          paths.map { |component| component[:relative].to_s }
+        end
+
+        def find_matches(list, min)
+          list.map do |path|
+            longest_prefix = []
+
+            path.zip(min).each do |left, right|
+              next if left != right
+              longest_prefix << right
+            end
+
+            File.join(longest_prefix)
+          end
+        end
+      end
+    end
+  end
+end
+
+class Array
+  include Rake::Funnel::Extensions::CommonPath
+end
+
+module Rake
+  class FileList
+    include Rake::Funnel::Extensions::CommonPath
+  end
+end

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

@@ -1,27 +1,33 @@
-require 'smart_colored'
-require 'smart_colored/extend'
-
-module Rake::Funnel::Extensions
-  module DisableColors
-    def self.included(klass)
-      original_apply_format = klass.instance_method(:apply_format)
-
-      define_method(:apply_format) do |format|
-        return self unless $stdout.tty?
-
-        bind_to = self
-        bind_to = SmartColored::String.new(self) if klass == SmartColored::String
-        
-        original_apply_format.bind(bind_to).call(format)
-      end
-    end
-  end
-end
-
-class SmartColored::String
-  include Rake::Funnel::Extensions::DisableColors
-end
-
-class String
-  include Rake::Funnel::Extensions::DisableColors
-end
+require 'smart_colored'
+require 'smart_colored/extend'
+
+module Rake
+  module Funnel
+    module Extensions
+      module DisableColors
+        def self.included(klass)
+          original_apply_format = klass.instance_method(:apply_format)
+
+          define_method(:apply_format) do |format|
+            return self unless $stdout.tty?
+
+            bind_to = self
+            bind_to = SmartColored::String.new(self) if klass == SmartColored::String
+
+            original_apply_format.bind(bind_to).call(format)
+          end
+        end
+      end
+    end
+  end
+end
+
+module SmartColored
+  class String
+    include Rake::Funnel::Extensions::DisableColors
+  end
+end
+
+class String
+  include Rake::Funnel::Extensions::DisableColors
+end

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

@@ -1,23 +1,27 @@
-require 'rexml/document'
-
-module Rake::Funnel::Extensions
-  module REXML
-    module Functions
-      def lower_case(string)
-        string.first.to_s.downcase
-      end
-
-      def matches(string, test)
-        File.fnmatch?(test, string.first.to_s, File::FNM_CASEFOLD)
-      end
-    end
-  end
-end
-
-module REXML
-  module Functions
-    class << self
-      include Rake::Funnel::Extensions::REXML::Functions
-    end
-  end
-end
+require 'rexml/document'
+
+module Rake
+  module Funnel
+    module Extensions
+      module REXML
+        module Functions
+          def lower_case(string)
+            string.first.to_s.downcase
+          end
+
+          def matches(string, test)
+            File.fnmatch?(test, string.first.to_s, File::FNM_CASEFOLD)
+          end
+        end
+      end
+    end
+  end
+end
+
+module REXML
+  module Functions
+    class << self
+      include Rake::Funnel::Extensions::REXML::Functions
+    end
+  end
+end

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

@@ -1,56 +1,92 @@
-require 'rake'
-require 'open3'
-require 'smart_colored/extend'
-
-module Rake::Funnel::Extensions
-  module Shell
-    def shell(*cmd, log_file: nil, error_lines: nil)
-      mkdir_p(File.dirname(log_file)) if log_file
-
-      stdout = -> (msg) { $stdout.puts msg.sub(/\n$/, '').green }
-
-      error_logged = false
-      stderr = -> (msg) {
-        error_logged = true
-        $stderr.puts msg.sub(/\n$/, '').bold.red
-      }
-
-      log = StringIO.new
-
-      begin
-        cmd = cmd.flatten.reject(&:nil?)
-        Rake.rake_output_message(cmd.join(' '))
-
-        Open3.popen2e(*cmd) do |_, stdout_and_stderr, wait_thread|
-          stdout_and_stderr.each do |line|
-            out = stdout
-            out = stderr if error_lines && line =~ error_lines
-            out.call(line)
-
-            log.write(line)
-            File.open(log_file, 'a') { |f| f.write(line) } if log_file
-          end
-
-          success = wait_thread.value.success? && error_logged == false
-          result = [cmd.join(' '),
-            wait_thread.value.exitstatus,
-            log.string]
-
-          if block_given?
-            yield(success, *result)
-            return
-          end
-
-          raise Rake::Funnel::ExecutionError.new(*result) unless success
-        end
-      ensure
-        log.close
-      end
-    end
-  end
-end
-
-module Rake::DSL
-  include Rake::Funnel::Extensions::Shell
-  private(*Rake::Funnel::Extensions::Shell.instance_methods(false))
-end
+require 'rake'
+require 'open3'
+require 'smart_colored/extend'
+require 'stringio'
+
+module Rake
+  module Funnel
+    module Extensions
+      module Shell
+        def shell(*cmd, log_file: nil, error_lines: nil, &block)
+          mkdir_p(File.dirname(log_file)) if log_file
+
+          run(cmd, log_file, error_lines) do |success, readable_cmd, result, log|
+            if block
+              block.call(success, readable_cmd, result, log)
+              return
+            end
+          end
+        end
+
+        private
+        def run(cmd, log_file, error_lines)
+          cmd, readable_cmd = normalize(cmd)
+
+          Rake.rake_output_message(readable_cmd)
+
+          Open3.popen2e(*cmd) do |_, stdout_and_stderr, wait_thread|
+            log, error_logged = log_output(stdout_and_stderr, log_file, error_lines)
+            success = wait_thread.value.success? && error_logged == false
+
+            result = [readable_cmd, wait_thread.value.exitstatus, log]
+
+            yield(success, *result) if block_given?
+
+            fail Rake::Funnel::ExecutionError.new(*result) unless success
+          end
+        end
+
+        def normalize(cmd)
+          cmd = cmd.flatten.reject(&:nil?)
+          readable_cmd = cmd.join(' ')
+
+          [cmd, readable_cmd]
+        end
+
+        def log_output(stdout_and_stderr, log_file, error_lines)
+          log_string = StringIO.new
+
+          begin
+            statuses = log_lines(stdout_and_stderr, log_file, error_lines, log_string)
+
+            [log_string.string, statuses.any? { |s| s == :error }]
+          ensure
+            log_string.close
+          end
+        end
+
+        def log_lines(stdout_and_stderr, log_file, error_lines, log_string)
+          stdout_and_stderr.map do |line|
+            log_string.write(line)
+            File.open(log_file, 'a') { |f| f.write(line) } if log_file
+
+            handle_line(line, error_lines)
+          end
+        end
+
+        def handle_line(line, error_lines)
+          to_stderr(line, error_lines) || to_stdout(line)
+        end
+
+        def to_stdout(line)
+          $stdout.puts line.sub(/\n$/, '').green
+          :success
+        end
+
+        def to_stderr(line, error_lines)
+          return unless error_lines && line =~ error_lines
+
+          $stderr.puts line.sub(/\n$/, '').bold.red
+          :error
+        end
+      end
+    end
+  end
+end
+
+module Rake
+  module DSL
+    include Rake::Funnel::Extensions::Shell
+    private(*Rake::Funnel::Extensions::Shell.instance_methods(false))
+  end
+end