fluent_command_builder 0.5.6 → 0.6.0

data/lib/fluent_command_builder/command_builders/installutil_35.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_35
+    FluentCommandBuilder::InstallUtil::V35.create { |b| yield b if block_given? }
+  end
   module InstallUtil
     module V35
-      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::V35.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_35
-    builder = CommandBuilder.new InstallUtil::V35::COMMAND_NAME
-    command = InstallUtil::V35::InstallUtil.new builder
-    yield builder if block_given?
-    command
-  end
-end
+end

data/lib/fluent_command_builder/command_builders/installutil_40.rb

@@ -1,70 +1,70 @@
 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_40
+    FluentCommandBuilder::InstallUtil::V40.create { |b| yield b if block_given? }
+  end
   module InstallUtil
     module V40
-      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::V40.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 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 install_state_dir(directory_name=nil)
-          @builder.append ' /installStateDir'
-          @builder.append "=#{@builder.format directory_name}" unless directory_name.nil?
-          yield @builder if block_given?
+          b.append ' /installStateDir'
+          b.append "=#{b.format directory_name}" unless directory_name.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_40
-    builder = CommandBuilder.new InstallUtil::V40::COMMAND_NAME
-    command = InstallUtil::V40::InstallUtil.new builder
-    yield builder if block_given?
-    command
-  end
-end
+end

data/lib/fluent_command_builder/command_builders/msbuild.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 msbuild(&block)
+    MSBuild.create &block
+  end
+  module MSBuild
+    COMMAND_NAME = 'MSBuild'
+    def self.create
+      b = UnderlyingBuilder.new FluentCommandBuilder::MSBuild::COMMAND_NAME
+      c = version_module(MSBuild).create b
+      yield b if block_given?
+      c
+    end
+  end
+end

data/lib/fluent_command_builder/command_builders/msbuild_20.rb

@@ -1,89 +1,89 @@
 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 msbuild_20(project_file=nil)
+    FluentCommandBuilder::MSBuild::V20.create(project_file) { |b| yield b if block_given? }
+  end
   module MSBuild
     module V20
-      COMMAND_NAME = 'MSBuild'
+      def self.create(project_file=nil)
+        b = UnderlyingBuilder.new FluentCommandBuilder::MSBuild::COMMAND_NAME
+        c = MSBuild.new(b, project_file)
+        yield b if block_given?
+        c
+      end
+      def msbuild(project_file=nil)
+        FluentCommandBuilder::MSBuild::V20.create(project_file) { |b| yield b if block_given? }
+      end
       class MSBuild < CommandBase
-        def initialize(builder, project_file=nil)
-          super builder
-          @builder.append " #{@builder.format project_file}" unless project_file.nil?
+        def initialize(underlying_builder, project_file=nil)
+          super underlying_builder
+          b.append " #{b.format project_file}" unless project_file.nil?
         end
         def help
-          @builder.append ' /help'
-          yield @builder if block_given?
+          b.append ' /help'
+          yield b if block_given?
           self
         end
         def no_logo
-          @builder.append ' /noLogo'
-          yield @builder if block_given?
+          b.append ' /noLogo'
+          yield b if block_given?
           self
         end
         def version
-          @builder.append ' /version'
-          yield @builder if block_given?
+          b.append ' /version'
+          yield b if block_given?
           self
         end
         def file(file)
-          @builder.append " @#{@builder.format file}"
-          yield @builder if block_given?
+          b.append " @#{b.format file}"
+          yield b if block_given?
           self
         end
         def no_auto_response
-          @builder.append ' /noAutoResponse'
-          yield @builder if block_given?
+          b.append ' /noAutoResponse'
+          yield b if block_given?
           self
         end
         def target(target)
-          @builder.append " /target:#{@builder.format target, ';'}"
-          yield @builder if block_given?
+          b.append " /target:#{b.format target, ';'}"
+          yield b if block_given?
           self
         end
         def property(property)
-          @builder.append " /property:#{@builder.format property, ';', '='}"
-          yield @builder if block_given?
+          b.append " /property:#{b.format property, ';', '='}"
+          yield b if block_given?
           self
         end
         def logger(logger)
-          @builder.append " /logger:#{@builder.format logger}"
-          yield @builder if block_given?
+          b.append " /logger:#{b.format logger}"
+          yield b if block_given?
           self
         end
         def console_logger_parameters(parameters)
-          @builder.append " /consoleLoggerParameters:#{@builder.format parameters}"
-          yield @builder if block_given?
+          b.append " /consoleLoggerParameters:#{b.format parameters}"
+          yield b if block_given?
           self
         end
         def verbosity(level)
