fluent_command_builder 0.1.5 → 0.1.6

data/lib/fluent_command_builder/command_builders/msbuild_35.rb

@@ -4,134 +4,102 @@ module FluentCommandBuilder
   module MSBuild
     module V35
       class MSBuild
-        def initialize command=nil
-          @b = CommandBuilder.new command
-          @b.append 'MSBuild'
-          self
-        end
-        
-        def project_file project_file
-          @b.append "#{@b.format project_file}"
-          self
+        def initialize builder, project_file=nil
+          @builder = builder
+          @builder.append 'MSBuild'
+          @builder.append " #{@builder.format project_file}" unless project_file.nil?
         end
-        
         def help 
-          @b.append '/help'
+          @builder.append ' /help'
           self
         end
-        
         def no_logo 
-          @b.append '/noLogo'
+          @builder.append ' /noLogo'
           self
         end
-        
         def version 
-          @b.append '/version'
+          @builder.append ' /version'
           self
         end
-        
         def file file
-          @b.append "@#{@b.format file}"
+          @builder.append " @#{@builder.format file}"
           self
         end
-        
         def no_auto_response 
-          @b.append '/noAutoResponse'
+          @builder.append ' /noAutoResponse'
           self
         end
-        
         def target target
-          @b.append "/target:#{@b.format target, ';'}"
+          @builder.append " /target:#{@builder.format target, ';'}"
           self
         end
-        
         def property property
-          @b.append "/property:#{@b.format property, ';', '='}"
+          @builder.append " /property:#{@builder.format property, ';', '='}"
           self
         end
-        
         def logger logger
-          @b.append "/logger:#{@b.format logger}"
+          @builder.append " /logger:#{@builder.format logger}"
           self
         end
-        
         def distributed_logger logger
-          @b.append "/distributedLogger:#{@b.format logger}"
+          @builder.append " /distributedLogger:#{@builder.format logger}"
           self
         end
-        
         def console_logger_parameters parameters
-          @b.append "/consoleLoggerParameters:#{@b.format parameters}"
+          @builder.append " /consoleLoggerParameters:#{@builder.format parameters}"
           self
         end
-        
         def verbosity level
-          @b.append "/verbosity:#{@b.format level}"
+          @builder.append " /verbosity:#{@builder.format level}"
           self
         end
-        
         def no_console_logger 
-          @b.append '/noConsoleLogger'
+          @builder.append ' /noConsoleLogger'
           self
         end
-        
-        def validate schema
-          @b.append "/validate:#{@b.format schema}"
+        def validate schema=nil
+          @builder.append ' /validate'
+          @builder.append ":#{@builder.format schema}" unless schema.nil?
           self
         end
-        
         def max_cpu_count number
-          @b.append "/maxCpuCount:#{@b.format number}"
+          @builder.append " /maxCpuCount:#{@builder.format number}"
           self
         end
-        
         def ignore_project_extensions extensions
-          @b.append "/ignoreProjectExtensions:#{@b.format extensions, ';'}"
+          @builder.append " /ignoreProjectExtensions:#{@builder.format extensions, ';'}"
           self
         end
-        
         def file_logger 
-          @b.append '/fileLogger'
+          @builder.append ' /fileLogger'
           self
         end
-        
         def distributed_file_logger 
-          @b.append '/distributedFileLogger'
+          @builder.append ' /distributedFileLogger'
           self
         end
-        
         def file_logger_parameters parameters
-          @b.append "/fileLoggerParameters:#{@b.format parameters, ';', '='}"
+          @builder.append " /fileLoggerParameters:#{@builder.format parameters, ';', '='}"
           self
         end
-        
         def tools_version version
-          @b.append "/toolsVersion:#{@b.format version}"
+          @builder.append " /toolsVersion:#{@builder.format version}"
           self
         end
-        
         def node_reuse parameters
-          @b.append "/nodeReuse:#{@b.format parameters}"
+          @builder.append " /nodeReuse:#{@builder.format parameters}"
           self
         end
-        
-        def to_s
-          @b.to_s
+        def to_s 
+          @builder.to_s
         end
-        
       end
-      
-      def msbuild
-        MSBuild.new
+      def msbuild project_file=nil
+        MSBuild.new CommandBuilder.new, project_file
       end
-      
     end
-    
   end
-  
-  def msbuild_35
-    MSBuild::V35::MSBuild.new
+  def msbuild_35 project_file=nil
+    MSBuild::V35::MSBuild.new CommandBuilder.new, project_file
   end
-  
 end
-

data/lib/fluent_command_builder/command_builders/msbuild_40.rb

@@ -4,224 +4,105 @@ module FluentCommandBuilder
   module MSBuild
     module V40
       class MSBuild
-        def initialize command=nil
-          @b = CommandBuilder.new command
-          @b.append 'MSBuild'
-          self
-        end
-        
-        def project_file project_file
-          @b.append "#{@b.format project_file}"
-          self
+        def initialize builder, project_file=nil
+          @builder = builder
+          @builder.append 'MSBuild'
+          @builder.append " #{@builder.format project_file}" unless project_file.nil?
         end
-        
         def help 
-          @b.append '/help'
+          @builder.append ' /help'
           self
         end
-        
         def no_logo 
-          @b.append '/noLogo'
+          @builder.append ' /noLogo'
           self
         end
-        
         def version 
-          @b.append '/version'
+          @builder.append ' /version'
           self
         end
-        
         def file file
-          @b.append "@#{@b.format file}"
+          @builder.append " @#{@builder.format file}"
           self
         end
-        
         def no_auto_response 
-          @b.append '/noAutoResponse'
+          @builder.append ' /noAutoResponse'
           self
         end
-        
         def target target
-          @b.append "/target:#{@b.format target, ';'}"
+          @builder.append " /target:#{@builder.format target, ';'}"
           self
         end
-        
         def property property
-          @b.append "/property:#{@b.format property, ';', '='}"
+          @builder.append " /property:#{@builder.format property, ';', '='}"
           self
         end
-        
         def logger logger
-          @b.append "/logger:#{@b.format logger}"
+          @builder.append " /logger:#{@builder.format logger}"
           self
         end
-        
         def distributed_logger logger
-          @b.append "/distributedLogger:#{@b.format logger}"
+          @builder.append " /distributedLogger:#{@builder.format logger}"
           self
         end
-        
         def console_logger_parameters parameters
-          @b.append "/consoleLoggerParameters:#{@b.format parameters}"
+          @builder.append " /consoleLoggerParameters:#{@builder.format parameters}"
           self
         end
-        
         def verbosity level
-          @b.append "/verbosity:#{@b.format level}"
+          @builder.append " /verbosity:#{@builder.format level}"
           self
         end
-        
         def no_console_logger 
-          @b.append '/noConsoleLogger'
+          @builder.append ' /noConsoleLogger'
           self
         end
-        
-        def validate schema
-          @b.append "/validate:#{@b.format schema}"
+        def validate schema=nil
+          @builder.append ' /validate'
+          @builder.append ":#{@builder.format schema}" unless schema.nil?
           self
         end
-        
         def max_cpu_count number
-          @b.append "/maxCpuCount:#{@b.format number}"
+          @builder.append " /maxCpuCount:#{@builder.format number}"
           self
         end
-        
         def ignore_project_extensions extensions
-          @b.append "/ignoreProjectExtensions:#{@b.format extensions, ';'}"
-          self
-        end
-        
-        def file_logger 
-          @b.append '/fileLogger'
-          self
-        end
-        
-        def file_logger1 
-          @b.append '/fileLogger1'
-          self
-        end
-        
-        def file_logger2 
-          @b.append '/fileLogger2'
-          self
-        end
-        
-        def file_logger3 
-          @b.append '/fileLogger3'
-          self
-        end
-        
-        def file_logger4 
-          @b.append '/fileLogger4'
-          self
-        end
-        
-        def file_logger5 
-          @b.append '/fileLogger5'
-          self
-        end
-        
-        def file_logger6 
-          @b.append '/fileLogger6'
-          self
-        end
-        
-        def file_logger7 
-          @b.append '/fileLogger7'
-          self
-        end
-        
-        def file_logger8 
-          @b.append '/fileLogger8'
+          @builder.append " /ignoreProjectExtensions:#{@builder.format extensions, ';'}"
           self
         end
-        
-        def file_logger9 
-          @b.append '/fileLogger9'
+        def file_logger n=nil
+          @builder.append ' /fileLogger'
+          @builder.append "#{@builder.format n}" unless n.nil?
           self
         end
-        
         def distributed_file_logger 
-          @b.append '/distributedFileLogger'
-          self
-        end
-        
-        def file_logger_parameters parameters
-          @b.append "/fileLoggerParameters:#{@b.format parameters, ';', '='}"
-          self
-        end
-        
-        def file_logger_parameters1 parameters
-          @b.append "/fileLoggerParameters1:#{@b.format parameters, ';', '='}"
-          self
-        end
-        
-        def file_logger_parameters2 parameters
-          @b.append "/fileLoggerParameters2:#{@b.format parameters, ';', '='}"
-          self
-        end
-        
-        def file_logger_parameters3 parameters
-          @b.append "/fileLoggerParameters3:#{@b.format parameters, ';', '='}"
-          self
-        end
-        
-        def file_logger_parameters4 parameters
-          @b.append "/fileLoggerParameters4:#{@b.format parameters, ';', '='}"
-          self
-        end
-        
-        def file_logger_parameters5 parameters
-          @b.append "/fileLoggerParameters5:#{@b.format parameters, ';', '='}"
-          self
-        end
-        
-        def file_logger_parameters6 parameters
-          @b.append "/fileLoggerParameters6:#{@b.format parameters, ';', '='}"
+          @builder.append ' /distributedFileLogger'
           self
         end
-        
-        def file_logger_parameters7 parameters
-          @b.append "/fileLoggerParameters7:#{@b.format parameters, ';', '='}"
+        def file_logger_parameters parameters, n=nil
+          @builder.append ' /fileLoggerParameters'
+          @builder.append "#{@builder.format n}" unless n.nil?
+          @builder.append ":#{@builder.format parameters, ';', '='}"
           self
         end
-        
-        def file_logger_parameters8 parameters
-          @b.append "/fileLoggerParameters8:#{@b.format parameters, ';', '='}"
-          self
-        end
-        
-        def file_logger_parameters9 parameters
-          @b.append "/fileLoggerParameters9:#{@b.format parameters, ';', '='}"
-          self
-        end
-        
         def tools_version version
-          @b.append "/toolsVersion:#{@b.format version}"
+          @builder.append " /toolsVersion:#{@builder.format version}"
           self
         end
-        
         def node_reuse parameters
-          @b.append "/nodeReuse:#{@b.format parameters}"
+          @builder.append " /nodeReuse:#{@builder.format parameters}"
           self
         end
-        
-        def to_s
-          @b.to_s
+        def to_s 
+          @builder.to_s
         end
-        
       end
-      
-      def msbuild
-        MSBuild.new
+      def msbuild project_file=nil
+        MSBuild.new CommandBuilder.new, project_file
       end
-      
     end
-    
   end
-  
-  def msbuild_40
-    MSBuild::V40::MSBuild.new
+  def msbuild_40 project_file=nil
+    MSBuild::V40::MSBuild.new CommandBuilder.new, project_file
   end
-  
 end
-

data/lib/fluent_command_builder/command_builders/msdeploy_40.rb

@@ -4,179 +4,140 @@ module FluentCommandBuilder
   module MSDeploy
     module V40
       class MSDeploy
-        def initialize command=nil
-          @b = CommandBuilder.new command
-          @b.append 'MSDeploy'
-          self
+        def initialize builder
+          @builder = builder
+          @builder.append 'MSDeploy'
         end
-        
         def allow_untrusted bool
-          @b.append "-allowUntrusted:#{@b.format bool}"
+          @builder.append " -allowUntrusted:#{@builder.format bool}"
           self
         end
-        
         def app_host_config_dir path
-          @b.append "-appHostConfigDir:#{@b.format path}"
+          @builder.append " -appHostConfigDir:#{@builder.format path}"
           self
         end
-        
         def declare_param param
-          @b.append "-declareParam:#{@b.format param, ',', '='}"
+          @builder.append " -declareParam:#{@builder.format param, ',', '='}"
           self
         end
-        
         def declare_param_file xml_file
-          @b.append "-declareParamFile:#{@b.format xml_file}"
+          @builder.append " -declareParamFile:#{@builder.format xml_file}"
           self
         end
-        
         def dest provider
-          @b.append "-dest:#{@b.format provider}"
+          @builder.append " -dest:#{@builder.format provider}"
           self
         end
-        
         def disable_link link_extension
-          @b.append "-disableLink:#{@b.format link_extension}"
+          @builder.append " -disableLink:#{@builder.format link_extension}"
           self
         end
-        
         def disable_rule rule
