fluent_command_builder 0.1.18 → 0.1.19

data/lib/fluent_command_builder/command_builders/mstest_2010.rb

@@ -4,101 +4,124 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module MSTest
     module V2010
+      COMMAND_NAME = 'MSTest'
       class MSTest < CommandBase
         def initialize builder
-          @builder = builder
-          @builder.append 'MSTest'
+          super builder
         end
         def test_container file_name
           @builder.append " /testContainer:#{@builder.format file_name}"
+          yield @builder if block_given?
           self
         end
         def test_metadata file_name
           @builder.append " /testMetadata:#{@builder.format file_name}"
+          yield @builder if block_given?
           self
         end
         def test_list list_list_path
           @builder.append " /testList:#{@builder.format list_list_path}"
+          yield @builder if block_given?
           self
         end
         def category test_category_filter
           @builder.append " /category:#{@builder.format test_category_filter}"
+          yield @builder if block_given?
           self
         end
         def test test_name
           @builder.append " /test:#{@builder.format test_name}"
+          yield @builder if block_given?
           self
         end
         def no_isolation 
           @builder.append ' /noIsolation'
+          yield @builder if block_given?
           self
         end
         def test_settings file_name
           @builder.append " /testSettings:#{@builder.format file_name}"
+          yield @builder if block_given?
           self
         end
         def run_config file_name
           @builder.append " /runConfig:#{@builder.format file_name}"
+          yield @builder if block_given?
           self
         end
         def results_file file_name
           @builder.append " /resultsFile:#{@builder.format file_name}"
+          yield @builder if block_given?
           self
         end
         def unique 
           @builder.append ' /unique'
+          yield @builder if block_given?
           self
         end
         def detail property_id
           @builder.append " /detail:#{@builder.format property_id}"
+          yield @builder if block_given?
           self
         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 use_std_err 
           @builder.append ' /useStdErr'
+          yield @builder if block_given?
           self
         end
         def publish server_name
           @builder.append " /publish:#{@builder.format server_name}"
+          yield @builder if block_given?
           self
         end
         def publish_results_file file_name
           @builder.append " /publishResultsFile:#{@builder.format file_name}"
+          yield @builder if block_given?
           self
         end
         def publish_build build_id
           @builder.append " /publishBuild:#{@builder.format build_id}"
+          yield @builder if block_given?
           self
         end
         def team_project team_project_name
           @builder.append " /teamProject:#{@builder.format team_project_name}"
+          yield @builder if block_given?
           self
         end
         def platform platform
           @builder.append " /platform:#{@builder.format platform}"
+          yield @builder if block_given?
           self
         end
         def flavor flavor
           @builder.append " /flavor:#{@builder.format flavor}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def mstest 
-        MSTest.new CommandBuilder.new
+        builder = CommandBuilder.new COMMAND_NAME
+        command = MSTest.new builder
+        yield builder if block_given?
+        command
       end
     end
   end
   def mstest_2010 
-    MSTest::V2010::MSTest.new CommandBuilder.new
+    builder = CommandBuilder.new MSTest::V2010::COMMAND_NAME
+    command = MSTest::V2010::MSTest.new builder
+    yield builder if block_given?
+    command
   end
 end

data/lib/fluent_command_builder/command_builders/netsh_2008.rb

@@ -4,10 +4,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module Netsh
     module V2008
+      COMMAND_NAME = 'netsh'
       class Netsh < CommandBase
         def initialize builder
-          @builder = builder
-          @builder.append 'netsh'
+          super builder
         end
         def advfirewall 
           Advfirewall.new @builder
@@ -15,25 +15,19 @@ module FluentCommandBuilder
         def http 
           Http.new @builder
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Advfirewall < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' advfirewall'
         end
         def firewall 
           Firewall.new @builder
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Firewall < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' firewall'
         end
         def add_rule rule_name, direction, action
@@ -48,281 +42,318 @@ module FluentCommandBuilder
         def show_rule rule_name
           ShowRule.new @builder, rule_name
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class AddRule < CommandBase
         def initialize builder, rule_name, direction, action
-          @builder = builder
+          super builder
           @builder.append " add rule name=#{@builder.format rule_name} dir=#{@builder.format direction} action=#{@builder.format action}"
         end
         def program path
           @builder.append " program=#{@builder.format path}"
+          yield @builder if block_given?
           self
         end
         def service service_short_name
           @builder.append " service=#{@builder.format service_short_name}"
+          yield @builder if block_given?
           self
         end
         def description rule_description
           @builder.append " description=#{@builder.format rule_description}"
+          yield @builder if block_given?
           self
         end
         def enable enable
           @builder.append " enable=#{@builder.format enable}"
+          yield @builder if block_given?
           self
         end
         def profile profile
           @builder.append " profile=#{@builder.format profile}"
+          yield @builder if block_given?
           self
         end
         def local_ip address
           @builder.append " localIp=#{@builder.format address, ','}"
+          yield @builder if block_given?
           self
         end
         def remote_ip address
           @builder.append " remoteIp=#{@builder.format address, ','}"
+          yield @builder if block_given?
           self
         end
         def local_port port
           @builder.append " localPort=#{@builder.format port, ','}"
+          yield @builder if block_given?
           self
         end
         def remote_port port
           @builder.append " remotePort=#{@builder.format port, ','}"
+          yield @builder if block_given?
           self
         end
         def protocol protocol
           @builder.append " protocol=#{@builder.format protocol}"
+          yield @builder if block_given?
           self
         end
         def interface_type type
           @builder.append " interfaceType=#{@builder.format type}"
+          yield @builder if block_given?
           self
         end
         def remote_computer_group sddl_string
           @builder.append " rmtcomputergrp=#{@builder.format sddl_string}"
+          yield @builder if block_given?
           self
         end
         def remote_user_group sddl_string
           @builder.append " rmtusgrp=#{@builder.format sddl_string}"
+          yield @builder if block_given?
           self
         end
         def edge edge
           @builder.append " edge=#{@builder.format edge}"
+          yield @builder if block_given?
           self
         end
         def security security
           @builder.append " security=#{@builder.format security}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class DeleteRule < CommandBase
         def initialize builder, rule_name
-          @builder = builder
+          super builder
           @builder.append " delete rule name=#{@builder.format rule_name}"
         end
         def dir direction
           @builder.append " dir=#{@builder.format direction}"
+          yield @builder if block_given?
           self
         end
         def profile profile
           @builder.append " profile=#{@builder.format profile}"
+          yield @builder if block_given?
           self
         end
         def program path
           @builder.append " program=#{@builder.format path}"
+          yield @builder if block_given?
           self
         end
         def service service_short_name
           @builder.append " service=#{@builder.format service_short_name}"
+          yield @builder if block_given?
           self
         end
         def local_ip address
           @builder.append " localIp=#{@builder.format address, ','}"
+          yield @builder if block_given?
           self
         end
         def remote_ip address
           @builder.append " remoteIp=#{@builder.format address, ','}"
+          yield @builder if block_given?
           self
         end
         def local_port port
           @builder.append " localPort=#{@builder.format port, ','}"
+          yield @builder if block_given?
           self
         end
         def remote_port port
           @builder.append " remotePort=#{@builder.format port, ','}"
+          yield @builder if block_given?
           self
         end
         def protocol protocol
           @builder.append " protocol=#{@builder.format protocol}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class SetRule < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' set rule'
         end
         def group group_name
           @builder.append " group=#{@builder.format group_name}"
+          yield @builder if block_given?
           self
         end
         def dir direction
           @builder.append " dir=#{@builder.format direction}"
+          yield @builder if block_given?
           self
         end
         def profile profile
           @builder.append " profile=#{@builder.format profile}"
+          yield @builder if block_given?
           self
         end
         def program path
           @builder.append " program=#{@builder.format path}"
+          yield @builder if block_given?
           self
         end
         def service service_short_name
           @builder.append " service=#{@builder.format service_short_name}"
+          yield @builder if block_given?
           self
         end
         def local_ip address
           @builder.append " localIp=#{@builder.format address, ','}"
+          yield @builder if block_given?
           self
         end
         def remote_ip address
           @builder.append " remoteIp=#{@builder.format address, ','}"
+          yield @builder if block_given?
           self
         end
         def local_port port
           @builder.append " localPort=#{@builder.format port, ','}"
+          yield @builder if block_given?
           self
         end
         def remote_port port
           @builder.append " remotePort=#{@builder.format port, ','}"
