specinfra 2.42.0 → 2.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa5a4e0dbe8336562680e6edd462840713fd926c
-  data.tar.gz: 10341d7185fc49e9e711e4921db8f8189b35c0b9
+  metadata.gz: 211b97ff28d60bfeda6954c6e605af14e4cd12ec
+  data.tar.gz: 93c326f9dc28ff0c2698ca9f774d0f5717ea14db
 SHA512:
-  metadata.gz: 916bd11416a36f4cdef5c0157f7dd22d97a019479243509368d386334edb49b5911102b6bd4cafee5a98eb293f53fa478e47427e715f42295140b09d789473d2
-  data.tar.gz: 821b8f9cf6c7b44dc5d1f73fcc85c9d9cc42dc03dd0e9a5da6da81a8007d82ca5327c82bb5a78bdac08c87550219056591c56a9e23fc6e9b4e23750f8051f8d4
+  metadata.gz: 277f327b85a7fe633f67683b7b75c2528cb4c02cd17d747aa0d91cba93ef82c4057cf05c6fe1a642296f76effdc335c7e3d5a902006c8b9a2b8d134994056640
+  data.tar.gz: a380d86cc801f2e6a0a132b652ce652839ce2aabd0a001a0f5bc6d0de32dd58e9ea004c54ad9c6c2ee10295b3f6c7f2f4a5a39564132fd9042f65f09dc4ccdab

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

@@ -1,5 +1,17 @@
 class Specinfra::Command::Darwin::Base::Host < Specinfra::Command::Base::Host
   class << self
