specinfra 1.27.0 → 1.27.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7658e7fe4c67252486e77d68ac990288030c5cf0
-  data.tar.gz: c68fec3ced189e0fa2d2ef201768f3860d7c7e3e
+  metadata.gz: cf132b8746de3ef1580b6c39ef553ee7b2459832
+  data.tar.gz: 03a3abbe7eadea2f0436b9363cc59737ab7bfc2a
 SHA512:
-  metadata.gz: c4ea2d208cd76f18efad1c414023bac31f75d460497e164284212623b4ff1e68a05a7f696844dee21ee7f323253371141d1310043c9b15fec1798be78f8174c0
-  data.tar.gz: a4b7e852f0ee01390ee3d22162b5cfb77d3a4a4a8fc8903a313c950e54212dbdc7c4c2ba4e12bdeea5d45408f66dd9e4bb925c8aad089ec00e5485a2f6b2ef91
+  metadata.gz: ca0ab54768ea1818a89c2b3e96fc9dae37495a14e0aa1921b28c102b71178e83d978edd9721315ed67cf43dbfde54365e61a048c823ccf2ab3ded603469b6d58
+  data.tar.gz: a0e32824d098305ddac11e1c2bf19fc69c9848cb77bf77e1edf6b66786ee9bbb028a9e6c7f99035770671d24f931cc3e147c2d3b4ca94a3b1de9c9f2f38ab4fe

data/lib/specinfra/backend/powershell/support/find_iis_component.ps1

@@ -17,8 +17,13 @@ function FindIISAppPool
     param($name)
     
     Import-Module WebAdministration
-    
-    Get-Item "IIS:\AppPools\$name" -Erroraction silentlycontinue
+    Try {
+        Get-Item "IIS:\AppPools\$name" -Erroraction silentlycontinue
+    }
+    Catch [System.IO.FileNotFoundException] {
+        Get-Item "IIS:\AppPools\$name" -Erroraction silentlycontinue
+
+    }
 }
 
 function FindSiteBindings
@@ -26,8 +31,12 @@ function FindSiteBindings
     param($name, $protocol, $hostHeader, $port, $ipAddress)
     
     Import-Module WebAdministration
-    
-    Get-WebBinding -Name $name -Protocol $protocol -HostHeader $hostHeader -Port $port -IPAddress $ipAddress
+    Try {
+        Get-WebBinding -Name $name -Protocol $protocol -HostHeader $hostHeader -Port $port -IPAddress $ipAddress
+    }
+    Catch [System.IO.FileNotFoundException] {
+        Get-WebBinding -Name $name -Protocol $protocol -HostHeader $hostHeader -Port $port -IPAddress $ipAddress
+    }
 }
 
 function FindSiteVirtualDir
@@ -77,4 +86,4 @@ function FindSiteApplication
     }
     
     $result
-}
+}

data/lib/specinfra/command/arch.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module SpecInfra
   module Command
     class Arch < Linux
@@ -7,7 +8,7 @@ module SpecInfra
 
       def check_enabled(service, level)
         level = "multi-user.target" if level == 3
-        "systemctl --plain list-dependencies #{level} | grep '^#{escape(service)}.service$'"
+        "systemctl --plain list-dependencies #{level} | grep '^● #{escape(service)}.service$'"
       end
 
       def check_running(service)
@@ -16,12 +17,12 @@ module SpecInfra
 
       def check_installed(package,version=nil)
         if version
-          "pacman -Q | grep #{escape(package)} #{escape(version)}"
+          grep = version.include?('-') ? "^#{escape(version)}$" : "^#{escape(version)}-"
+          "pacman -Q #{escape(package)} | awk '{print $2}' | grep '#{grep}'"
         else
-          "pacman -Q | grep #{escape(package)}"
+          "pacman -Q #{escape(package)}"
         end
       end
-
       def sync_repos
         "pacman -Syy"
       end

data/lib/specinfra/command/debian.rb

@@ -2,8 +2,12 @@ module SpecInfra
   module Command
     class Debian < Linux
       def check_enabled(service, level=3)
-        # Until everything uses Upstart, this needs an OR.
-        "ls /etc/rc#{level}.d/ | grep -- '^S..#{escape(service)}' || grep 'start on' /etc/init/#{escape(service)}.conf"
+        # Debian jessie default init system (on Linux) is systemd,
+        # but upstart and sysvinit is also available.
+        cmd  = "if [ -d /run/systemd/system ]; then systemctl --plain list-dependencies runlevel#{level}.target | grep '^#{escape(service)}.service$'; "
+        cmd += "else ls /etc/rc#{level}.d/ | grep -- '^S..#{escape(service)}' || grep 'start on' /etc/init/#{escape(service)}.conf; "
+        cmd += "fi"
+        "sh -c \"#{cmd}\""
       end
 
       def check_installed(package, version=nil)

data/lib/specinfra/command/openbsd.rb

@@ -2,7 +2,7 @@ module SpecInfra
   module Command
     class OpenBSD < Base
       def check_enabled(service, level=3)
-        "egrep '(#{escape(service)}_flags=|^pkg_scripts=\"(.*)#{escape(service)}(.*)\")' /etc/rc.conf.local | grep -v \=NO"
+        "rcctl status #{escape(service)}"
       end
 
       def check_file_md5checksum(file, expected)
@@ -76,7 +76,7 @@ module SpecInfra
 #      end
 
       def check_running(service)
-        "/etc/rc.d/#{escape(service)} status"
+        "rcctl check #{escape(service)}"
       end
 
       def get_mode(file)

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.27.0"
+  VERSION = "1.27.5"
 end

data/wercker.yml

@@ -26,35 +26,39 @@ build:
         name: Run vagrant up centos65
         code: vagrant up centos65 --provider=digital_ocean
         cwd: $WORKING_DIR
+    - script:
+        name: Run itamae
+        code: bundle exec itamae ssh --host centos65 --vagrant recipe.rb
+        cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload centos65
         code: vagrant reload centos65
         cwd: $WORKING_DIR
     - script:
         name: Run rake spec:centos65
-        code: rake spec:centos65
+        code: DIGITALOCEAN=true rake spec:centos65
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant up ubuntu1404
         code: vagrant up ubuntu1404 --provider=digital_ocean
         cwd: $WORKING_DIR
+    - script:
+        name: Run itamae
+        code: bundle exec itamae ssh --host ubuntu1404 --vagrant recipe.rb
+        cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload ubuntu1404
         code: vagrant reload ubuntu1404
         cwd: $WORKING_DIR
     - script:
         name: Run rake spec:ubuntu1404
-        code: rake spec:ubuntu1404
+        code: DIGITALOCEAN=true rake spec:ubuntu1404
         cwd: $WORKING_DIR
 
   after-steps:
     - script:
-        name: Run vagrant destroy centos65
-        code: vagrant destroy centos65 --force
-        cwd: $WORKING_DIR
-    - script:
-        name: Run vagrant destroy ubuntu1404
-        code: vagrant destroy ubuntu1404 --force
+        name: Run vagrant destroy
+        code: vagrant destroy --force
         cwd: $WORKING_DIR
     - 1syo/idobata-notify@0.1.1:
         token: $IDOBATA_TOKEN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.27.5
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler