getversion 0.0.1 → 0.0.2

data/lib/getversion/detectors/apple.rb

@@ -7,7 +7,7 @@ module GetVersion
   end
 
   executable 'xcodebuild' do
-    find_version_in_output @exe, '-version'
+    find_version_in_output path, '-version'
   end
 
 end

data/lib/getversion/detectors/google.rb

@@ -5,11 +5,11 @@ module GetVersion
   namespace :google
 
   executable 'appcfg.py' do
-    google_appengine_version @exe
+    google_appengine_version
   end
 
   executable 'dev_appserver.py' do
-    google_appengine_version @exe
+    google_appengine_version
   end
 
 end

data/lib/getversion/detectors/jetbrains.rb

@@ -3,7 +3,7 @@ module GetVersion
   namespace :jetbrains
 
   executable 'dotcover' do
-    find_version_in_output @exe
+    find_version_in_output
   end
 
 end

data/lib/getversion/detectors/microsoft.rb

@@ -7,19 +7,19 @@ module GetVersion
   end
 
   executable 'installutil' do
-    find_version_in_output @exe
+    find_version_in_output
   end
 
   executable 'msbuild' do
-    find_version_in_output @exe, '/version'
+    find_version_in_output '/version'
   end
 
   executable 'msdeploy' do
-    find_version_in_output @exe
+    find_version_in_output
   end
 
   executable 'mstest' do
-    find_version_in_output @exe, '/help'
+    find_version_in_output '/help'
   end
 
   executable 'netsh' do
@@ -27,11 +27,11 @@ module GetVersion
   end
 
   executable 'nuget' do
-    find_version_in_output @exe
+    find_version_in_output
   end
 
   executable 'tf' do
-    find_version_in_output @exe
+    find_version_in_output
   end
 
 end

data/lib/getversion/detectors/rubygems.rb

@@ -3,15 +3,15 @@ module GetVersion
   namespace :rubygems
 
   executable 'bundle' do
-    find_version_in_output @exe, '--version'
+    find_version_in_output '--version'
   end
 
   executable 'cucumber' do
-    find_version_in_output @exe, '--version'
+    find_version_in_output '--version'
   end
 
   executable 'rake' do
-    find_version_in_output @exe, '--version'
+    find_version_in_output '--version'
   end
 
 end

data/lib/getversion/detectors/uncategorised.rb

@@ -1,19 +1,19 @@
 module GetVersion
 
   executable 'conlinkchecker' do
-    find_version_in_output @exe
+    find_version_in_output
   end
 
   executable 'nunit' do
-    find_version_in_output @exe, '/help'
+    find_version_in_output '/help'
   end
 
   executable '7z' do
-    find_version_in_output @exe
+    find_version_in_output
   end
 
   executable '7za' do
-    find_version_in_output @exe
+    find_version_in_output
   end
 
 end

data/lib/getversion/executable.rb

@@ -0,0 +1,29 @@
+require_relative 'execution_context'
+require_relative 'path_finder'
+require_relative 'path'
+
+module GetVersion
+  class Executable
+
+    attr_reader :name, :namespace, :block
+
+    def initialize(name, namespace, &block)
+      @name = name
+      @namespace = namespace
+      @block = block
+    end
+
+    def version
+      c = ExecutionContext.new path
+      c.execute &@block
+    end
+
+    def path
+      dir = PathFinder.find_path @name
+      exclusions = %w(.)
+      exclusions.include?(dir) ? nil : dir
+      dir ? Path.new(dir, name).evaluated_path : @name
+    end
+
+  end
+end

data/lib/getversion/execution_context.rb

@@ -0,0 +1,43 @@
+require_relative 'version'
+
+module GetVersion
+  class ExecutionContext
+
+    def initialize(path)
+      @path = path
+    end
+
+    def execute(&block)
+      instance_eval &block
+    end
+
+    def path
+      @path
+    end
+
+    def find_version_in_output(arg=nil)
+      ExecutionContext.find_version_in_output @path, arg
+    end
+
+    def self.find_version_in_output(path, arg=nil)
+      output = `"#{path}" #{arg} 2>&1`
+      v = Version.match output
+      v ? v.version : nil
+    end
+
+    def google_appengine_version(path=@path)
+      path = File.dirname path
+      version_file = File.join path, 'VERSION'
+      YAML::load_file(version_file)['release']
+    end
+
+    def osx_version
+      ExecutionContext.find_version_in_output 'sw_vers', '-productVersion'
+    end
+
+    def windows_version
+      find_version_in_output 'ver'
+    end
+
+  end
+end

data/lib/getversion.rb

@@ -1,28 +1,36 @@
-require_relative 'getversion/path_finder'
-require_relative 'getversion/path'
-require_relative 'getversion/helpers'
+require_relative 'getversion/executable'
 
 module GetVersion
 
   @executables = []
 
   def self.[](name)
-    executable = @executables.find { |e| e[:name] == name }
-    path = PathFinder.find_path name
-    path = nil if path == '.'
-    @exe = path ? Path.new(path, name).evaluated_path : name
-    instance_eval &executable[:block]
+    executable = find_executable(name) || executable_for_guessing(name)
+    executable.version
   end
 
   private
 
+  def self.executable_for_guessing(name)
+    Executable.new name, nil do
+      args = %w(--version -version /version version --help -help /help help) << nil
+      versions = args.map { |arg| find_version_in_output arg }.compact.uniq
+      versions[0] if versions.length == 1
+    end
+  end
+
+  def self.find_executable(name)
+    @executables.find { |e| e.name == name }
+  end
+
   def self.namespace(namespace)
     @namespace = namespace
     yield if block_given?
   end
 
   def self.executable(name, &block)
-    @executables << {name: name, namespace: @namespace, block: block}
+    executable = Executable.new name, @namespace, &block
+    @executables << executable
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getversion
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -25,7 +25,8 @@ files:
 - lib/getversion/detectors/rubygems.rb
 - lib/getversion/detectors/uncategorised.rb
 - lib/getversion/detectors.rb
-- lib/getversion/helpers.rb
+- lib/getversion/executable.rb
+- lib/getversion/execution_context.rb
 - lib/getversion/path.rb
 - lib/getversion/path_finder.rb
 - lib/getversion/path_finders/unix_path_finder.rb

data/lib/getversion/helpers.rb

@@ -1,25 +0,0 @@
-require_relative 'version'
-
-module GetVersion
-
-  def self.find_version_in_output(executable, args=nil)
-    output = `"#{executable}" #{args} 2>&1`
-    v = Version.match output
-    v ? v.version : nil
-  end
-
-  def self.google_appengine_version(executable)
-    path = File.dirname executable
-    version_file = File.join path, 'VERSION'
-    YAML::load_file(version_file)['release']
-  end
-
-  def self.osx_version
-    find_version_in_output 'sw_vers', '-productVersion'
-  end
-
-  def self.windows_version
-    find_version_in_output 'ver'
-  end
-
-end