fluent_command_builder 0.8.9 → 0.8.10

data/lib/fluent_command_builder/command_builders/appcfg_python_16.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::AppCfgPython::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::AppCfgPython.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::AppCfgPython.version_detector
         c = AppCfgPython.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/appcfg_python_17.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::AppCfgPython::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::AppCfgPython.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::AppCfgPython.version_detector
         c = AppCfgPython.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/aspnet_compiler_20.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(target_dir=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::AspnetCompiler::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::AspnetCompiler.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::AspnetCompiler.version_detector
         c = AspnetCompiler.new(b, target_dir)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/aspnet_compiler_40.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(target_dir=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::AspnetCompiler::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::AspnetCompiler.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::AspnetCompiler.version_detector
         c = AspnetCompiler.new(b, target_dir)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/bundle_11.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::Bundle::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::Bundle.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::Bundle.version_detector
         c = Bundle.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/cucumber_11.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(feature=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::Cucumber::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::Cucumber.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::Cucumber.version_detector
         c = Cucumber.new(b, feature)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/cucumber_12.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(feature=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::Cucumber::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::Cucumber.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::Cucumber.version_detector
         c = Cucumber.new(b, feature)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/dev_appserver_python_16.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(application_root=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::DevAppserverPython::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::DevAppserverPython.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::DevAppserverPython.version_detector
         c = DevAppserverPython.new(b, application_root)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/dev_appserver_python_17.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(application_root=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::DevAppserverPython::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::DevAppserverPython.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::DevAppserverPython.version_detector
         c = DevAppserverPython.new(b, application_root)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/dotcover_10.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::DotCover::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::DotCover.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::DotCover.version_detector
         c = DotCover.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/dotcover_11.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::DotCover::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::DotCover.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::DotCover.version_detector
         c = DotCover.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/dotcover_12.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::DotCover::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::DotCover.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::DotCover.version_detector
         c = DotCover.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/dotcover_20.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::DotCover::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::DotCover.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::DotCover.version_detector
         c = DotCover.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/fastlinkchecker_21.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::FastLinkChecker::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::FastLinkChecker.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::FastLinkChecker.version_detector
         c = FastLinkChecker.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/installutil_11.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::InstallUtil::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::InstallUtil.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::InstallUtil.version_detector
         c = InstallUtil.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/installutil_20.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::InstallUtil::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::InstallUtil.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::InstallUtil.version_detector
         c = InstallUtil.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/installutil_35.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::InstallUtil::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::InstallUtil.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::InstallUtil.version_detector
         c = InstallUtil.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/installutil_40.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::InstallUtil::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::InstallUtil.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::InstallUtil.version_detector
         c = InstallUtil.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/msbuild_20.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(project_file=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::MSBuild::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::MSBuild.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::MSBuild.version_detector
         c = MSBuild.new(b, project_file)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/msbuild_30.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(project_file=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::MSBuild::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::MSBuild.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::MSBuild.version_detector
         c = MSBuild.new(b, project_file)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/msbuild_35.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(project_file=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::MSBuild::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::MSBuild.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::MSBuild.version_detector
         c = MSBuild.new(b, project_file)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/msbuild_40.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(project_file=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::MSBuild::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::MSBuild.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::MSBuild.version_detector
         c = MSBuild.new(b, project_file)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/msdeploy_71.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::MSDeploy::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::MSDeploy.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::MSDeploy.version_detector
         c = MSDeploy.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/mstest_100.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::MSTest::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::MSTest.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::MSTest.version_detector
         c = MSTest.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/mstest_80.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::MSTest::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::MSTest.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::MSTest.version_detector
         c = MSTest.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/mstest_90.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::MSTest::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::MSTest.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::MSTest.version_detector
         c = MSTest.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/netsh_61.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::Netsh::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::Netsh.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::Netsh.version_detector
         c = Netsh.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/nuget_20.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::NuGet::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::NuGet.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::NuGet.version_detector
         c = NuGet.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/nunit_25.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(input_files=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::NUnit::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::NUnit.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::NUnit.version_detector
         c = NUnit.new(b, input_files)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/nunit_26.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(input_files=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::NUnit::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::NUnit.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::NUnit.version_detector
         c = NUnit.new(b, input_files)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/rake_09.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create(task=nil)
         b = UnderlyingBuilder.new FluentCommandBuilder::Rake::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::Rake.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::Rake.version_detector
         c = Rake.new(b, task)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/security_osx_107.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::SecurityOSX::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::SecurityOSX.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::SecurityOSX.version_detector
         c = SecurityOSX.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/sevenzip_920.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::SevenZip::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::SevenZip.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::SevenZip.version_detector
         c = SevenZip.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/simian_23.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::Simian::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::Simian.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::Simian.version_detector
         c = Simian.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/team_foundation_100.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::TeamFoundation::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::TeamFoundation.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::TeamFoundation.version_detector
         c = TeamFoundation.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/team_foundation_tee_100.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::TeamFoundationTEE::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::TeamFoundationTEE.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::TeamFoundationTEE.version_detector
         c = TeamFoundationTEE.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/team_foundation_tee_101.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::TeamFoundationTEE::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::TeamFoundationTEE.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::TeamFoundationTEE.version_detector
         c = TeamFoundationTEE.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/xcodebuild_43.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::XCodeBuild::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::XCodeBuild.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::XCodeBuild.version_detector
         c = XCodeBuild.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_builders/xcodebuild_44.rb

@@ -25,10 +25,16 @@ module FluentCommandBuilder
         validator.validate
         @default_path = value
       end
+      def self.version_validation_options
+        @version_validation_options ||= {}
+        yield @version_validation_options if block_given?
+        @version_validation_options
+      end
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::XCodeBuild::COMMAND_NAME, self.exact_version
         b.path = self.default_path
-        b.actual_version_lambda = lambda { |path| FluentCommandBuilder::XCodeBuild.version path }
+        b.version_validation_options = self.version_validation_options
+        b.version_detector = FluentCommandBuilder::XCodeBuild.version_detector
         c = XCodeBuild.new(b)
         yield b if block_given?
         c

data/lib/fluent_command_builder/command_executors/backticks_executor.rb

@@ -3,8 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/executor_base')
 module FluentCommandBuilder
   class BackticksExecutor < ExecutorBase
 
-    def do_execute(underlying_builder)
-      `#{underlying_builder}`
+    def do_execute(command)
+      `#{command}`
     end
 
   end

data/lib/fluent_command_builder/command_executors/executor_base.rb

@@ -1,8 +1,8 @@
 module FluentCommandBuilder
   class ExecutorBase
 
-    def execute(underlying_builder)
-      result = do_execute underlying_builder
+    def execute(command)
+      result = do_execute command
       yield $? if block_given?
       result
     end
@@ -17,7 +17,7 @@ module FluentCommandBuilder
 
     protected
 
-    def do_execute(underlying_builder)
+    def do_execute(command)
       # template method
     end
 

data/lib/fluent_command_builder/command_executors/rake_sh_executor.rb

@@ -5,8 +5,8 @@ include Rake::DSL
 module FluentCommandBuilder
   class RakeShExecutor < ExecutorBase
 
-    def do_execute(underlying_builder)
-      sh underlying_builder.to_s
+    def do_execute(command)
+      sh command.to_s
     end
 
     def will_print_on_execute?

data/lib/fluent_command_builder/command_executors/system_executor.rb

@@ -3,8 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/executor_base')
 module FluentCommandBuilder
   class SystemExecutor < ExecutorBase
 
-    def do_execute(underlying_builder)
-      system underlying_builder.to_s
+    def do_execute(command)
+      system command.to_s
     end
 
   end

data/lib/fluent_command_builder/execution_context.rb

@@ -1,31 +1,25 @@
-require File.expand_path(File.dirname(__FILE__) + '/path_validator')
 require File.expand_path(File.dirname(__FILE__) + '/printer')
-require File.expand_path(File.dirname(__FILE__) + '/version_validator')
 require File.expand_path(File.dirname(__FILE__) + '/command_executors/system_executor')
 require File.expand_path(File.dirname(__FILE__) + '/command_formatters/null_formatter')
 
 module FluentCommandBuilder
   class ExecutionContext
 
-    attr_accessor :executor, :formatter, :should_print_on_execute, :should_fail_on_error, :should_fail_on_unexpected_version
+    attr_accessor :executor, :formatter, :should_print_on_execute, :should_fail_on_error
 
     def initialize(executor)
       @executor = executor
       @formatter = NullFormatter.new
       @should_print_on_execute = true
       @should_fail_on_error = true
-      @should_fail_on_unexpected_version = false
       @printer = FluentCommandBuilder::Printer.new
     end
 
-    def execute(underlying_builder)
+    def execute(command, visible_command=command)
       validate_should_print_on_execute
       validate_should_fail_on_error
-      validate_path underlying_builder
-      validate_version underlying_builder
-      visible_command = @formatter.format underlying_builder
       print_command visible_command
-      @executor.execute(underlying_builder) do |status|
+      @executor.execute(command) do |status|
         raise "Command failed with status (#{status.exitstatus}): [#{visible_command}]" if @should_fail_on_error && !status.success?
       end
     end
@@ -40,17 +34,6 @@ module FluentCommandBuilder
       raise "should_fail_on_error must be true for #{@executor}." if !@should_fail_on_error && @executor.will_fail_on_error?
     end
 
-    def validate_version(underlying_builder)
-      v = VersionValidator.new underlying_builder
-      v.should_fail_on_unexpected_version = @should_fail_on_unexpected_version
-      v.validate
-    end
-
-    def validate_path(underlying_builder)
-      v = PathValidator.new underlying_builder
-      v.validate
-    end
-
     def print_command(visible_command)
       @printer.print_command visible_command if @should_print_on_execute && !@executor.will_print_on_execute?
     end

data/lib/fluent_command_builder/path_validator.rb

@@ -3,33 +3,26 @@ require File.expand_path(File.dirname(__FILE__) + '/printer')
 module FluentCommandBuilder
   class PathValidator
 
-    def initialize(underlying_builder)
-      @underlying_builder = underlying_builder
+    def initialize(path, command_name, version)
+      @path = path
+      @command_name = command_name
+      @version = version
       @printer = Printer.new
     end
 
     def validate
-      return unless can_validate?
       return if is_valid?
-      version = @underlying_builder.version || '(unknown)'
-      message = %Q[Path for command "#{@underlying_builder.command_name}", version "#{version}" does not exist. Path: #{path}]
+      version = @version || '(unknown)'
+      message = %Q[Path for command "#{@command_name}", version "#{version}" does not exist. Path: #{@path}]
       @printer.print_error message
       raise message
     end
 
     private
 
-    def can_validate?
-      !path.nil?
-    end
-
     def is_valid?
       File.exist? path
     end
 
-    def path
-      @underlying_builder.path
-    end
-
   end
 end

data/lib/fluent_command_builder/underlying_builder.rb

@@ -1,20 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '/argument_formatter')
 require File.expand_path(File.dirname(__FILE__) + '/execution_context')
+require File.expand_path(File.dirname(__FILE__) + '/path_validator')
+require File.expand_path(File.dirname(__FILE__) + '/version_validator')
 
 module FluentCommandBuilder
   class UnderlyingBuilder
     include ArgumentFormatter
 
     attr_reader :command_name, :version, :args, :passwords
-    attr_accessor :path, :actual_version_lambda
+    attr_accessor :path, :version_detector, :version_validation_options
 
     def initialize(command_name, version=nil)
       @command_name = command_name
       @version = version
       @args = nil
       @passwords = []
+      @version_validation_options = {}
       @path = nil
-      @actual_version_lambda = nil
+      @version_detector = nil
       @execution_context = FluentCommandBuilder.execution_context
     end
 
@@ -31,16 +34,27 @@ module FluentCommandBuilder
     end
 
     def execute
-      @execution_context.execute self
-    end
-
-    def actual_version
-      @actual_version_lambda.call @path if @actual_version_lambda
+      validate_path if @path
+      validate_version if @version_detector
+      visible_command = @execution_context.formatter.format self
+      @execution_context.execute to_s, visible_command
     end
 
     def to_s
       "#{quote_if_includes_space executable} #{@args}".strip
     end
 
+    private
+
+    def validate_path
+      v = PathValidator.new @path, @command_name, @version
+      v.validate
+    end
+
+    def validate_version
+      v = VersionValidator.new @command_name, @path, @version, @version_detector, @version_validation_options
+      v.validate
+    end
+
   end
 end

data/lib/fluent_command_builder/version_validator.rb

@@ -3,16 +3,19 @@ require File.expand_path(File.dirname(__FILE__) + '/printer')
 module FluentCommandBuilder
   class VersionValidator
 
-    attr_accessor :should_fail_on_unexpected_version
-
-    def initialize(underlying_builder)
-      @underlying_builder = underlying_builder
+    def initialize(command_name, path, expected_version, version_detector, options={})
+      @command_name = command_name
+      @path = path
+      @expected_version_string = expected_version
+      @version_detector = version_detector
+      @options = { enabled: true, warn_only: false }.merge options
       @printer = Printer.new
-      @should_fail_on_unexpected_version = false
     end
 
     def validate
-      return unless can_validate?
+      return unless enabled?
+
+      @actual_version_string = @version_detector.version(@path)
 
       unless actual_version
         @printer.print_warning error_message('unable to determine actual version')
@@ -21,15 +24,19 @@ module FluentCommandBuilder
 
       unless is_valid?
         message = error_message actual_version.to_s(expected_version.to_a.length)
-        @should_fail_on_unexpected_version ? @printer.print_error(message) : @printer.print_warning(message)
-        raise message if @should_fail_on_unexpected_version
+        warn_only? ? @printer.print_warning(message) : @printer.print_error(message)
+        raise message unless warn_only?
       end
     end
 
     private
 
-    def can_validate?
-      @underlying_builder.version && @underlying_builder.actual_version_lambda
+    def enabled?
+      @options[:enabled]
+    end
+
+    def warn_only?
+      @options[:warn_only]
     end
 
     def is_valid?
@@ -37,15 +44,15 @@ module FluentCommandBuilder
     end
 
     def expected_version
-      @expected_version ||= Version.new(@underlying_builder.version)
+      @expected_version ||= Version.new(@expected_version_string)
     end
 
     def actual_version
-      @actual_version ||= Version.new(@underlying_builder.actual_version) if @underlying_builder.actual_version
+      @actual_version ||= Version.new(@actual_version_string) if @actual_version_string
     end
 
     def error_message(actual_version)
-      %Q[Version validation for command "#{@underlying_builder.command_name}" failed. Expected version #{expected_version} but was #{actual_version}.]
+      %Q[Version validation for command "#{@command_name}" failed. Expected version #{expected_version} but was #{actual_version}.]
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_command_builder
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70187253086500 !ruby/object:Gem::Requirement
+  requirement: &70349041327120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187253086500
+  version_requirements: *70349041327120
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70187253086060 !ruby/object:Gem::Requirement
+  requirement: &70349041326680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187253086060
+  version_requirements: *70349041326680
 description: Fluent Command Builder makes building command lines easy and clean.
 email: matthew-github@matthewriley.name
 executables: []