fluent_command_builder 0.1.21 → 0.1.22

data/lib/fluent_command_builder/command_builder.rb

@@ -3,11 +3,12 @@ require File.expand_path(File.dirname(__FILE__) + '/command_base')
 module FluentCommandBuilder
   class CommandBuilder
 
-    attr_reader :command_name
+    attr_accessor :command_name, :path
 
-    def initialize command_name, command=nil
+    def initialize command_name, path=nil
       @command_name = command_name
-      @command = command.to_s
+      @path = path
+      @args = ''
     end
 
     def format value, delimiter=nil, key_value_separator=nil
@@ -33,19 +34,29 @@ module FluentCommandBuilder
     end
 
     def append value
-      @command << value
+      @args << value.to_s
+    end
+
+    def append_arg arg
+      append " #{arg.to_s}"
     end
 
     def to_s
-      "#{@command_name} #{@command.strip}".strip
+      "#{executable} #{args}".strip
     end
 
     def args
-      @command.strip
+      @args.strip
     end
 
     private
 
+    def executable
+      executable = @path ? File.join(@path, @command_name) : @command_name
+      executable.gsub! '/', '\\' if executable.include? '\\'
+      executable
+    end
+
     def hash_to_array hash, key_value_separator
       hash.map { |k, v| k.to_s + key_value_separator + v.to_s }
     end

data/lib/fluent_command_builder/command_builders/installutil_11.rb

@@ -6,9 +6,8 @@ module FluentCommandBuilder
     module V11
       COMMAND_NAME = 'installUtil'
       class InstallUtil < CommandBase
-        def initialize builder, assembly_name
+        def initialize builder
           super builder
-          @builder.append " #{@builder.format assembly_name}"
         end
         def help assembly_path=nil
           @builder.append ' /help'
@@ -37,18 +36,23 @@ module FluentCommandBuilder
           yield @builder if block_given?
           self
         end
+        def assembly_file_name assembly_file_name
+          @builder.append " #{@builder.format assembly_file_name}"
+          yield @builder if block_given?
+          self
+        end
       end
-      def installutil assembly_name
+      def installutil 
         builder = CommandBuilder.new COMMAND_NAME
-        command = InstallUtil.new builder, assembly_name
+        command = InstallUtil.new builder
         yield builder if block_given?
         command
       end
     end
   end
-  def installutil_11 assembly_name
+  def installutil_11 
     builder = CommandBuilder.new InstallUtil::V11::COMMAND_NAME
-    command = InstallUtil::V11::InstallUtil.new builder, assembly_name
+    command = InstallUtil::V11::InstallUtil.new builder
     yield builder if block_given?
     command
   end

data/lib/fluent_command_builder/command_builders/installutil_20.rb

@@ -6,9 +6,8 @@ module FluentCommandBuilder
     module V20
       COMMAND_NAME = 'installUtil'
       class InstallUtil < CommandBase
-        def initialize builder, assembly_name=nil
+        def initialize builder
           super builder
-          @builder.append " #{@builder.format assembly_name}" unless assembly_name.nil?
         end
         def help assembly_path=nil
           @builder.append ' /help'
@@ -22,7 +21,7 @@ module FluentCommandBuilder
           yield @builder if block_given?
           self
         end
-        def assembly_name assembly_name
+        def assembly_strong_name assembly_name
           @builder.append " /assemblyName=#{@builder.format assembly_name}"
           yield @builder if block_given?
           self
@@ -42,18 +41,23 @@ module FluentCommandBuilder
           yield @builder if block_given?
           self
         end
+        def assembly_file_name assembly_file_name
+          @builder.append " #{@builder.format assembly_file_name}"
+          yield @builder if block_given?
+          self
+        end
       end
-      def installutil assembly_name=nil
+      def installutil 
         builder = CommandBuilder.new COMMAND_NAME
-        command = InstallUtil.new builder, assembly_name
+        command = InstallUtil.new builder
         yield builder if block_given?
         command
       end
     end
   end
