getversion 0.0.2 → 0.0.3

data/bin/getversion.rb

@@ -1,2 +1,7 @@
 require_relative '../lib/getversion'
-puts GetVersion[ARGV[0]]
+
+name = ARGV[0]
+should_guess = ARGV[1] && ARGV[1] == '--guess'
+
+version = should_guess ? GetVersion.guess(name) : GetVersion[name]
+puts version

data/lib/getversion/detectors/apple.rb

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

data/lib/getversion/executable.rb

@@ -15,15 +15,18 @@ module GetVersion
 
     def version
       c = ExecutionContext.new path
-      c.execute &@block
+      c.execute &@block if @block
     end
 
     def path
       dir = PathFinder.find_path @name
-      exclusions = %w(.)
-      exclusions.include?(dir) ? nil : dir
+      dir = nil if dir == '.'
       dir ? Path.new(dir, name).evaluated_path : @name
     end
 
+    def self.version(name, &block)
+      Executable.new(name, nil, &block).version
+    end
+
   end
 end

data/lib/getversion/executable_store.rb

@@ -0,0 +1,43 @@
+require_relative 'executable'
+
+module GetVersion
+  class ExecutableStore
+
+    def initialize
+      @executables = []
+    end
+
+    def get_version(name)
+      executable = find_executable(name) || null_executable(name)
+      executable.version
+    end
+
+    def guess_version(name)
+      executable = find_executable(name) || executable_for_guessing(name)
+      executable.version
+    end
+
+    def add_executable(name, namespace, &block)
+      @executables << Executable.new(name, namespace, &block)
+    end
+
+    private
+
+    def find_executable(name)
+      @executables.find { |e| e.name == name }
+    end
+
+    def null_executable(name)
+      Executable.new name, nil
+    end
+
+    def 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
+
+  end
+end

data/lib/getversion/execution_context.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+require_relative 'executable'
 require_relative 'version'
 
 module GetVersion
@@ -11,32 +13,24 @@ module GetVersion
       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`
+      output = `"#{@path}" #{arg} 2>&1`
       v = Version.match output
       v ? v.version : nil
     end
 
-    def google_appengine_version(path=@path)
-      path = File.dirname path
+    def google_appengine_version
+      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'
+      Executable.version('sw_vers') { find_version_in_output '-productVersion' }
     end
 
     def windows_version
-      find_version_in_output 'ver'
+      Executable.version('ver') { find_version_in_output }
     end
 
   end

data/lib/getversion/path_finders/unix_path_finder.rb

@@ -1,11 +1,10 @@
 class UnixPathFinder
 
   def find_path(executable_name)
-    executable = `which #{executable_name}`
-    real_executable = `readlink #{executable}`.strip
-    result = real_executable == '' ? executable : real_executable
-    return if result.to_s == ''
-    File.dirname result
+    path = `which #{executable_name}`
+    real_path = `readlink #{path}`.strip
+    result = real_path.empty? ? path : real_path
+    result.empty? ? nil : File.dirname(result)
   end
 
 end

data/lib/getversion/path_finders/windows_path_finder.rb

@@ -5,8 +5,7 @@ class WindowsPathFinder
     extensions = ENV['PATHEXT'].split ';'
     possibilities = paths.map { |path| extensions.map { |ext| File.join(path, executable_name + ext.downcase).gsub('/', '\\') } }.flatten
     executable = possibilities.select { |exe| File.exist? exe }.first
-    return unless executable
-    File.dirname executable
+    executable ? File.dirname(executable) : nil
   end
 
 end

data/lib/getversion.rb

@@ -1,38 +1,26 @@
-require_relative 'getversion/executable'
+require_relative 'getversion/executable_store'
 
 module GetVersion
 
-  @executables = []
+  @executable_store = ExecutableStore.new
 
   def self.[](name)
-    executable = find_executable(name) || executable_for_guessing(name)
-    executable.version
+    @executable_store.get_version name
   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
+  def self.guess(name)
+    @executable_store.guess_version name
   end
 
-  def self.find_executable(name)
-    @executables.find { |e| e.name == name }
-  end
+  private
 
   def self.namespace(namespace)
     @namespace = namespace
-    yield if block_given?
   end
 
   def self.executable(name, &block)
-    executable = Executable.new name, @namespace, &block
-    @executables << executable
+    @executable_store.add_executable name, @namespace, &block
   end
 
-end
-
-require_relative 'getversion/detectors'
+  require_relative 'getversion/detectors'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getversion
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies: []
 description: Provides a standard interface for obtaining CLI application version numbers.
 email: matthew@matthewriley.name
@@ -26,6 +26,7 @@ files:
 - lib/getversion/detectors/uncategorised.rb
 - lib/getversion/detectors.rb
 - lib/getversion/executable.rb
+- lib/getversion/executable_store.rb
 - lib/getversion/execution_context.rb
 - lib/getversion/path.rb
 - lib/getversion/path_finder.rb