rake-funnel 0.3.2.pre → 0.4.0.pre

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

@@ -1,33 +1,41 @@
-module Rake::Funnel::Support::ArgumentMapper::Styles
-  class MSBuild
-    attr_reader :prefix, :separator, :value_separator
-
-    def initialize
-      @prefix = '/'
-      @separator = ':'
-      @value_separator = '='
-    end
-
-    def generate_from(model)
-      model.map { |switch|
-        switch.values.flatten.map { |value|
-          top_level(switch) + nested(value)
-        }
-      }.flatten(1)
-    end
-
-    private
-    def top_level(switch)
-      [prefix, switch.switch]
-    end
-
-    def nested(value)
-      res = []
-      res << separator unless value.key.nil? && value.value.nil?
-      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 MSBuild
+            attr_reader :prefix, :separator, :value_separator
+
+            def initialize
+              @prefix = '/'
+              @separator = ':'
+              @value_separator = '='
+            end
+
+            def generate_from(model)
+              model.map { |switch|
+                switch.values.flatten.map { |value|
+                  top_level(switch) + nested(value)
+                }
+              }.flatten(1)
+            end
+
+            private
+            def top_level(switch)
+              [prefix, switch.switch]
+            end
+
+            def nested(value)
+              res = []
+              res << separator unless value.key.nil? && value.value.nil?
+              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

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

