specinfra 2.76.4 → 2.76.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e520eb86382bd78fcfc38c87433df87551b7570
-  data.tar.gz: 8a52edd53eeeb10e5cee61735e11cee4611c8cb0
+  metadata.gz: 8c49976eb31350bb425c6f05ebf906b826953148
+  data.tar.gz: e37241d192b8e6046b8d2e7a535fd974c3ceb650
 SHA512:
-  metadata.gz: c81467a2ed0d1c6a1139082c7804274c8a7138e718809b436f42416a9454636999f3f974a4e286f0ad36737edb6c6aa29bc8c709f0a0321c3ccaa0805ace983d
-  data.tar.gz: a011f0739d49fc23350b93ffe085c2458d92548e32b523a28138a951b8175602b57e019cec948bf7a53dbf2b07bc0afe7ee0a8a41e54053c4333de97f4d29669
+  metadata.gz: 8ae6d72220adcf21de7e46745775f72215ef4451c88c287548db6741545853a92587207eb74c6cd36782bc66e67b8f72bb7d2b738a45a0993d66f39fa0d8e964
+  data.tar.gz: 2202d642ca425553c8870ff483c16d968f2b31e5eddd86a31816bf6f7a91dd7b19a63682ca431bb132b968dc48c4f18759602567af1aede354520673286954d2

data/lib/specinfra/command.rb

@@ -264,18 +264,22 @@ require 'specinfra/command/freebsd/base/zfs'
 require 'specinfra/command/freebsd/v6'
 require 'specinfra/command/freebsd/v6/user'
 require 'specinfra/command/freebsd/v6/package'
+require 'specinfra/command/freebsd/v6/service'
 
 # FreeBSD V7 (inherit FreeBSD)
 require 'specinfra/command/freebsd/v7'
 require 'specinfra/command/freebsd/v7/package'
+require 'specinfra/command/freebsd/v7/service'
 
 # FreeBSD V8 (inherit FreeBSD)
 require 'specinfra/command/freebsd/v8'
 require 'specinfra/command/freebsd/v8/package'
+require 'specinfra/command/freebsd/v8/service'
 
 # FreeBSD V9 (inherit FreeBSD)
 require 'specinfra/command/freebsd/v9'
 require 'specinfra/command/freebsd/v9/package'
+require 'specinfra/command/freebsd/v9/service'
 
 # FreeBSD V11 (inherit FreeBSD)
 require 'specinfra/command/freebsd/v11'

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

@@ -1,7 +1,7 @@
 class Specinfra::Command::Freebsd::Base::Service < Specinfra::Command::Base::Service
   class << self
     def check_is_enabled(service, level=3)
-      "service -e | grep -- #{escape(service)}"
+      "service #{escape(service)} enabled"
     end
     def check_is_running_under_init(service)
       "service #{escape(service)} status | grep -E 'as (pid [0-9]+)'"

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

@@ -0,0 +1,7 @@
+class Specinfra::Command::Freebsd::V6::Service < Specinfra::Command::Base::Service
+  class << self
+    def check_is_enabled(service, level=3)
+      "service -e | grep -- /#{escape(service)}$"
+    end
+  end
+end

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

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

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

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

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

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

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.76.4"
+  VERSION = "2.76.5"
 end

data/spec/command/freebsd/service_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe 'command/freebsd/service works correctly' do
+  before do
+    property[:os] = nil
+  end
+
+  context 'freebsd-base' do
+    before do
+      set :os, :family => 'freebsd'
+    end
+    describe 'get_command(:check_service_is_enabled, "httpd")' do
+      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+    end
+  end
+
+  context 'freebsd-6' do
+    before do
+      set :os, :family => 'freebsd', :release => '6'
+    end
+    describe 'get_command(:check_service_is_enabled, "httpd")' do
+      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+    end
+  end
+
+  context 'freebsd-7' do
+    before do
+      set :os, :family => 'freebsd', :release => '7'
+    end
+    describe 'get_command(:check_service_is_enabled, "httpd")' do
+      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+    end
+  end
+
+  context 'freebsd-8' do
+    before do
+      set :os, :family => 'freebsd', :release => '8'
+    end
+    describe 'get_command(:check_service_is_enabled, "httpd")' do
+      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+    end
+  end
+
+  context 'freebsd-9' do
+    before do
+      set :os, :family => 'freebsd', :release => '9'
+    end
+    describe 'get_command(:check_service_is_enabled, "httpd")' do
+      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+    end
+  end
+
+  context 'freebsd-10' do
+    before do
+      set :os, :family => 'freebsd', :release => '10'
+    end
+    describe 'get_command(:check_service_is_enabled, "httpd")' do
+      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+    end
+  end
+
+  context 'freebsd-11' do
+    before do
+      set :os, :family => 'freebsd', :release => '11'
+    end
+    describe 'get_command(:check_service_is_enabled, "httpd")' do
+      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.76.4
+  version: 2.76.5
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -307,13 +307,17 @@ files:
 - lib/specinfra/command/freebsd/v11/interface.rb
 - lib/specinfra/command/freebsd/v6.rb
 - lib/specinfra/command/freebsd/v6/package.rb
+- lib/specinfra/command/freebsd/v6/service.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/v7/service.rb
 - lib/specinfra/command/freebsd/v8.rb
 - lib/specinfra/command/freebsd/v8/package.rb
+- lib/specinfra/command/freebsd/v8/service.rb
 - lib/specinfra/command/freebsd/v9.rb
 - lib/specinfra/command/freebsd/v9/package.rb
+- lib/specinfra/command/freebsd/v9/service.rb
 - lib/specinfra/command/gentoo.rb
 - lib/specinfra/command/gentoo/base.rb
 - lib/specinfra/command/gentoo/base/package.rb
@@ -562,6 +566,7 @@ files:
 - spec/command/freebsd/host_spec.rb
 - spec/command/freebsd/interface_spec.rb
 - spec/command/freebsd/package_spec.rb
+- spec/command/freebsd/service_spec.rb
 - spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
 - spec/command/linux/file_spec.rb
@@ -691,6 +696,7 @@ test_files:
 - spec/command/freebsd/host_spec.rb
 - spec/command/freebsd/interface_spec.rb
 - spec/command/freebsd/package_spec.rb
+- spec/command/freebsd/service_spec.rb
 - spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
 - spec/command/linux/file_spec.rb