rake-funnel 0.3.2.pre → 0.4.0.pre

data/lib/rake/funnel/support/timing/statistics.rb

@@ -1,26 +1,32 @@
-module Rake::Funnel::Support::Timing
-  class Statistics
-    include Enumerable
-
-    attr_reader :started_at
-
-    def initialize
-      @stats = []
-      @started_at = Time.now
-    end
-
-    def each(&block)
-      @stats.each(&block)
-    end
-
-    def benchmark(task)
-      t0 = Time.now
-      begin
-        yield if block_given?
-      ensure
-        t1 = Time.now
-        @stats << { task: task, time: t1 - t0 }
-      end
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Support
+      module Timing
+        class Statistics
+          include Enumerable
+
+          attr_reader :started_at
+
+          def initialize
+            @stats = []
+            @started_at = Time.now
+          end
+
+          def each(&block)
+            @stats.each(&block)
+          end
+
+          def benchmark(task)
+            t0 = Time.now
+            begin
+              yield if block_given?
+            ensure
+              t1 = Time.now
+              @stats << { task: task, time: t1 - t0 }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -1,72 +1,103 @@
-require 'ostruct'
-
-module Rake::Funnel::Support
-  class VersionInfo < OpenStruct
-    include Enumerable
-
-    def initialize(hash = nil)
-      super(hash)
-      freeze
-    end
-
-    def each(&block)
-      each_pair(&block)
-    end
-
-    class << self
-      def parse(context)
-        VersionInfo.new({
-            assembly_version: assembly_version(context),
-            assembly_file_version: assembly_file_version(context),
-            assembly_informational_version: assembly_informational_version(context)
-          })
-      end
-
-      def read_version_from(file)
-        File.open(file, &:readline).strip
-      end
-
-      private
-      def default_version(context)
-        context[:version] || '0'
-      end
-
-      def assembly_version(context)
-        strip_trailing_non_numeric(default_version(context))
-      end
-
-      def assembly_file_version(context)
-        numeric_build_number = strip_leading_non_numeric(context[:build_number])
-
-        [
-          assembly_version(context),
-          numeric_build_number
-        ].compact.join('.')
-      end
-
-      def assembly_informational_version(context)
-        build_number = context[:build_number]
-        join_using = '.'
-        join_using = '' if build_number =~ /^\D/
-
-        prefix = [default_version(context), build_number].compact.join(join_using)
-        sha = context[:sha]
-
-        [prefix, sha].compact.join('-')
-      end
-
-      def strip_trailing_non_numeric(str)
-        return nil if str.nil?
-        str.to_s.gsub(/[^\d\.].*/, '')
-      end
-
-      def strip_leading_non_numeric(str)
-        return nil if str.nil?
-        str = str.to_s.gsub(/[^\d\.]/, '')
-
-        return nil if str.empty?
-        str
-      end
-    end
-  end
-end
+require 'ostruct'
+
+module Rake
+  module Funnel
+    module Support
+      class VersionInfo < OpenStruct
+        include Enumerable
+
+        def initialize(hash = nil)
+          super(hash)
+          freeze
+        end
+
+        def each(&block)
+          each_pair(&block)
+        end
+
+        class << self
+          def parse(context)
+            VersionInfo.new({
+                assembly_version: assembly_version(context),
+                assembly_file_version: assembly_file_version(context),
+                assembly_informational_version: assembly_informational_version(context)
+              })
+          end
+
+          def read_version_from(file)
+            File.open(file, &:readline).strip
+          end
+
+          private
+          def default_version(context)
+            context[:version].to_s || '0'
+          end
+
+          def pad(version, parts)
+            numerics = version.split('.').take(parts).map { |part| part.to_i }
+
+            template = Array.new(parts) { 0 }.map.with_index do |part, index|
+              numerics[index] || part
+            end
+            template.join('.')
+          end
+
+          def assembly_version(context)
+            version = default_version(context)
+            pad(version, 4)
+          end
+
+          def assembly_file_version(context)
+            version = assembly_version(context)
+            build_number = numeric(context.fetch(:metadata, {})[:build])
+            return version.sub(/\.0$/, ".#{build_number}") if build_number
+            version
+          end
+
+          def numeric(str)
+            return str if str.to_s =~ /^\d+$/
+            nil
+          end
+
+          def assembly_informational_version(context)
+            version = default_version(context)
+            numeric_version = pad(version, 3)
+            alpha_version = version.sub(/^[\d\.]*/, '')
+
+            semver = [
+              numeric_version,
+              alpha_version,
+              pre(context),
+            ].join
+
+            [
+              semver,
+              metadata(context)
+            ].compact.join('+')
+          end
+
+          def pre(context)
+            pre = context.fetch(:metadata, {})[:pre]
+
+            if pre && pre.to_s !~ /^-/
+              pre = "-#{pre}"
+            end
+
+            pre
+          end
+
+          def metadata(context)
+            metadata = context.fetch(:metadata, {}).reject { |k, _| k == :pre }
+
+            metadata = metadata.map { |key, value|
+              [key.to_s, value.to_s] if value
+            }.compact
+
+            return nil if metadata.empty?
+            metadata.join('.')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,15 +1,19 @@
-module Rake::Funnel::Support
-  class Which
-    class << self
-      def which(executable)
-        return executable if File.file?(executable)
-
-        ENV['PATH']
-          .split(File::PATH_SEPARATOR)
-          .map { |path| File.join(path, executable) }
-          .select { |path| File.file?(path) }
-          .first
-      end
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Support
+      class Which
+        class << self
+          def which(executable)
+            return executable if File.file?(executable)
+
+            ENV['PATH']
+              .split(File::PATH_SEPARATOR)
+              .map { |path| File.join(path, executable) }
+              .select { |path| File.file?(path) }
+              .first
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,49 +1,53 @@
-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
+require 'pathname'
+require 'zip'
+
+module Rake
+  module Funnel
+    module 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
+  end
+end

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

@@ -1,40 +1,44 @@
-require 'rake/tasklib'
-
-module Rake::Funnel::Tasks
-  class AssemblyVersion < Rake::TaskLib
-    include Rake::Funnel::Support
-
-    attr_accessor :name, :language, :source, :source_args, :target_path
-
-    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
-    end
-
-    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}") }
-    end
-  end
-end
+require 'rake/tasklib'
+
+module Rake
+  module Funnel
+    module Tasks
+      class AssemblyVersion < Rake::TaskLib
+        include Rake::Funnel::Support
+
+        attr_accessor :name, :language, :source, :source_args, :target_path
+
+        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
+        end
+
+        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 { |language, _version_info, source| File.join(File.dirname(source), "VersionInfo.#{language}") }
+        end
+      end
+    end
+  end
+end

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

@@ -1,41 +1,45 @@
-require 'rake/tasklib'
-
-module Rake::Funnel::Tasks
-  class BinPath < Rake::TaskLib
-    attr_accessor :name, :search_pattern
-
-    def initialize(*args, &task_block)
-      setup_ivars(args)
-
-      define(args, &task_block)
-    end
-
-    private
-    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}"
-        end
-      end
-
-      self
-    end
-
-    def add_pattern_to_path_environment
-      paths = Dir[*search_pattern].map { |path| File.expand_path(path) }.sort
-
-      ENV['PATH'] = ([] << paths << ENV['PATH']).flatten.join(File::PATH_SEPARATOR)
-      paths
-    end
-  end
-end
+require 'rake/tasklib'
+
+module Rake
+  module Funnel
+    module Tasks
+      class BinPath < Rake::TaskLib
+        attr_accessor :name, :search_pattern
+
+        def initialize(*args, &task_block)
+          setup_ivars(args)
+
+          define(args, &task_block)
+        end
+
+        private
+        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}"
+            end
+          end
+
+          self
+        end
+
+        def add_pattern_to_path_environment
+          paths = Dir[*search_pattern].map { |path| File.expand_path(path) }.sort
+
+          ENV['PATH'] = ([] << paths << ENV['PATH']).flatten.join(File::PATH_SEPARATOR)
+          paths
+        end
+      end
+    end
+  end
+end

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

@@ -1,39 +1,43 @@
-require 'rake/tasklib'
-
-module Rake::Funnel::Tasks
-  class Copy < Rake::TaskLib
-    include Rake::Funnel::Support
-
-    attr_accessor :name, :source, :target
-
-    def initialize(*args, &task_block)
-      setup_ivars(args)
-
-      define(args, &task_block)
-    end
-
-    private
-    def setup_ivars(args)
-      @name = args.shift || :copy
-
-      @source = []
-      @target = nil
-    end
-
-    def define(args, &task_block)
-      desc 'Copy files' 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
-
-        Copier.copy(files, target)
-      end
-
-      self
-    end
-
-    def files
-      Finder.new(source, self, 'No files found.').all_or_default
-    end
-  end
-end
+require 'rake/tasklib'
+
+module Rake
+  module Funnel
+    module Tasks
+      class Copy < Rake::TaskLib
+        include Rake::Funnel::Support
+
+        attr_accessor :name, :source, :target
+
+        def initialize(*args, &task_block)
+          setup_ivars(args)
+
+          define(args, &task_block)
+        end
+
+        private
+        def setup_ivars(args)
+          @name = args.shift || :copy
+
+          @source = []
+          @target = nil
+        end
+
+        def define(args, &task_block)
+          desc 'Copy files' 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
+
+            Copier.copy(files, target)
+          end
+
+          self
+        end
+
+        def files
+          Finder.new(source, self, 'No files found.').all_or_default
+        end
+      end
+    end
+  end
+end