specinfra 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d7b33a9426ee904733fe53b9d6ffbd1cebe3ea
-  data.tar.gz: d55366a918a9fca40a44cead029bca4741fa678e
+  metadata.gz: 6ef7aa033a801726f811188a418cc0a69d8e61e5
+  data.tar.gz: 5f498638b1a934242bf042f52e3bc2bda6f22734
 SHA512:
-  metadata.gz: 99c03de16c601652b044fecae7da678a086bfeba76ecd2d642bf3830ac869d966cd600a1757c3168050bbe228f53387da6f93f6a382374b08fc8e5b7bedf6a30
-  data.tar.gz: ce8ff057cd8d6df76d66a99d51fc18df747ead841423f5920c8d07780fbc521e90cda8d76709520005dc1197e36510fe96b27896d8517600456000cc48ebe7b6
+  metadata.gz: 13e5c402882f7f50e03124b211b8adcd63347f7274a3062122422728ceeecdebd56e1c4e152ced6ed4820f0d3ccfc769b35e0b8dde7bd93561ac514a8803cbea
+  data.tar.gz: 8acd3900038b66864231626d4da4ef6ff132f13261b822364ad2d06802907cedceeac42bdb8b33eceb6af00b2244c3b43f685c1363fdcc9dd1b43fe490eeeee3

data/lib/specinfra/backend/exec.rb

@@ -53,7 +53,7 @@ module SpecInfra
 
       def check_running(process)
         ret = run_command(commands.check_running(process))
-        
+
         # In Ubuntu, some services are under upstart and "service foo status" returns
         # exit status 0 even though they are stopped.
         # So return false if stdout contains "stopped/waiting".
@@ -74,7 +74,7 @@ module SpecInfra
         retlines = ret.stdout.split(/[\r\n]+/).map(&:strip)
         proc_index = retlines.index("Process '#{process}'")
         return false unless proc_index
-        
+
         retlines[proc_index+2].match(/\Amonitoring status\s+monitored\Z/i) != nil
       end
 
@@ -221,8 +221,12 @@ module SpecInfra
           end
         elsif run_command('uname -s').stdout =~ /Darwin/i
           { :family => 'Darwin', :release => nil }
-        elsif run_command('uname -s').stdout =~ /FreeBSD/i
-          { :family => 'FreeBSD', :release => nil }
+        elsif (os = run_command('uname -sr').stdout) && os =~ /FreeBSD/i
+          if os =~ /10./
+            { :family => 'FreeBSD10', :release => nil }
+          else
+            { :family => 'FreeBSD', :release => nil }
+          end
         else
           { :family => 'Base', :release => nil }
         end

data/lib/specinfra/command.rb

@@ -18,5 +18,5 @@ require "specinfra/command/smartos"
 require "specinfra/command/aix"
 require "specinfra/command/darwin"
 require "specinfra/command/freebsd"
+require "specinfra/command/freebsd10"
 require "specinfra/command/windows"
-

data/lib/specinfra/command/base.rb

@@ -173,7 +173,7 @@ module SpecInfra
       end
 
       def check_link(link, target)
-        "stat -c %N #{escape(link)} | grep -- #{escape(target)}"
+        "stat -c %N #{escape(link)} | grep -- \"-> \\`#{escape(target)}'\""
       end
 
       def check_installed_by_gem(name, version=nil)

data/lib/specinfra/command/freebsd10.rb

@@ -0,0 +1,13 @@
+module SpecInfra
+  module Command
+    class FreeBSD10 < FreeBSD
+      def check_installed(package, version=nil)
+        if version
+          "pkg query %v #{escape(package)} | grep -- #{escape(version)}"
+        else
+          "pkg info #{escape(package)}"
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/helper/os.rb

@@ -6,6 +6,7 @@ module SpecInfra
      'Darwin',
      'Debian',
      'FreeBSD',
+     'FreeBSD10',
      'Gentoo',
      'Plamo',
      'RedHat',

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,7 @@ files:
 - lib/specinfra/command/darwin.rb
 - lib/specinfra/command/debian.rb
 - lib/specinfra/command/freebsd.rb
+- lib/specinfra/command/freebsd10.rb
 - lib/specinfra/command/gentoo.rb
 - lib/specinfra/command/linux.rb
 - lib/specinfra/command/plamo.rb