@@ -1,47 +1,55 @@
-module Rake::Funnel::Support::ArgumentMapper::Styles
-  class MSDeploy
-    attr_reader :prefix, :separator, :value_separator, :value_list_separator
-
-    def initialize
-      @prefix = '-'
-      @separator = ':'
-      @value_separator = '='
-      @value_list_separator = ','
-    end
-
-    def generate_from(model)
-      model.map { |switch|
-        switch.values.map { |item|
-          if item.kind_of? Enumerable
-            values = item.map.with_index { |nested, index| nested(nested, index) }
-          else
-            values = nested(item)
-          end
-
-          (top_level(switch) + values).flatten
-        }
-      }.flatten(1)
-    end
-
-    private
-    def top_level(switch)
-      [prefix, quote(switch.switch)]
-    end
-
-    def nested(value, index = 0)
-      res = []
-      res << value_list_separator unless index == 0
-      res << separator unless value.key.nil? && value.value.nil? || index != 0
-      res << quote(value.key)
-      res << value_separator unless value.key.nil? || value.value.nil?
-      res << quote(value.value)
-      res.compact
-    end
-
-    def quote(value)
-      value = value.gsub(/"/, '""') if value.kind_of?(String)
-      return %Q{"#{value}"} if value =~ /\s/
-      value
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Support
+      module ArgumentMapper
+        module Styles
+          class MSDeploy
+            attr_reader :prefix, :separator, :value_separator, :value_list_separator
+
+            def initialize
+              @prefix = '-'
+              @separator = ':'
+              @value_separator = '='
+              @value_list_separator = ','
+            end
+
+            def generate_from(model)
+              model.map { |switch|
+                switch.values.map { |item|
+                  if item.is_a?(Enumerable)
+                    values = item.map.with_index { |nested, index| nested(nested, index) }
+                  else
+                    values = nested(item)
+                  end
+
+                  (top_level(switch) + values).flatten
+                }
+              }.flatten(1)
+            end
+
+            private
+            def top_level(switch)
+              [prefix, quote(switch.switch)]
+            end
+
+            def nested(value, index = 0)
+              res = []
+              res << value_list_separator unless index == 0
+              res << separator unless value.key.nil? && value.value.nil? || index != 0
+              res << quote(value.key)
+              res << value_separator unless value.key.nil? || value.value.nil?
+              res << quote(value.value)
+              res.compact
+            end
+
+            def quote(value)
+              value = value.gsub(/"/, '""') if value.is_a?(String)
+              return %{"#{value}"} if value =~ /\s/
+              value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,33 +1,41 @@
-module Rake::Funnel::Support::ArgumentMapper::Styles
-  class NUnit
-    attr_reader :prefix, :separator, :value_separator
-
-    def initialize
-      @prefix = Rake::Win32.windows? ? '/' : '-'
-      @separator = '='
-      @value_separator = ':'
-    end
-
-    def generate_from(model)
-      model.map { |switch|
-        switch.values.flatten.map { |value|
-          top_level(switch) + nested(value)
-        }
-      }.flatten(1)
-    end
-
-    private
-    def top_level(switch)
-      [prefix, switch.switch]
-    end
-
-    def nested(value)
-      res = []
-      res << separator unless value.key.nil? && value.value.nil?
-      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 NUnit
+            attr_reader :prefix, :separator, :value_separator
+
+            def initialize
+              @prefix = Rake::Win32.windows? ? '/' : '-'
+              @separator = '='
+              @value_separator = ':'
+            end
+
+            def generate_from(model)
+              model.map { |switch|
+                switch.values.flatten.map { |value|
+                  top_level(switch) + nested(value)
+                }
+              }.flatten(1)
+            end
+
+            private
+            def top_level(switch)
+              [prefix, switch.switch]
+            end
+
+            def nested(value)
+              res = []
+              res << separator unless value.key.nil? && value.value.nil?
+              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

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

@@ -1,5 +1,3 @@
-module Rake::Funnel::Support::ArgumentMapper; end
-
-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/argument_mapper/switch.rb

@@ -1,10 +1,16 @@
-module Rake::Funnel::Support::ArgumentMapper
-  class Switch
-    attr_reader :switch, :values
-
-    def initialize(switch, values)
-      @values = values
-      @switch = switch
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Support
+      module ArgumentMapper
+        class Switch
+          attr_reader :switch, :values
+
+          def initialize(switch, values)
+            @values = values
+            @switch = switch
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -1,35 +1,39 @@
-module Rake::Funnel::Support::AssemblyVersion
-  class FromVersionFiles
-    include Rake::Funnel::Support
-    include Enumerable
-
-    attr_reader :search_pattern, :build_number, :sha
-
-    def initialize(args = {})
-      @search_pattern = args[:search_pattern] || %w(**/VERSION)
-      @build_number = args[:build_number]
-      @sha = args[:sha]
-    end
-
-    def each
-      block_given? or return enum_for(__method__)
-
-      files.each do |file|
-        Rake.rake_output_message("Reading #{file}")
-
-        version_info = VersionInfo.parse({
-            version: VersionInfo.read_version_from(file),
-            build_number: build_number,
-            sha: sha
-          })
-
-        yield({ source: file, version_info: version_info })
-      end
-    end
-
-    private
-    def files
-      Finder.new(search_pattern, self, 'No version files found.').all_or_default
-    end
-  end
-end
+module Rake
+  module Funnel
+    module Support
+      module AssemblyVersion
+        class FromVersionFiles
+          include Rake::Funnel::Support
+          include Enumerable
+
+          attr_reader :search_pattern, :metadata
+
+          def initialize(args = {})
+            @search_pattern = args[:search_pattern] || %w(**/VERSION)
+            @metadata = args[:metadata]
+          end
+
+          def each
+            block_given? or return enum_for(__method__)
+
+            files.each do |file|
+              Rake.rake_output_message("Reading #{file}")
+
+              version_info = VersionInfo.parse(
+                version: VersionInfo.read_version_from(file),
+                metadata: metadata
+              )
+
+              yield({ source: file, version_info: version_info })
+            end
+          end
+
+          private
+          def files
+            Finder.new(search_pattern, self, 'No version files found.').all_or_default
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rake/funnel/support/assembly_version/languages/cs

@@ -1,5 +1,5 @@
-using System.Reflection;
-
-<% version_info.each do |key, value| %>
-[assembly: <%= key.pascalize %>("<%= value %>")]
-<% end %>
+using System.Reflection;
+
+<% version_info.each do |key, value| %>
+[assembly: <%= key.pascalize %>("<%= value %>")]
+<% end %>

data/lib/rake/funnel/support/assembly_version/languages/fs

@@ -1,12 +1,12 @@
-namespace System
-open System.Reflection
-
-<% version_info.each do |key, value| %>
-[<assembly: <%= key.pascalize %>("<%= value %>")>]
-<% end %>
-do ()
-
-<% if version_info.assembly_file_version %>
-module internal AssemblyVersionInformation =
-  let [<Literal>] Version = "<%= version_info.assembly_file_version %>"
-<% end %>
+namespace System
+open System.Reflection
+
+<% version_info.each do |key, value| %>
+[<assembly: <%= key.pascalize %>("<%= value %>")>]
+<% end %>
+do ()
+
+<% if version_info.assembly_file_version %>
+module internal AssemblyVersionInformation =
+  let [<Literal>] Version = "<%= version_info.assembly_file_version %>"
+<% end %>

data/lib/rake/funnel/support/assembly_version/languages/vb

@@ -1,5 +1,5 @@
-Imports System.Reflection
-
-<% version_info.each do |key, value| %>
-<Assembly: <%= key.pascalize %>("<%= value %>")>
-<% end %>
+Imports System.Reflection
+
+<% version_info.each do |key, value| %>
+<Assembly: <%= key.pascalize %>("<%= value %>")>
+<% end %>

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

@@ -1,52 +1,56 @@
-require 'erb'
-
-Dir[File.join(File.dirname(__FILE__), 'assembly_version', '*.rb')].each do |path|
-  require path
-end
-
-module Rake::Funnel::Support
-  class AssemblyVersionWriter
-    include Rake::Funnel::Support::InstantiateSymbol
-    instantiate AssemblyVersion
-
-    def initialize(type = :FromVersionFiles, args = {})
-      @type = create(type, args)
-    end
-
-    def write(target_path, languages = [])
-      @type.each do |info|
-        source = info[:source]
-        version_info = info[:version_info]
-
-        [languages].flatten.each do |language|
-          target = target_path.call(language, version_info, source)
-
-          contents = evaluate_erb(language, version_info, target)
-
-          Rake.rake_output_message("Writing #{target}")
-          File.write(target, contents)
-        end
-      end
-    end
-
-    private
-    def evaluate_erb(language, version_info, target)
-      template = template_for(language)
-
-      render = ERB.new(template, nil, '%<>')
-      render.filename = target
-      render.result(get_binding(version_info))
-    end
-
-    def template_for(language)
-      template = File.join(File.dirname(__FILE__), 'assembly_version', 'languages', language.to_s)
-      raise "Language is not supported: #{language}" unless File.readable?(template)
-
-      File.read(template)
-    end
-
-    def get_binding(version_info)
-      binding
-    end
-  end
-end
+require 'erb'
+
+Dir[File.join(File.dirname(__FILE__), 'assembly_version', '*.rb')].each do |path|
+  require path
+end
+
+module Rake
+  module Funnel
+    module Support
+      class AssemblyVersionWriter
+        include InstantiateSymbol
+        instantiate AssemblyVersion
+
+        def initialize(type = :FromVersionFiles, args = {})
+          @type = create(type, args)
+        end
+
+        def write(target_path, languages = [])
+          @type.each do |info|
+            source = info[:source]
+            version_info = info[:version_info]
+
+            [languages].flatten.each do |language|
+              target = target_path.call(language, version_info, source)
+
+              contents = evaluate_erb(language, version_info, target)
+
+              Rake.rake_output_message("Writing #{target}")
+              File.write(target, contents)
+            end
+          end
+        end
+
+        private
+        def evaluate_erb(language, version_info, target)
+          template = template_for(language)
+
+          render = ERB.new(template, nil, '%<>')
+          render.filename = target
+          render.result(get_binding(version_info))
+        end
+
+        def template_for(language)
+          template = File.join(File.dirname(__FILE__), 'assembly_version', 'languages', language.to_s)
+          raise "Language is not supported: #{language}" unless File.readable?(template)
+
+          File.read(template)
+        end
+
+        def get_binding(version_info)
+          binding
+        end
+      end
+    end
+  end
+end

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

@@ -1,32 +1,37 @@
-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
+module Rake
+  module Funnel
+    module 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)
+
+            attributes = KNOWN_ATTRIBUTES.map { |attr|
+              read_attribute(binary, attr)
+            }
+
+            hash = attributes.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
+  end
+end