specinfra 2.0.0.beta8 → 2.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50a10980f138ec879c1ac3a5c120188071418ad9
-  data.tar.gz: d993a25a4be1bea047667287d3d35dd39dc32a9e
+  metadata.gz: 572f8250ba4ca99acbaa3740b61bb646103cd041
+  data.tar.gz: d8cec18e50e69cd12c3186dbcbc7835e8896df93
 SHA512:
-  metadata.gz: b2338c5dc61527407961299803bbdb2779e0d39fe878afce5eadf65914166727af1250cb748fd984d90e3e3339f82d171b7c684c91fe42ff4119c22e9ce6e035
-  data.tar.gz: 09cf549373c2c63725169e4fa0de1e7fa2ad00ed1772602a53af34fcb9c1390d8b4f1e864377402b269bcc8ed98f0a33a0f3a2406e6ae805d82bce8395aae79f
+  metadata.gz: 7250feadcc58c2e9672a5e5580674b2283cbb2c5109ee8e3c7b3ec330e83985d3494d39c332c8ea1825ebd211f82e7a1ddafae6c7468a2c43dc94cdfa3a84518
+  data.tar.gz: a8e345e42bb720faa2d8001e17513d2b76ccc0c3135884aa0beff203f9681d04542f169b5101fbc7ff0a96925d855092f0f7f70c51cf9562713da17b6f6910ab

data/lib/specinfra/backend/base.rb

@@ -1,5 +1,6 @@
 require 'singleton'
 require 'specinfra/command_result'
+require 'specinfra/command/processor'
 
 module Specinfra
   module Backend
@@ -22,12 +23,15 @@ module Specinfra
         run_command(commands.send(cmd, *args)).success?
       end
 
-      # Default action is to call check_zero with args
       def method_missing(meth, *args, &block)
-        if meth.to_s =~ /^check/
-          check_zero(meth, *args)
+        if os[:family] == 'windows'
+          if meth.to_s =~ /^check/
+            backend.check_zero(meth, *args)
+          else
+            backend.run_command(commands.send(meth, *args))
+          end
         else
-          run_command(commands.send(meth, *args))
+          Specinfra::Command::Processor.send(meth, *args)
         end
       end
     end

data/lib/specinfra/backend/exec.rb

@@ -55,134 +55,6 @@ module Specinfra
         end
       end
 
