specinfra 2.18.1 → 2.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab3820cc872b378eb1157615c60772812ecc51de
-  data.tar.gz: 3fe8b65314493d58539ae0bd98ee9e58c7fa00b1
+  metadata.gz: 02ae335e1959787204447d1b773a79a39c266953
+  data.tar.gz: d69f35462442aa8478066d3133a42031082e8759
 SHA512:
-  metadata.gz: 9a7b92a818a42e34dd8625edf47a4724794be578db5c8363bc3a8875b890545ac3fa63a8831bebd15e062986d0644127041a6abdfd6e9c974992e5e4b89d2457
-  data.tar.gz: 52d14b2b97959fe84c6529c1c6b335218c8f5394c60c0712924cc607e5caf041009db1314e5b0d40b22ba1837ddf0667efc87cdc7d09e84a908b728b5ac9f3db
+  metadata.gz: 954e34b845d79e6a63dbae19abbc4898f3f722be54b7131bb24fdc73e74f67271a8cb29a094d76d72bdf3027652c4e7a3ef8bb4b7c1a00e78c5c3c956e7f2370
+  data.tar.gz: 7ea174d5fe37d3d81b905902796df74ec27d796529c1f24797b7c55ffa928a0b77d1c6f33bc69ef086475ca05b07e5798894fa80aea12d153cb28efaeeb8002a

data/lib/specinfra/command.rb

@@ -220,6 +220,7 @@ require 'specinfra/command/solaris/v10/user'
 # SmartOS (inherit Solaris)
 require 'specinfra/command/smartos'
 require 'specinfra/command/smartos/base'
+require 'specinfra/command/smartos/base/file'
 require 'specinfra/command/smartos/base/package'
 require 'specinfra/command/smartos/base/service'
 

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

@@ -22,5 +22,9 @@ class Specinfra::Command::Arch::Base::Package < Specinfra::Command::Linux::Base:
     def sync_repos
       "pacman -Syy"
     end
+
+    def remove(package, option='')
+      "pacman -R --noconfirm #{option} #{package}"
+    end
   end
 end

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

@@ -24,6 +24,10 @@ class Specinfra::Command::Debian::Base::Package < Specinfra::Command::Linux::Bas
     def get_version(package, opts=nil)
       "dpkg-query -f '${Status} ${Version}' -W #{package} | sed -n 's/^install ok installed //p'"
     end
+
+    def remove(package, option='')
+      "DEBIAN_FRONTEND='noninteractive' apt-get -y #{option} remove #{package}"
+    end
   end
 end
 

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

@@ -22,6 +22,10 @@ class Specinfra::Command::Redhat::Base::Package < Specinfra::Command::Linux::Bas
       end
       cmd = "yum -y #{option} install #{full_package}"
     end
+
+    def remove(package, option='')
+      "yum -y #{option} remove #{package}"
+    end
   end
 end
 

data/lib/specinfra/command/smartos/base/file.rb

@@ -0,0 +1,11 @@
+class Specinfra::Command::Smartos::Base::File < Specinfra::Command::Solaris::Base::File
+  class << self
+    def get_md5sum(file)
+      "/usr/bin/digest -a md5 -v #{escape(file)} | cut -d '=' -f 2 |  cut -c 2-"
+    end
+    
+    def get_sha256sum(file)
+      "/usr/bin/digest -a sha256 -v #{escape(file)} | cut -d '=' -f 2 |  cut -c 2-"
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 class Specinfra::Command::Smartos::Base::Package < Specinfra::Command::Solaris::Base::Package
   class << self
     def check_is_installed(package, version=nil)
-      cmd = "/opt/local/bin/pkgin list 2> /dev/null | grep -qw ^#{escape(package)}"
+      cmd = "pkg_info -qE #{escape(package)}"
       if version
         cmd = "#{cmd}-#{escape(version)}"
       end
@@ -9,7 +9,7 @@ class Specinfra::Command::Smartos::Base::Package < Specinfra::Command::Solaris::
     end
 
     def get_version(package, opts=nil)
-      "pkgin list | cut -f 1 -d ' ' | grep -E '^#{escape(package)}-([^-])+$' | grep -Eo '(\\.|\\w)+$'"
+      "pkg_info -E #{escape(package)} | awk -F '-' '{print $NF}'"
     end
   end
 end

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

@@ -1,11 +1,11 @@
 class Specinfra::Command::Smartos::Base::Service < Specinfra::Command::Solaris::Base::Service
   class << self
     def check_is_enabled(service, level=nil)
-      "svcs -l #{escape(service)} 2> /dev/null | grep -wx '^enabled.*true$'"
+      "svcs -l #{escape(service)} 2>/dev/null | grep '^enabled *true$' >/dev/null"
     end
 
     def check_is_running(service)
-      "svcs -l #{escape(service)} status 2> /dev/null |grep -wx '^state.*online$'"
+      "svcs -Ho state  #{escape(service)} 2>/dev/null |grep '^online$' >/dev/null"
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.18.1"
+  VERSION = "2.18.2"
 end

data/wercker.yml

@@ -1,74 +1,12 @@
 box: mizzy/serverspec-base@0.0.6
 build:
   steps:
-    - script:
-        name: Make $HOME/.ssh directory
-        code: mkdir -p $HOME/.ssh
-    - create-file:
-        name: Put SSH public key
-        filename: $HOME/.ssh/id_rsa.pub
-        overwrite: true
-        hide-from-log: true
-        content: $DIGITALOCEAN_SSH_KEY_PUBLIC
-    - create-file:
-        name: Put SSH private key
-        filename: $HOME/.ssh/id_rsa
-        overwrite: true
-        hide-from-log: true
-        content: $DIGITALOCEAN_SSH_KEY_PRIVATE
-    - script:
-        name: Run chmod 0400 $HOME/.ssh/id_rsa
-        code: chmod 0400 $HOME/.ssh/id_rsa
     - script:
         name: Run setup.sh
         code: $WORKING_DIR/setup.sh
     - script:
-        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: DIGITALOCEAN=true rake spec:centos65
-        cwd: $WORKING_DIR
-    - script:
-        name: Run vagrant up centos70
-        code: vagrant up centos70 --provider=digital_ocean
-        cwd: $WORKING_DIR
-    - script:
-        name: Run itamae
-        code: bundle exec itamae ssh --host centos70 --vagrant recipe.rb
-        cwd: $WORKING_DIR
-    - script:
-        name: Run vagrant reload centos70
-        code: vagrant reload centos70
-        cwd: $WORKING_DIR
-    - script:
-        name: Run rake spec:centos70
-        code: DIGITALOCEAN=true rake spec:centos70
-        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: DIGITALOCEAN=true rake spec:ubuntu1404
+        name: Run walter
+        code: ./walter
         cwd: $WORKING_DIR
 
   after-steps:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.18.1
+  version: 2.18.2
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -277,6 +277,7 @@ files:
 - lib/specinfra/command/redhat/v7/service.rb
 - lib/specinfra/command/smartos.rb
 - lib/specinfra/command/smartos/base.rb
+- lib/specinfra/command/smartos/base/file.rb
 - lib/specinfra/command/smartos/base/package.rb
 - lib/specinfra/command/smartos/base/service.rb
 - lib/specinfra/command/solaris.rb