getversion 0.0.8 → 0.0.9

data/lib/getversion/detectors/apple.rb

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

data/lib/getversion/detectors/google.rb

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

data/lib/getversion/detectors/jetbrains.rb

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

data/lib/getversion/detectors/microsoft.rb

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

data/lib/getversion/detectors/rubygems.rb

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

data/lib/getversion/detectors/uncategorised.rb

@@ -1,10 +1,10 @@
 module GetVersion
 
-  executable 'conlinkchecker' do
+  executable :conlinkchecker do
     find_version_in_output
   end
 
-  executable 'nunit' do
+  executable :nunit do
     find_version_in_output '/help'
   end
 

data/lib/getversion/executable.rb

@@ -4,31 +4,18 @@ require_relative 'execution_context'
 module GetVersion
   class Executable
 
-    attr_reader :name, :namespace, :block
+    attr_reader :block
 
-    def initialize(name, namespace, &block)
-      @name = name
-      @namespace = namespace
-      @block = block
+    def initialize(&block)
+      @block = block || Proc.new {}
     end
 
-    def version(name, dir=nil)
-      ExecutionContext.execute path(name, dir), &@block
+    def version(path)
+      ExecutionContext.execute path, &@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
+    def self.version(path, &block)
+      Executable.new(&block).version(path)
     end
 
   end

data/lib/getversion/executable_store.rb

@@ -8,12 +8,15 @@ module GetVersion
     end
 
     def add_executable(name, namespace, &block)
-      @executables << Executable.new(name, namespace, &block)
+      @executables << {name: name.to_sym, namespace: namespace.to_sym, value: Executable.new(&block)}
     end
 
-    def get_executable(name)
+    def get_executable(path)
+      basename = File.basename path
+      name = basename == path ? path : basename
       possibilities = [name, File.basename(name, '.*')]
-      @executables.find { |e| possibilities.find { |p| p.casecmp(e.name) == 0 } }
+      executable = @executables.find { |e| possibilities.find { |p| p.casecmp(e[:name].to_s) == 0 } }
+      executable[:value] if executable
     end
 
   end

data/lib/getversion/platform_versions.rb

@@ -1,3 +1,4 @@
+require 'wicked_witch'
 require 'yaml'
 require_relative 'executable'
 
@@ -5,7 +6,8 @@ module GetVersion
   module PlatformVersions
 
     def google_appengine_version
-      dir = File.dirname @path
+      realpath = WickedWitch[@path]
+      dir = File.dirname realpath
       version_file = File.join dir, 'VERSION'
       YAML::load_file(version_file)['release']
     end

data/lib/getversion/version_finder.rb

@@ -19,31 +19,16 @@ module GetVersion
     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
+      executable = @executable_store.get_executable(@path) || executable_if_nil
+      executable.version @path
     end
 
     def null_executable
-      Executable.new name, nil do
-      end
+      Executable.new
     end
 
     def executable_for_guessing
-      Executable.new name, nil do
+      Executable.new 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getversion
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wicked_witch
-  requirement: &70254546514720 !ruby/object:Gem::Requirement
+  requirement: &70288378670740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,18 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70254546514720
+  version_requirements: *70288378670740
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70288378670260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.5
+  type: :development
+  prerelease: false
+  version_requirements: *70288378670260
 description: Provides a standard interface for obtaining CLI application version numbers.
 email: matthew@matthewriley.name
 executables: