specinfra 2.61.3 → 2.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 595aec10abe3600660b94d07bcb78c93c78cb5bb
-  data.tar.gz: 1e15b54261cc640db4ae9a7264d6e5994b1ad645
+  metadata.gz: ed49d01b31c18e7f80b214bbcbe121db6a415f9d
+  data.tar.gz: ac889adaf47b4dc2cbe6a08fb03386d76dd34ab7
 SHA512:
-  metadata.gz: 27ccf2fc50f00579d4726bfdabefb06a55e078b1b97a16cf11fb45611f32500b33eee892332eeabf2ae615bd8fb830042e2aa16a2e16b89bab815bc089047b78
-  data.tar.gz: a9190a888cce763b2863ee597e9dcaf0c2f8b21db57ccaf3a7e6f083cc1d82f0fe9c79cee3bf19a8179403a1e7417a18af694c17b2bdd55400a32f273aa73d49
+  metadata.gz: faf5959daccb4b5c64428fbc7e2010f5478fe42faf8e07ff3cc8c8fe808c6fe03587cec74696b9cc6a3c08ceabcfa1491feee5c997beac5a10609cb0df758f3a
+  data.tar.gz: 05e1af735ea64b0c6c789502a8563b49a84f8525b4e960271ac368806b99042cc1632f32f76c168880c7985276c4082d5d43d14c03cc58a1196718e2805248bd

data/lib/specinfra/command.rb

@@ -243,6 +243,10 @@ require 'specinfra/command/freebsd/base/user'
 require 'specinfra/command/freebsd/v6'
 require 'specinfra/command/freebsd/v6/user'
 
+# 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'

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

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

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

@@ -0,0 +1,48 @@
+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
+end

data/lib/specinfra/version.rb

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

data/spec/command/freebsd/package_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+
+describe 'command/freebsd/package works correctly' do
+  before do
+    property[:os] = nil
+  end
+
+  context 'freebsd-base' 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 +-Ix +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_info +-I +figlet-1.2.3$/ }
+    end
+    describe 'get_command(:install_package, "figlet")' do
+      it { expect(get_command(:install_package, 'figlet')).to match /^pkg_add +-r +install +figlet$/ }
+    end
+  end
+
+  context 'freebsd-8' do
+    before do
+      set :os, :family => 'freebsd', :release => '8'
+    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
+    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_info +-I +figlet-1.2.3$/ }
+    end
+    describe 'get_command(:install_package, "figlet")' do
+      it { expect(get_command(:install_package, 'figlet')).to match /^pkg_add +-r +install +figlet$/ }
+    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/
+    end
+    describe 'get_command(:check_package_is_installed, "figlet")' do
+      st = /pkg +info +-e +figlet/
+      sf = /pkg_info +-Ix +figlet/
+      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 *\| *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-10' do
+    before do
+      set :os, :family => 'freebsd', :release => '10'
+    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.61.3
+  version: 2.62.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -304,6 +304,8 @@ files:
 - lib/specinfra/command/freebsd/v10/package.rb
 - lib/specinfra/command/freebsd/v6.rb
 - lib/specinfra/command/freebsd/v6/user.rb
+- lib/specinfra/command/freebsd/v9.rb
+- lib/specinfra/command/freebsd/v9/package.rb
 - lib/specinfra/command/gentoo.rb
 - lib/specinfra/command/gentoo/base.rb
 - lib/specinfra/command/gentoo/base/package.rb
@@ -537,6 +539,7 @@ files:
 - spec/command/freebsd/file_spec.rb
 - spec/command/freebsd/host_spec.rb
 - spec/command/freebsd/interface_spec.rb
+- spec/command/freebsd/package_spec.rb
 - spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
 - spec/command/linux/file_spec.rb
@@ -655,6 +658,7 @@ test_files:
 - spec/command/freebsd/file_spec.rb
 - spec/command/freebsd/host_spec.rb
 - spec/command/freebsd/interface_spec.rb
+- spec/command/freebsd/package_spec.rb
 - spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
 - spec/command/linux/file_spec.rb