specinfra 2.44.6 → 2.44.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26001382ecee3209a8b36ce8a89026553ea8fdf4
-  data.tar.gz: 5228b828c4c93ae7bf994a90ec48d6fe92787cc8
+  metadata.gz: 7a7752539a98d121da670a943b1dfee8075b66ba
+  data.tar.gz: a38bd13b6a8656d6ccb2e742c3f60b617d03a474
 SHA512:
-  metadata.gz: ee25dec81c0887842535b4b57352a765640e843b9fd49131d9f1bafd357137acb9670b3ed9f2ef4ccb0bff05f3da1273cae9968e9ae8083ac5f8d52392aaac5a
-  data.tar.gz: 09667dec2a67838fc23e73db81c24ebf0bab181538669feb844456314bdabc9b45f6a62dcde6fe0961123f5da9374bf2fa4bcd93c474430d91bcdf427155989b
+  metadata.gz: 46bb50879bf62095e16ec274ebed421595c85d7523bd0a15618b830c85fd3accbc568d8149ed7741a99f505139e699bfafa88d6bd31e8e8febd8cace14c9c8be
+  data.tar.gz: 462498819859a30a2072ca60a2f51e6b8afa43eeffc7002a627658afd702315b747b352dfeff5f49356e2756659fd08c1b36960a3fd0847975f6a654ce9f467d

data/lib/specinfra/command/darwin/base/package.rb

@@ -1,11 +1,11 @@
 class Specinfra::Command::Darwin::Base::Package < Specinfra::Command::Base::Package
   class << self
     def check_is_installed(package, version=nil)
-      escaped_package = escape(package)
+      escaped_package = escape(File.basename(package))
       if version
-        cmd = "/usr/local/bin/brew info #{escaped_package} | grep -E '^\/usr\/local\/Cellar\/#{escaped_package}\/#{escape(version)}'"
+        cmd = %Q[brew info #{escaped_package} | grep -E "^$(brew --prefix)/Cellar/#{escaped_package}/#{escape(version)}"]
       else
-        cmd = "/usr/local/bin/brew list -1 | grep -E '^#{escaped_package}$'"
+        cmd = "#{brew_list} | grep -E '^#{escaped_package}$'"
       end
       cmd
     end
@@ -13,11 +13,11 @@ class Specinfra::Command::Darwin::Base::Package < Specinfra::Command::Base::Pack
     alias :check_is_installed_by_homebrew :check_is_installed
 
     def check_is_installed_by_homebrew_cask(package, version=nil)
-      escaped_package = escape(package)
+      escaped_package = escape(File.basename(package))
       if version
-        cmd = "/usr/local/bin/brew cask info #{escaped_package} | grep -E '^\/opt\/homebrew-cask\/Caskroom\/#{escaped_package}\/#{escape(version)}'"
+        cmd = "brew cask info #{escaped_package} | grep -E '^/opt/homebrew-cask/Caskroom/#{escaped_package}/#{escape(version)}'"
       else
-        cmd = "/usr/local/bin/brew cask list -1 | grep -E '^#{escaped_package}$'"
+        cmd = "#{brew_cask_list} | grep -E '^#{escaped_package}$'"
       end
       cmd
     end
@@ -30,11 +30,21 @@ class Specinfra::Command::Darwin::Base::Package < Specinfra::Command::Base::Pack
 
     def install(package, version=nil, option='')
       # Homebrew doesn't support to install specific version.
-      cmd = "/usr/local/bin/brew install #{option} '#{package}'"
+      cmd = "brew install #{option} '#{package}'"
     end
 
     def get_version(package, opts=nil)
-      "basename $((/usr/local/bin/brew info #{package} | grep '\*$' || /usr/local/bin/brew info #{package} | grep '^/usr/local/Cellar' | tail -1) | awk '{print $1}')"
+      %Q[ls -1 "$(brew --prefix)/Cellar/#{package}/" | tail -1]
+    end
+
+    def brew_list
+      # Since `brew list` is slow, directly check Cellar directory
+      'ls -1 "$(brew --prefix)/Cellar/"'
+    end
+
+    def brew_cask_list
+      # Since `brew cask list` is slow, directly check Caskroom directory
+      "ls -1 /opt/homebrew-cask/Caskroom/"
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.44.6"
+  VERSION = "2.44.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.44.6
+  version: 2.44.7
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp