fluent_command_builder 0.7.8 → 0.7.9

data/lib/fluent_command_builder/command_builders/rake.rb

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

data/lib/fluent_command_builder/command_builders/security_osx.rb

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

data/lib/fluent_command_builder/command_builders/sevenzip.rb

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

data/lib/fluent_command_builder/command_builders/{sevenzip_92.rb → sevenzip_920.rb}

@@ -3,12 +3,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../printer')
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
 
 module FluentCommandBuilder
-  def sevenzip_92
-    FluentCommandBuilder::SevenZip::V92.create { |b| yield b if block_given? }
+  def sevenzip_920
+    FluentCommandBuilder::SevenZip::V920.create { |b| yield b if block_given? }
   end
   module SevenZip
-    module V92
-      VERSION = '9.2'
+    module V920
+      VERSION = '9.20'
       def self.default_path
         @default_path ||= nil
       end
@@ -29,7 +29,7 @@ module FluentCommandBuilder
         c
       end
       def sevenzip
-        FluentCommandBuilder::SevenZip::V92.create { |b| yield b if block_given? }
+        FluentCommandBuilder::SevenZip::V920.create { |b| yield b if block_given? }
       end
       class SevenZip < CommandBase
         def initialize(underlying_builder)

data/lib/fluent_command_builder/command_builders/simian.rb

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

data/lib/fluent_command_builder/command_builders/team_foundation.rb

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

data/lib/fluent_command_builder/command_builders/team_foundation_tee.rb

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

data/lib/fluent_command_builder/command_builders/team_foundation_tee_100.rb

@@ -140,18 +140,6 @@ module FluentCommandBuilder
         def properties(item_spec)
           Properties.new @b, item_spec
         end
-        def reconcile
-          Reconcile.new @b
-        end
-        def reconcile_build(build_name, item_spec=nil)
-          ReconcileBuild.new @b, build_name, item_spec
-        end
-        def reconcile_changeset(changeset_name, item_spec=nil)
-          ReconcileChangeset.new @b, changeset_name, item_spec
-        end
-        def reconcile_forget_build(build_name, item_spec=nil)
-          ReconcileForgetBuild.new @b, build_name, item_spec
-        end
         def rename(old_item, new_item)
           Rename.new @b, old_item, new_item
         end
@@ -412,22 +400,12 @@ module FluentCommandBuilder
           yield @b if block_given?
           self
         end
-        def bypass
-          @b.append ' -bypass'
-          yield @b if block_given?
-          self
-        end
         def login(username, password=nil)
           @b.append " -login:#{@b.format username}"
           @b.append ",#{@b.format password}" unless password.nil?
           yield @b if block_given?
           self
         end
-        def force
-          @b.append ' -force'
-          yield @b if block_given?
-          self
-        end
       end
       class CheckinShelveset < CommandBase
         def initialize(underlying_builder, shelveset_name, shelveset_owner=nil)
@@ -435,11 +413,6 @@ module FluentCommandBuilder
           @b.append " checkin -shelveset:#{@b.format shelveset_name}"
           @b.append ";#{@b.format shelveset_owner}" unless shelveset_owner.nil?
         end
-        def bypass
-          @b.append ' -bypass'
-          yield @b if block_given?
-          self
-        end
         def no_prompt
           @b.append ' -noPrompt'
           yield @b if block_given?
@@ -461,11 +434,6 @@ module FluentCommandBuilder
           yield @b if block_given?
           self
         end
-        def force
-          @b.append ' -force'
-          yield @b if block_given?
-          self
-        end
       end
       class Checkout < CommandBase
         def initialize(underlying_builder, item_spec=nil)
@@ -547,6 +515,11 @@ module FluentCommandBuilder
           yield @b if block_given?
           self
         end
+        def force
+          @b.append ' -force'
+          yield @b if block_given?
+          self
+        end
         def silent
           @b.append ' -silent'
           yield @b if block_given?
@@ -1275,92 +1248,6 @@ module FluentCommandBuilder
           self
         end
       end
-      class Reconcile < CommandBase
-        def initialize(underlying_builder)
-          super underlying_builder
-          @b.append ' reconcile'
-        end
-        def team_project(team_project_name)
-          @b.append " -teamProject:#{@b.format team_project_name}"
-          yield @b if block_given?
-          self
-        end
-        def workspace(workspace_name, workspace_owner=nil)
-          @b.append " -workspace:#{@b.format workspace_name}"
-          @b.append ";#{@b.format workspace_owner}" unless workspace_owner.nil?
-          yield @b if block_given?
-          self
-        end
-      end
-      class ReconcileBuild < CommandBase
-        def initialize(underlying_builder, build_name, item_spec=nil)
-          super underlying_builder
-          @b.append " reconcile -buildName:#{@b.format build_name}"
-          @b.append " #{@b.format item_spec}" unless item_spec.nil?
-        end
-        def team_project(team_project_name)
-          @b.append " -teamProject:#{@b.format team_project_name}"
-          yield @b if block_given?
-          self
-        end
-        def workspace(workspace_name, workspace_owner=nil)
-          @b.append " -workspace:#{@b.format workspace_name}"
-          @b.append ";#{@b.format workspace_owner}" unless workspace_owner.nil?
-          yield @b if block_given?
-          self
-        end
-        def recursive
-          @b.append ' -recursive'
-          yield @b if block_given?
-          self
-        end
-      end
-      class ReconcileChangeset < CommandBase
-        def initialize(underlying_builder, changeset_name, item_spec=nil)
-          super underlying_builder
-          @b.append " reconcile -changeset:#{@b.format changeset_name}"
-          @b.append " #{@b.format item_spec}" unless item_spec.nil?
-        end
-        def team_project(team_project_name)
-          @b.append " -teamProject:#{@b.format team_project_name}"
-          yield @b if block_given?
-          self
-        end
-        def workspace(workspace_name, workspace_owner=nil)
-          @b.append " -workspace:#{@b.format workspace_name}"
-          @b.append ";#{@b.format workspace_owner}" unless workspace_owner.nil?
-          yield @b if block_given?
-          self
-        end
-        def recursive
-          @b.append ' -recursive'
-          yield @b if block_given?
-          self
-        end
-      end
-      class ReconcileForgetBuild < CommandBase
-        def initialize(underlying_builder, build_name, item_spec=nil)
-          super underlying_builder
-          @b.append " reconcile -forgetBuild:#{@b.format build_name}"
-          @b.append " #{@b.format item_spec}" unless item_spec.nil?
-        end
-        def team_project(team_project_name)
-          @b.append " -teamProject:#{@b.format team_project_name}"
-          yield @b if block_given?
-          self
-        end
-        def workspace(workspace_name, workspace_owner=nil)
-          @b.append " -workspace:#{@b.format workspace_name}"
-          @b.append ";#{@b.format workspace_owner}" unless workspace_owner.nil?
-          yield @b if block_given?
-          self
-        end
-        def recursive
-          @b.append ' -recursive'
-          yield @b if block_given?
-          self
-        end
-      end
       class Rename < CommandBase
         def initialize(underlying_builder, old_item, new_item)
           super underlying_builder

data/lib/fluent_command_builder/command_builders/team_foundation_tee_101.rb

@@ -547,6 +547,11 @@ module FluentCommandBuilder
           yield @b if block_given?
           self
         end
+        def force
+          @b.append ' -force'
+          yield @b if block_given?
+          self
+        end
         def silent
           @b.append ' -silent'
           yield @b if block_given?

data/lib/fluent_command_builder/command_builders/xcodebuild.rb

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

data/lib/fluent_command_builder/version.rb

@@ -27,7 +27,8 @@ module FluentCommandBuilder
     def self.match(value)
       exp = Regexp.new VERSION_REGEX
       version = value.scan(exp)[0]
-      version ? Version.new(version) : nil
+      return unless version
+      Version.new(version)
     end
 
     private

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

@@ -1,15 +1,19 @@
-require 'yaml'
-
-module FluentCommandBuilder
-  class AppEnginePythonVersionDetector
-
-    def self.version(executable_name, path=nil)
-      path ||= FluentCommandBuilder.path_finder.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
+require 'yaml'
+
+module FluentCommandBuilder
+  class AppEnginePythonVersionDetector
+
+    def initialize(command_name)
+      @command_name = command_name
+    end
+
+    def version(path=nil)
+      path ||= FluentCommandBuilder.path_finder.find_path @command_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/default_version_detector.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.dirname(__FILE__) + '/../version')
+require File.expand_path(File.dirname(__FILE__) + '/standard_version_detector')
+
+module FluentCommandBuilder
+  class DefaultVersionDetector
+
+    def initialize(command_name)
+      @command_name = command_name
+      @command_args = %w(--version -version /version --help -help /help version help)
+    end
+
+    def version(path=nil)
+      path ||= FluentCommandBuilder.path_finder.find_path @command_name
+      return unless path
+
+      @command_args.each do |command_arg|
+        version = try_get_version command_arg
+        return version if version
+      end
+
+      try_get_version
+    end
+
+    private
+
+    def try_get_version(command_arg=nil)
+      d = StandardVersionDetector.new @command_name, command_arg
+      d.version
+    end
+
+  end
+end

data/lib/fluent_command_builder/version_detectors/osx_version_detector.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/standard_version_detector')
+
+module FluentCommandBuilder
+  class OsxVersionDetector
+
+    def version(path=nil)
+      d = StandardVersionDetector.new 'sw_vers', '-productVersion'
+      d.version
+    end
+
+  end
+end