getversion 0.0.7 → 0.0.8

data/bin/getversion.rb

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

data/lib/getversion/detectors/apple.rb

@@ -1,13 +1,13 @@
-module GetVersion
-
-  namespace :apple
-
-  executable 'security' do
-    osx_version
-  end
-
-  executable 'xcodebuild' do
-    find_version_in_output '-version'
-  end
-
+module GetVersion
+
+  namespace :apple
+
+  executable 'security' do
+    osx_version
+  end
+
+  executable 'xcodebuild' do
+    find_version_in_output '-version'
+  end
+
 end

data/lib/getversion/detectors/google.rb

@@ -1,13 +1,13 @@
-module GetVersion
-
-  namespace :google
-
-  executable 'appcfg' do
-    google_appengine_version
-  end
-
-  executable 'dev_appserver' do
-    google_appengine_version
-  end
-
+module GetVersion
+
+  namespace :google
+
+  executable 'appcfg' do
+    google_appengine_version
+  end
+
+  executable 'dev_appserver' do
+    google_appengine_version
+  end
+
 end

data/lib/getversion/detectors/jetbrains.rb

@@ -1,9 +1,9 @@
-module GetVersion
-
-  namespace :jetbrains
-
-  executable 'dotcover' do
-    find_version_in_output
-  end
-
+module GetVersion
+
+  namespace :jetbrains
+
+  executable 'dotcover' do
+    find_version_in_output
+  end
+
 end

data/lib/getversion/detectors/microsoft.rb

@@ -1,37 +1,37 @@
-module GetVersion
-
-  namespace :microsoft
-
-  executable 'aspnet_compiler' do
-    GetVersion['msbuild']
-  end
-
-  executable 'installutil' do
-    find_version_in_output
-  end
-
-  executable 'msbuild' do
-    find_version_in_output '/version'
-  end
-
-  executable 'msdeploy' do
-    find_version_in_output
-  end
-
-  executable 'mstest' do
-    find_version_in_output '/help'
-  end
-
-  executable 'netsh' do
-    windows_version
-  end
-
-  executable 'nuget' do
-    find_version_in_output
-  end
-
-  executable 'tf' do
-    find_version_in_output
-  end
-
+module GetVersion
+
+  namespace :microsoft
+
+  executable 'aspnet_compiler' do
+    GetVersion['msbuild']
+  end
+
+  executable 'installutil' do
+    find_version_in_output
+  end
+
+  executable 'msbuild' do
+    find_version_in_output '/version'
+  end
+
+  executable 'msdeploy' do
+    find_version_in_output
+  end
+
+  executable 'mstest' do
+    find_version_in_output '/help'
+  end
+
+  executable 'netsh' do
+    windows_version
+  end
+
+  executable 'nuget' do
+    find_version_in_output
+  end
+
+  executable 'tf' do
+    find_version_in_output
+  end
+
 end

data/lib/getversion/detectors/rubygems.rb

@@ -1,17 +1,17 @@
-module GetVersion
-
-  namespace :rubygems
-
-  executable 'bundle' do
-    find_version_in_output '--version'
-  end
-
-  executable 'cucumber' do
-    find_version_in_output '--version'
-  end
-
-  executable 'rake' do
-    find_version_in_output '--version'
-  end
-
+module GetVersion
+
+  namespace :rubygems
+
+  executable 'bundle' do
+    find_version_in_output '--version'
+  end
+
+  executable 'cucumber' do
+    find_version_in_output '--version'
+  end
+
+  executable 'rake' do
+    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
-  end
-
-  executable 'nunit' do
-    find_version_in_output '/help'
-  end
-
-  executable '7z' do
-    find_version_in_output
-  end
-
-  executable '7za' do
-    find_version_in_output
-  end
-
+module GetVersion
+
+  executable 'conlinkchecker' do
+    find_version_in_output
+  end
+
+  executable 'nunit' do
+    find_version_in_output '/help'
+  end
+
+  executable '7z' do
+    find_version_in_output
+  end
+
+  executable '7za' do
+    find_version_in_output
+  end
+
 end

data/lib/getversion/executable.rb

