rake-funnel 0.1.0.pre → 0.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bd0e3285c6c760070f068f6e37f30bb327594c0
-  data.tar.gz: 7826b86b0515d328267aa271249014916ca1a8f2
+  metadata.gz: 451750a7dd9a6f23c3cfa57c7be0214d1a4af806
+  data.tar.gz: 2f4cbb488c0a1fa453044e9a59eb8b180ee33492
 SHA512:
-  metadata.gz: 0b1cd945436df9fda43190a41c2975b0101c1ec4223ac165aa67247184bf92192ca5ce970da0f53540753a94ff7fc39afe1c1f8dafae65a42012f2249866dd0b
-  data.tar.gz: dae7713e1bf4c1fb22423969dd70b8c9fe2bdb91989bbf56d3faeb4f5e03495902153a7de42c4e53958c2e428472dab40cf22b435232c798ab0a311d5bf01ff4
+  metadata.gz: 3d087c8959125bfc8bfd20c186d19dbfef8726c5c15e9e2cdfe27c71d389ed682c95af8e5dff0cfab89f95079fd9fbff383b721ec68cd49de0120822cfc27263
+  data.tar.gz: 8d5fc064dfec98fa2ba725f4d90fdaa78851dfbf592a0d983e1da122602be7cb5678f9e32622ef2201b8225569e0d60bcb1f437d92375fe1169a2bb3b39dfe57

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

@@ -21,18 +21,14 @@ module Rake::Funnel::Integration::TeamCity
 
       def read_version(executable)
         nunit = Rake::Funnel::Support::Which.which(executable) || return
-        binary = File.read(nunit)
+        version = BinaryVersionReader.read_from(nunit)
 
-        version = binary.match(/F\0i\0l\0e\0V\0e\0r\0s\0i\0o\0n\0*(.*?)\0\0\0/)
-        if version.nil?
+        unless version.file_version
           Rake.rake_output_message("Could read version from NUnit executable in #{nunit}")
           return
         end
 
-        [
-          nunit,
-          version[1].gsub(/\0/, '').split('.').take(3).join('.')
-        ]
+        [nunit, version.file_version.split('.').take(3).join('.')]
       end
 
       def find_teamcity_addins(addins, version)

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

@@ -0,0 +1,32 @@
+module Rake::Funnel::Support
+  class BinaryVersionReader
+    class << self
+      KNOWN_ATTRIBUTES = [:company_name, :file_description, :file_version, :legal_copyright, :product_name, :product_version, :assembly_version]
+      SEPARATOR = "\0"
+      TERMINATOR = "\0" * 3
+
+      def read_from(assembly)
+        binary = File.binread(assembly)
+
+        hash = KNOWN_ATTRIBUTES.map { |attr|
+          read_attribute(binary, attr)
+        }
+        .inject({}) { |memo, attr|
+          memo.merge(attr)
+        }
+
+        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}/, '') }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Rake::Funnel::Support
+  class Copier
+    class << self
+      def copy(files, target)
+        raise 'Target not defined' unless target
+
+        common_path = files.common_path
+        files.each do |source|
+          next if File.directory?(source)
+
+          target_path = target_path(source, common_path, target)
+
+          dir = File.dirname(target_path)
+          RakeFileUtils.mkdir_p(dir) unless File.directory?(dir)
+
+          RakeFileUtils.cp(source, target_path, { preserve: true })
+        end
+      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)
+      end
+    end
+  end
+end

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

@@ -2,26 +2,22 @@ module Rake::Funnel::Support::MSBuild
   class BuildTool
     class << self
       def find
-        if Rake::Win32.windows?
-          require 'win32/registry'
+        return 'xbuild' unless Rake::Win32.windows?
 
-          %w{12.0 4.0 3.5 2.0}.collect { |version|
-            msbuild = nil
-            key = "SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\#{version}"
+        require 'win32/registry'
 
-            begin
-              Win32::Registry::HKEY_LOCAL_MACHINE.open(key) do |reg|
-                candidate = "#{reg['MSBuildToolsPath']}\\msbuild.exe"
-                msbuild = candidate if File.exists?(candidate)
-              end
-            rescue
-            end
+        %w(12.0 4.0 3.5 2.0).collect { |version|
+          key = "SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\#{version}"
 
-            msbuild
-          }.compact.first
-        else
-          'xbuild'
-        end
+          begin
+            Win32::Registry::HKEY_LOCAL_MACHINE.open(key) do |reg|
+              candidate = File.join(reg['MSBuildToolsPath'] || '', 'msbuild.exe')
+              next candidate if File.exists?(candidate)
+            end
+          rescue
+            next
+          end
+        }.compact.first
       end
     end
   end

data/lib/rake/funnel/support/{side_by_side_specs/remover.rb → specs_remover.rb}

@@ -1,7 +1,7 @@
 require 'rexml/document'
 
-module Rake::Funnel::Support::SideBySideSpecs
-  class Remover
+module Rake::Funnel::Support
+  class SpecsRemover
     class << self
       DEFAULTS = {
         projects: [],

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

@@ -0,0 +1,49 @@
+require 'pathname'
+require 'zip'
+
+module Rake::Funnel::Support
+  class Zipper
+    class << self
+      def zip(files, target, zip_root = nil)
+        raise 'Target not defined' unless target
+
+        target_dir = File.dirname(target)
+        RakeFileUtils.mkdir_p(target_dir) unless File.directory?(target_dir)
+
+        configure_zip
+        create_zip(files || [], target, zip_root)
+      end
+
+      private
+      def configure_zip
+        ::Zip.unicode_names = true
+        ::Zip.default_compression = Zlib::BEST_COMPRESSION
+      end
+
+      def create_zip(files, target, zip_root)
+        ::Zip::File.open(target, ::Zip::File::CREATE) do |zip|
+          common_path = files.common_path
+
+          files.each do |file|
+            zipped_file = get_zipped_path(common_path, file, zip_root)
+
+            entry = zip.add(zipped_file, file)
+            set_mtime(entry, file)
+          end
+        end
+      end
+
+      def get_zipped_path(common_path, file, zip_root)
+        file = Pathname.new(file).relative_path_from(Pathname.new(common_path)).to_s unless common_path.nil?
+        file = File.join(zip_root, file) unless zip_root.nil? || zip_root.empty?
+        file
+      end
+
+      # To work around this bug: https://github.com/rubyzip/rubyzip/issues/176
+      def set_mtime(entry, file)
+        entry.time = ::Zip::DOSTime.at(File.mtime(file))
+        entry.extra.delete('UniversalTime')
+      end
+    end
+  end
+end

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

@@ -6,29 +6,35 @@ module Rake::Funnel::Tasks
 
     attr_accessor :name, :language, :source, :source_args, :target_path
 
-    def initialize(name = :version)
-      @name = name
+    def initialize(*args, &task_block)
+      setup_ivars(args)
+
+      define(args, &task_block)
+    end
+
+    private
+    def setup_ivars(args)
+      @name = args.shift || :version
+
       @language = :cs
       @source = :FromVersionFiles
       @source_args = {}
       @target_path = next_to_version_file
-
-      yield self if block_given?
-      define
     end
 
-    private
-    def define
-      desc 'Generate version info'
-      task name do
-        writer = AssemblyVersionWriter.new(source, source_args)
+    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
+
+        writer = AssemblyVersionWriter.new(source, source_args)
         writer.write(target_path, language)
       end
     end
 
     def next_to_version_file
-      Proc.new { |language, version_info, source| File.join(File.dirname(source), "VersionInfo.#{language}") }
+      Proc.new { |language, _version_info, source| File.join(File.dirname(source), "VersionInfo.#{language}") }
     end
   end
 end

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

@@ -4,17 +4,24 @@ module Rake::Funnel::Tasks
   class BinPath < Rake::TaskLib
     attr_accessor :name, :search_pattern
 
-    def initialize(name = :bin_path)
-      @name = name
-      @search_pattern = %w(tools/* tools/*/bin packages/**/tools)
+    def initialize(*args, &task_block)
+      setup_ivars(args)
 
-      yield self if block_given?
-      define
+      define(args, &task_block)
     end
 
     private
-    def define
-      task @name do
+    def setup_ivars(args)
+      @name = args.shift || :bin_path
+      @search_pattern = %w(tools/* tools/*/bin packages/**/tools)
+    end
+
+    def define(args, &task_block)
+      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
+
         Rake.rake_output_message 'Added the following paths to the PATH environment variable:'
         add_pattern_to_path_environment.each do |p|
           Rake.rake_output_message "  - #{p}"
@@ -25,10 +32,10 @@ module Rake::Funnel::Tasks
     end
 
     def add_pattern_to_path_environment
-      bin_paths = Dir[*@search_pattern].map { |path| File.expand_path(path) }.sort
+      paths = Dir[*search_pattern].map { |path| File.expand_path(path) }.sort
 
-      ENV['PATH'] = ([] << bin_paths << ENV['PATH']).flatten.join(File::PATH_SEPARATOR)
-      bin_paths
+      ENV['PATH'] = ([] << paths << ENV['PATH']).flatten.join(File::PATH_SEPARATOR)
+      paths
     end
   end
 end

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

@@ -1,4 +1,3 @@
-require 'rake/clean'
 require 'rake/tasklib'
 
 module Rake::Funnel::Tasks
@@ -7,34 +6,27 @@ module Rake::Funnel::Tasks
 
     attr_accessor :name, :source, :target
 
-    def initialize(name = :copy)
-      @name = name
+    def initialize(*args, &task_block)
+      setup_ivars(args)
 
-      @source = []
-      @target = nil
-
-      yield self if block_given?
-      define
+      define(args, &task_block)
     end
 
     private
-    def define
-      target && CLEAN.include(target)
+    def setup_ivars(args)
+      @name = args.shift || :copy
 
-      desc "Copy #{files.join(', ')} to #{target}"
-      task name do
-        raise 'Target not defined' unless target
-
-        files.each do |source|
-          next if File.directory?(source)
+      @source = []
+      @target = nil
+    end
 
-          target = target_path(source)
+    def define(args, &task_block)
+      desc 'Copy files' unless Rake.application.last_description
 
-          dir = File.dirname(target)
-          RakeFileUtils.mkdir_p(dir) unless File.directory?(dir)
+      task(name, *args) do |_, task_args|
+        task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
 
-          RakeFileUtils.cp(source, target, { preserve: true})
-        end
+        Copier.copy(files, target)
       end
 
       self
@@ -43,14 +35,5 @@ module Rake::Funnel::Tasks
     def files
       Finder.new(source, self, 'No files found.').all_or_default
     end
-
-    def target_path(file)
-      target_relative = Pathname.new(file).relative_path_from(Pathname.new(common_path)).to_s
-      File.join(target, target_relative)
-    end
-
-    def common_path
-      @common_path ||= files.common_path
-    end
   end
 end

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

@@ -1,3 +1,4 @@
+require 'configatron'
 require 'rake/tasklib'
 
 Dir["#{File.dirname(__FILE__)}/environments_support/*.rb"].each do |path|
@@ -8,36 +9,42 @@ module Rake::Funnel::Tasks
   class Environments < Rake::TaskLib
     include Rake::Funnel::Support::Environments
 
-    attr_accessor :base_dir, :default_env, :default_config, :local_config, :customizer
+    attr_accessor :base_dir, :store, :default_env, :default_config, :local_config, :customizer
 
-    def initialize
+    def initialize(*args, &task_block)
+      setup_ivars(args)
+
+      define(args, &task_block)
+    end
+
+    private
+    def setup_ivars(_args)
+      @store = configatron
       @default_env = nil
       @default_config = 'default'
       @local_config = 'local'
       @base_dir = 'config'
-
-      yield self if block_given?
-      define
-      default_environment_setup
-
-      self
     end
 
-    private
-    def define
+    def define(args, &task_block)
+      task_block.call(*[self].slice(0, task_block.arity)) if task_block
+
       environments.each do |env|
         desc "Configure for the #{env[:name]} environment"
-        task env[:name] do
-          Loader.load_configuration(env, configatron, customizer)
+
+        task(env[:name], *args) do |_, task_args|
+          Loader.load_configuration(env, store, customizer)
         end
       end
+
+      default_environment_setup
     end
 
     def environments
-      default = File.join(@base_dir, config_ext(default_config))
-      local = File.join(@base_dir, config_ext(local_config))
+      default = File.join(base_dir, config_ext(default_config))
+      local = File.join(base_dir, config_ext(local_config))
 
-      Dir[File.join(@base_dir, config_ext('*'))]
+      Dir[File.join(base_dir, config_ext('*'))]
         .reject { |config| config == default || config == local }
         .map do |config|
         {
@@ -56,19 +63,25 @@ module Rake::Funnel::Tasks
     end
 
     def default_environment_setup
-      return unless @default_env
+      return unless default_env
 
-      tasks = user_defined_env_tasks
-      if tasks.empty?
-        tasks = [] << Rake.application.current_scope.path_with_task_name(@default_env)
+      top_level_envs = top_level_env_tasks
+      if top_level_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)
+        end
       end
+    end
 
-      tasks.each do |task|
-        Rake::Task[task].invoke
-      end
+    def prepend_task(task)
+      Rake.application.top_level_tasks.unshift(task)
     end
 
-    def user_defined_env_tasks
+    def top_level_env_tasks
       expect_user_defined = environments.map { |env| Rake.application.current_scope.path_with_task_name(env[:name]) }
       Rake.application.top_level_tasks.select { |t| expect_user_defined.include?(t) }
     end

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

@@ -5,41 +5,41 @@ module Rake::Funnel::Tasks
     include Rake::Funnel::Support
     include Rake::Funnel::Support::MSBuild
 
-    attr_accessor :name, :project_or_solution, :args, :search_pattern
+    attr_accessor :name, :msbuild, :project_or_solution, :args, :search_pattern
 
-    def initialize(name = :compile)
-      @name = name
-      @args = {}
-      @search_pattern = %w(**/*.sln)
-
-      yield self if block_given?
-      define
-    end
+    def initialize(*args, &task_block)
+      setup_ivars(args)
 
-    def msbuild
-      @_msbuild || BuildTool.find
-    end
-
-    def msbuild=(value)
-      @_msbuild = value
+      define(args, &task_block)
     end
 
     def project_or_solution
-      Finder.new(@_project_or_solution || search_pattern, self, 'No projects or more than one project found.')
+      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
+      @project_or_solution = value
     end
 
     private
-    def define
-      desc "Compile #{project_or_solution.single_or_default}"
-      task @name do
+    def setup_ivars(args)
+      @name = args.shift || :compile
+
+      @msbuild = BuildTool.find
+      @args = {}
+      @search_pattern = %w(**/*.sln)
+    end
+
+    def define(args, &task_block)
+      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
+
         cmd = [
           msbuild,
           project_or_solution.single,
-          *Mapper.new(:MSBuild).map(args)
+          *Mapper.new(:MSBuild).map(@args)
         ]
 
         sh(*cmd)

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

@@ -1,4 +1,3 @@
-require 'rake/clean'
 require 'rake/tasklib'
 
 module Rake::Funnel::Tasks
@@ -6,29 +5,31 @@ module Rake::Funnel::Tasks
     include Rake::Funnel::Support
     include Rake::Funnel::Support::MSDeploy
 
-    attr_accessor :name, :msdeploy, :log_file, :args
+    attr_accessor :name, :msdeploy, :args, :log_file
 
-    def initialize(name = :msdeploy)
-      @name = name
-      @msdeploy = 'msdeploy'
-      @args = {}
+    def initialize(*args, &task_block)
+      setup_ivars(args)
 
-      yield self if block_given?
-      define
+      define(args, &task_block)
     end
 
-    def log_file
-      @log_file || "#{@name}.log"
+    private
+    def setup_ivars(args)
+      @name = args.shift || :msdeploy
+
+      @msdeploy = 'msdeploy'
+      @args = {}
+      @log_file = "#{@name}.log"
     end
 
-    private
-    def define
-      CLEAN.include(log_file)
+    def define(args, &task_block)
+      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
 
-      desc "Deploy #{deploy_source(args)}"
-      task @name do
         mapper = Mapper.new(:MSDeploy)
-        cmd = [quote(msdeploy), mapper.map(args)]
+        cmd = [quote(msdeploy), mapper.map(@args)]
           .flatten
           .join(' ')
 
@@ -40,14 +41,6 @@ module Rake::Funnel::Tasks
       self
     end
 
-    def deploy_source(args)
-      source = (args || {}).fetch(:source, {})
-      path = source.first
-      return if path.nil?
-
-      Pathname.new(path[1]).relative_path_from(Pathname.new('.').realpath) rescue path[1]
-    end
-
     def quote(value)
       value = value.gsub(/"/, '""') if value.kind_of?(String)
       return %Q{"#{value}"} if value =~ /\s/

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

@@ -4,35 +4,35 @@ module Rake::Funnel::Tasks
   class NUnit < Rake::TaskLib
     include Rake::Funnel::Support
 
-    attr_accessor :name, :files, :args
+    attr_accessor :name, :nunit, :files, :args
 
-    def initialize(name = :test)
-      @name = name
-      @args = {}
-      @files = %w(build/specs/**/*.dll build/specs/**/*.exe)
+    def initialize(*args, &task_block)
+      setup_ivars(args)
 
-      yield self if block_given?
-      define
+      define(args, &task_block)
     end
 
-    def nunit
-      @_nunit || 'nunit-console.exe'
-    end
+    private
+    def setup_ivars(args)
+      @name = args.shift || :test
 
-    def nunit=(value)
-      @_nunit = value
+      @nunit = 'nunit-console.exe'
+      @args = {}
+      @files = %w(build/specs/**/*.dll build/specs/**/*.exe)
     end
 
-    private
-    def define
-      desc "Test #{test_assemblies.all_or_default.join(', ')}"
-      task name do
+    def define(args, &task_block)
+      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
+
         Rake::Funnel::Integration::TeamCity::NUnitPlugin.setup(nunit)
 
         cmd = [
           *Mono.invocation(nunit),
           *test_assemblies.all,
-          *Mapper.new(:NUnit).map(args)
+          *Mapper.new(:NUnit).map(@args)
         ]
 
         sh(*cmd)

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

@@ -6,23 +6,29 @@ module Rake::Funnel::Tasks
 
     attr_accessor :name, :paket, :paket_args, :bootstrapper, :bootstrapper_args
 
-    def initialize(name = :paket)
-      @name = name
+    def initialize(*args, &task_block)
+      setup_ivars(args)
+
+      define(args, &task_block)
+    end
+
+    private
+    def setup_ivars(args)
+      @name = args.shift || :paket
 
       @paket = File.join('.paket', 'paket.exe')
       @paket_args = 'restore'
 
       @bootstrapper = File.join('.paket', 'paket.bootstrapper.exe')
       @bootstrapper_args = nil
-
-      yield self if block_given?
-      define
     end
 
-    private
-    def define
-      desc "#{paket_cmd.join(' ')} (optionally #{bootstrapper_cmd.join(' ')})"
-      task name do
+    def define(args, &task_block)
+      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
+
         sh(*bootstrapper_cmd) unless File.exist?(paket)
         sh(*paket_cmd)
       end