-          @b.append "-disableRule:#{@b.format rule, ','}"
+          @builder.append " -disableRule:#{@builder.format rule, ','}"
           self
         end
-        
         def disable_skip_directive skip_directive_name
-          @b.append "-disableSkipDirective:#{@b.format skip_directive_name}"
+          @builder.append " -disableSkipDirective:#{@builder.format skip_directive_name}"
           self
         end
-        
         def enable_link link_extension
-          @b.append "-enableLink:#{@b.format link_extension}"
+          @builder.append " -enableLink:#{@builder.format link_extension}"
           self
         end
-        
         def enable_rule rule
-          @b.append "-enableRule:#{@b.format rule, ','}"
+          @builder.append " -enableRule:#{@builder.format rule, ','}"
           self
         end
-        
         def enable_skip_directive skip_directive_name
-          @b.append "-enableSkipDirective:#{@b.format skip_directive_name}"
+          @builder.append " -enableSkipDirective:#{@builder.format skip_directive_name}"
           self
         end
-        
         def post_sync command
-          @b.append "-postSync:#{@b.format command}"
+          @builder.append " -postSync:#{@builder.format command}"
           self
         end
-        
         def pre_sync command
-          @b.append "-preSync:#{@b.format command}"
+          @builder.append " -preSync:#{@builder.format command}"
           self
         end
-        
         def remove_param param
-          @b.append "-removeParam:#{@b.format param}"
+          @builder.append " -removeParam:#{@builder.format param}"
           self
         end
-        
         def replace arg
-          @b.append "-replace:#{@b.format arg}"
+          @builder.append " -replace:#{@builder.format arg}"
           self
         end
-        
         def retry_attempts number
-          @b.append "-retryAttempts:#{@b.format number}"
+          @builder.append " -retryAttempts:#{@builder.format number}"
           self
         end
-        
         def retry_interval milliseconds
-          @b.append "-retryInterval:#{@b.format milliseconds}"
+          @builder.append " -retryInterval:#{@builder.format milliseconds}"
           self
         end
-        
         def set_param param
-          @b.append "-setParam:#{@b.format param, ',', '='}"
+          @builder.append " -setParam:#{@builder.format param, ',', '='}"
           self
         end
-        
         def set_param_file xml_file
-          @b.append "-setParamFile:#{@b.format xml_file}"
+          @builder.append " -setParamFile:#{@builder.format xml_file}"
           self
         end
-        
         def show_secure 
-          @b.append '-showSecure'
+          @builder.append ' -showSecure'
           self
         end
-        
         def skip arg
-          @b.append "-skip:#{@b.format arg}"
+          @builder.append " -skip:#{@builder.format arg}"
           self
         end
-        
         def source provider
-          @b.append "-source:#{@b.format provider}"
+          @builder.append " -source:#{@builder.format provider}"
           self
         end
-        
         def unicode 
-          @b.append '-unicode'
+          @builder.append ' -unicode'
           self
         end
-        
         def use_check_sum 
-          @b.append '-useCheckSum'
+          @builder.append ' -useCheckSum'
           self
         end
-        
         def verb verb_name
-          @b.append "-verb:#{@b.format verb_name}"
+          @builder.append " -verb:#{@builder.format verb_name}"
           self
         end
-        
         def verbose 
-          @b.append '-verbose'
+          @builder.append ' -verbose'
           self
         end
-        
         def web_server_dir path
-          @b.append "-webServerDir:#{@b.format path}"
+          @builder.append " -webServerDir:#{@builder.format path}"
           self
         end
-        
         def whatif 
-          @b.append '-whatif'
+          @builder.append ' -whatif'
           self
         end
-        
         def xml 
-          @b.append '-xml'
+          @builder.append ' -xml'
           self
         end
-        
         def xpath path
-          @b.append "-xpath:#{@b.format path}"
+          @builder.append " -xpath:#{@builder.format path}"
           self
         end
-        
-        def to_s
-          @b.to_s
+        def to_s 
+          @builder.to_s
         end
-        
       end
-      
-      def msdeploy
-        MSDeploy.new
+      def msdeploy 
+        MSDeploy.new CommandBuilder.new
       end
-      
     end
-    
   end
-  
-  def msdeploy_40
-    MSDeploy::V40::MSDeploy.new
+  def msdeploy_40 
+    MSDeploy::V40::MSDeploy.new CommandBuilder.new
   end
-  
 end
-