fluent_command_builder 0.5.6 → 0.6.0

data/lib/fluent_command_builder/command_builders/dotcover_20.rb

@@ -1,304 +1,304 @@
 require File.expand_path(File.dirname(__FILE__) + '/../command_base')
-require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
+require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
 
 module FluentCommandBuilder
+  def dotcover_20
+    FluentCommandBuilder::DotCover::V20.create { |b| yield b if block_given? }
+  end
   module DotCover
     module V20
-      COMMAND_NAME = 'dotCover'
+      def self.create
+        b = UnderlyingBuilder.new FluentCommandBuilder::DotCover::COMMAND_NAME
+        c = DotCover.new(b)
+        yield b if block_given?
+        c
+      end
+      def dotcover
+        FluentCommandBuilder::DotCover::V20.create { |b| yield b if block_given? }
+      end
       class DotCover < CommandBase
-        def initialize(builder)
-          super builder
+        def initialize(underlying_builder)
+          super underlying_builder
         end
         def analyse(configuration_file=nil)
-          Analyse.new @builder, configuration_file
+          Analyse.new b, configuration_file
         end
         def cover(configuration_file=nil)
-          Cover.new @builder, configuration_file
+          Cover.new b, configuration_file
         end
         def delete(configuration_file=nil)
-          Delete.new @builder, configuration_file
+          Delete.new b, configuration_file
         end
         def help(command=nil, file_name=nil)
-          @builder.append ' help'
-          @builder.append " #{@builder.format command}" unless command.nil?
-          @builder.append " #{@builder.format file_name}" unless file_name.nil?
-          yield @builder if block_given?
+          b.append ' help'
+          b.append " #{b.format command}" unless command.nil?
+          b.append " #{b.format file_name}" unless file_name.nil?
+          yield b if block_given?
           self
         end
         def list(configuration_file=nil)
-          List.new @builder, configuration_file
+          List.new b, configuration_file
         end
         def merge(configuration_file=nil)
-          Merge.new @builder, configuration_file
+          Merge.new b, configuration_file
         end
         def report(configuration_file=nil)
-          Report.new @builder, configuration_file
+          Report.new b, configuration_file
         end
         def version(output_file_name=nil)
-          Version.new @builder, output_file_name
+          Version.new b, output_file_name
         end
         def zip(configuration_file=nil)
-          Zip.new @builder, configuration_file
+          Zip.new b, configuration_file
         end
       end
       class Analyse < CommandBase
-        def initialize(builder, configuration_file=nil)
-          super builder
-          @builder.append ' analyse'
-          @builder.append " #{@builder.format configuration_file}" unless configuration_file.nil?
+        def initialize(underlying_builder, configuration_file=nil)
+          super underlying_builder
+          b.append ' analyse'
+          b.append " #{b.format configuration_file}" unless configuration_file.nil?
         end
         def analyse_target_arguments(bool)
-          @builder.append " /analyseTargetArguments=#{@builder.format bool}"
-          yield @builder if block_given?
+          b.append " /analyseTargetArguments=#{b.format bool}"
+          yield b if block_given?
           self
         end
         def attribute_filters(filters)
-          @builder.append " /attributeFilters=#{@builder.format filters, ';'}"
-          yield @builder if block_given?
+          b.append " /attributeFilters=#{b.format filters, ';'}"
+          yield b if block_given?
           self
         end
         def filters(filters)
-          @builder.append " /filters=#{@builder.format filters, ';'}"
-          yield @builder if block_given?
+          b.append " /filters=#{b.format filters, ';'}"
+          yield b if block_given?
           self
         end
         def inherit_console(bool)
-          @builder.append " /inheritConsole=#{@builder.format bool}"
-          yield @builder if block_given?
+          b.append " /inheritConsole=#{b.format bool}"
+          yield b if block_given?
           self
         end
         def log_file(log_file)
-          @builder.append " /logFile=#{@builder.format log_file}"
-          yield @builder if block_given?
+          b.append " /logFile=#{b.format log_file}"
+          yield b if block_given?
           self
         end
         def output(snapshot_path)
-          @builder.append " /output=#{@builder.format snapshot_path}"
-          yield @builder if block_given?
+          b.append " /output=#{b.format snapshot_path}"
+          yield b if block_given?
           self
         end
         def report_type(report_type)
-          @builder.append " /reportType=#{@builder.format report_type}"
-          yield @builder if block_given?
+          b.append " /reportType=#{b.format report_type}"
+          yield b if block_given?
           self
         end
         def target_arguments(target_arguments)
-          @builder.append " /targetArguments=#{@builder.format target_arguments}"
-          yield @builder if block_given?
+          b.append " /targetArguments=#{b.format target_arguments}"
+          yield b if block_given?
           self
         end
         def target_executable(target_executable)
-          @builder.append " /targetExecutable=#{@builder.format target_executable}"
-          yield @builder if block_given?
+          b.append " /targetExecutable=#{b.format target_executable}"
+          yield b if block_given?
           self
         end
         def target_working_dir(target_working_dir)
-          @builder.append " /targetWorkingDir=#{@builder.format target_working_dir}"
-          yield @builder if block_given?
+          b.append " /targetWorkingDir=#{b.format target_working_dir}"
+          yield b if block_given?
           self
         end
         def temp_dir(temp_dir)
-          @builder.append " /tempDir=#{@builder.format temp_dir}"
-          yield @builder if block_given?
+          b.append " /tempDir=#{b.format temp_dir}"
+          yield b if block_given?
           self
         end
       end
       class Cover < CommandBase
-        def initialize(builder, configuration_file=nil)
-          super builder
-          @builder.append ' cover'
-          @builder.append " #{@builder.format configuration_file}" unless configuration_file.nil?
+        def initialize(underlying_builder, configuration_file=nil)
+          super underlying_builder
+          b.append ' cover'
+          b.append " #{b.format configuration_file}" unless configuration_file.nil?
         end
         def analyse_target_arguments(bool)
-          @builder.append " /analyseTargetArguments=#{@builder.format bool}"
-          yield @builder if block_given?
+          b.append " /analyseTargetArguments=#{b.format bool}"
+          yield b if block_given?
           self
         end
         def attribute_filters(filters)
-          @builder.append " /attributeFilters=#{@builder.format filters, ';'}"
-          yield @builder if block_given?
+          b.append " /attributeFilters=#{b.format filters, ';'}"
+          yield b if block_given?
           self
         end
         def filters(filters)
-          @builder.append " /filters=#{@builder.format filters, ';'}"
-          yield @builder if block_given?
+          b.append " /filters=#{b.format filters, ';'}"
+          yield b if block_given?
           self
         end
         def inherit_console(bool)
-          @builder.append " /inheritConsole=#{@builder.format bool}"
-          yield @builder if block_given?
+          b.append " /inheritConsole=#{b.format bool}"
+          yield b if block_given?
           self
         end
         def log_file(log_file)
-          @builder.append " /logFile=#{@builder.format log_file}"
-          yield @builder if block_given?
+          b.append " /logFile=#{b.format log_file}"
+          yield b if block_given?
           self
         end
         def output(snapshot_path)
-          @builder.append " /output=#{@builder.format snapshot_path}"
-          yield @builder if block_given?
+          b.append " /output=#{b.format snapshot_path}"
+          yield b if block_given?
           self
         end
         def target_arguments(target_arguments)
-          @builder.append " /targetArguments=#{@builder.format target_arguments}"
-          yield @builder if block_given?
+          b.append " /targetArguments=#{b.format target_arguments}"
+          yield b if block_given?
           self
         end
         def target_executable(target_executable)
-          @builder.append " /targetExecutable=#{@builder.format target_executable}"
-          yield @builder if block_given?
+          b.append " /targetExecutable=#{b.format target_executable}"
+          yield b if block_given?
           self
         end
         def target_working_dir(target_working_dir)
-          @builder.append " /targetWorkingDir=#{@builder.format target_working_dir}"
-          yield @builder if block_given?
+          b.append " /targetWorkingDir=#{b.format target_working_dir}"
+          yield b if block_given?
           self
         end
         def temp_dir(temp_dir)
-          @builder.append " /tempDir=#{@builder.format temp_dir}"
-          yield @builder if block_given?
+          b.append " /tempDir=#{b.format temp_dir}"
+          yield b if block_given?
           self
         end
       end
       class Delete < CommandBase
-        def initialize(builder, configuration_file=nil)
-          super builder
-          @builder.append ' delete'
-          @builder.append " #{@builder.format configuration_file}" unless configuration_file.nil?
+        def initialize(underlying_builder, configuration_file=nil)
+          super underlying_builder
+          b.append ' delete'
+          b.append " #{b.format configuration_file}" unless configuration_file.nil?
         end
         def log_file(log_file)
-          @builder.append " /logFile=#{@builder.format log_file}"
-          yield @builder if block_given?
+          b.append " /logFile=#{b.format log_file}"
+          yield b if block_given?
           self
         end
         def source(source)
-          @builder.append " /source=#{@builder.format source}"
-          yield @builder if block_given?
+          b.append " /source=#{b.format source}"
+          yield b if block_given?
           self
         end
       end
       class List < CommandBase
-        def initialize(builder, configuration_file=nil)
-          super builder
-          @builder.append ' list'
-          @builder.append " #{@builder.format configuration_file}" unless configuration_file.nil?
+        def initialize(underlying_builder, configuration_file=nil)
+          super underlying_builder
+          b.append ' list'
+          b.append " #{b.format configuration_file}" unless configuration_file.nil?
         end
         def log_file(log_file)
-          @builder.append " /logFile=#{@builder.format log_file}"
-          yield @builder if block_given?
+          b.append " /logFile=#{b.format log_file}"
+          yield b if block_given?
           self
         end
         def output(snapshot_path)
-          @builder.append " /output=#{@builder.format snapshot_path}"
-          yield @builder if block_given?
+          b.append " /output=#{b.format snapshot_path}"
+          yield b if block_given?
           self
         end
         def source(source)
-          @builder.append " /source=#{@builder.format source}"
-          yield @builder if block_given?
+          b.append " /source=#{b.format source}"
+          yield b if block_given?
           self
         end
       end
       class Merge < CommandBase
-        def initialize(builder, configuration_file=nil)
-          super builder
-          @builder.append ' merge'
-          @builder.append " #{@builder.format configuration_file}" unless configuration_file.nil?
+        def initialize(underlying_builder, configuration_file=nil)
+          super underlying_builder
+          b.append ' merge'
+          b.append " #{b.format configuration_file}" unless configuration_file.nil?
         end
         def log_file(log_file)
-          @builder.append " /logFile=#{@builder.format log_file}"
-          yield @builder if block_given?
+          b.append " /logFile=#{b.format log_file}"
+          yield b if block_given?
           self
         end
         def output(snapshot_path)
-          @builder.append " /output=#{@builder.format snapshot_path}"
-          yield @builder if block_given?
+          b.append " /output=#{b.format snapshot_path}"
+          yield b if block_given?
           self
         end
         def source(source)
-          @builder.append " /source=#{@builder.format source}"
-          yield @builder if block_given?
+          b.append " /source=#{b.format source}"
+          yield b if block_given?
           self
         end
         def temp_dir(temp_dir)
-          @builder.append " /tempDir=#{@builder.format temp_dir}"
-          yield @builder if block_given?
+          b.append " /tempDir=#{b.format temp_dir}"
+          yield b if block_given?
           self
         end
       end
       class Report < CommandBase
-        def initialize(builder, configuration_file=nil)
-          super builder
-          @builder.append ' report'
-          @builder.append " #{@builder.format configuration_file}" unless configuration_file.nil?
+        def initialize(underlying_builder, configuration_file=nil)
+          super underlying_builder
+          b.append ' report'
+          b.append " #{b.format configuration_file}" unless configuration_file.nil?
         end
         def log_file(log_file)
-          @builder.append " /logFile=#{@builder.format log_file}"
-          yield @builder if block_given?
+          b.append " /logFile=#{b.format log_file}"
+          yield b if block_given?
           self
         end
         def output(snapshot_path)
-          @builder.append " /output=#{@builder.format snapshot_path}"
-          yield @builder if block_given?
+          b.append " /output=#{b.format snapshot_path}"
+          yield b if block_given?
           self
         end
         def report_type(report_type)
-          @builder.append " /reportType=#{@builder.format report_type}"
-          yield @builder if block_given?
+          b.append " /reportType=#{b.format report_type}"
+          yield b if block_given?
           self
         end
         def source(source)
-          @builder.append " /source=#{@builder.format source}"
-          yield @builder if block_given?
+          b.append " /source=#{b.format source}"
+          yield b if block_given?
           self
         end
       end
       class Version < CommandBase
-        def initialize(builder, output_file_name=nil)
-          super builder
-          @builder.append ' version'
-          @builder.append " #{@builder.format output_file_name}" unless output_file_name.nil?
+        def initialize(underlying_builder, output_file_name=nil)
+          super underlying_builder
+          b.append ' version'
+          b.append " #{b.format output_file_name}" unless output_file_name.nil?
         end
         def log_file(log_file)
-          @builder.append " /logFile=#{@builder.format log_file}"
-          yield @builder if block_given?
+          b.append " /logFile=#{b.format log_file}"
+          yield b if block_given?
           self
         end
       end
       class Zip < CommandBase
-        def initialize(builder, configuration_file=nil)
-          super builder
-          @builder.append ' zip'
-          @builder.append " #{@builder.format configuration_file}" unless configuration_file.nil?
+        def initialize(underlying_builder, configuration_file=nil)
+          super underlying_builder
+          b.append ' zip'
+          b.append " #{b.format configuration_file}" unless configuration_file.nil?
         end
         def log_file(log_file)
-          @builder.append " /logFile=#{@builder.format log_file}"
-          yield @builder if block_given?
+          b.append " /logFile=#{b.format log_file}"
+          yield b if block_given?
           self
         end
         def output(snapshot_path)
-          @builder.append " /output=#{@builder.format snapshot_path}"
-          yield @builder if block_given?
+          b.append " /output=#{b.format snapshot_path}"
+          yield b if block_given?
           self
         end
         def source(source)
-          @builder.append " /source=#{@builder.format source}"
-          yield @builder if block_given?
+          b.append " /source=#{b.format source}"
+          yield b if block_given?
           self
         end
       end
-      def dotcover
-        builder = CommandBuilder.new COMMAND_NAME
-        command = DotCover.new builder
-        yield builder if block_given?
-        command
-      end
+
     end
   end
-  def dotcover_20
-    builder = CommandBuilder.new DotCover::V20::COMMAND_NAME
-    command = DotCover::V20::DotCover.new builder
-    yield builder if block_given?
-    command
-  end
-end
+end

data/lib/fluent_command_builder/command_builders/installutil.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
+require File.expand_path(File.dirname(__FILE__) + '/../util')
+
+module FluentCommandBuilder
+  def installutil(&block)
+    InstallUtil.create &block
+  end
+  module InstallUtil
+    COMMAND_NAME = 'installUtil'
+    def self.create
+      b = UnderlyingBuilder.new FluentCommandBuilder::InstallUtil::COMMAND_NAME
+      c = version_module(InstallUtil).create b
+      yield b if block_given?
+      c
+    end
+  end
+end

data/lib/fluent_command_builder/command_builders/installutil_11.rb

@@ -1,59 +1,59 @@
 require File.expand_path(File.dirname(__FILE__) + '/../command_base')
-require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
+require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
 
 module FluentCommandBuilder
+  def installutil_11
+    FluentCommandBuilder::InstallUtil::V11.create { |b| yield b if block_given? }
+  end
   module InstallUtil
     module V11
-      COMMAND_NAME = 'installUtil'
+      def self.create
+        b = UnderlyingBuilder.new FluentCommandBuilder::InstallUtil::COMMAND_NAME
+        c = InstallUtil.new(b)
+        yield b if block_given?
+        c
+      end
+      def installutil
+        FluentCommandBuilder::InstallUtil::V11.create { |b| yield b if block_given? }
+      end
       class InstallUtil < CommandBase
-        def initialize(builder)
-          super builder
+        def initialize(underlying_builder)
+          super underlying_builder
         end
         def help(assembly_path=nil)
-          @builder.append ' /help'
-          @builder.append " #{@builder.format assembly_path}" unless assembly_path.nil?
-          yield @builder if block_given?
+          b.append ' /help'
+          b.append " #{b.format assembly_path}" unless assembly_path.nil?
+          yield b 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?
+          b.append ' /logFile'
+          b.append "=#{b.format file_name}" unless file_name.nil?
+          yield b if block_given?
           self
         end
         def log_to_console(bool)
-          @builder.append " /logToConsole=#{@builder.format bool}"
-          yield @builder if block_given?
+          b.append " /logToConsole=#{b.format bool}"
+          yield b if block_given?
           self
         end
         def show_call_stack
-          @builder.append ' /showCallStack'
-          yield @builder if block_given?
+          b.append ' /showCallStack'
+          yield b if block_given?
           self
         end
         def uninstall
-          @builder.append ' /uninstall'
-          yield @builder if block_given?
+          b.append ' /uninstall'
+          yield b if block_given?
           self
         end
         def assembly_file_name(assembly_file_name)
-          @builder.append " #{@builder.format assembly_file_name}"
-          yield @builder if block_given?
+          b.append " #{b.format assembly_file_name}"
+          yield b if block_given?
           self
         end
       end
-      def installutil
-        builder = CommandBuilder.new COMMAND_NAME
-        command = InstallUtil.new builder
-        yield builder if block_given?
-        command
-      end
+
     end
   end
-  def installutil_11
-    builder = CommandBuilder.new InstallUtil::V11::COMMAND_NAME
-    command = InstallUtil::V11::InstallUtil.new builder
-    yield builder if block_given?
-    command
-  end
-end
+end

data/lib/fluent_command_builder/command_builders/installutil_20.rb

@@ -1,64 +1,64 @@
 require File.expand_path(File.dirname(__FILE__) + '/../command_base')
-require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
+require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
 
 module FluentCommandBuilder
+  def installutil_20
+    FluentCommandBuilder::InstallUtil::V20.create { |b| yield b if block_given? }
+  end
   module InstallUtil
     module V20
-      COMMAND_NAME = 'installUtil'
+      def self.create
+        b = UnderlyingBuilder.new FluentCommandBuilder::InstallUtil::COMMAND_NAME
+        c = InstallUtil.new(b)
+        yield b if block_given?
+        c
+      end
+      def installutil
+        FluentCommandBuilder::InstallUtil::V20.create { |b| yield b if block_given? }
+      end
       class InstallUtil < CommandBase
-        def initialize(builder)
-          super builder
+        def initialize(underlying_builder)
+          super underlying_builder
         end
         def help(assembly_path=nil)
-          @builder.append ' /help'
-          @builder.append " #{@builder.format assembly_path}" unless assembly_path.nil?
-          yield @builder if block_given?
+          b.append ' /help'
+          b.append " #{b.format assembly_path}" unless assembly_path.nil?
+          yield b 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?
+          b.append ' /logFile'
+          b.append "=#{b.format file_name}" unless file_name.nil?
+          yield b if block_given?
           self
         end
         def assembly_strong_name(assembly_name)
-          @builder.append " /assemblyName=#{@builder.format assembly_name}"
-          yield @builder if block_given?
+          b.append " /assemblyName=#{b.format assembly_name}"
+          yield b if block_given?
           self
         end
         def log_to_console(bool)
-          @builder.append " /logToConsole=#{@builder.format bool}"
-          yield @builder if block_given?
+          b.append " /logToConsole=#{b.format bool}"
+          yield b if block_given?
           self
         end
         def show_call_stack
-          @builder.append ' /showCallStack'
-          yield @builder if block_given?
+          b.append ' /showCallStack'
+          yield b if block_given?
           self
         end
         def uninstall
-          @builder.append ' /uninstall'
-          yield @builder if block_given?
+          b.append ' /uninstall'
+          yield b if block_given?
           self
         end
         def assembly_file_name(assembly_file_name)
-          @builder.append " #{@builder.format assembly_file_name}"
-          yield @builder if block_given?
+          b.append " #{b.format assembly_file_name}"
+          yield b if block_given?
           self
         end
       end
-      def installutil
-        builder = CommandBuilder.new COMMAND_NAME
-        command = InstallUtil.new builder
-        yield builder if block_given?
-        command
-      end
+
     end
   end
-  def installutil_20
-    builder = CommandBuilder.new InstallUtil::V20::COMMAND_NAME
-    command = InstallUtil::V20::InstallUtil.new builder
-    yield builder if block_given?
-    command
-  end
-end
+end