rake-funnel 0.3.2.pre → 0.4.0.pre

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

@@ -1,11 +1,15 @@
-module Rake::Funnel::Extensions
-  module WindowsPath
-    def to_windows_path
-      self.gsub(%r|/|, '\\')
-    end
-  end
-end
-
-class String
-  include Rake::Funnel::Extensions::WindowsPath
-end
+module Rake
+  module Funnel
+    module Extensions
+      module WindowsPath
+        def to_windows_path
+          gsub(%r|/|, '\\')
+        end
+      end
+    end
+  end
+end
+
+class String
+  include Rake::Funnel::Extensions::WindowsPath
+end

data/lib/rake/funnel/framework.rb

@@ -1,16 +1,11 @@
-module Rake::Funnel::Extensions; end
-module Rake::Funnel::Integration; end
-module Rake::Funnel::Support; end
-module Rake::Funnel::Tasks; end
-
-[
-  "#{File.dirname(__FILE__)}/*.rb",
-  "#{File.dirname(__FILE__)}/extensions/*.rb",
-  "#{File.dirname(__FILE__)}/support/internal/*.rb",
-  "#{File.dirname(__FILE__)}/support/*.rb",
-  "#{File.dirname(__FILE__)}/*/*.rb",
-].each do |path|
-  Dir.glob(path).sort.each do |p|
-    require p
-  end
-end
+[
+  "#{File.dirname(__FILE__)}/*.rb",
+  "#{File.dirname(__FILE__)}/extensions/*.rb",
+  "#{File.dirname(__FILE__)}/support/internal/*.rb",
+  "#{File.dirname(__FILE__)}/support/*.rb",
+  "#{File.dirname(__FILE__)}/*/*.rb"
+].each do |path|
+  Dir.glob(path).sort.each do |p|
+    require p
+  end
+end

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

@@ -1,70 +1,72 @@
-require 'rake'
-
-module Rake::Funnel::Integration
-  class ProgressReport
-    attr_accessor :starting, :finished
-
-    def initialize
-      task_starting do |task, args|
-        puts "\n[#{task.name}]" unless Rake::Funnel::Integration::TeamCity.running?
-      end
-
-      task_finished { |task, args, error| }
-
-      yield self if block_given?
-
-      patch.apply!
-    end
-
-    def disable!
-      patch.revert!
-    end
-
-    def task_starting(&block)
-      @starting = block
-    end
-
-    def task_finished(&block)
-      @finished = block
-    end
-
-    private
-    def patch
-      @patch ||= create_patch
-    end
-
-    def create_patch
-      Rake::Funnel::Support::Patch.new(self) do |p|
-        p.setup do |context|
-          Rake::Task.class_eval do
-            old_execute = instance_method(:execute)
-
-            define_method(:execute) do |args|
-              context.starting.call(self, args)
-
-              error = nil
-              begin
-                old_execute.bind(self).call(args)
-              rescue => e
-                error = e
-              ensure
-                context.finished.call(self, args, error)
-                raise error if error
-              end
-            end
-
-            old_execute
-          end
-        end
-
-        p.reset do |memo|
-          Rake::Task.class_eval do
-            define_method(:execute) do |args|
-              memo.bind(self).call(args)
-            end
-          end
-        end
-      end
-    end
-  end
-end
+require 'rake'
+
+module Rake
+  module Funnel
+    module Integration
+      class ProgressReport
+        attr_reader :starting, :finished
+
+        def initialize
+          task_starting do |task, _args|
+            puts "\n[#{task.name}]" unless Rake::Funnel::Integration::TeamCity.running?
+          end
+
+          yield self if block_given?
+
+          patch.apply!
+        end
+
+        def task_starting(&block)
+          @starting = block
+        end
+
+        def task_finished(&block)
+          @finished = block
+        end
+
+        def disable!
+          patch.revert!
+        end
+
+        private
+        def patch
+          @patch ||= create_patch
+        end
+
+        def create_patch
+          Rake::Funnel::Support::Patch.new(self) do |p|
+            p.setup do |context|
+              Rake::Task.class_eval do
+                old_execute = instance_method(:execute)
+
+                define_method(:execute) do |args|
+                  context.starting.call(self, args) if context.starting
+
+                  error = nil
+                  begin
+                    old_execute.bind(self).call(args)
+                  rescue => e
+                    error = e
+                  ensure
+                    context.finished.call(self, args, error) if context.finished
+                    fail error if error
+                  end
+                end
+
+                old_execute
+              end
+            end
+
+            p.reset do |memo|
+              Rake::Task.class_eval do
+                define_method(:execute) do |args|
+                  memo.bind(self).call(args)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,12 @@
-module Rake::Funnel::Integration
-  class SyncOutput
-    def initialize
-      $stdout.sync = true
-      $stderr.sync = true
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Integration
+      class SyncOutput
+        def initialize
+          $stdout.sync = true
+          $stderr.sync = true
+        end
+      end
+    end
+  end
+end

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

