fluent_command_builder 0.1.18 → 0.1.19

data/lib/fluent_command_builder/command_builders/installutil_20.rb

@@ -4,48 +4,57 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module InstallUtil
     module V20
+      COMMAND_NAME = 'installUtil'
       class InstallUtil < CommandBase
         def initialize builder, assembly_name=nil
-          @builder = builder
-          @builder.append 'installUtil'
+          super builder
           @builder.append " #{@builder.format assembly_name}" unless assembly_name.nil?
         end
         def help assembly_path=nil
           @builder.append ' /help'
           @builder.append " #{@builder.format assembly_path}" unless assembly_path.nil?
+          yield @builder if block_given?
           self
         end
         def log_file file_name=nil
           @builder.append ' /logFile'
           @builder.append "=#{@builder.format file_name}" unless file_name.nil?
+          yield @builder if block_given?
           self
         end
         def assembly_name assembly_name
           @builder.append " /assemblyName=#{@builder.format assembly_name}"
+          yield @builder if block_given?
           self
         end
         def log_to_console bool
           @builder.append " /logToConsole=#{@builder.format bool}"
+          yield @builder if block_given?
           self
         end
         def show_call_stack 
           @builder.append ' /showCallStack'
+          yield @builder if block_given?
           self
         end
         def uninstall 
           @builder.append ' /uninstall'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def installutil assembly_name=nil
-        InstallUtil.new CommandBuilder.new, assembly_name
+        builder = CommandBuilder.new COMMAND_NAME
+        command = InstallUtil.new builder, assembly_name
+        yield builder if block_given?
+        command
       end
     end
   end
   def installutil_20 assembly_name=nil
-    InstallUtil::V20::InstallUtil.new CommandBuilder.new, assembly_name
+    builder = CommandBuilder.new InstallUtil::V20::COMMAND_NAME
+    command = InstallUtil::V20::InstallUtil.new builder, assembly_name
+    yield builder if block_given?
+    command
   end
 end

data/lib/fluent_command_builder/command_builders/installutil_35.rb

@@ -4,48 +4,57 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module InstallUtil
     module V35
+      COMMAND_NAME = 'installUtil'
       class InstallUtil < CommandBase
         def initialize builder, assembly_name=nil
-          @builder = builder
-          @builder.append 'installUtil'
+          super builder
           @builder.append " #{@builder.format assembly_name}" unless assembly_name.nil?
         end
         def help assembly_path=nil
           @builder.append ' /help'
           @builder.append " #{@builder.format assembly_path}" unless assembly_path.nil?
+          yield @builder if block_given?
           self
         end
         def log_file file_name=nil
           @builder.append ' /logFile'
           @builder.append "=#{@builder.format file_name}" unless file_name.nil?
+          yield @builder if block_given?
           self
         end
         def assembly_name assembly_name
           @builder.append " /assemblyName=#{@builder.format assembly_name}"
+          yield @builder if block_given?
           self
         end
         def log_to_console bool
           @builder.append " /logToConsole=#{@builder.format bool}"
+          yield @builder if block_given?
           self
         end
         def show_call_stack 
           @builder.append ' /showCallStack'
+          yield @builder if block_given?
           self
         end
         def uninstall 
           @builder.append ' /uninstall'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def installutil assembly_name=nil
-        InstallUtil.new CommandBuilder.new, assembly_name
+        builder = CommandBuilder.new COMMAND_NAME
+        command = InstallUtil.new builder, assembly_name
+        yield builder if block_given?
+        command
       end
     end
   end
   def installutil_35 assembly_name=nil
-    InstallUtil::V35::InstallUtil.new CommandBuilder.new, assembly_name
+    builder = CommandBuilder.new InstallUtil::V35::COMMAND_NAME
+    command = InstallUtil::V35::InstallUtil.new builder, assembly_name
+    yield builder if block_given?
+    command
   end
 end

data/lib/fluent_command_builder/command_builders/installutil_40.rb

@@ -4,53 +4,63 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module InstallUtil
     module V40
+      COMMAND_NAME = 'installUtil'
       class InstallUtil < CommandBase
         def initialize builder, assembly_name=nil
-          @builder = builder
-          @builder.append 'installUtil'
+          super builder
           @builder.append " #{@builder.format assembly_name}" unless assembly_name.nil?
         end
         def help assembly_path=nil
           @builder.append ' /help'
           @builder.append " #{@builder.format assembly_path}" unless assembly_path.nil?
+          yield @builder if block_given?
           self
         end
         def assembly_name assembly_name
           @builder.append " /assemblyName=#{@builder.format assembly_name}"
+          yield @builder if block_given?
           self
         end
         def install_state_dir directory_name=nil
           @builder.append ' /installStateDir'
           @builder.append "=#{@builder.format directory_name}" unless directory_name.nil?
+          yield @builder if block_given?
           self
         end
         def log_file file_name=nil
           @builder.append ' /logFile'
           @builder.append "=#{@builder.format file_name}" unless file_name.nil?
+          yield @builder if block_given?
           self
         end
         def log_to_console bool
           @builder.append " /logToConsole=#{@builder.format bool}"
+          yield @builder if block_given?
           self
         end
         def show_call_stack 
           @builder.append ' /showCallStack'
+          yield @builder if block_given?
           self
         end
         def uninstall 
           @builder.append ' /uninstall'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def installutil assembly_name=nil
-        InstallUtil.new CommandBuilder.new, assembly_name
+        builder = CommandBuilder.new COMMAND_NAME
+        command = InstallUtil.new builder, assembly_name
+        yield builder if block_given?
+        command
       end
     end
   end
   def installutil_40 assembly_name=nil
-    InstallUtil::V40::InstallUtil.new CommandBuilder.new, assembly_name
+    builder = CommandBuilder.new InstallUtil::V40::COMMAND_NAME
+    command = InstallUtil::V40::InstallUtil.new builder, assembly_name
+    yield builder if block_given?
+    command
   end
 end

data/lib/fluent_command_builder/command_builders/msbuild_20.rb

@@ -4,71 +4,86 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module MSBuild
     module V20
+      COMMAND_NAME = 'MSBuild'
       class MSBuild < CommandBase
         def initialize builder, project_file=nil
-          @builder = builder
-          @builder.append 'MSBuild'
+          super builder
           @builder.append " #{@builder.format project_file}" unless project_file.nil?
         end
         def help 
           @builder.append ' /help'
+          yield @builder if block_given?
           self
         end
         def no_logo 
           @builder.append ' /noLogo'
+          yield @builder if block_given?
           self
         end
         def version 
           @builder.append ' /version'
+          yield @builder if block_given?
           self
         end
         def file file
           @builder.append " @#{@builder.format file}"
+          yield @builder if block_given?
           self
         end
         def no_auto_response 
           @builder.append ' /noAutoResponse'
+          yield @builder if block_given?
           self
         end
         def target target
           @builder.append " /target:#{@builder.format target, ';'}"
+          yield @builder if block_given?
           self
         end
         def property property
           @builder.append " /property:#{@builder.format property, ';', '='}"
+          yield @builder if block_given?
           self
         end
         def logger logger
           @builder.append " /logger:#{@builder.format logger}"
+          yield @builder if block_given?
           self
         end
         def console_logger_parameters parameters
           @builder.append " /consoleLoggerParameters:#{@builder.format parameters}"
+          yield @builder if block_given?
           self
         end
         def verbosity level
           @builder.append " /verbosity:#{@builder.format level}"
+          yield @builder if block_given?
           self
         end
         def no_console_logger 
           @builder.append ' /noConsoleLogger'
+          yield @builder if block_given?
           self
         end
         def validate schema=nil
           @builder.append ' /validate'
           @builder.append ":#{@builder.format schema}" unless schema.nil?
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def msbuild project_file=nil
-        MSBuild.new CommandBuilder.new, project_file
+        builder = CommandBuilder.new COMMAND_NAME
+        command = MSBuild.new builder, project_file
+        yield builder if block_given?
+        command
       end
     end
   end
   def msbuild_20 project_file=nil
-    MSBuild::V20::MSBuild.new CommandBuilder.new, project_file
+    builder = CommandBuilder.new MSBuild::V20::COMMAND_NAME
+    command = MSBuild::V20::MSBuild.new builder, project_file
+    yield builder if block_given?
+    command
   end
 end

data/lib/fluent_command_builder/command_builders/msbuild_30.rb

@@ -4,71 +4,86 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module MSBuild
     module V30
+      COMMAND_NAME = 'MSBuild'
       class MSBuild < CommandBase
         def initialize builder, project_file=nil
-          @builder = builder
-          @builder.append 'MSBuild'
+          super builder
           @builder.append " #{@builder.format project_file}" unless project_file.nil?
         end
         def help 
           @builder.append ' /help'
+          yield @builder if block_given?
           self
         end
         def no_logo 
           @builder.append ' /noLogo'
+          yield @builder if block_given?
           self
         end
         def version 
           @builder.append ' /version'
+          yield @builder if block_given?
           self
         end
         def file file
           @builder.append " @#{@builder.format file}"
+          yield @builder if block_given?
           self
         end
         def no_auto_response 
           @builder.append ' /noAutoResponse'
+          yield @builder if block_given?
           self
         end
         def target target
           @builder.append " /target:#{@builder.format target, ';'}"
+          yield @builder if block_given?
           self
         end
         def property property
           @builder.append " /property:#{@builder.format property, ';', '='}"
+          yield @builder if block_given?
           self
         end
         def logger logger
           @builder.append " /logger:#{@builder.format logger}"
