getversion 0.0.10 → 0.0.11

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.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

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-console' 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,22 +1,22 @@
-require 'wicked_witch'
-require_relative 'execution_context'
-
-module GetVersion
-  class Executable
-
-    attr_reader :block
-
-    def initialize(&block)
-      @block = block || Proc.new {}
-    end
-
-    def version(path)
-      ExecutionContext.execute path, &@block
-    end
-
-    def self.version(path, &block)
-      Executable.new(&block).version(path)
-    end
-
-  end
+require 'wicked_witch'
+require_relative 'execution_context'
+
+module GetVersion
+  class Executable
+
+    attr_reader :block
+
+    def initialize(&block)
+      @block = block || Proc.new {}
+    end
+
+    def version(path)
+      ExecutionContext.execute path, &@block
+    end
+
+    def self.version(path, &block)
+      Executable.new(&block).version(path)
+    end
+
+  end
 end

data/lib/getversion/executable_store.rb

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

data/lib/getversion/execution_context.rb

@@ -1,25 +1,26 @@
-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 = @path.include?(' ') ? %Q["#{@path}"] : @path
+      `#{path} #{arg} 2>&1`[/(\d+\.)+\d+/]
+    end
+
+  end
 end

data/lib/getversion/platform_versions.rb

@@ -1,26 +1,26 @@
-require 'pathname'
-require 'yaml'
-require 'wicked_witch'
-require_relative 'executable'
-
-module GetVersion
-  module PlatformVersions
-
-    def google_appengine_version
-      has_dir = File.basename(@path) != @path
-      realpath = has_dir ? Pathname.new(@path).realpath.to_s : WickedWitch[@path]
-      dir = File.dirname realpath
-      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 'pathname'
+require 'yaml'
+require 'wicked_witch'
+require_relative 'executable'
+
+module GetVersion
+  module PlatformVersions
+
+    def google_appengine_version
+      has_dir = File.basename(@path) != @path
+      realpath = has_dir ? Pathname.new(@path).realpath.to_s : WickedWitch[@path]
+      dir = File.dirname realpath
+      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,39 +1,39 @@
-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(@path) || executable_if_nil
-      executable.version @path
-    end
-
-    def null_executable
-      Executable.new
-    end
-
-    def executable_for_guessing
-      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
-      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(@path) || executable_if_nil
+      executable.version @path
+    end
+
+    def null_executable
+      Executable.new
+    end
+
+    def executable_for_guessing
+      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
+      end
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getversion
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wicked_witch
-  requirement: &70232585889500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70232585889500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70232585905400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: 2.5.5
   type: :development
   prerelease: false
-  version_requirements: *70232585905400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.5
 description: Provides a standard interface for obtaining CLI application version numbers.
 email: matthew@matthewriley.name
 executables:
@@ -53,8 +63,7 @@ files:
 - lib/getversion/platform_versions.rb
 - lib/getversion/version_finder.rb
 - lib/getversion.rb
-- !binary |-
-  YmluL2dldHZlcnNpb24ucmI=
+- bin/getversion.rb
 homepage: http://rubygems.org/gems/getversion
 licenses: []
 post_install_message: 
@@ -75,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Provides a standard interface for obtaining CLI application version numbers.