@@ -1,55 +1,61 @@
-module Rake::Funnel::Integration::TeamCity
-  class NUnitPlugin
-    ENV_VAR = 'teamcity.dotnet.nunitaddin'
-
-    class << self
-      def setup(nunit_executable)
-        addins = get_addin_dir(ENV[ENV_VAR]) || return
-        nunit, version = read_version(nunit_executable) || return
-
-        addin_files = find_teamcity_addins(addins, version) || return
-
-        copy_addin_files(nunit, addin_files, version)
-      end
-
-      private
-      def get_addin_dir(source)
-        return nil unless source
-
-        File.expand_path(source)
-      end
-
-      def read_version(executable)
-        nunit = Rake::Funnel::Support::Which.which(executable) || return
-        version = Rake::Funnel::Support::BinaryVersionReader.read_from(nunit)
-
-        unless version.file_version
-          Rake.rake_output_message("Could read version from NUnit executable in #{nunit}")
-          return
-        end
-
-        [nunit, version.file_version.split('.').take(3).join('.')]
-      end
-
-      def find_teamcity_addins(addins, version)
-        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}")
-          return
-        end
-
-        addin_files
-      end
-
-      def copy_addin_files(nunit, addin_files, version)
-        Rake.rake_output_message("Installing TeamCity NUnit addin for version #{version} in #{nunit}")
-
-        destination = File.join(File.dirname(nunit), 'addins')
-
-        RakeFileUtils.mkdir_p(destination)
-        RakeFileUtils.cp(addin_files, destination, { preserve: true })
-      end
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Integration
+      module TeamCity
+        class NUnitPlugin
+          ENV_VAR = 'teamcity.dotnet.nunitaddin'
+
+          class << self
+            def setup(nunit_executable)
+              addins = get_addin_dir(ENV[ENV_VAR]) || return
+              nunit, version = read_version(nunit_executable) || return
+
+              addin_files = find_teamcity_addins(addins, version) || return
+
+              copy_addin_files(nunit, addin_files, version)
+            end
+
+            private
+            def get_addin_dir(source)
+              return nil unless source
+
+              File.expand_path(source)
+            end
+
+            def read_version(executable)
+              nunit = Rake::Funnel::Support::Which.which(executable) || return
+              version = Rake::Funnel::Support::BinaryVersionReader.read_from(nunit)
+
+              unless version.file_version
+                Rake.rake_output_message("Could read version from NUnit executable in #{nunit}")
+                return
+              end
+
+              [nunit, version.file_version.split('.').take(3).join('.')]
+            end
+
+            def find_teamcity_addins(addins, version)
+              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}")
+                return
+              end
+
+              addin_files
+            end
+
+            def copy_addin_files(nunit, addin_files, version)
+              Rake.rake_output_message("Installing TeamCity NUnit addin for version #{version} in #{nunit}")
+
+              destination = File.join(File.dirname(nunit), 'addins')
+
+              RakeFileUtils.mkdir_p(destination)
+              RakeFileUtils.cp(addin_files, destination, preserve: true)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,33 +1,39 @@
-require 'rake'
-
-module Rake::Funnel::Integration::TeamCity
-  class ProgressReport < Rake::Funnel::Integration::ProgressReport
-    include Rake::Funnel::Integration
-
-    def initialize
-      super do
-        task_starting do |task, args|
-          next unless TeamCity.running?
-
-          unless TeamCity.rake_runner?
-            ServiceMessages.block_opened({ name: task.name })
-          end
-        end
-
-        task_finished do |task, args, error|
-          next unless TeamCity.running?
-
-          if error.respond_to?(:inner_exception)
-            error = error.inner_exception
-          end
-
-          ServiceMessages.build_problem({ description: error.message[0..4000 - 1] }) if error
-
-          next if Rake::Funnel::Integration::TeamCity.rake_runner?
-
-          ServiceMessages.block_closed({ name: task.name })
-        end
-      end
-    end
-  end
-end
+require 'rake'
+
+module Rake
+  module Funnel
+    module Integration
+      module TeamCity
+        class ProgressReport < Rake::Funnel::Integration::ProgressReport
+          include Rake::Funnel::Integration
+
+          def initialize
+            super do
+              task_starting do |task, _args|
+                next unless TeamCity.running?
+
+                unless TeamCity.rake_runner?
+                  ServiceMessages.block_opened(name: task.name)
+                end
+              end
+
+              task_finished do |task, _args, error|
+                next unless TeamCity.running?
+
+                if error.respond_to?(:inner_exception)
+                  error = error.inner_exception
+                end
+
+                ServiceMessages.build_problem(description: error.message[0..4000 - 1]) if error
+
+                next if Rake::Funnel::Integration::TeamCity.rake_runner?
+
+                ServiceMessages.block_closed(name: task.name)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,40 +1,46 @@
-module Rake::Funnel::Integration::TeamCity
-  class ServiceMessages
-    class << self
-      def method_missing(method, *args, &block)
-        return unless Rake::Funnel::Integration::TeamCity.running?
-
-        message_name = method.camelize
-        publish message_name, args[0]
-      end
-
-      private
-      def publish(message_name, args)
-        args = [message_name] << escaped_array_of(args)
-        args = args.flatten.reject(&:nil?)
-
-        puts "##teamcity[#{args.join(' ')}]"
-      end
-
-      def escape(string)
-        string
-          .gsub(/\|/, '||')
-          .gsub(/'/, "|'")
-          .gsub(/\r/, '|r')
-          .gsub(/\n/, '|n')
-          .gsub(/\u0085/, '|x')
-          .gsub(/\u2028/, '|l')
-          .gsub(/\u2029/, '|p')
-          .gsub(/\[/, '|[')
-          .gsub(/\]/, '|]')
-      end
-
-      def escaped_array_of(args)
-        return [] if args.nil?
-
-        return "'#{escape args}'" unless args.is_a?(Hash)
-        args.map { |key, value| "#{key.camelize}='#{escape value.to_s}'" }
-      end
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Integration
+      module TeamCity
+        class ServiceMessages
+          class << self
+            def method_missing(method, *args, &_block)
+              return unless Rake::Funnel::Integration::TeamCity.running?
+
+              message_name = method.camelize
+              publish message_name, args[0]
+            end
+
+            private
+            def publish(message_name, args)
+              args = [message_name] << escaped_array_of(args)
+              args = args.flatten.reject(&:nil?)
+
+              puts "##teamcity[#{args.join(' ')}]"
+            end
+
+            def escape(string)
+              string
+                .gsub(/\|/, '||')
+                .gsub(/'/, "|'")
+                .gsub(/\r/, '|r')
+                .gsub(/\n/, '|n')
+                .gsub(/\u0085/, '|x')
+                .gsub(/\u2028/, '|l')
+                .gsub(/\u2029/, '|p')
+                .gsub(/\[/, '|[')
+                .gsub(/\]/, '|]')
+            end
+
+            def escaped_array_of(args)
+              return [] if args.nil?
+
+              return "'#{escape args}'" unless args.is_a?(Hash)
+              args.map { |key, value| "#{key.camelize}='#{escape value.to_s}'" }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,15 +1,19 @@
-module Rake::Funnel::Integration
-  module TeamCity
-    ENV_VAR = 'TEAMCITY_PROJECT_NAME'
-
-    class << self
-      def running?
-        ENV.include?(ENV_VAR)
-      end
-
-      def rake_runner?
-        running? && Object.const_defined?('Rake') && Rake.const_defined?('TeamCityApplication')
-      end
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Integration
+      module TeamCity
+        ENV_VAR = 'TEAMCITY_PROJECT_NAME'
+
+        class << self
+          def running?
+            ENV.include?(ENV_VAR)
+          end
+
+          def rake_runner?
+            running? && Object.const_defined?('Rake') && Rake.const_defined?('TeamCityApplication')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,3 @@
-module Rake::Funnel::Integration::TeamCity; end
-
-Dir["#{File.dirname(__FILE__)}/teamcity/*.rb"].each do |path|
-  require path
-end
+Dir["#{File.dirname(__FILE__)}/teamcity/*.rb"].each do |path|
+  require path
+end

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

@@ -1,10 +1,16 @@
-module Rake::Funnel::Support::ArgumentMapper
-  class KeyValuePair
-    attr_reader :key, :value
-
-    def initialize(key, value)
-      @key = key
-      @value = value
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Support
+      module ArgumentMapper
+        class KeyValuePair
+          attr_reader :key, :value
+
+          def initialize(key, value)
+            @key = key
+            @value = value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,31 +1,39 @@
-module Rake::Funnel::Support::ArgumentMapper::Styles
-  class Default
-    attr_reader :prefix, :value_separator
-
-    def initialize
-      @prefix = '/'
-      @value_separator = ','
-    end
-
-    def generate_from(model)
-      model.map { |switch|
-        switch.values.flatten.map { |value|
-          [top_level(switch), nested(value)].reject(&:empty?)
-        }
-      }.flatten(2)
-    end
-
-    private
-    def top_level(switch)
-      [prefix, switch.switch]
-    end
-
-    def nested(value)
-      res = []
-      res << value.key
-      res << value_separator unless value.key.nil? || value.value.nil?
-      res << value.value
-      res.compact
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Support
+      module ArgumentMapper
+        module Styles
+          class Default
+            attr_reader :prefix, :value_separator
+
+            def initialize
+              @prefix = '/'
+              @value_separator = ','
+            end
+
+            def generate_from(model)
+              model.map { |switch|
+                switch.values.flatten.map { |value|
+                  [top_level(switch), nested(value)].reject(&:empty?)
+                }
+              }.flatten(2)
+            end
+
+            private
+            def top_level(switch)
+              [prefix, switch.switch]
+            end
+
+            def nested(value)
+              res = []
+              res << value.key
+              res << value_separator unless value.key.nil? || value.value.nil?
+              res << value.value
+              res.compact
+            end
+          end
+        end
+      end
+    end
+  end
+end