-          @builder.append " /verbosity:#{@builder.format level}"
-          yield @builder if block_given?
+          b.append " /verbosity:#{b.format level}"
+          yield b if block_given?
           self
         end
         def no_console_logger
-          @builder.append ' /noConsoleLogger'
-          yield @builder if block_given?
+          b.append ' /noConsoleLogger'
+          yield b 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?
+          b.append ' /validate'
+          b.append ":#{b.format schema}" unless schema.nil?
+          yield b if block_given?
           self
         end
       end
-      def msbuild(project_file=nil)
-        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)
-    builder = CommandBuilder.new MSBuild::V20::COMMAND_NAME
-    command = MSBuild::V20::MSBuild.new builder, project_file
-    yield builder if block_given?
-    command
-  end
-end
+end

data/lib/fluent_command_builder/command_builders/msbuild_30.rb

@@ -1,89 +1,89 @@
 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 msbuild_30(project_file=nil)
+    FluentCommandBuilder::MSBuild::V30.create(project_file) { |b| yield b if block_given? }
+  end
   module MSBuild
     module V30
-      COMMAND_NAME = 'MSBuild'
+      def self.create(project_file=nil)
+        b = UnderlyingBuilder.new FluentCommandBuilder::MSBuild::COMMAND_NAME
+        c = MSBuild.new(b, project_file)
+        yield b if block_given?
+        c
+      end
+      def msbuild(project_file=nil)
+        FluentCommandBuilder::MSBuild::V30.create(project_file) { |b| yield b if block_given? }
+      end
       class MSBuild < CommandBase
-        def initialize(builder, project_file=nil)
-          super builder
-          @builder.append " #{@builder.format project_file}" unless project_file.nil?
+        def initialize(underlying_builder, project_file=nil)
+          super underlying_builder
+          b.append " #{b.format project_file}" unless project_file.nil?
         end
         def help
-          @builder.append ' /help'
-          yield @builder if block_given?
+          b.append ' /help'
+          yield b if block_given?
           self
         end
         def no_logo
-          @builder.append ' /noLogo'
-          yield @builder if block_given?
+          b.append ' /noLogo'
+          yield b if block_given?
           self
         end
         def version
-          @builder.append ' /version'
-          yield @builder if block_given?
+          b.append ' /version'
+          yield b if block_given?
           self
         end
         def file(file)
-          @builder.append " @#{@builder.format file}"
-          yield @builder if block_given?
+          b.append " @#{b.format file}"
+          yield b if block_given?
           self
         end
         def no_auto_response
-          @builder.append ' /noAutoResponse'
-          yield @builder if block_given?
+          b.append ' /noAutoResponse'
+          yield b if block_given?
           self
         end
         def target(target)
-          @builder.append " /target:#{@builder.format target, ';'}"
-          yield @builder if block_given?
+          b.append " /target:#{b.format target, ';'}"
+          yield b if block_given?
           self
         end
         def property(property)
-          @builder.append " /property:#{@builder.format property, ';', '='}"
-          yield @builder if block_given?
+          b.append " /property:#{b.format property, ';', '='}"
+          yield b if block_given?
           self
         end
         def logger(logger)
-          @builder.append " /logger:#{@builder.format logger}"
-          yield @builder if block_given?
+          b.append " /logger:#{b.format logger}"
+          yield b if block_given?
           self
         end
         def console_logger_parameters(parameters)
-          @builder.append " /consoleLoggerParameters:#{@builder.format parameters}"
-          yield @builder if block_given?
+          b.append " /consoleLoggerParameters:#{b.format parameters}"
+          yield b if block_given?
           self
         end
         def verbosity(level)
-          @builder.append " /verbosity:#{@builder.format level}"
-          yield @builder if block_given?
+          b.append " /verbosity:#{b.format level}"
+          yield b if block_given?
           self
         end
         def no_console_logger
-          @builder.append ' /noConsoleLogger'
-          yield @builder if block_given?
+          b.append ' /noConsoleLogger'
+          yield b 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?
+          b.append ' /validate'
+          b.append ":#{b.format schema}" unless schema.nil?
+          yield b if block_given?
           self
         end
       end
-      def msbuild(project_file=nil)
-        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)
-    builder = CommandBuilder.new MSBuild::V30::COMMAND_NAME
-    command = MSBuild::V30::MSBuild.new builder, project_file
-    yield builder if block_given?
-    command
-  end
-end
+end