specinfra 2.62.0 → 2.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed49d01b31c18e7f80b214bbcbe121db6a415f9d
-  data.tar.gz: ac889adaf47b4dc2cbe6a08fb03386d76dd34ab7
+  metadata.gz: 9f008a62e9df588d9f48580058a5fff5fadbe5c8
+  data.tar.gz: 4aee183c7c190d945245b85c5c76cc98dcf4b7e4
 SHA512:
-  metadata.gz: faf5959daccb4b5c64428fbc7e2010f5478fe42faf8e07ff3cc8c8fe808c6fe03587cec74696b9cc6a3c08ceabcfa1491feee5c997beac5a10609cb0df758f3a
-  data.tar.gz: 05e1af735ea64b0c6c789502a8563b49a84f8525b4e960271ac368806b99042cc1632f32f76c168880c7985276c4082d5d43d14c03cc58a1196718e2805248bd
+  metadata.gz: 95d908aa7bd24ba5dc84d7a773ac9790bba3f13bca5c017270110b8892965daa2302b0f0474c8eb869b8c68389db7476aeb784db726f79b8668a8119fbf12302
+  data.tar.gz: 717b4f3a56efa608c17ea937fd3b2c566ddc7c73ed632c3039937c8ba473ecc814b758f3cd9d18cb7e4cdb02d107fb6f2a061785d6980de099ba8e2627e66958

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

@@ -2,18 +2,30 @@ class Specinfra::Command::Freebsd::Base::Package < Specinfra::Command::Base::Pac
   class << self
     def check_is_installed(package, version=nil)
       if version
-        "pkg_info -I #{escape(package)}-#{escape(version)}"
+        "pkg query %v #{escape(package)} | grep -- #{escape(version)}"
       else
-        "pkg_info -Ix #{escape(package)}"
+        "pkg info -e #{escape(package)}"
       end
     end
 
+    alias :check_is_installed_by_pkg :check_is_installed
+
+    def check_is_installed_by_rpm(package, version=nil)
+      cmd = "rpm -q #{escape(package)}"
+      if version
+        cmd = "#{cmd} | grep -w -- #{escape(package)}-#{escape(version)}"
+      end
+      cmd
+    end
+
+    alias :check_is_installed_by_yum :check_is_installed_by_rpm
+
     def install(package, version=nil, option='')
-      "pkg_add -r #{option} install #{package}"
+      "pkg install -y #{option} #{package}"
     end
 
     def get_version(package, opts=nil)
-      "pkg_info -Ix #{escape(package)} | cut -f 1 -w | sed -n 's/^#{escape(package)}-//p'"
+      "pkg query %v #{escape(package)}"
     end
   end
 end

data/lib/specinfra/command/freebsd/v6/package.rb

@@ -0,0 +1,19 @@
+class Specinfra::Command::Freebsd::V6::Package < Specinfra::Command::Base::Package
+  class << self
+    def check_is_installed(package, version=nil)
+      if version
+        "pkg_info -I #{escape(package)}-#{escape(version)}"
+      else
+        "pkg_info -Ix #{escape(package)}"
+      end
+    end
+
+    def install(package, version=nil, option='')
+      "pkg_add -r #{option} install #{package}"
+    end
+
+    def get_version(package, opts=nil)
+      "pkg_info -Ix #{escape(package)} | cut -f 1 -w | sed -n 's/^#{escape(package)}-//p'"
+    end
+  end
+end

data/lib/specinfra/command/freebsd/v7/package.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Freebsd::V7::Package <  Specinfra::Command::Freebsd::V6::Package
+end

data/lib/specinfra/command/freebsd/v7.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Freebsd::V7 < Specinfra::Command::Freebsd::Base
+end

data/lib/specinfra/command/freebsd/v8/package.rb