@@ -1,31 +1,35 @@
-require_relative 'executable_path_finder'
-require_relative 'execution_context'
-
-module GetVersion
-  class Executable
-
-    attr_reader :name, :namespace, :block
-
-    def initialize(name, namespace, &block)
-      @name = name
-      @namespace = namespace
-      @block = block
-    end
-
-    def version(dir=nil)
-      ExecutionContext.execute path(dir), &@block
-    end
-
-    def self.version(name, &block)
-      Executable.new(name, nil, &block).version
-    end
-
-    def path(dir=nil)
-      dir ||= ExecutablePathFinder.find_dir @name
-      dir = nil if dir == '.'
-      return @name unless dir
-      File.join dir, @name
-    end
-
-  end
+require 'wicked_witch'
+require_relative 'execution_context'
+
+module GetVersion
+  class Executable
+
+    attr_reader :name, :namespace, :block
+
+    def initialize(name, namespace, &block)
+      @name = name
+      @namespace = namespace
+      @block = block
+    end
+
+    def version(name, dir=nil)
+      ExecutionContext.execute path(name, dir), &@block
+    end
+
+    def self.version(name, &block)
+      Executable.new(name, nil, &block).version(name)
+    end
+
+    private
+
+    def path(name, dir=nil)
+      path = WickedWitch[name]
+      raise "#{name} not found." unless path
+      dir ||= File.dirname(path)
+      dir = nil if dir == '.'
+      return name unless dir
+      File.join dir, name
+    end
+
+  end
 end

data/lib/getversion/executable_store.rb

@@ -1,20 +1,20 @@
-require_relative 'executable'
-
-module GetVersion
-  class ExecutableStore
-
-    def initialize
-      @executables = []
-    end
-
-    def add_executable(name, namespace, &block)
-      @executables << Executable.new(name, namespace, &block)
-    end
-
-    def get_executable(name)
-      possibilities = [name, File.basename(name, '.*')]
-      @executables.find { |e| possibilities.find { |p| p.casecmp(e.name) == 0 } }
-    end
-
-  end
+require_relative 'executable'
+
+module GetVersion
+  class ExecutableStore
+
+    def initialize
+      @executables = []
+    end
+
+    def add_executable(name, namespace, &block)
+      @executables << Executable.new(name, namespace, &block)
+    end
+
+    def get_executable(name)
+      possibilities = [name, File.basename(name, '.*')]
+      @executables.find { |e| possibilities.find { |p| p.casecmp(e.name) == 0 } }
+    end
+
+  end
 end

data/lib/getversion/execution_context.rb

@@ -1,25 +1,25 @@
-require_relative 'platform_versions'
-
-module GetVersion
-  class ExecutionContext
-
-    include PlatformVersions
-
-    def initialize(path)
-      @path = path
-    end
-
-    def execute(&block)
-      instance_eval &block
-    end
-
-    def self.execute(path, &block)
-      ExecutionContext.new(path).execute(&block)
-    end
-
-    def find_version_in_output(arg=nil)
-      `"#{@path}" #{arg} 2>&1`[/(\d+\.)+\d+/]
-    end
-
-  end
+require_relative 'platform_versions'
+
+module GetVersion
+  class ExecutionContext
+
+    include PlatformVersions
+
+    def initialize(path)
+      @path = path
+    end
+
+    def execute(&block)
+      instance_eval &block
+    end
+
+    def self.execute(path, &block)
+      ExecutionContext.new(path).execute(&block)
+    end
+
+    def find_version_in_output(arg=nil)
+      `"#{@path}" #{arg} 2>&1`[/(\d+\.)+\d+/]
+    end
+
+  end
 end

data/lib/getversion/platform_versions.rb

@@ -1,22 +1,22 @@
-require 'yaml'
-require_relative 'executable'
-
-module GetVersion
-  module PlatformVersions
-
-    def google_appengine_version
-      dir = File.dirname @path
-      version_file = File.join dir, 'VERSION'
-      YAML::load_file(version_file)['release']
-    end
-
-    def osx_version
-      Executable.version('sw_vers') { find_version_in_output '-productVersion' }
-    end
-
-    def windows_version
-      Executable.version('ver') { find_version_in_output }
-    end
-
-  end
+require 'yaml'
+require_relative 'executable'
+
+module GetVersion
+  module PlatformVersions
+
+    def google_appengine_version
+      dir = File.dirname @path
+      version_file = File.join dir, 'VERSION'
+      YAML::load_file(version_file)['release']
+    end
+
+    def osx_version
+      Executable.version('sw_vers') { find_version_in_output '-productVersion' }
+    end
+
+    def windows_version
+      Executable.version('ver') { find_version_in_output }
+    end
+
+  end
 end

data/lib/getversion/version_finder.rb