+          yield @builder if block_given?
           self
         end
         def console_logger_parameters parameters
           @builder.append " /consoleLoggerParameters:#{@builder.format parameters}"
+          yield @builder if block_given?
           self
         end
         def verbosity level
           @builder.append " /verbosity:#{@builder.format level}"
+          yield @builder if block_given?
           self
         end
         def no_console_logger 
           @builder.append ' /noConsoleLogger'
+          yield @builder if block_given?
           self
         end
         def validate schema=nil
           @builder.append ' /validate'
           @builder.append ":#{@builder.format schema}" unless schema.nil?
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def msbuild project_file=nil
-        MSBuild.new CommandBuilder.new, project_file
+        builder = CommandBuilder.new COMMAND_NAME
+        command = MSBuild.new builder, project_file
+        yield builder if block_given?
+        command
       end
     end
   end
   def msbuild_30 project_file=nil
-    MSBuild::V30::MSBuild.new CommandBuilder.new, project_file
+    builder = CommandBuilder.new MSBuild::V30::COMMAND_NAME
+    command = MSBuild::V30::MSBuild.new builder, project_file
+    yield builder if block_given?
+    command
   end
 end

data/lib/fluent_command_builder/command_builders/msbuild_35.rb

@@ -4,103 +4,126 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module MSBuild
     module V35
+      COMMAND_NAME = 'MSBuild'
       class MSBuild < CommandBase
         def initialize builder, project_file=nil
-          @builder = builder
-          @builder.append 'MSBuild'
+          super builder
           @builder.append " #{@builder.format project_file}" unless project_file.nil?
         end
         def help 
           @builder.append ' /help'
+          yield @builder if block_given?
           self
         end
         def no_logo 
           @builder.append ' /noLogo'
+          yield @builder if block_given?
           self
         end
         def version 
           @builder.append ' /version'
+          yield @builder if block_given?
           self
         end
         def file file
           @builder.append " @#{@builder.format file}"
+          yield @builder if block_given?
           self
         end
         def no_auto_response 
           @builder.append ' /noAutoResponse'
+          yield @builder if block_given?
           self
         end
         def target target
           @builder.append " /target:#{@builder.format target, ';'}"
+          yield @builder if block_given?
           self
         end
         def property property
           @builder.append " /property:#{@builder.format property, ';', '='}"
+          yield @builder if block_given?
           self
         end
         def logger logger
           @builder.append " /logger:#{@builder.format logger}"
+          yield @builder if block_given?
           self
         end
         def distributed_logger logger
           @builder.append " /distributedLogger:#{@builder.format logger}"
+          yield @builder if block_given?
           self
         end
         def console_logger_parameters parameters
           @builder.append " /consoleLoggerParameters:#{@builder.format parameters}"
+          yield @builder if block_given?
           self
         end
         def verbosity level
           @builder.append " /verbosity:#{@builder.format level}"
+          yield @builder if block_given?
           self
         end
         def no_console_logger 
           @builder.append ' /noConsoleLogger'
+          yield @builder if block_given?
           self
         end
         def validate schema=nil
           @builder.append ' /validate'
           @builder.append ":#{@builder.format schema}" unless schema.nil?
+          yield @builder if block_given?
           self
         end
         def max_cpu_count number
           @builder.append " /maxCpuCount:#{@builder.format number}"
+          yield @builder if block_given?
           self
         end
         def ignore_project_extensions extensions
           @builder.append " /ignoreProjectExtensions:#{@builder.format extensions, ';'}"
+          yield @builder if block_given?
           self
         end
         def file_logger 
           @builder.append ' /fileLogger'
+          yield @builder if block_given?
           self
         end
         def distributed_file_logger 
           @builder.append ' /distributedFileLogger'
+          yield @builder if block_given?
           self
         end
         def file_logger_parameters parameters
           @builder.append " /fileLoggerParameters:#{@builder.format parameters, ';', '='}"
+          yield @builder if block_given?
           self
         end
         def tools_version version
           @builder.append " /toolsVersion:#{@builder.format version}"
+          yield @builder if block_given?
           self
         end
         def node_reuse parameters
           @builder.append " /nodeReuse:#{@builder.format parameters}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def msbuild project_file=nil
-        MSBuild.new CommandBuilder.new, project_file
+        builder = CommandBuilder.new COMMAND_NAME
+        command = MSBuild.new builder, project_file
+        yield builder if block_given?
+        command
       end
     end
   end
   def msbuild_35 project_file=nil
-    MSBuild::V35::MSBuild.new CommandBuilder.new, project_file
+    builder = CommandBuilder.new MSBuild::V35::COMMAND_NAME
+    command = MSBuild::V35::MSBuild.new builder, project_file
+    yield builder if block_given?
+    command
   end
 end