cliver 0.1.0 → 0.1.1

data/README.md

@@ -56,8 +56,10 @@ the same rules including pre-release semantics.
 
 ## See Also:
 
+ - [YARD Documentation][yard-docs]
  - [Contributing](CONTRIBUTING.md)
  - [License](LICENSE.txt)
 
 
 [rubygems/requirements]: https://github.com/rubygems/rubygems/blob/master/lib/rubygems/requirement.rb
+[yard-docs]: http://yaauie.github.io/cliver/

data/cliver.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'ruby-appraiser-reek'
   spec.add_development_dependency 'ruby-appraiser-rubocop'
+  spec.add_development_dependency 'yard'
 end

data/lib/cliver.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'cliver/version'
+require 'cliver/which'
 require 'cliver/assertion'
 require 'cliver/detector'
 require 'cliver/detector/default'

data/lib/cliver/assertion.rb

@@ -6,6 +6,9 @@ module Cliver
   # The core of Cliver, Assertion is responsible for detecting the
   # installed version of a binary and determining if it meets the requirements
   class Assertion
+
+    include Which # platform-specific implementation of `which`
+
     DependencyNotMet = Class.new(ArgumentError)
     DependencyVersionMismatch = Class.new(DependencyNotMet)
     DependencyNotFound = Class.new(DependencyNotMet)
@@ -59,9 +62,8 @@ module Cliver
     # @return [String] Gem::Version-parsable string version
     # @return [true]   if present and no requirements (optimization)
     def installed_version
-      which, _ = Open3.capture2e("which #{@executable}")
-      executable_path = which.chomp
-      return nil if executable_path.empty?
+      executable_path = which(@executable)
+      return nil unless executable_path
       return true unless @requirement
 
       @detector.to_proc.call(executable_path).tap do |version|

data/lib/cliver/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cliver
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/cliver/which.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+module Cliver
+  # The `which` command we love on many posix-systems needs analogues on other
+  # systems. The Which module congitionally includes the correct implementation
+  # into itself, so you can include it into something else.
+  module Which
+    case RbConfig::CONFIG['host_os']
+    when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+      require_relative 'which/windows'
+      include Cliver::Which::Windows
+    else
+      require_relative 'which/posix'
+      include Cliver::Which::Posix
+    end
+  end
+end

data/lib/cliver/which/posix.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+require 'open3'
+
+module Cliver
+  module Which
+    # Posix implementation of Which
+    # Required and mixed into Cliver::Which in posix environments
+    module Posix
+      # @param executable [String]
+      # @return [nil,String] - path to found executable
+      def which(executable)
+        # command -v is the POSIX-specified implementation behind which.
+        # http://pubs.opengroup.org/onlinepubs/009695299/utilities/command.html
+        which, status = Open3.capture2e('command', '-v', executable)
+        return nil unless status.success?
+        which.chomp
+      end
+    end
+  end
+end

data/lib/cliver/which/windows.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'open3'
+
+module Cliver
+  module Which
+    # Windows-specific implementation of Which
+    # Required and mixed into Cliver::Which in windows environments
+    module Windows
+      # @param executable [String]
+      # @return [nil,String] - path to found executable
+      def which(executable)
+        # `where` returns newline-separated files found on path, but doesn't
+        # ensure that they are executable as commands.
+        where, _ = Open3.capture2e('where', executable)
+        where.split("\n").find do |found|
+          next if found.empty?
+          File.executable?(found)
+        end
+      end
+    end
+  end
+end

data/spec/cliver/assertion_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'cliver/assertion'
+require 'cliver'
 
 describe Cliver::Assertion do
   let(:mismatch_exception) { Cliver::Assertion::DependencyVersionMismatch }

data/spec/cliver/detector_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'cliver/detector'
+require 'cliver'
 
 describe Cliver::Detector do
   let(:detector) { Cliver::Detector::Default.new(*args) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cliver
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Assertions for command-line dependencies
 email:
 - ryan@yaauie.com
@@ -111,6 +127,9 @@ files:
 - lib/cliver/detector.rb
 - lib/cliver/detector/default.rb
 - lib/cliver/version.rb
+- lib/cliver/which.rb
+- lib/cliver/which/posix.rb
+- lib/cliver/which/windows.rb
 - spec/cliver/assertion_spec.rb
 - spec/cliver/detector_spec.rb
 - spec/cliver_spec.rb