@@ -0,0 +1,54 @@
+class Specinfra::Command::Freebsd::V8::Package < Specinfra::Command::Freebsd::Base::Package
+  class << self
+    def pkg_info_pattern(package)
+      # allow portorigin (origin/portname) as package argument, so that we get
+      # similar answers from either "pkg info" and "pkg_info"
+      "^#{package.split('/', 2)[-1]}-[0-9][0-9a-zA-Z_\.,]*$"
+    end
+
+    def shell_check_pkgng
+      # See manpage of pkg(8), the paragraph devoted to -N flag
+      # https://www.freebsd.org/cgi/man.cgi?query=pkg
+      'TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 PACKAGESITE=file:///nonexist ' \
+      'pkg info -x \'pkg(-devel)?$\' > /dev/null 2>&1'
+    end
+
+    def shell_ifelse(cond, stmt_t, stmt_f)
+      "if #{cond}; then #{stmt_t}; else #{stmt_f}; fi"
+    end
+
+    def check_is_installed(package, version = nil)
+      if version
+        shell_ifelse(
+          shell_check_pkgng(),
+          "pkg query %v #{escape(package)} | grep -- #{escape(version)}",
+          "pkg_info -I #{escape(package)}-#{escape(version)}"
+        )
+      else
+        pattern = pkg_info_pattern(package)
+        shell_ifelse(
+          shell_check_pkgng(),
+          "pkg info -e #{escape(package)}",
+          "pkg_info -Ix #{escape(pattern)}"
+        )
+      end
+    end
+
+    def install(package, _version = nil, option = '')
+      shell_ifelse(
+        shell_check_pkgng(),
+        "pkg install -y #{option} #{package}",
+        "pkg_add -r #{option} install #{package}"
+      )
+    end
+
+    def get_version(package, _options = nil)
+      pattern = pkg_info_pattern(package)
+      shell_ifelse(
+        shell_check_pkgng(),
+        "pkg query %v #{escape(package)}",
+        "pkg_info -Ix #{escape(pattern)} | cut -f 1 -w | sed -n 's/^#{escape(package)}-//p'"
+      )
+    end
+  end
+end

data/lib/specinfra/command/freebsd/v8.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Freebsd::V8 < Specinfra::Command::Freebsd::Base
+end

data/lib/specinfra/command/freebsd/v9/package.rb

@@ -1,48 +1,2 @@
-class Specinfra::Command::Freebsd::V9::Package < Specinfra::Command::Freebsd::Base::Package
-  class << self
-    def shell_check_pkgng
-      # This test works on FreeBSD >= 9.2. On 9.1, pkg has no -N option. Also,
-      # on fresh 9.1 installation there is only a placeholder pkg command,
-      # which immediatelly enters interactive mode and wants to install pkg
-      # package (so it's not suitable for a test like ours). On 9.0, there
-      # seems to be no pkg command/package at all.
-      "test `sysctl -n kern.osreldate` -ge 902000 && pkg -N > /dev/null 2>&1"
-    end
-
-    def shell_ifelse(cond, stmt_t, stmt_f)
-      "if #{cond}; then #{stmt_t}; else #{stmt_f}; fi"
-    end
-
-    def check_is_installed(package, version=nil)
-      if version
-        shell_ifelse(
-          shell_check_pkgng(),
-          "pkg query %v #{escape(package)} | grep -- #{escape(version)}",
-          "pkg_info -I #{escape(package)}-#{escape(version)}"
-        )
-      else
-        shell_ifelse(
-          shell_check_pkgng(),
-          "pkg info -e #{escape(package)}",
-          "pkg_info -Ix #{escape(package)}"
-        )
-      end
-    end
-
-    def install(package, version=nil, option='')
-      shell_ifelse(
-        shell_check_pkgng(),
-        "pkg install -y #{option} #{package}",
-        "pkg_add -r #{option} install #{package}"
-      )
-    end
-
-    def get_version(package, opts=nil)
-      shell_ifelse(
-        shell_check_pkgng(),
-        "pkg query %v #{escape(package)}",
-        "pkg_info -Ix #{escape(package)} | cut -f 1 -w | sed -n 's/^#{escape(package)}-//p'"
-      )
-    end
-  end
+class Specinfra::Command::Freebsd::V9::Package < Specinfra::Command::Freebsd::V8::Package 
 end

data/lib/specinfra/command.rb

@@ -242,15 +242,20 @@ require 'specinfra/command/freebsd/base/user'
 # FreeBSD V6 (inherit FreeBSD)
 require 'specinfra/command/freebsd/v6'
 require 'specinfra/command/freebsd/v6/user'
+require 'specinfra/command/freebsd/v6/package'
+
+# FreeBSD V7 (inherit FreeBSD)
+require 'specinfra/command/freebsd/v7'
+require 'specinfra/command/freebsd/v7/package'
+
+# FreeBSD V8 (inherit FreeBSD)
+require 'specinfra/command/freebsd/v8'
+require 'specinfra/command/freebsd/v8/package'
 
 # FreeBSD V9 (inherit FreeBSD)
 require 'specinfra/command/freebsd/v9'
 require 'specinfra/command/freebsd/v9/package'
 
-# FreeBSD V10 (inherit FreeBSD)
-require 'specinfra/command/freebsd/v10'
-require 'specinfra/command/freebsd/v10/package'
-
 # OpenBSD (inherit Base)
 require 'specinfra/command/openbsd'
 require 'specinfra/command/openbsd/base'

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.62.0"
+  VERSION = "2.63.0"
 end