+          yield @builder if block_given?
           self
         end
         def protocol protocol
           @builder.append " protocol=#{@builder.format protocol}"
+          yield @builder if block_given?
           self
         end
         def new 
           New.new @builder
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class New < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' new'
         end
         def name rule_name
           @builder.append " name=#{@builder.format rule_name}"
+          yield @builder if block_given?
           self
         end
         def dir direction
           @builder.append " dir=#{@builder.format direction}"
+          yield @builder if block_given?
           self
         end
         def program path
           @builder.append " program=#{@builder.format path}"
+          yield @builder if block_given?
           self
         end
         def service service_short_name
           @builder.append " service=#{@builder.format service_short_name}"
+          yield @builder if block_given?
           self
         end
         def action action
           @builder.append " action=#{@builder.format action}"
+          yield @builder if block_given?
           self
         end
         def description rule_description
           @builder.append " description=#{@builder.format rule_description}"
+          yield @builder if block_given?
           self
         end
         def enable enable
           @builder.append " enable=#{@builder.format enable}"
+          yield @builder if block_given?
           self
         end
         def profile profile
           @builder.append " profile=#{@builder.format profile}"
+          yield @builder if block_given?
           self
         end
         def local_ip address
           @builder.append " localIp=#{@builder.format address, ','}"
+          yield @builder if block_given?
           self
         end
         def remote_ip address
           @builder.append " remoteIp=#{@builder.format address, ','}"
+          yield @builder if block_given?
           self
         end
         def local_port port
           @builder.append " localPort=#{@builder.format port, ','}"
+          yield @builder if block_given?
           self
         end
         def remote_port port
           @builder.append " remotePort=#{@builder.format port, ','}"
+          yield @builder if block_given?
           self
         end
         def protocol protocol
           @builder.append " protocol=#{@builder.format protocol}"
+          yield @builder if block_given?
           self
         end
         def interface_type type
           @builder.append " interfaceType=#{@builder.format type}"
+          yield @builder if block_given?
           self
         end
         def remote_computer_group sddl_string
           @builder.append " rmtcomputergrp=#{@builder.format sddl_string}"
+          yield @builder if block_given?
           self
         end
         def remote_user_group sddl_string
           @builder.append " rmtusgrp=#{@builder.format sddl_string}"
+          yield @builder if block_given?
           self
         end
         def edge edge
           @builder.append " edge=#{@builder.format edge}"
+          yield @builder if block_given?
           self
         end
         def security security
           @builder.append " security=#{@builder.format security}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class ShowRule < CommandBase
         def initialize builder, rule_name
-          @builder = builder
+          super builder
           @builder.append " show rule name=#{@builder.format rule_name}"
         end
         def profile profile
           @builder.append " profile=#{@builder.format profile}"
+          yield @builder if block_given?
           self
         end
         def type type
           @builder.append " type=#{@builder.format type}"
+          yield @builder if block_given?
           self
         end
         def verbose 
           @builder.append ' verbose'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Http < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' http'
         end
         def add_url_acl url
@@ -330,43 +361,48 @@ module FluentCommandBuilder
         end
         def delete_url_acl url
           @builder.append " delete urlacl url=#{@builder.format url}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class AddUrlAcl < CommandBase
         def initialize builder, url
-          @builder = builder
+          super builder
           @builder.append " add urlacl url=#{@builder.format url}"
         end
         def user user
           @builder.append " user=#{@builder.format user}"
+          yield @builder if block_given?
           self
         end
         def listen listen
           @builder.append " listen=#{@builder.format listen}"
+          yield @builder if block_given?
           self
         end
         def delegate delegate
           @builder.append " delegate=#{@builder.format delegate}"
+          yield @builder if block_given?
           self
         end
         def sddl sddl
           @builder.append " sddl=#{@builder.format sddl}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def netsh 
-        Netsh.new CommandBuilder.new
+        builder = CommandBuilder.new COMMAND_NAME
+        command = Netsh.new builder
+        yield builder if block_given?
+        command
       end
     end
   end
   def netsh_2008 
-    Netsh::V2008::Netsh.new CommandBuilder.new
+    builder = CommandBuilder.new Netsh::V2008::COMMAND_NAME
+    command = Netsh::V2008::Netsh.new builder
+    yield builder if block_given?
+    command
   end
 end