-      def check_service_is_running(service)
-        ret = run_command(commands.check_service_is_running(service))
-
-        # In Ubuntu, some services are under upstart and "service foo status" returns
-        # exit status 0 even though they are stopped.
-        # So return false if stdout contains "stopped/waiting".
-        return false if ret.stdout =~ /stopped\/waiting/
-
-        # If the service is not registered, check by ps command
-        if ret.exit_status == 1
-          ret = run_command(commands.check_process_is_running(service))
-        end
-
-        ret.success?
-      end
-
-      def check_service_is_monitored_by_monit(process)
-        ret = run_command(commands.check_service_is_monitored_by_monit(process))
-        return false unless ret.stdout != nil && ret.success?
-
-        retlines = ret.stdout.split(/[\r\n]+/).map(&:strip)
-        proc_index = retlines.index("Process '#{process}'")
-        return false unless proc_index
-
-        retlines[proc_index+2].match(/\Amonitoring status\s+monitored\Z/i) != nil
-      end
-
-      def check_file_is_readable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_file_mode(file)).stdout.strip)
-        mode = mode.split('')
-        mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-        case by_whom
-        when nil
-          mode_octal & 0444 != 0
-        when 'owner'
-          mode_octal & 0400 != 0
-        when 'group'
-          mode_octal & 0040 != 0
-        when 'others'
-          mode_octal & 0004 != 0
-        end
-      end
-
-      def check_file_is_writable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_file_mode(file)).stdout.strip)
-        mode = mode.split('')
-        mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-        case by_whom
-        when nil
-          mode_octal & 0222 != 0
-        when 'owner'
-          mode_octal & 0200 != 0
-        when 'group'
-          mode_octal & 0020 != 0
-        when 'others'
-          mode_octal & 0002 != 0
-        end
-      end
-
-      def check_file_is_executable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_file_mode(file)).stdout.strip)
-        mode = mode.split('')
-        mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-        case by_whom
-        when nil
-          mode_octal & 0111 != 0
-        when 'owner'
-          mode_octal & 0100 != 0
-        when 'group'
-          mode_octal & 0010 != 0
-        when 'others'
-          mode_octal & 0001 != 0
-        end
-      end
-
-      def check_file_is_mounted(path, expected_attr, only_with)
-        ret = run_command(commands.check_file_is_mounted(path))
-        if expected_attr.nil? || ret.failure?
-          return ret.success?
-        end
-
-        mount = ret.stdout.scan(/\S+/)
-        actual_attr    = { :device => mount[0], :type => mount[4] }
-        mount[5].gsub(/\(|\)/, '').split(',').each do |option|
-          name, val = option.split('=')
-          if val.nil?
-            actual_attr[name.to_sym] = true
-          else
-            val = val.to_i if val.match(/^\d+$/)
-            actual_attr[name.to_sym] = val
-          end
-        end
-
-        if ! expected_attr[:options].nil?
-          expected_attr.merge!(expected_attr[:options])
-          expected_attr.delete(:options)
-        end
-
-        if only_with
-          actual_attr == expected_attr
-        else
-          expected_attr.each do |key, val|
-            return false if actual_attr[key] != val
-          end
-          true
-        end
-      end
-
-      def check_routing_table_has_entry(expected_attr)
-        return false if ! expected_attr[:destination]
-        ret = run_command(commands.check_routing_table_has_entry(expected_attr[:destination]))
-        return false if ret.failure?
-
-        ret.stdout.gsub!(/\r\n/, "\n")
-
-        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
-        end
-        true
-      end
-
       def copy_file(from, to)
         begin
           FileUtils.cp(from, to)

data/lib/specinfra/command/processor.rb

@@ -0,0 +1,139 @@
+module Specinfra::Command
+  class Processor
+    def self.method_missing(meth, *args, &block)
+      if meth.to_s =~ /^check/
+        backend.check_zero(meth, *args)
+      else
+        backend.run_command(commands.send(meth, *args))
+      end
+    end
+
+    def self.check_service_is_running(service)
+      ret = backend.run_command(commands.check_service_is_running(service))
+
+      # In Ubuntu, some services are under upstart and "service foo status" returns
+      # exit status 0 even though they are stopped.
+      # So return false if stdout contains "stopped/waiting".
+      return false if ret.stdout =~ /stopped\/waiting/
+
+      # If the service is not registered, check by ps command
+      if ret.exit_status == 1
+        ret = backend.run_command(commands.check_process_is_running(service))
+      end
+
+      ret.success?
+    end
+
+    def self.check_service_is_monitored_by_monit(process)
+      ret = backend.run_command(commands.check_service_is_monitored_by_monit(process))
+      return false unless ret.stdout != nil && ret.success?
+
+      retlines = ret.stdout.split(/[\r\n]+/).map(&:strip)
+      proc_index = retlines.index("Process '#{process}'")
+      return false unless proc_index
+
+      retlines[proc_index+2].match(/\Amonitoring status\s+monitored\Z/i) != nil
+    end
+
+    def self.check_file_is_readable(file, by_whom)
+      mode = sprintf('%04s',backend.run_command(commands.get_file_mode(file)).stdout.strip)
+      mode = mode.split('')
+      mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
+      case by_whom
+      when nil
+        mode_octal & 0444 != 0
+      when 'owner'
+        mode_octal & 0400 != 0
+      when 'group'
+        mode_octal & 0040 != 0
+      when 'others'
+        mode_octal & 0004 != 0
+      end
+    end
+
+    def self.check_file_is_writable(file, by_whom)
+      mode = sprintf('%04s',backend.run_command(commands.get_file_mode(file)).stdout.strip)
+      mode = mode.split('')
+      mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
+      case by_whom
+      when nil
+        mode_octal & 0222 != 0
+      when 'owner'
+        mode_octal & 0200 != 0
+      when 'group'
+        mode_octal & 0020 != 0
+      when 'others'
+        mode_octal & 0002 != 0
+      end
+    end
+
+    def self.check_file_is_executable(file, by_whom)
+      mode = sprintf('%04s',backend.run_command(commands.get_file_mode(file)).stdout.strip)
+      mode = mode.split('')
+      mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
+      case by_whom
+      when nil
+        mode_octal & 0111 != 0
+      when 'owner'
+        mode_octal & 0100 != 0
+      when 'group'
+        mode_octal & 0010 != 0
+      when 'others'
+        mode_octal & 0001 != 0
+      end
+    end
+
+    def self.check_file_is_mounted(path, expected_attr, only_with)
+      ret = backend.run_command(commands.check_file_is_mounted(path))
+      if expected_attr.nil? || ret.failure?
+        return ret.success?
+      end
+
+      mount = ret.stdout.scan(/\S+/)
+      actual_attr    = { :device => mount[0], :type => mount[4] }
+      mount[5].gsub(/\(|\)/, '').split(',').each do |option|
+        name, val = option.split('=')
+        if val.nil?
+          actual_attr[name.to_sym] = true
+        else
+          val = val.to_i if val.match(/^\d+$/)
+          actual_attr[name.to_sym] = val
+        end
+      end
+
+      if ! expected_attr[:options].nil?
+        expected_attr.merge!(expected_attr[:options])
+        expected_attr.delete(:options)
+      end
+
+      if only_with
+        actual_attr == expected_attr
+      else
+        expected_attr.each do |key, val|
+          return false if actual_attr[key] != val
+        end
+        true
+      end
+    end
+
+    def self.check_routing_table_has_entry(expected_attr)
+      return false if ! expected_attr[:destination]
+      ret = backend.run_command(commands.check_routing_table_has_entry(expected_attr[:destination]))
+      return false if ret.failure?
+
+      ret.stdout.gsub!(/\r\n/, "\n")
+
+      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
+      end
+      true
+    end
+  end
+end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta8"
+  VERSION = "2.0.0.beta9"
 end

data/wercker.yml

@@ -34,18 +34,6 @@ build:
         name: Run rake spec:centos65
         code: 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 vagrant reload centos70
-        code: vagrant reload centos70
-        cwd: $WORKING_DIR
-    - script:
-        name: Run rake spec:centos70
-        code: rake spec:centos70
-        cwd: $WORKING_DIR
     - script:
         name: Run vagrant up ubuntu1404
         code: vagrant up ubuntu1404 --provider=digital_ocean
@@ -64,10 +52,6 @@ build:
         name: Run vagrant destroy centos65
         code: vagrant destroy centos65 --force
         cwd: $WORKING_DIR
-    - script:
-        name: Run vagrant destroy centos70
-        code: vagrant destroy centos70 --force
-        cwd: $WORKING_DIR
     - script:
         name: Run vagrant destroy ubuntu1404
         code: vagrant destroy ubuntu1404 --force

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta8
+  version: 2.0.0.beta9
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -206,6 +206,7 @@ files:
 - lib/specinfra/command/plamo/base.rb
 - lib/specinfra/command/plamo/base/package.rb
 - lib/specinfra/command/plamo/base/service.rb
+- lib/specinfra/command/processor.rb
 - lib/specinfra/command/redhat.rb
 - lib/specinfra/command/redhat/base.rb
 - lib/specinfra/command/redhat/base/file.rb