specinfra 2.0.0.beta50 → 2.0.0.beta51

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

@@ -17,8 +17,14 @@ 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 +32,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

data/lib/specinfra/command.rb

@@ -12,6 +12,7 @@ require 'specinfra/command/base/file'
 require 'specinfra/command/base/group'
 require 'specinfra/command/base/host'
 require 'specinfra/command/base/interface'
+require 'specinfra/command/base/inventory'
 require 'specinfra/command/base/ipfilter'
 require 'specinfra/command/base/ipnat'
 require 'specinfra/command/base/iptables'
@@ -36,6 +37,7 @@ require 'specinfra/command/linux'
 require 'specinfra/command/linux/base'
 require 'specinfra/command/linux/base/file'
 require 'specinfra/command/linux/base/interface'
+require 'specinfra/command/linux/base/inventory'
 require 'specinfra/command/linux/base/iptables'
 require 'specinfra/command/linux/base/ip6tables'
 require 'specinfra/command/linux/base/kernel_module'
@@ -160,7 +162,6 @@ require 'specinfra/command/openbsd/base/interface'
 require 'specinfra/command/openbsd/base/mail_alias'
 require 'specinfra/command/openbsd/base/package'
 require 'specinfra/command/openbsd/base/port'
-require 'specinfra/command/openbsd/base/routing_table'
 require 'specinfra/command/openbsd/base/service'
 require 'specinfra/command/openbsd/base/user'
 

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

@@ -2,9 +2,10 @@ class Specinfra::Command::Arch::Base::Package < Specinfra::Command::Linux::Base:
   class << self
     def check_is_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
 

data/lib/specinfra/command/base/inventory.rb

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

data/lib/specinfra/command/linux/base/inventory.rb

@@ -0,0 +1,7 @@
+class Specinfra::Command::Linux::Base::Inventory < Specinfra::Command::Base::Inventory
+  class << self
+    def get_memory
+      'cat /proc/meminfo'
+    end
+  end
+end

data/lib/specinfra/helper.rb

@@ -11,3 +11,6 @@ include Specinfra::Helper::Properties
 
 require 'specinfra/helper/set'
 include Specinfra::Helper::Set
+
+require 'specinfra/helper/host_inventory'
+include Specinfra::Helper::HostInventory

data/lib/specinfra/helper/host_inventory.rb

@@ -0,0 +1,12 @@
+require 'specinfra/host_inventory'
+
+module Specinfra
+  module Helper
+    module HostInventory
+      def host_inventory
+        Specinfra::HostInventory.instance
+      end
+    end
+  end
+end
+

data/lib/specinfra/host_inventory.rb

@@ -0,0 +1,18 @@
+module Specinfra
+  class HostInventory
+    include Singleton
+
+    def initialize
+      property[:host_inventory] ||= {}
+      @inventory = property[:host_inventory]
+    end
+
+    def [](key)
+      @inventory[key.to_sym] ||= {}
+      if @inventory[key.to_sym].empty?
+        @inventory[key.to_sym] = Specinfra::Runner.send("get_inventory_#{key}")
+      end
+      @inventory[key.to_sym]
+    end
+  end
+end

data/lib/specinfra/processor.rb

@@ -123,21 +123,12 @@ module Specinfra
 
       ret.stdout.gsub!(/\r\n/, "\n")
 
-      if os[:family] == 'openbsd'
-        match = ret.stdout.match(/^(?<destination>\S+)\s+(?<gateway>\S+).*?(?<interface>\S+[0-9]+)(\s*)$/)
-	actual_attr = {
-	  :destination => match[:destination],
-	  :gateway     => match[:gateway],
-	  :interface   => expected_attr[:interface] ? match[:interface] : nil
-	}
-      else
-        ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+\n(?:default via (\S+))?/
-        actual_attr = {
-          :destination => $1,
-          :gateway     => $2 ? $2 : $4,
-          :interface   => expected_attr[:interface] ? $3 : nil
-        }
-      end
+      ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+\n(?:default via (\S+))?/
+      actual_attr = {
+        :destination => $1,
+        :gateway     => $2 ? $2 : $4,
+        :interface   => expected_attr[:interface] ? $3 : nil
+      }
 
       expected_attr.each do |key, val|
         return false if actual_attr[key] != val
@@ -153,16 +144,31 @@ module Specinfra
       ret.stdout.gsub!(/\r\n/, "\n")
 
       if os[:family] == 'openbsd'
-        match = ret.stdout.match(/^(?<destination>\S+)\s+(?<gateway>\S+).*?(?<interface>\S+[0-9]+)(\s*)$/)
-	match[attr]
+        # This code does not work with Ruby 1.8.7.
+        # So commented out.
+        # match = ret.stdout.match(/^(?<destination>\S+)\s+(?<gateway>\S+).*?(?<interface>\S+[0-9]+)(\s*)$/)
+        # match[attr]
       else
         ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+\n(?:default via (\S+))?/
