fluent_command_builder 0.9.0 → 0.9.1

data/lib/fluent_command_builder/command_builders/appcfg_python.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/aspnet_compiler.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/bundle.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/cucumber.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/dev_appserver_python.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/dotcover.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/dotcover_21.rb

@@ -0,0 +1,309 @@
+# Generated code. Do not modify.
+
+require File.expand_path(File.dirname(__FILE__) + '/../internal/command_base')
+require File.expand_path(File.dirname(__FILE__) + '/../internal/command_builder_config')
+require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
+
+module FluentCommandBuilder
+  module DotCover
+    module V21
+      VERSION = '2.1'
+      @@config = CommandBuilderConfig.new FluentCommandBuilder::DotCover::COMMAND_NAME, VERSION
+      @@config.version_detector = FluentCommandBuilder::DotCover.version_detector
+      def configure_dotcover
+        yield @@config
+        @@config.validate_path
+        @@config.validate_version
+      end
+      def dotcover
+        b = UnderlyingBuilder.new @@config
+        c = DotCover.new(b)
+        yield b if block_given?
+        c
+      end
+      class DotCover < CommandBase
+        def initialize(underlying_builder)
+          super underlying_builder
+        end
+        def analyse(configuration_file=nil)
+          Analyse.new @b, configuration_file
+        end
+        def cover(configuration_file=nil)
+          Cover.new @b, configuration_file
+        end
+        def delete(configuration_file=nil)
+          Delete.new @b, configuration_file
+        end
+        def help(command=nil, file_name=nil)
+          @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 @b, configuration_file
+        end
+        def merge(configuration_file=nil)
+          Merge.new @b, configuration_file
+        end
+        def report(configuration_file=nil)
+          Report.new @b, configuration_file
+        end
+        def version(output_file_name=nil)
+          Version.new @b, output_file_name
+        end
+        def zip(configuration_file=nil)
+          Zip.new @b, configuration_file
+        end
+      end
+      class Analyse < CommandBase
+        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)
+          @b.append " /analyseTargetArguments=#{@b.format bool}"
+          yield @b if block_given?
+          self
+        end
+        def attribute_filters(filters)
+          @b.append " /attributeFilters=#{@b.format filters, ';'}"
+          yield @b if block_given?
+          self
+        end
+        def filters(filters)
+          @b.append " /filters=#{@b.format filters, ';'}"
+          yield @b if block_given?
+          self
+        end
+        def inherit_console(bool)
+          @b.append " /inheritConsole=#{@b.format bool}"
+          yield @b if block_given?
+          self
+        end
+        def log_file(log_file)
+          @b.append " /logFile=#{@b.format log_file}"
+          yield @b if block_given?
+          self
+        end
+        def output(snapshot_path)
+          @b.append " /output=#{@b.format snapshot_path}"
+          yield @b if block_given?
+          self
+        end
+        def report_type(report_type)
+          @b.append " /reportType=#{@b.format report_type}"
+          yield @b if block_given?
+          self
+        end
+        def target_arguments(target_arguments)
+          @b.append " /targetArguments=#{@b.format target_arguments}"
+          yield @b if block_given?
+          self
+        end
+        def target_executable(target_executable)
+          @b.append " /targetExecutable=#{@b.format target_executable}"
+          yield @b if block_given?
+          self
+        end
+        def target_working_dir(target_working_dir)
+          @b.append " /targetWorkingDir=#{@b.format target_working_dir}"
+          yield @b if block_given?
+          self
+        end
+        def temp_dir(temp_dir)
+          @b.append " /tempDir=#{@b.format temp_dir}"
+          yield @b if block_given?
+          self
+        end
+      end
+      class Cover < CommandBase
+        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)
+          @b.append " /analyseTargetArguments=#{@b.format bool}"
+          yield @b if block_given?
+          self
+        end
+        def attribute_filters(filters)
+          @b.append " /attributeFilters=#{@b.format filters, ';'}"
+          yield @b if block_given?
+          self
+        end
+        def filters(filters)
+          @b.append " /filters=#{@b.format filters, ';'}"
+          yield @b if block_given?
+          self
+        end
+        def inherit_console(bool)
+          @b.append " /inheritConsole=#{@b.format bool}"
+          yield @b if block_given?
+          self
+        end
+        def log_file(log_file)
+          @b.append " /logFile=#{@b.format log_file}"
+          yield @b if block_given?
+          self
+        end
+        def output(snapshot_path)
+          @b.append " /output=#{@b.format snapshot_path}"
+          yield @b if block_given?
+          self
+        end
+        def target_arguments(target_arguments)
+          @b.append " /targetArguments=#{@b.format target_arguments}"
+          yield @b if block_given?
+          self
+        end
+        def target_executable(target_executable)
+          @b.append " /targetExecutable=#{@b.format target_executable}"
+          yield @b if block_given?
+          self
+        end
+        def target_working_dir(target_working_dir)
+          @b.append " /targetWorkingDir=#{@b.format target_working_dir}"
+          yield @b if block_given?
+          self
+        end
+        def temp_dir(temp_dir)
+          @b.append " /tempDir=#{@b.format temp_dir}"
+          yield @b if block_given?
+          self
+        end
+      end
+      class Delete < CommandBase
+        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)
+          @b.append " /logFile=#{@b.format log_file}"
+          yield @b if block_given?
+          self
+        end
+        def source(source)
+          @b.append " /source=#{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+      end
+      class List < CommandBase
+        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)
+          @b.append " /logFile=#{@b.format log_file}"
+          yield @b if block_given?
+          self
+        end
+        def output(snapshot_path)
+          @b.append " /output=#{@b.format snapshot_path}"
+          yield @b if block_given?
+          self
+        end
+        def source(source)
+          @b.append " /source=#{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+      end
+      class Merge < CommandBase
+        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)
+          @b.append " /logFile=#{@b.format log_file}"
+          yield @b if block_given?
+          self
+        end
+        def output(snapshot_path)
+          @b.append " /output=#{@b.format snapshot_path}"
+          yield @b if block_given?
+          self
+        end
+        def source(source)
+          @b.append " /source=#{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+        def temp_dir(temp_dir)
+          @b.append " /tempDir=#{@b.format temp_dir}"
+          yield @b if block_given?
+          self
+        end
+      end
+      class Report < CommandBase
+        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)
+          @b.append " /logFile=#{@b.format log_file}"
+          yield @b if block_given?
+          self
+        end
+        def output(snapshot_path)
+          @b.append " /output=#{@b.format snapshot_path}"
+          yield @b if block_given?
+          self
+        end
+        def report_type(report_type)
+          @b.append " /reportType=#{@b.format report_type}"
+          yield @b if block_given?
+          self
+        end
+        def source(source)
+          @b.append " /source=#{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+      end
+      class Version < CommandBase
+        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)
+          @b.append " /logFile=#{@b.format log_file}"
+          yield @b if block_given?
+          self
+        end
+      end
+      class Zip < CommandBase
+        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)
+          @b.append " /logFile=#{@b.format log_file}"
+          yield @b if block_given?
+          self
+        end
+        def output(snapshot_path)
+          @b.append " /output=#{@b.format snapshot_path}"
+          yield @b if block_given?
+          self
+        end
+        def source(source)
+          @b.append " /source=#{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+      end
+
+    end
+  end
+end

data/lib/fluent_command_builder/command_builders/fastlinkchecker.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/installutil.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/msbuild.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/msdeploy.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/mstest.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/netsh.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/nuget.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/nunit.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/rake.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/security_osx.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/sevenzip.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/simian.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/team_foundation.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/team_foundation_tee.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/command_builders/xcodebuild.rb

@@ -1,6 +1,6 @@
 # Generated code. Do not modify.
 
-require File.expand_path(File.dirname(__FILE__) + '/../internal/version_detectors')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
 
 module FluentCommandBuilder

data/lib/fluent_command_builder/internal/command_builder_config.rb

@@ -1,6 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/../version_validator')
+require File.expand_path(File.dirname(__FILE__) + '/../version_detectors/default_version_detector')
 require File.expand_path(File.dirname(__FILE__) + '/path_validator')
-require File.expand_path(File.dirname(__FILE__) + '/version_validator')
-require File.expand_path(File.dirname(__FILE__) + '/version_detectors/default_version_detector')
 
 module FluentCommandBuilder
   class CommandBuilderConfig
@@ -18,7 +18,7 @@ module FluentCommandBuilder
       @path_validation_level = :fatal
       @version_validation_level = :fatal
       @path_validator = PathValidator.new self
-      @version_validator = VersionValidator.new self
+      @version_validator = nil
       @is_windows = !ENV['WINDIR'].nil?
     end
 
@@ -27,7 +27,9 @@ module FluentCommandBuilder
     end
 
     def validate_version
-      @version_validator.validate if @version
+      return unless @version
+      v = @version_validator || VersionValidator.new(@command_name, @version_detector)
+      v.validate @version, evaluated_path
     end
 
     def executable

data/lib/fluent_command_builder/internal/path_finders/unix_path_finder.rb

@@ -5,7 +5,7 @@ module FluentCommandBuilder
       executable = `which #{executable_name}`
       real_executable = `readlink #{executable}`.strip
       result = real_executable == '' ? executable : real_executable
-      return unless result
+      return if result.to_s == ''
       File.dirname result
     end
 

data/lib/fluent_command_builder/{internal/version_detectors → version_detectors}/appengine_python_version_detector.rb

@@ -1,16 +1,19 @@
 require 'yaml'
-require File.expand_path(File.dirname(__FILE__) + '/../path_finder')
+require File.expand_path(File.dirname(__FILE__) + '/../internal/path_finder')
 
 module FluentCommandBuilder
   class AppEnginePythonVersionDetector
 
+    attr_accessor :path_finder
+
     def initialize(command_name)
       @command_name = command_name
+      @path_finder = FluentCommandBuilder.path_finder
     end
 
     def version(path=nil)
-      path ||= FluentCommandBuilder.path_finder.find_path @command_name
-      return unless path
+      path ||= @path_finder.find_path @command_name
+      return unless path && File.exist?(path)
       version_file = File.join path, 'VERSION'
       version_hash = YAML::load_file version_file
       version_hash['release']

data/lib/fluent_command_builder/{internal/version_detectors → version_detectors}/default_version_detector.rb

@@ -1,24 +1,25 @@
-require File.expand_path(File.dirname(__FILE__) + '/../path_finder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
+require File.expand_path(File.dirname(__FILE__) + '/../internal/path_finder')
+require File.expand_path(File.dirname(__FILE__) + '/../internal/version')
 require File.expand_path(File.dirname(__FILE__) + '/standard_version_detector')
 
 module FluentCommandBuilder
   class DefaultVersionDetector
 
+    attr_accessor :path_finder
+
     def initialize(command_name)
       @command_name = command_name
       @command_args = %w(--version -version /version --help -help /help version help)
+      @path_finder = FluentCommandBuilder.path_finder
     end
 
     def version(path=nil)
-      path ||= FluentCommandBuilder.path_finder.find_path @command_name
-      return unless path
-
+      path ||= @path_finder.find_path @command_name
+      return unless path && File.exist?(path)
       @command_args.each do |command_arg|
         version = try_get_version command_arg
         return version if version
       end
-
       try_get_version
     end
 
@@ -26,6 +27,7 @@ module FluentCommandBuilder
 
     def try_get_version(command_arg=nil)
       d = StandardVersionDetector.new @command_name, command_arg
+      d.path_finder = @path_finder
       d.version
     end
 

data/lib/fluent_command_builder/version_detectors/dot_net_framework_version_detector.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/../internal/path_finder')
+
+module FluentCommandBuilder
+  class DotNetFrameworkVersionDetector
+
+    attr_accessor :path_finder, :backticks_executor
+
+    def initialize
+      @path_finder = FluentCommandBuilder.path_finder
+      @backticks_executor = BackticksExecutor.new
+    end
+
+    def version(path=nil)
+      path ||= @path_finder.find_path 'msbuild'
+      return unless path && File.exist?(path)
+      Dir.chdir path do
+        command = 'msbuild /version'
+        output = @backticks_executor.execute command
+        output.scan(/\[Microsoft .NET Framework, Version (.+)\]/).first
+      end
+    end
+
+  end
+end

data/lib/fluent_command_builder/{internal/version_detectors → version_detectors}/osx_version_detector.rb

@@ -5,9 +5,13 @@ module FluentCommandBuilder
 
     attr_accessor :backticks_executor
 
+    def initialize
+      @backticks_executor = BackticksExecutor.new
+    end
+
     def version(path=nil)
       d = StandardVersionDetector.new 'sw_vers', '-productVersion'
-      d.backticks_executor = @backticks_executor if @backticks_executor
+      d.backticks_executor = @backticks_executor
       d.version
     end
 

data/lib/fluent_command_builder/{internal/version_detectors → version_detectors}/standard_version_detector.rb

@@ -1,22 +1,22 @@
-require File.expand_path(File.dirname(__FILE__) + '/../path_finder')
-require File.expand_path(File.dirname(__FILE__) + '/../version')
-require File.expand_path(File.dirname(__FILE__) + '/../../command_executors/backticks_executor')
+require File.expand_path(File.dirname(__FILE__) + '/../internal/path_finder')
+require File.expand_path(File.dirname(__FILE__) + '/../internal/version')
+require File.expand_path(File.dirname(__FILE__) + '/../command_executors/backticks_executor')
 
 module FluentCommandBuilder
   class StandardVersionDetector
 
-    attr_accessor :backticks_executor
+    attr_accessor :path_finder, :backticks_executor
 
     def initialize(command_name, command_arg=nil)
       @command_name = command_name
       @command_arg = command_arg
+      @path_finder = FluentCommandBuilder.path_finder
       @backticks_executor = BackticksExecutor.new
     end
 
     def version(path=nil)
-      path ||= FluentCommandBuilder.path_finder.find_path @command_name
-      return unless path
-      return unless File.exist? path
+      path ||= @path_finder.find_path @command_name
+      return unless path && File.exist?(path)
       Dir.chdir path do
         command = %Q["#{@command_name}" #{@command_arg} 2>&1]
         output = @backticks_executor.execute command

data/lib/fluent_command_builder/{internal/version_validator.rb → version_validator.rb}

@@ -1,21 +1,24 @@
-require File.expand_path(File.dirname(__FILE__) + '/printer')
+require File.expand_path(File.dirname(__FILE__) + '/internal/printer')
 
 module FluentCommandBuilder
   class VersionValidator
 
-    attr_accessor :printer, :should_abort_on_fatal
+    attr_accessor :validation_level, :should_abort_on_fatal, :printer
 
-    def initialize(command_builder_config)
-      @c = command_builder_config
-      @printer = Printer.new
+    def initialize(target_name, version_detector)
+      @target_name = target_name
+      @version_detector = version_detector
+      @validation_level = :fatal
       @should_abort_on_fatal = true
+      @printer = FluentCommandBuilder::Printer.new
     end
 
-    def validate
+    def validate(expected_version_string, path=nil)
       validate_validation_level
-      return if validation_level == :off
+      return if @validation_level == :off
 
-      @actual_version_string = @c.version_detector.version(@c.evaluated_path)
+      @expected_version_string = expected_version_string
+      @actual_version_string = @version_detector.version path
 
       unless actual_version
         @printer.print_warning error_message('unable to determine actual version')
@@ -40,7 +43,7 @@ module FluentCommandBuilder
     private
 
     def validation_level
-      @c.version_validation_level
+      @validation_level
     end
 
     def validate_validation_level
@@ -51,15 +54,12 @@ module FluentCommandBuilder
       [:off, :warn, :fatal].include? validation_level
     end
 
-
-
-
     def is_valid?
       actual_version.to_a.first(expected_version.to_a.length) == expected_version.to_a
     end
 
     def expected_version
-      @expected_version ||= Version.new(@c.version)
+      @expected_version ||= Version.new(@expected_version_string)
     end
 
     def actual_version
@@ -67,7 +67,10 @@ module FluentCommandBuilder
     end
 
     def error_message(actual_version)
-      %Q[Version validation for command "#{@c.command_name}" failed. Expected version #{expected_version} but was #{actual_version}.]
+      m = 'Version validation '
+      m += %Q[for "#{@target_name}" ] if @target_name
+      m += "failed. Expected version #{expected_version} but was #{actual_version}."
+      m
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_command_builder
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70300608096120 !ruby/object:Gem::Requirement
+  requirement: &70183412696920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300608096120
+  version_requirements: *70183412696920
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70300608095680 !ruby/object:Gem::Requirement
+  requirement: &70183412696480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300608095680
+  version_requirements: *70183412696480
 description: Fluent Command Builder makes building command lines easy and clean.
 email: matthew-github@matthewriley.name
 executables: []
@@ -59,6 +59,7 @@ files:
 - lib/fluent_command_builder/command_builders/dotcover_11.rb
 - lib/fluent_command_builder/command_builders/dotcover_12.rb
 - lib/fluent_command_builder/command_builders/dotcover_20.rb
+- lib/fluent_command_builder/command_builders/dotcover_21.rb
 - lib/fluent_command_builder/command_builders/fastlinkchecker.rb
 - lib/fluent_command_builder/command_builders/fastlinkchecker_21.rb
 - lib/fluent_command_builder/command_builders/installutil.rb
@@ -118,14 +119,15 @@ files:
 - lib/fluent_command_builder/internal/printer.rb
 - lib/fluent_command_builder/internal/underlying_builder.rb
 - lib/fluent_command_builder/internal/version.rb
-- lib/fluent_command_builder/internal/version_detectors/appengine_python_version_detector.rb
-- lib/fluent_command_builder/internal/version_detectors/default_version_detector.rb
-- lib/fluent_command_builder/internal/version_detectors/osx_version_detector.rb
-- lib/fluent_command_builder/internal/version_detectors/standard_version_detector.rb
-- lib/fluent_command_builder/internal/version_detectors/windows_version_detector.rb
-- lib/fluent_command_builder/internal/version_detectors.rb
-- lib/fluent_command_builder/internal/version_validator.rb
 - lib/fluent_command_builder/password_formatter.rb
+- lib/fluent_command_builder/version_detectors/appengine_python_version_detector.rb
+- lib/fluent_command_builder/version_detectors/default_version_detector.rb
+- lib/fluent_command_builder/version_detectors/dot_net_framework_version_detector.rb
+- lib/fluent_command_builder/version_detectors/osx_version_detector.rb
+- lib/fluent_command_builder/version_detectors/standard_version_detector.rb
+- lib/fluent_command_builder/version_detectors/windows_version_detector.rb
+- lib/fluent_command_builder/version_detectors.rb
+- lib/fluent_command_builder/version_validator.rb
 - lib/fluent_command_builder.rb
 homepage: http://rubygems.org/gems/fluent_command_builder
 licenses: []