+    def check_is_resolvable(name, type)
+      if type == "dns"
+        ## try to resolve either A or AAAA record; grep is used to return the appropriate exit code
+        %Q{dig +short +time=1 -q #{escape(name)} a #{escape(name)} aaaa | grep -qie '^[0-9a-f:.]*$'}
+      elsif type == "hosts"
+        "sed 's/#.*$//' /etc/hosts | grep -w -- #{escape(name)}"
+      else
+        ## grep is required as dscacheutil always returns exit code 0
+        "dscacheutil -q host -a name #{escape(name)} | grep -q '_address:'"
+      end
+    end
+
     def check_is_reachable(host, port, proto, timeout)
       if port.nil?
         "ping -t #{escape(timeout)} -c 2 -n #{escape(host)}"
@@ -7,5 +19,21 @@ class Specinfra::Command::Darwin::Base::Host < Specinfra::Command::Base::Host
         "nc -vvvvz#{escape(proto[0].chr)} #{escape(host)} #{escape(port)} -w #{escape(timeout)}"
       end
     end
+
+    def get_ipaddress(name)
+      # If the query returns multiple records the most likey match is returned.
+      # Generally this means IPv6 wins over IPv4.
+      %Q{dscacheutil -q host -a name #{escape(name)} | } + 
+      %Q{awk '/^ipv6_/{ ip = $2 }; /^$/{ exit }; /^ip_/{ ip = $2; exit}; END{ print ip }'}
+    end
+    def get_ipv4_address(name)
+      ## With dscacheutil multiple IPs can be returned for IPv4 just pick the first one
+      %Q{dscacheutil -q host -a name #{escape(name)} | awk '/^ip_/{ print $2; exit }'}
+    end
+    def get_ipv6_address(name)
+      ## With dscacheutil multiple IPs can be returned. For IPv6 the link-local is displayed first
+      ## hence the last entry is picked.
+      %Q{dscacheutil -q host -a name #{escape(name)} | awk '/^ipv6_/{ ip = $2 } END{ print ip }'}
+    end
   end
 end

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

@@ -1,5 +1,13 @@
 class Specinfra::Command::Openbsd::Base::Service < Specinfra::Command::Base::Service
   class << self
+    def create
+      if os[:release].to_f < 5.7
+        self
+      else
+        Specinfra::Command::Openbsd::V57::Service
+      end
+    end
+
     def check_is_enabled(service, level=nil)
       "/etc/rc.d/#{escape(service)} status"
     end

data/lib/specinfra/command/openbsd/v57/service.rb

@@ -0,0 +1,35 @@
+class Specinfra::Command::Openbsd::V57::Service < Specinfra::Command::Openbsd::Base::Service
+  class << self
+    def check_is_enabled(service, level=nil)
+      "rcctl get #{escape(service)} status"
+    end
+
+    def check_is_running(service)
+      "rcctl check #{escape(service)}"
+    end
+
+    def enable(service)
+      "rcctl set #{escape(service)} status on"
+    end
+
+    def disable(service)
+      "rcctl set #{escape(service)} status off"
+    end
+
+    def start(service)
+      "rcctl start #{escape(service)}"
+    end
+
+    def stop(service)
+      "rcctl stop #{escape(service)}"
+    end
+
+    def restart(service)
+      "rcctl restart #{escape(service)}"
+    end
+
+    def reload(service)
+      "rcctl reload #{escape(service)}"
+    end
+  end
+end

data/lib/specinfra/command/openbsd/v57.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Openbsd::V57 < Specinfra::Command::Openbsd::Base
+end

data/lib/specinfra/command/ubuntu/base/ppa.rb

@@ -1,11 +1,11 @@
 class Specinfra::Command::Ubuntu::Base::Ppa < Specinfra::Command::Debian::Base::Ppa
   class << self
     def check_exists(package)
-      %Q{find /etc/apt/ -name \*.list | xargs grep -o -E "deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      %Q{find /etc/apt/ -name \*.list | xargs grep -o -E "deb +[\"']?http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
     end
 
     def check_is_enabled(package)
-      %Q{find /etc/apt/ -name \*.list | xargs grep -o -E "^deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      %Q{find /etc/apt/ -name \*.list | xargs grep -o -E "^deb +[\"']?http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
     end
 
     private

data/lib/specinfra/command.rb

@@ -244,6 +244,10 @@ require 'specinfra/command/openbsd/base/routing_table'
 require 'specinfra/command/openbsd/base/service'
 require 'specinfra/command/openbsd/base/user'
 
+# OpenBSD >= V5.7 (inherit OpenBSD)
+require 'specinfra/command/openbsd/v57'
+require 'specinfra/command/openbsd/v57/service'
+
 # Solaris (inherit Base)
 require 'specinfra/command/solaris'
 require 'specinfra/command/solaris/base'

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.42.0"
+  VERSION = "2.42.1"
 end

data/spec/command/darwin/host_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'darwin'
+
+describe get_command(:check_host_is_resolvable, 'pink.unicorn.com', 'dns') do 
+  it { should eq "dig +short +time=1 -q pink.unicorn.com a pink.unicorn.com aaaa | grep -qie '^[0-9a-f:.]*$'" } 
+end
+
+describe get_command(:check_host_is_resolvable, 'pink.unicorn.com', 'hosts') do 
+  it { should eq "sed 's/#.*$//' /etc/hosts | grep -w -- pink.unicorn.com" }
+end 
+
+describe get_command(:check_host_is_resolvable, 'pink.unicorn.com', nil) do 
+  it { should eq "dscacheutil -q host -a name pink.unicorn.com | grep -q '_address:'" } 
+end
+
+describe get_command(:check_host_is_reachable, 'pink.unicorn.com', nil, 'tcp', 10) do 
+  it { should eq "ping -t 10 -c 2 -n pink.unicorn.com"} 
+end
+
+describe get_command(:check_host_is_reachable, 'pink.unicorn.com', 53, 'udp', 66) do 
+  it { should eq "nc -vvvvzu pink.unicorn.com 53 -w 66" } 
+end
+
+describe get_command(:get_host_ipaddress, 'pink.unicorn.com') do 
+  it do should eq "dscacheutil -q host -a name pink.unicorn.com | " + 
+    "awk '/^ipv6_/{ ip = $2 }; /^$/{ exit }; /^ip_/{ ip = $2; exit}; END{ print ip }'"
+  end 
+end
+
+describe get_command(:get_host_ipv4_address, 'pink.unicorn.com') do 
+  it { should eq "dscacheutil -q host -a name pink.unicorn.com | awk '/^ip_/{ print $2; exit }'" }
+end 
+
+describe get_command(:get_host_ipv6_address, 'pink.unicorn.com') do 
+  it { should eq "dscacheutil -q host -a name pink.unicorn.com | awk '/^ipv6_/{ ip = $2 } END{ print ip }'" }
+end 

data/spec/command/openbsd/service_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'openbsd'
+
+describe get_command(:check_service_is_enabled, 'httpd') do
+  it { should eq '/etc/rc.d/httpd status' }
+end
+
+describe get_command(:check_service_is_running, 'httpd') do
+  it { should eq '/etc/rc.d/httpd check' }
+end

data/spec/command/openbsd57/service_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'openbsd', :release => '5.7'
+
+describe get_command(:check_service_is_enabled, 'httpd') do
+  it { should eq 'rcctl get httpd status' }
+end
+
+describe get_command(:check_service_is_running, 'httpd') do
+  it { should eq 'rcctl check httpd' }
+end
+
+describe get_command(:enable_service, 'httpd') do
+  it { should eq 'rcctl set httpd status on' }
+end
+
+describe get_command(:disable_service, 'httpd') do
+  it { should eq 'rcctl set httpd status off' }
+end
+
+describe get_command(:start_service, 'httpd') do
+  it { should eq 'rcctl start httpd' }
+end
+
+describe get_command(:stop_service, 'httpd') do
+  it { should eq 'rcctl stop httpd' }
+end
+
+describe get_command(:restart_service, 'httpd') do
+  it { should eq 'rcctl restart httpd' }
+end
+
+describe get_command(:reload_service, 'httpd') do
+  it { should eq 'rcctl reload httpd' }
+end

data/spec/command/ubuntu/ppa_spec.rb

@@ -4,9 +4,9 @@ property[:os] = nil
 set :os, :family => 'ubuntu'
 
 describe get_command(:check_ppa_exists, 'nginx/stable') do
-  it { should eq 'find /etc/apt/ -name *.list | xargs grep -o -E "deb +http://ppa.launchpad.net/nginx/stable"' }
+  it { should eq %(find /etc/apt/ -name *.list | xargs grep -o -E "deb +["']?http://ppa.launchpad.net/nginx/stable") }
 end
 
 describe get_command(:check_ppa_is_enabled, 'nginx/stable') do
-  it { should eq 'find /etc/apt/ -name *.list | xargs grep -o -E "^deb +http://ppa.launchpad.net/nginx/stable"' }
+  it { should eq %(find /etc/apt/ -name *.list | xargs grep -o -E "^deb +["']?http://ppa.launchpad.net/nginx/stable") }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.42.0
+  version: 2.42.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -319,6 +319,8 @@ files:
 - lib/specinfra/command/openbsd/base/routing_table.rb
 - lib/specinfra/command/openbsd/base/service.rb
 - lib/specinfra/command/openbsd/base/user.rb
+- lib/specinfra/command/openbsd/v57.rb
+- lib/specinfra/command/openbsd/v57/service.rb
 - lib/specinfra/command/opensuse.rb
 - lib/specinfra/command/opensuse/base.rb
 - lib/specinfra/command/opensuse/base/service.rb
@@ -464,6 +466,7 @@ files:
 - spec/command/base/package_spec.rb
 - spec/command/base/user_spec.rb
 - spec/command/darwin/file_spec.rb
+- spec/command/darwin/host_spec.rb
 - spec/command/darwin/user_spec.rb
 - spec/command/debian/service_spec.rb
 - spec/command/esxi/package_spec.rb
@@ -488,6 +491,8 @@ files:
 - spec/command/openbsd/file_spec.rb
 - spec/command/openbsd/host_spec.rb
 - spec/command/openbsd/interface_spec.rb
+- spec/command/openbsd/service_spec.rb
+- spec/command/openbsd57/service_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
 - spec/command/redhat7/host_spec.rb
@@ -559,6 +564,7 @@ test_files:
 - spec/command/base/package_spec.rb
 - spec/command/base/user_spec.rb
 - spec/command/darwin/file_spec.rb
+- spec/command/darwin/host_spec.rb
 - spec/command/darwin/user_spec.rb
 - spec/command/debian/service_spec.rb
 - spec/command/esxi/package_spec.rb
@@ -583,6 +589,8 @@ test_files:
 - spec/command/openbsd/file_spec.rb
 - spec/command/openbsd/host_spec.rb
 - spec/command/openbsd/interface_spec.rb
+- spec/command/openbsd/service_spec.rb
+- spec/command/openbsd57/service_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
 - spec/command/redhat7/host_spec.rb
@@ -612,3 +620,4 @@ test_files:
 - spec/host_inventory/openbsd/filesystem_spec.rb
 - spec/host_inventory/solaris/filesystem_spec.rb
 - spec/spec_helper.rb
+has_rdoc: