fluent_command_builder 0.5.6 → 0.6.0

data/lib/fluent_command_builder/command_builders/xcodebuild_44.rb

@@ -1,306 +1,306 @@
 require File.expand_path(File.dirname(__FILE__) + '/../command_base')
-require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
+require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
 
 module FluentCommandBuilder
+  def xcodebuild_44
+    FluentCommandBuilder::XCodeBuild::V44.create { |b| yield b if block_given? }
+  end
   module XCodeBuild
     module V44
-      COMMAND_NAME = 'xcodebuild'
+      def self.create
+        b = UnderlyingBuilder.new FluentCommandBuilder::XCodeBuild::COMMAND_NAME
+        c = XCodeBuild.new(b)
+        yield b if block_given?
+        c
+      end
+      def xcodebuild
+        FluentCommandBuilder::XCodeBuild::V44.create { |b| yield b if block_given? }
+      end
       class XCodeBuild < CommandBase
-        def initialize(builder)
-          super builder
+        def initialize(underlying_builder)
+          super underlying_builder
         end
         def build_project(build_action=nil)
-          BuildProject.new @builder, build_action
+          BuildProject.new b, build_action
         end
         def build_project_scheme(build_action=nil)
-          BuildProjectScheme.new @builder, build_action
+          BuildProjectScheme.new b, build_action
         end
         def build_workspace(workspace_name, build_action=nil)
-          BuildWorkspace.new @builder, workspace_name, build_action
+          BuildWorkspace.new b, workspace_name, build_action
         end
         def version
-          Version.new @builder
+          Version.new b
         end
         def list
-          @builder.append ' -list'
-          yield @builder if block_given?
+          b.append ' -list'
+          yield b if block_given?
           self
         end
         def list_project(project_name)
-          @builder.append " -list -project #{@builder.format project_name}"
-          yield @builder if block_given?
+          b.append " -list -project #{b.format project_name}"
+          yield b if block_given?
           self
         end
         def list_workspace(workspace_name)
-          @builder.append " -list -workspace #{@builder.format workspace_name}"
-          yield @builder if block_given?
+          b.append " -list -workspace #{b.format workspace_name}"
+          yield b if block_given?
           self
         end
         def find(binary)
-          @builder.append " -find #{@builder.format binary}"
-          yield @builder if block_given?
+          b.append " -find #{b.format binary}"
+          yield b if block_given?
           self
         end
         def help
-          @builder.append ' -help'
-          yield @builder if block_given?
+          b.append ' -help'
+          yield b if block_given?
           self
         end
         def license
-          @builder.append ' -license'
-          yield @builder if block_given?
+          b.append ' -license'
+          yield b if block_given?
           self
         end
         def show_sdks
-          @builder.append ' -showsdks'
-          yield @builder if block_given?
+          b.append ' -showsdks'
+          yield b if block_given?
           self
         end
         def usage
-          @builder.append ' -usage'
-          yield @builder if block_given?
+          b.append ' -usage'
+          yield b if block_given?
           self
         end
       end
       class BuildProject < CommandBase
-        def initialize(builder, build_action=nil)
-          super builder
-          @builder.append ' '
-          @builder.append "#{@builder.format build_action, ' '}" unless build_action.nil?
+        def initialize(underlying_builder, build_action=nil)
+          super underlying_builder
+          b.append ' '
+          b.append "#{b.format build_action, ' '}" unless build_action.nil?
         end
         def all_targets
-          @builder.append ' -alltargets'
-          yield @builder if block_given?
+          b.append ' -alltargets'
+          yield b if block_given?
           self
         end
         def architecture(architecture)
-          @builder.append " -arch #{@builder.format architecture}"
-          yield @builder if block_given?
+          b.append " -arch #{b.format architecture}"
+          yield b if block_given?
           self
         end
         def configuration(configuration_name)
-          @builder.append " -configuration #{@builder.format configuration_name}"
-          yield @builder if block_given?
+          b.append " -configuration #{b.format configuration_name}"
+          yield b if block_given?
           self
         end
         def dry_run
-          @builder.append ' -dry-run'
-          yield @builder if block_given?
+          b.append ' -dry-run'
+          yield b if block_given?
           self
         end
         def jobs(number)
-          @builder.append " -jobs #{@builder.format number}"
-          yield @builder if block_given?
+          b.append " -jobs #{b.format number}"
+          yield b if block_given?
           self
         end
         def parallelize_targets
-          @builder.append ' -parallelizeTargets'
-          yield @builder if block_given?
+          b.append ' -parallelizeTargets'
+          yield b if block_given?
           self
         end
         def project(project_name)
