fluent_command_builder 0.7.8 → 0.7.9

data/lib/fluent_command_builder.rb

@@ -45,7 +45,7 @@ require File.expand_path(File.dirname(__FILE__) + '/fluent_command_builder/comma
 require File.expand_path(File.dirname(__FILE__) + '/fluent_command_builder/command_builders/security_osx.rb')
 require File.expand_path(File.dirname(__FILE__) + '/fluent_command_builder/command_builders/security_osx_107.rb')
 require File.expand_path(File.dirname(__FILE__) + '/fluent_command_builder/command_builders/sevenzip.rb')
-require File.expand_path(File.dirname(__FILE__) + '/fluent_command_builder/command_builders/sevenzip_92.rb')
+require File.expand_path(File.dirname(__FILE__) + '/fluent_command_builder/command_builders/sevenzip_920.rb')
 require File.expand_path(File.dirname(__FILE__) + '/fluent_command_builder/command_builders/simian.rb')
 require File.expand_path(File.dirname(__FILE__) + '/fluent_command_builder/command_builders/simian_23.rb')
 require File.expand_path(File.dirname(__FILE__) + '/fluent_command_builder/command_builders/team_foundation.rb')

data/lib/fluent_command_builder/command_builders/appcfg_python.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def appcfg_python(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module AppCfgPython
     COMMAND_NAME = 'appcfg.py'
+    def self.version_detector
+      @version_detector ||= AppEnginePythonVersionDetector.new COMMAND_NAME
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(AppCfgPython).create &block
     end

data/lib/fluent_command_builder/command_builders/aspnet_compiler.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def aspnet_compiler(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module AspnetCompiler
     COMMAND_NAME = 'aspnet_compiler'
+    def self.version_detector
+      @version_detector ||= MSBuild.version_detector
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(AspnetCompiler).create &block
     end

data/lib/fluent_command_builder/command_builders/bundle.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def bundle(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module Bundle
     COMMAND_NAME = 'bundle'
+    def self.version_detector
+      @version_detector ||= StandardVersionDetector.new COMMAND_NAME, '--version'
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(Bundle).create &block
     end

data/lib/fluent_command_builder/command_builders/cucumber.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def cucumber(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module Cucumber
     COMMAND_NAME = 'cucumber'
+    def self.version_detector
+      @version_detector ||= StandardVersionDetector.new COMMAND_NAME, '--version'
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(Cucumber).create &block
     end

data/lib/fluent_command_builder/command_builders/dev_appserver_python.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def dev_appserver_python(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module DevAppserverPython
     COMMAND_NAME = 'dev_appserver.py'
+    def self.version_detector
+      @version_detector ||= AppEnginePythonVersionDetector.new COMMAND_NAME
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(DevAppserverPython).create &block
     end

data/lib/fluent_command_builder/command_builders/dotcover.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def dotcover(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module DotCover
     COMMAND_NAME = 'dotCover'
+    def self.version_detector
+      @version_detector ||= StandardVersionDetector.new COMMAND_NAME, 'version'
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(DotCover).create &block
     end

data/lib/fluent_command_builder/command_builders/installutil.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def installutil(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module InstallUtil
     COMMAND_NAME = 'installUtil'
+    def self.version_detector
+      @version_detector ||= StandardVersionDetector.new COMMAND_NAME
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(InstallUtil).create &block
     end

data/lib/fluent_command_builder/command_builders/msbuild.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def msbuild(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module MSBuild
     COMMAND_NAME = 'MSBuild'
+    def self.version_detector
+      @version_detector ||= StandardVersionDetector.new COMMAND_NAME, '/version'
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(MSBuild).create &block
     end

data/lib/fluent_command_builder/command_builders/msdeploy.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def msdeploy(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module MSDeploy
     COMMAND_NAME = 'MSDeploy'
+    def self.version_detector
+      @version_detector ||= StandardVersionDetector.new COMMAND_NAME
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(MSDeploy).create &block
     end

data/lib/fluent_command_builder/command_builders/mstest.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def mstest(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module MSTest
     COMMAND_NAME = 'MSTest'
+    def self.version_detector
+      @version_detector ||= StandardVersionDetector.new COMMAND_NAME, '/help'
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(MSTest).create &block
     end

data/lib/fluent_command_builder/command_builders/netsh.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def netsh(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module Netsh
     COMMAND_NAME = 'netsh'
+    def self.version_detector
+      @version_detector ||= WindowsVersionDetector.new
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(Netsh).create &block
     end

data/lib/fluent_command_builder/command_builders/nuget.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def nuget(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module NuGet
     COMMAND_NAME = 'NuGet'
+    def self.version_detector
+      @version_detector ||= StandardVersionDetector.new COMMAND_NAME
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(NuGet).create &block
     end

data/lib/fluent_command_builder/command_builders/nunit.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def nunit(&block)
@@ -7,6 +6,15 @@ module FluentCommandBuilder
   end
   module NUnit
     COMMAND_NAME = 'nunit-console'
+    def self.version_detector
+      @version_detector ||= StandardVersionDetector.new COMMAND_NAME, '/help'
+    end
+    def self.version_detector=(value)
+      @version_detector = value
+    end
+    def self.version(path=nil)
+      self.version_detector.version path
+    end
     def self.create(&block)
       version_module(NUnit).create &block
     end

data/lib/fluent_command_builder/command_builders/nunit_25.rb

@@ -42,117 +42,117 @@ module FluentCommandBuilder
           self
         end
         def fixture(fixture)
-          @b.append " /fixture:#{@b.format fixture}"
+          @b.append " -fixture:#{@b.format fixture}"
           yield @b if block_given?
           self
         end
         def load(fixture)
-          @b.append " /load:#{@b.format fixture}"
+          @b.append " -load:#{@b.format fixture}"
           yield @b if block_given?
           self
         end
         def run(test)
-          @b.append " /run:#{@b.format test}"
+          @b.append " -run:#{@b.format test}"
           yield @b if block_given?
           self
         end
         def config(config)
-          @b.append " /config:#{@b.format config}"
+          @b.append " -config:#{@b.format config}"
           yield @b if block_given?
           self
         end
         def xml(file)
-          @b.append " /xml:#{@b.format file}"
+          @b.append " -xml:#{@b.format file}"
           yield @b if block_given?
           self
         end
         def xml_console
-          @b.append ' /xmlConsole'
+          @b.append ' -xmlConsole'
           yield @b if block_given?
           self
         end
         def output(file)
-          @b.append " /output:#{@b.format file}"
+          @b.append " -output:#{@b.format file}"
           yield @b if block_given?
           self
         end
         def out(file)
-          @b.append " /out:#{@b.format file}"
+          @b.append " -out:#{@b.format file}"
           yield @b if block_given?
           self
         end
         def err(file)
-          @b.append " /err:#{@b.format file}"
+          @b.append " -err:#{@b.format file}"
           yield @b if block_given?
           self
         end
         def labels
-          @b.append ' /labels'
+          @b.append ' -labels'
           yield @b if block_given?
           self
         end
         def trace(level)
-          @b.append " /trace:#{@b.format level}"
+          @b.append " -trace:#{@b.format level}"
           yield @b if block_given?
           self
         end
         def include(category)
-          @b.append " /include:#{@b.format category}"
+          @b.append " -include:#{@b.format category}"
           yield @b if block_given?
           self
         end
         def exclude(category)
-          @b.append " /exclude:#{@b.format category}"
+          @b.append " -exclude:#{@b.format category}"
           yield @b if block_given?
           self
         end
         def process(process)
-          @b.append " /process:#{@b.format process}"
+          @b.append " -process:#{@b.format process}"
           yield @b if block_given?
           self
         end
         def domain(domain)
-          @b.append " /domain:#{@b.format domain}"
+          @b.append " -domain:#{@b.format domain}"
           yield @b if block_given?
           self
         end
         def framework(framework)
-          @b.append " /framework:#{@b.format framework}"
+          @b.append " -framework:#{@b.format framework}"
           yield @b if block_given?
           self
         end
         def no_shadow
-          @b.append ' /noShadow'
+          @b.append ' -noShadow'
           yield @b if block_given?
           self
         end
         def no_thread
-          @b.append ' /noThread'
+          @b.append ' -noThread'
           yield @b if block_given?
           self
         end
         def timeout(timeout)
-          @b.append " /timeout:#{@b.format timeout}"
+          @b.append " -timeout:#{@b.format timeout}"
           yield @b if block_given?
           self
         end
         def wait
-          @b.append ' /wait'
+          @b.append ' -wait'
           yield @b if block_given?
           self
         end
         def no_logo
-          @b.append ' /noLogo'
+          @b.append ' -noLogo'
           yield @b if block_given?
           self
         end
         def no_dots
-          @b.append ' /noDots'
+          @b.append ' -noDots'
           yield @b if block_given?
           self
         end
         def help
-          @b.append ' /help'
+          @b.append ' -help'
           yield @b if block_given?
           self
         end

data/lib/fluent_command_builder/command_builders/nunit_26.rb

@@ -42,157 +42,157 @@ module FluentCommandBuilder
           self
         end
         def fixture(fixture)
-          @b.append " /fixture:#{@b.format fixture}"
+          @b.append " -fixture:#{@b.format fixture}"
           yield @b if block_given?
           self
         end
         def load(fixture)
-          @b.append " /load:#{@b.format fixture}"
+          @b.append " -load:#{@b.format fixture}"
           yield @b if block_given?
           self
         end
         def run(test)
-          @b.append " /run:#{@b.format test}"
+          @b.append " -run:#{@b.format test}"
           yield @b if block_given?
           self
         end
         def run_list(file)
-          @b.append " /runList:#{@b.format file}"
+          @b.append " -runList:#{@b.format file}"
           yield @b if block_given?
           self
         end
         def config(config)
-          @b.append " /config:#{@b.format config}"
+          @b.append " -config:#{@b.format config}"
           yield @b if block_given?
           self
         end
         def result(file)
-          @b.append " /result:#{@b.format file}"
+          @b.append " -result:#{@b.format file}"
           yield @b if block_given?
           self
         end
         def xml(file)
-          @b.append " /xml:#{@b.format file}"
+          @b.append " -xml:#{@b.format file}"
           yield @b if block_given?
           self
         end
         def xml_console
-          @b.append ' /xmlConsole'
+          @b.append ' -xmlConsole'
           yield @b if block_given?
           self
         end
         def no_result
-          @b.append ' /noResult'
+          @b.append ' -noResult'
           yield @b if block_given?
           self
         end
         def no_xml
-          @b.append ' /noXml'
+          @b.append ' -noXml'
           yield @b if block_given?
           self
         end
         def output(file)
-          @b.append " /output:#{@b.format file}"
+          @b.append " -output:#{@b.format file}"
           yield @b if block_given?
           self
         end
         def out(file)
-          @b.append " /out:#{@b.format file}"
+          @b.append " -out:#{@b.format file}"
           yield @b if block_given?
           self
         end
         def err(file)
-          @b.append " /err:#{@b.format file}"
+          @b.append " -err:#{@b.format file}"
           yield @b if block_given?
           self
         end
         def work(directory)
-          @b.append " /work:#{@b.format directory}"
+          @b.append " -work:#{@b.format directory}"
           yield @b if block_given?
           self
         end
         def labels
-          @b.append ' /labels'
+          @b.append ' -labels'
           yield @b if block_given?
           self
         end
         def trace(level)
-          @b.append " /trace:#{@b.format level}"
+          @b.append " -trace:#{@b.format level}"
           yield @b if block_given?
           self
         end
         def include(category)
-          @b.append " /include:#{@b.format category}"
+          @b.append " -include:#{@b.format category}"
           yield @b if block_given?
           self
         end
         def exclude(category)
-          @b.append " /exclude:#{@b.format category}"
+          @b.append " -exclude:#{@b.format category}"
           yield @b if block_given?
           self
         end
         def framework(framework)
-          @b.append " /framework:#{@b.format framework}"
+          @b.append " -framework:#{@b.format framework}"
           yield @b if block_given?
           self
         end
         def process(process)
-          @b.append " /process:#{@b.format process}"
+          @b.append " -process:#{@b.format process}"
           yield @b if block_given?
           self
         end
         def domain(domain)
-          @b.append " /domain:#{@b.format domain}"
+          @b.append " -domain:#{@b.format domain}"
           yield @b if block_given?
           self
         end
         def apartment(apartment)
-          @b.append " /apartment:#{@b.format apartment}"
+          @b.append " -apartment:#{@b.format apartment}"
           yield @b if block_given?
           self
         end
         def no_shadow
-          @b.append ' /noShadow'
+          @b.append ' -noShadow'
           yield @b if block_given?
           self
         end
         def no_thread
-          @b.append ' /noThread'
+          @b.append ' -noThread'
           yield @b if block_given?
           self
         end
         def timeout(timeout)
-          @b.append " /timeout:#{@b.format timeout}"
+          @b.append " -timeout:#{@b.format timeout}"
           yield @b if block_given?
           self
         end
         def wait
-          @b.append ' /wait'
+          @b.append ' -wait'
           yield @b if block_given?
           self
         end
         def no_logo
-          @b.append ' /noLogo'
+          @b.append ' -noLogo'
           yield @b if block_given?
           self
         end
         def no_dots
-          @b.append ' /noDots'
+          @b.append ' -noDots'
           yield @b if block_given?
           self
         end
         def stop_on_error
-          @b.append ' /stopOnError'
+          @b.append ' -stopOnError'
           yield @b if block_given?
           self
         end
         def cleanup
-          @b.append ' /cleanup'
+          @b.append ' -cleanup'
           yield @b if block_given?
           self
         end
         def help
-          @b.append ' /help'
+          @b.append ' -help'
           yield @b if block_given?
           self
         end