-  def installutil_20 assembly_name=nil
+  def installutil_20 
     builder = CommandBuilder.new InstallUtil::V20::COMMAND_NAME
-    command = InstallUtil::V20::InstallUtil.new builder, assembly_name
+    command = InstallUtil::V20::InstallUtil.new builder
     yield builder if block_given?
     command
   end

data/lib/fluent_command_builder/command_builders/installutil_35.rb

@@ -6,9 +6,8 @@ module FluentCommandBuilder
     module V35
       COMMAND_NAME = 'installUtil'
       class InstallUtil < CommandBase
-        def initialize builder, assembly_name=nil
+        def initialize builder
           super builder
-          @builder.append " #{@builder.format assembly_name}" unless assembly_name.nil?
         end
         def help assembly_path=nil
           @builder.append ' /help'
@@ -22,7 +21,7 @@ module FluentCommandBuilder
           yield @builder if block_given?
           self
         end
-        def assembly_name assembly_name
+        def assembly_strong_name assembly_name
           @builder.append " /assemblyName=#{@builder.format assembly_name}"
           yield @builder if block_given?
           self
@@ -42,18 +41,23 @@ module FluentCommandBuilder
           yield @builder if block_given?
           self
         end
+        def assembly_file_name assembly_file_name
+          @builder.append " #{@builder.format assembly_file_name}"
+          yield @builder if block_given?
+          self
+        end
       end
-      def installutil assembly_name=nil
+      def installutil 
         builder = CommandBuilder.new COMMAND_NAME
-        command = InstallUtil.new builder, assembly_name
+        command = InstallUtil.new builder
         yield builder if block_given?
         command
       end
     end
   end
-  def installutil_35 assembly_name=nil
+  def installutil_35 
     builder = CommandBuilder.new InstallUtil::V35::COMMAND_NAME
-    command = InstallUtil::V35::InstallUtil.new builder, assembly_name
+    command = InstallUtil::V35::InstallUtil.new builder
     yield builder if block_given?
     command
   end

data/lib/fluent_command_builder/command_builders/installutil_40.rb

@@ -6,9 +6,8 @@ module FluentCommandBuilder
     module V40
       COMMAND_NAME = 'installUtil'
       class InstallUtil < CommandBase
-        def initialize builder, assembly_name=nil
+        def initialize builder
           super builder
-          @builder.append " #{@builder.format assembly_name}" unless assembly_name.nil?
         end
         def help assembly_path=nil
           @builder.append ' /help'
@@ -16,7 +15,7 @@ module FluentCommandBuilder
           yield @builder if block_given?
           self
         end
-        def assembly_name assembly_name
+        def assembly_strong_name assembly_name
           @builder.append " /assemblyName=#{@builder.format assembly_name}"
           yield @builder if block_given?
           self
@@ -48,18 +47,23 @@ module FluentCommandBuilder
           yield @builder if block_given?
           self
         end
+        def assembly_file_name assembly_file_name
+          @builder.append " #{@builder.format assembly_file_name}"
+          yield @builder if block_given?
+          self
+        end
       end
-      def installutil assembly_name=nil
+      def installutil 
         builder = CommandBuilder.new COMMAND_NAME
-        command = InstallUtil.new builder, assembly_name
+        command = InstallUtil.new builder
         yield builder if block_given?
         command
       end
     end
   end
-  def installutil_40 assembly_name=nil
+  def installutil_40 
     builder = CommandBuilder.new InstallUtil::V40::COMMAND_NAME
-    command = InstallUtil::V40::InstallUtil.new builder, assembly_name
+    command = InstallUtil::V40::InstallUtil.new builder
     yield builder if block_given?
     command
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_command_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-02-14 00:00:00.000000000 Z
 dependencies: []
 description: A command line builder with a fluent interface written in Ruby.
 email: matthew-github@matthewriley.name