-          @builder.append " -project #{@builder.format project_name}"
-          yield @builder if block_given?
+          b.append " -project #{b.format project_name}"
+          yield b if block_given?
           self
         end
         def target(target_name)
-          @builder.append " -target #{@builder.format target_name}"
-          yield @builder if block_given?
+          b.append " -target #{b.format target_name}"
+          yield b if block_given?
           self
         end
         def sdk(sdk_name)
-          @builder.append " -sdk #{@builder.format sdk_name}"
-          yield @builder if block_given?
+          b.append " -sdk #{b.format sdk_name}"
+          yield b if block_given?
           self
         end
         def show_build_settings
-          @builder.append ' -showBuildSettings'
-          yield @builder if block_given?
+          b.append ' -showBuildSettings'
+          yield b if block_given?
           self
         end
         def toolchain(name)
-          @builder.append " -toolchain #{@builder.format name}"
-          yield @builder if block_given?
+          b.append " -toolchain #{b.format name}"
+          yield b if block_given?
           self
         end
         def verbose
-          @builder.append ' -verbose'
-          yield @builder if block_given?
+          b.append ' -verbose'
+          yield b if block_given?
           self
         end
         def xcconfig(path)
-          @builder.append " -xcconfig #{@builder.format path}"
-          yield @builder if block_given?
+          b.append " -xcconfig #{b.format path}"
+          yield b if block_given?
           self
         end
         def setting(setting, value)
-          @builder.append " #{@builder.format setting}=#{@builder.format value}"
-          yield @builder if block_given?
+          b.append " #{b.format setting}=#{b.format value}"
+          yield b if block_given?
           self
         end
       end
       class BuildProjectScheme < CommandBase
-        def initialize(builder, build_action=nil)
-          super builder
-          @builder.append ' '
-          @builder.append "#{@builder.format build_action, ' '}" unless build_action.nil?
+        def initialize(underlying_builder, build_action=nil)
+          super underlying_builder
+          b.append ' '
+          b.append "#{b.format build_action, ' '}" unless build_action.nil?
         end
         def architecture(architecture)
-          @builder.append " -arch #{@builder.format architecture}"
-          yield @builder if block_given?
+          b.append " -arch #{b.format architecture}"
+          yield b if block_given?
           self
         end
         def configuration(configuration_name)
-          @builder.append " -configuration #{@builder.format configuration_name}"
-          yield @builder if block_given?
+          b.append " -configuration #{b.format configuration_name}"
+          yield b if block_given?
           self
         end
         def dry_run
-          @builder.append ' -dry-run'
-          yield @builder if block_given?
+          b.append ' -dry-run'
+          yield b if block_given?
           self
         end
         def jobs(number)
-          @builder.append " -jobs #{@builder.format number}"
-          yield @builder if block_given?
+          b.append " -jobs #{b.format number}"
+          yield b if block_given?
           self
         end
         def parallelize_targets
-          @builder.append ' -parallelizeTargets'
-          yield @builder if block_given?
+          b.append ' -parallelizeTargets'
+          yield b if block_given?
           self
         end
         def scheme(scheme_name)
-          @builder.append " -scheme #{@builder.format scheme_name}"
-          yield @builder if block_given?
+          b.append " -scheme #{b.format scheme_name}"
+          yield b if block_given?
           self
         end
         def sdk(sdk_name)
-          @builder.append " -sdk #{@builder.format sdk_name}"
-          yield @builder if block_given?
+          b.append " -sdk #{b.format sdk_name}"
+          yield b if block_given?
           self
         end
         def show_build_settings
-          @builder.append ' -showBuildSettings'
-          yield @builder if block_given?
+          b.append ' -showBuildSettings'
+          yield b if block_given?
           self
         end
         def toolchain(name)
-          @builder.append " -toolchain #{@builder.format name}"
-          yield @builder if block_given?
+          b.append " -toolchain #{b.format name}"
+          yield b if block_given?
           self
         end
         def verbose
-          @builder.append ' -verbose'
-          yield @builder if block_given?
+          b.append ' -verbose'
+          yield b if block_given?
           self
         end
         def xcconfig(path)
-          @builder.append " -xcconfig #{@builder.format path}"
-          yield @builder if block_given?
+          b.append " -xcconfig #{b.format path}"
+          yield b if block_given?
           self
         end
         def setting(setting, value)
-          @builder.append " #{@builder.format setting}=#{@builder.format value}"
-          yield @builder if block_given?
+          b.append " #{b.format setting}=#{b.format value}"
+          yield b if block_given?
           self
         end
       end
       class BuildWorkspace < CommandBase