data/spec/command/freebsd/package_spec.rb

@@ -10,6 +10,21 @@ describe 'command/freebsd/package works correctly' do
     before do
       set :os, :family => 'freebsd'
     end
+    describe 'get_command(:check_package_is_installed, "figlet")' do
+      it { expect(get_command(:check_package_is_installed, 'figlet')).to match /^pkg +info +-e +figlet$/ }
+    end
+    describe 'get_command(:check_package_is_installed, "figlet", "1.2.3")' do
+      it { expect(get_command(:check_package_is_installed, 'figlet', '1.2.3')).to match /^pkg +query +%v +figlet *\| *grep -- 1.2.3$/ }
+    end
+    describe 'get_command(:install_package, "figlet")' do
+      it { expect(get_command(:install_package, 'figlet')).to match /^pkg +install +-y +figlet$/ }
+    end
+  end
+
+  context 'freebsd-6' do
+    before do
+      set :os, :family => 'freebsd', :release => '6'
+    end
     describe 'get_command(:check_package_is_installed, "figlet")' do
       it { expect(get_command(:check_package_is_installed, 'figlet')).to match /^pkg_info +-Ix +figlet$/ }
     end
@@ -21,9 +36,9 @@ describe 'command/freebsd/package works correctly' do
     end
   end
 
-  context 'freebsd-8' do
+  context 'freebsd-7' do
     before do
-      set :os, :family => 'freebsd', :release => '8'
+      set :os, :family => 'freebsd', :release => '7'
     end
     describe 'get_command(:check_package_is_installed, "figlet")' do
       it { expect(get_command(:check_package_is_installed, 'figlet')).to match /^pkg_info +-Ix +figlet$/ }
@@ -36,16 +51,49 @@ describe 'command/freebsd/package works correctly' do
     end
   end
 
+  context 'freebsd-8' do
+    before do
+      set :os, :family => 'freebsd', :release => '8'
+    end
+    let(:cond) do
+      %r{TMPDIR=/dev/null +ASSUME_ALWAYS_YES=1 +PACKAGESITE=file:///nonexist +pkg +info +-x +'pkg\(-devel\)\?\$' *> */dev/null +2>&1}
+    end
+    describe 'get_command(:check_package_is_installed, "figlet")' do
+      st = /pkg +info +-e +figlet/
+      sf = /pkg_info +-Ix +\\\^figlet-\\\[0-9\\\]\\\[0-9a-zA-Z_\.,\\\]\\\*\\\$/
+      it { expect(get_command(:check_package_is_installed, 'figlet')).
+           to match /^if +#{cond} *; *then +#{st} *; *else +#{sf} *; *fi$/ }
+    end
+    describe 'get_command(:check_package_is_installed, "figlet", "1.2.3")' do
+      st = /pkg +query +%v +figlet *\| *grep -- 1.2.3/
+      sf = /pkg_info +-I +figlet-1.2.3/
+      it { expect(get_command(:check_package_is_installed, 'figlet', '1.2.3')).
+           to match /^if +#{cond} *; *then +#{st} *; *else +#{sf} *; *fi$/ }
+    end
+    describe 'get_command(:install_package, "figlet")' do
+      st = /pkg +install +-y +figlet/
+      sf = /pkg_add +-r +install +figlet/
+      it { expect(get_command(:install_package, 'figlet')).
+           to match /^if +#{cond} *; *then +#{st} *; *else +#{sf} *; *fi$/ }
+    end
+    describe 'get_command(:get_package_version, "figlet")' do
+      st = /pkg +query +%v +figlet/
+      sf = /pkg_info +-Ix +\\\^figlet-\\\[0-9\\\]\\\[0-9a-zA-Z_\.,\\\]\\\*\\\$ *\| *cut +-f +1 +-w *\| *sed +-n +'s\/\^figlet-\/\/p'/
+      it { expect(get_command(:get_package_version, 'figlet')).
+           to match /if +#{cond} *; *then +#{st} *; *else +#{sf} *; *fi/ }
+    end
+  end
+
   context 'freebsd-9' do
     before do
       set :os, :family => 'freebsd', :release => '9'
     end
     let(:cond) do
-      /test +`sysctl +-n +kern.osreldate` +-ge +902000 *&& *pkg +-N *> *\/dev\/null +2>&1/
+      %r{TMPDIR=/dev/null +ASSUME_ALWAYS_YES=1 +PACKAGESITE=file:///nonexist +pkg +info +-x +'pkg\(-devel\)\?\$' *> */dev/null +2>&1}
     end
     describe 'get_command(:check_package_is_installed, "figlet")' do
       st = /pkg +info +-e +figlet/
-      sf = /pkg_info +-Ix +figlet/
+      sf = /pkg_info +-Ix +\\\^figlet-\\\[0-9\\\]\\\[0-9a-zA-Z_\.,\\\]\\\*\\\$/
       it { expect(get_command(:check_package_is_installed, 'figlet')).
            to match /^if +#{cond} *; *then +#{st} *; *else +#{sf} *; *fi$/ }
     end
@@ -63,7 +111,7 @@ describe 'command/freebsd/package works correctly' do
     end
     describe 'get_command(:get_package_version, "figlet")' do
       st = /pkg +query +%v +figlet/
-      sf = /pkg_info +-Ix +figlet *\| *cut +-f +1 +-w *\| *sed +-n +'s\/\^figlet-\/\/p'/
+      sf = /pkg_info +-Ix +\\\^figlet-\\\[0-9\\\]\\\[0-9a-zA-Z_\.,\\\]\\\*\\\$ *\| *cut +-f +1 +-w *\| *sed +-n +'s\/\^figlet-\/\/p'/
       it { expect(get_command(:get_package_version, 'figlet')).
            to match /if +#{cond} *; *then +#{st} *; *else +#{sf} *; *fi/ }
     end
@@ -83,4 +131,19 @@ describe 'command/freebsd/package works correctly' do
       it { expect(get_command(:install_package, 'figlet')).to match /^pkg +install +-y +figlet$/ }
     end
   end
+
+  context 'freebsd-11' do
+    before do
+      set :os, :family => 'freebsd', :release => '11'
+    end
+    describe 'get_command(:check_package_is_installed, "figlet")' do
+      it { expect(get_command(:check_package_is_installed, 'figlet')).to match /^pkg +info +-e +figlet$/ }
+    end
+    describe 'get_command(:check_package_is_installed, "figlet", "1.2.3")' do
+      it { expect(get_command(:check_package_is_installed, 'figlet', '1.2.3')).to match /^pkg +query +%v +figlet *\| *grep -- 1.2.3$/ }
+    end
+    describe 'get_command(:install_package, "figlet")' do
+      it { expect(get_command(:install_package, 'figlet')).to match /^pkg +install +-y +figlet$/ }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.62.0
+  version: 2.63.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -300,10 +300,13 @@ files:
 - lib/specinfra/command/freebsd/base/routing_table.rb
 - lib/specinfra/command/freebsd/base/service.rb
 - lib/specinfra/command/freebsd/base/user.rb
-- lib/specinfra/command/freebsd/v10.rb
-- lib/specinfra/command/freebsd/v10/package.rb
 - lib/specinfra/command/freebsd/v6.rb
+- lib/specinfra/command/freebsd/v6/package.rb
 - lib/specinfra/command/freebsd/v6/user.rb
+- lib/specinfra/command/freebsd/v7.rb
+- lib/specinfra/command/freebsd/v7/package.rb
+- lib/specinfra/command/freebsd/v8.rb
+- lib/specinfra/command/freebsd/v8/package.rb
 - lib/specinfra/command/freebsd/v9.rb
 - lib/specinfra/command/freebsd/v9/package.rb
 - lib/specinfra/command/gentoo.rb

data/lib/specinfra/command/freebsd/v10/package.rb

@@ -1,31 +0,0 @@
-class Specinfra::Command::Freebsd::V10::Package < Specinfra::Command::Freebsd::Base::Package
-  class << self
-    def check_is_installed(package, version=nil)
-      if version
-        "pkg query %v #{escape(package)} | grep -- #{escape(version)}"
-      else
-        "pkg info -e #{escape(package)}"
-      end
-    end
-
-    alias :check_is_installed_by_pkg :check_is_installed
-
-    def check_is_installed_by_rpm(package, version=nil)
-      cmd = "rpm -q #{escape(package)}"
-      if version
-        cmd = "#{cmd} | grep -w -- #{escape(package)}-#{escape(version)}"
-      end
-      cmd
-    end
-
-    alias :check_is_installed_by_yum :check_is_installed_by_rpm
-
-    def install(package, version=nil, option='')
-      "pkg install -y #{option} #{package}"
-    end
-
-    def get_version(package, opts=nil)
-      "pkg query %v #{escape(package)}"
-    end
-  end
-end

data/lib/specinfra/command/freebsd/v10.rb

@@ -1,2 +0,0 @@
-class Specinfra::Command::Freebsd::V10 < Specinfra::Command::Freebsd::Base
-end