@@ -1,54 +1,54 @@
-require_relative 'executable'
-
-module GetVersion
-  class VersionFinder
-
-    def initialize(executable_path, executable_store)
-      @path = executable_path
-      @executable_store = executable_store
-    end
-
-    def get_version
-      get null_executable
-    end
-
-    def guess_version
-      get executable_for_guessing
-    end
-
-    private
-
-    def get(executable_if_nil)
-      executable = @executable_store.get_executable(name) || executable_if_nil
-      executable.version dir
-    end
-
-    def path
-      @path
-    end
-
-    def name
-      File.basename path
-    end
-
-    def dir
-      dir = File.dirname path
-      dir = nil if dir == '.'
-      dir
-    end
-
-    def null_executable
-      Executable.new name, nil do
-      end
-    end
-
-    def executable_for_guessing
-      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
+require_relative 'executable'
+
+module GetVersion
+  class VersionFinder
+
+    def initialize(executable_path, executable_store)
+      @path = executable_path
+      @executable_store = executable_store
+    end
+
+    def get_version
+      get null_executable
+    end
+
+    def guess_version
+      get executable_for_guessing
+    end
+
+    private
+
+    def get(executable_if_nil)
+      executable = @executable_store.get_executable(name) || executable_if_nil
+      executable.version name, dir
+    end
+
+    def path
+      @path
+    end
+
+    def name
+      File.basename path
+    end
+
+    def dir
+      dir = File.dirname path
+      dir = nil if dir == '.'
+      dir
+    end
+
+    def null_executable
+      Executable.new name, nil do
+      end
+    end
+
+    def executable_for_guessing
+      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.rb

@@ -1,31 +1,31 @@
-require_relative 'getversion/executable_store'
-require_relative 'getversion/version_finder'
-
-module GetVersion
-
-  @executable_store = ExecutableStore.new
-
-  def self.[](path)
-    version_finder(path).get_version
-  end
-
-  def self.guess(path)
-    version_finder(path).guess_version
-  end
-
-  private
-
-  def self.version_finder(path)
-    VersionFinder.new(path, @executable_store)
-  end
-
-  def self.namespace(namespace)
-    @namespace = namespace
-  end
-
-  def self.executable(name, &block)
-    @executable_store.add_executable name, @namespace, &block
-  end
-
-  require_relative 'getversion/detectors'
+require_relative 'getversion/executable_store'
+require_relative 'getversion/version_finder'
+
+module GetVersion
+
+  @executable_store = ExecutableStore.new
+
+  def self.[](path)
+    version_finder(path).get_version
+  end
+
+  def self.guess(path)
+    version_finder(path).guess_version
+  end
+
+  private
+
+  def self.version_finder(path)
+    VersionFinder.new(path, @executable_store)
+  end
+
+  def self.namespace(namespace)
+    @namespace = namespace
+  end
+
+  def self.executable(name, &block)
+    @executable_store.add_executable name, @namespace, &block
+  end
+
+  require_relative 'getversion/detectors'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getversion
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
-dependencies: []
+date: 2013-08-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: wicked_witch
+  requirement: &70254546514720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *70254546514720
 description: Provides a standard interface for obtaining CLI application version numbers.
 email: matthew@matthewriley.name
 executables:
@@ -26,13 +37,13 @@ files:
 - lib/getversion/detectors/uncategorised.rb
 - lib/getversion/detectors.rb
 - lib/getversion/executable.rb
-- lib/getversion/executable_path_finder.rb
 - lib/getversion/executable_store.rb
 - lib/getversion/execution_context.rb
 - lib/getversion/platform_versions.rb
 - lib/getversion/version_finder.rb
 - lib/getversion.rb
-- bin/getversion.rb
+- !binary |-
+  YmluL2dldHZlcnNpb24ucmI=
 homepage: http://rubygems.org/gems/getversion
 licenses: []
 post_install_message: 
@@ -53,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Provides a standard interface for obtaining CLI application version numbers.

data/lib/getversion/executable_path_finder.rb

@@ -1,43 +0,0 @@
-module GetVersion
-  class ExecutablePathFinder
-
-    def initialize(name)
-      @name = name
-    end
-
-    def find_dir
-      path = find_path
-      File.dirname path if path
-    end
-    
-    def find_path
-      is_windows? ? find_path_on_windows : find_path_on_unix
-    end
-
-    def self.find_dir(name)
-      ExecutablePathFinder.new(name).find_dir
-    end
-
-    private
-
-    def is_windows?
-      !ENV['WINDIR'].nil?
-    end
-
-    def find_path_on_unix
-      path = `which #{@name}`.strip
-      return if path.empty?
-      real_path = `readlink #{path}`.strip
-      real_path = nil if real_path.empty?
-      real_path || path
-    end
-
-    def find_path_on_windows
-      paths = ENV['PATH'].split ';'
-      extensions = ENV['PATHEXT'].split ';'
-      possibilities = paths.map { |path| extensions.map { |ext| File.join(path, @name + ext.downcase).gsub('/', '\\') } }.flatten
-      possibilities.find { |f| File.exist? f }
-    end
-
-  end
-end