-        def initialize(builder, workspace_name, build_action=nil)
-          super builder
-          @builder.append " -workspace #{@builder.format workspace_name}"
-          @builder.append " #{@builder.format build_action, ' '}" unless build_action.nil?
+        def initialize(underlying_builder, workspace_name, build_action=nil)
+          super underlying_builder
+          b.append " -workspace #{b.format workspace_name}"
+          b.append " #{b.format build_action, ' '}" unless build_action.nil?
         end
         def architecture(architecture)
-          @builder.append " -arch #{@builder.format architecture}"
-          yield @builder if block_given?
+          b.append " -arch #{b.format architecture}"
+          yield b if block_given?
           self
         end
         def configuration(configuration_name)
-          @builder.append " -configuration #{@builder.format configuration_name}"
-          yield @builder if block_given?
+          b.append " -configuration #{b.format configuration_name}"
+          yield b if block_given?
           self
         end
         def dry_run
-          @builder.append ' -dry-run'
-          yield @builder if block_given?
+          b.append ' -dry-run'
+          yield b if block_given?
           self
         end
         def jobs(number)
-          @builder.append " -jobs #{@builder.format number}"
-          yield @builder if block_given?
+          b.append " -jobs #{b.format number}"
+          yield b if block_given?
           self
         end
         def parallelize_targets
-          @builder.append ' -parallelizeTargets'
-          yield @builder if block_given?
+          b.append ' -parallelizeTargets'
+          yield b if block_given?
           self
         end
         def scheme(scheme_name)
-          @builder.append " -scheme #{@builder.format scheme_name}"
-          yield @builder if block_given?
+          b.append " -scheme #{b.format scheme_name}"
+          yield b if block_given?
           self
         end
         def sdk(sdk_name)
-          @builder.append " -sdk #{@builder.format sdk_name}"
-          yield @builder if block_given?
+          b.append " -sdk #{b.format sdk_name}"
+          yield b if block_given?
           self
         end
         def show_build_settings
-          @builder.append ' -showBuildSettings'
-          yield @builder if block_given?
+          b.append ' -showBuildSettings'
+          yield b if block_given?
           self
         end
         def toolchain(name)
-          @builder.append " -toolchain #{@builder.format name}"
-          yield @builder if block_given?
+          b.append " -toolchain #{b.format name}"
+          yield b if block_given?
           self
         end
         def verbose
-          @builder.append ' -verbose'
-          yield @builder if block_given?
+          b.append ' -verbose'
+          yield b if block_given?
           self
         end
         def xcconfig(path)
-          @builder.append " -xcconfig #{@builder.format path}"
-          yield @builder if block_given?
+          b.append " -xcconfig #{b.format path}"
+          yield b if block_given?
           self
         end
         def setting(setting, value)
-          @builder.append " #{@builder.format setting}=#{@builder.format value}"
-          yield @builder if block_given?
+          b.append " #{b.format setting}=#{b.format value}"
+          yield b if block_given?
           self
         end
       end
       class Version < CommandBase
-        def initialize(builder)
-          super builder
-          @builder.append ' -version'
+        def initialize(underlying_builder)
+          super underlying_builder
+          b.append ' -version'
         end
         def sdk(sdk_name)
-          @builder.append " -sdk #{@builder.format sdk_name}"
-          yield @builder if block_given?
+          b.append " -sdk #{b.format sdk_name}"
+          yield b if block_given?
           self
         end
         def info_item(info_item)
-          @builder.append " #{@builder.format info_item}"
-          yield @builder if block_given?
+          b.append " #{b.format info_item}"
+          yield b if block_given?
           self
         end
       end
-      def xcodebuild
-        builder = CommandBuilder.new COMMAND_NAME
-        command = XCodeBuild.new builder
-        yield builder if block_given?
-        command
-      end
+
     end
   end
-  def xcodebuild_44
-    builder = CommandBuilder.new XCodeBuild::V44::COMMAND_NAME
-    command = XCodeBuild::V44::XCodeBuild.new builder
-    yield builder if block_given?
-    command
-  end
-end
+end

data/lib/fluent_command_builder/{command_builder.rb → underlying_builder.rb}

@@ -1,11 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/command_base')
 
 module FluentCommandBuilder
-  class CommandBuilder
+  class UnderlyingBuilder
 
     attr_accessor :command_name, :path
 
-    def initialize(command_name)
+    def initialize(command_name=nil)
       @command_name = command_name
       @path = nil
       @args = ''

data/lib/fluent_command_builder/util.rb

@@ -0,0 +1,18 @@
+module FluentCommandBuilder
+
+  def version_module(command_module)
+    version = command_module.respond_to?(:version) ? command_module.version : nil
+    raise "Unable to determine version for #{command_module::COMMAND_NAME}." unless version
+    module_name = "#{command_module.name}::V#{compact_version version}"
+    begin
+      eval module_name
+    rescue
+      raise "Unable to load #{module_name}. Please consider contributing."
+    end
+  end
+
+  def compact_version(version)
+    version.match(/^\d+\.\d+/)[0].sub('.', '')
+  end
+
+end

data/lib/fluent_command_builder/version_detectors/appcfg_python.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/appengine_python_version_detector')
+
+module FluentCommandBuilder
+  module AppCfgPython
+    def self.version(path=nil)
+      AppEnginePythonVersionDetector.version 'appcfg.py', path
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/aspnet_compiler.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/msbuild')
+
+module FluentCommandBuilder
+  module AspnetCompiler
+    def self.version(path=nil)
+      MSBuild.version path
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/bundle.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/standard_version_detector')
+
+module FluentCommandBuilder
+  module Bundle
+    def self.version(path=nil)
+      StandardVersionDetector.version 'bundle', '--version', path
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/cucumber.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/standard_version_detector')
+
+module FluentCommandBuilder
+  module Cucumber
+    def self.version(path=nil)
+      StandardVersionDetector.version 'cucumber', '--version', path
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/dev_appserver_python.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/appengine_python_version_detector')
+
+module FluentCommandBuilder
+  module DevAppserverPython
+    def self.version(path=nil)
+      AppEnginePythonVersionDetector.version 'dev_appserver.py', path
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/dotcover.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/standard_version_detector')
+
+module FluentCommandBuilder
+  module DotCover
+    def self.version(path=nil)
+      StandardVersionDetector.version 'dotcover', 'version', path
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/installutil.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/standard_version_detector')
+
+module FluentCommandBuilder
+  module InstallUtil
+    def self.version(path=nil)
+      StandardVersionDetector.version 'installutil', '', path
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/lib/appengine_python_version_detector.rb

@@ -0,0 +1,16 @@
+require 'yaml'
+require File.expand_path(File.dirname(__FILE__) + '/path_finder')
+
+module FluentCommandBuilder
+  class AppEnginePythonVersionDetector
+
+    def self.version(executable_name, path=nil)
+      path ||= PathFinder.find_path executable_name
+      return unless path
+      version_file = File.join path, 'VERSION'
+      version_hash = YAML::load_file version_file
+      version_hash['release']
+    end
+
+  end
+end

data/lib/fluent_command_builder/version_detectors/lib/path_finder.rb

@@ -0,0 +1,43 @@
+module FluentCommandBuilder
+  class PathFinder
+
+    def initialize(executable_name)
+      @executable_name = executable_name
+    end
+
+    def find_path
+      executable = find_executable
+      return unless executable
+      File.dirname executable
+    end
+
+    def self.find_path(executable_name)
+      path_finder = PathFinder.new executable_name
+      path_finder.find_path
+    end
+
+    private
+
+    def find_executable
+      is_windows? ? find_executable_on_windows : find_executable_on_unix
+    end
+
+    def find_executable_on_unix
+      executable = `which #{@executable_name}`
+      real_executable = `readlink #{executable}`.strip
+      real_executable == '' ? executable : real_executable
+    end
+
+    def find_executable_on_windows
+      paths = ENV['PATH'].split ';'
+      extensions = ENV['PATHEXT'].split ';'
+      possibilities = paths.map { |path| extensions.map { |ext| File.join(path, @executable_name + ext.downcase).gsub('/', '\\') } }.flatten
+      possibilities.select { |exe| File.exist? exe }.first
+    end
+
+    def is_windows?
+      !ENV['WINDIR'].nil?
+    end
+
+  end
+end

data/lib/fluent_command_builder/version_detectors/lib/standard_version_detector.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/path_finder')
+
+module FluentCommandBuilder
+  class StandardVersionDetector
+    def self.version(executable_name, executable_args, path=nil)
+      path ||= PathFinder.find_path executable_name
+      return unless path
+      executable = File.join path, executable_name
+      command = %Q["#{executable}" #{executable_args} 2>&1]
+      output = `#{command}`
+      output.match(/(?:\d+\.)(?:\d+\.?)+/) { |m| m[0] }
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/msbuild.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/standard_version_detector')
+
+module FluentCommandBuilder
+  module MSBuild
+    def self.version(path=nil)
+      StandardVersionDetector.version 'msbuild', '/version', path
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/msdeploy.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/standard_version_detector')
+
+module FluentCommandBuilder
+  module MSDeploy
+    def self.version(path=nil)
+      StandardVersionDetector.version 'msdeploy', '', path
+    end
+  end
+end

data/lib/fluent_command_builder/version_detectors/mstest.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/standard_version_detector')
+
+module FluentCommandBuilder
+  module MSTest
+    def self.version(path=nil)
+      StandardVersionDetector.version 'mstest', '/help', path
+    end
+  end
+end