-	if attr == :gateway
-	  $2 ? $2 : $4
-	elsif attr == :interface
-	  $3
-	end
+        if attr == :gateway
+          $2 ? $2 : $4
+        elsif attr == :interface
+          $3
+        end
+      end
+    end
+
+    def self.get_inventory_memory
+      cmd = Specinfra.command.get(:get_inventory_memory)
+      ret = Specinfra.backend.run_command(cmd).stdout
+      memory = {}
+      ret.each_line do |line|
+        case line
+        when /^MemTotal:\s+(\d+) (.+)$/
+          memory[:total] = "#{$1}#{$2}"
+        end
       end
+      memory
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta50"
+  VERSION = "2.0.0.beta51"
 end

data/spec/command/linux/inventory_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+set :os, :family => 'linux'
+
+describe get_command(:get_inventory_memory) do
+  it { should eq 'cat /proc/meminfo' }
+end

metadata

@@ -1,109 +1,125 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: specinfra
-version: !ruby/object:Gem::Version
-  version: 2.0.0.beta50
+version: !ruby/object:Gem::Version 
+  hash: -3009863172
+  prerelease: 6
+  segments: 
+  - 2
+  - 0
+  - 0
+  - beta
+  - 51
+  version: 2.0.0.beta51
 platform: ruby
-authors:
+authors: 
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-10-02 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: net-scp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.1.1
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 73
+        segments: 
+        - 10
+        - 1
+        - 1
         version: 10.1.1
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec-its
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Common layer for serverspec and itamae
-email:
+email: 
 - gosukenator@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".gitmodules"
-- ".travis.yml"
+
+files: 
+- .gitignore
+- .gitmodules
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -155,6 +171,7 @@ files:
 - lib/specinfra/command/base/group.rb
 - lib/specinfra/command/base/host.rb
 - lib/specinfra/command/base/interface.rb
+- lib/specinfra/command/base/inventory.rb
 - lib/specinfra/command/base/ip6tables.rb
 - lib/specinfra/command/base/ipfilter.rb
 - lib/specinfra/command/base/ipnat.rb
@@ -205,6 +222,7 @@ files:
 - lib/specinfra/command/linux/base.rb
 - lib/specinfra/command/linux/base/file.rb
 - lib/specinfra/command/linux/base/interface.rb
+- lib/specinfra/command/linux/base/inventory.rb
 - lib/specinfra/command/linux/base/ip6tables.rb
 - lib/specinfra/command/linux/base/iptables.rb
 - lib/specinfra/command/linux/base/kernel_module.rb
@@ -229,7 +247,6 @@ files:
 - lib/specinfra/command/openbsd/base/mail_alias.rb
 - lib/specinfra/command/openbsd/base/package.rb
 - lib/specinfra/command/openbsd/base/port.rb
-- 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/opensuse.rb
@@ -316,10 +333,12 @@ files:
 - lib/specinfra/helper/detect_os/solaris.rb
 - lib/specinfra/helper/detect_os/suse.rb
 - lib/specinfra/helper/docker.rb
+- lib/specinfra/helper/host_inventory.rb
 - lib/specinfra/helper/lxc.rb
 - lib/specinfra/helper/os.rb
 - lib/specinfra/helper/properties.rb
 - lib/specinfra/helper/set.rb
+- lib/specinfra/host_inventory.rb
 - lib/specinfra/processor.rb
 - lib/specinfra/properties.rb
 - lib/specinfra/runner.rb
@@ -334,6 +353,7 @@ files:
 - spec/command/debian/service_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/linux/interface_spec.rb
+- spec/command/linux/inventory_spec.rb
 - spec/command/linux/ip6tables_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/redhat/interface_spec.rb
@@ -347,31 +367,43 @@ files:
 - spec/spec_helper.rb
 - specinfra.gemspec
 - wercker.yml
-homepage: ''
-licenses:
+has_rdoc: true
+homepage: ""
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">"
-    - !ruby/object:Gem::Version
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Common layer for serverspec and itamae
-test_files:
+test_files: 
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/env_spec.rb
 - spec/backend/ssh/build_command_spec.rb
@@ -382,6 +414,7 @@ test_files:
 - spec/command/debian/service_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/linux/interface_spec.rb
+- spec/command/linux/inventory_spec.rb
 - spec/command/linux/ip6tables_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/redhat/interface_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 84744a7a631801a67ee1cb4357dc3b19be41c06f
-  data.tar.gz: 85a4c8ca8abdb1de2c532bbfc6a54d4aa994e3df
-SHA512:
-  metadata.gz: 5ebe9832eb880d67db5c597465cae89c4b1aec7251af8e119153d20eeca7ee300796fe9faf8b8e29fc9c91fc8239508ccc9a15e813e9c958eeabb5a844057240
-  data.tar.gz: 5c37468b41ed148f2512fc065b6f91125de428751ad5020fd51ba220ab4dd2869ab5e7535fb322f3d57d4af46c38dacd2a6b201cceb19ac386d620a2b789eb33

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

@@ -1,9 +0,0 @@
-class Specinfra::Command::Openbsd::Base::RoutingTable < Specinfra::Command::Base::RoutingTable
-  class << self
-    def check_has_entry(destination)
-      "route -n show -gateway | egrep '^#{destination}' | head -1"
-    end
-
-    alias :get_entry :check_has_entry
-  end
-end