specinfra 2.0.0.beta12 → 2.0.0.beta13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e83660b824856312827345a04517188e064c1e6
-  data.tar.gz: ecf35e4263f0b93b3a9db776bab43c0ebc207081
+  metadata.gz: 5c02ea87aab8e7f7ed23696adbe6f4c943179cd8
+  data.tar.gz: ec24615f39351a0e8b94b85196e3ea00becb2ae9
 SHA512:
-  metadata.gz: eb2b8b616fa33bb47882acd858c0a0ac46db3f2b50209863ad639c3b0dc679d7ad8d885056d9b3791677646544774e2a10451af06b0fcaee2a9c16d4cfa5388e
-  data.tar.gz: 60d9cb2c010eae33245ee8737267e012554bf538c6cf352ba5b5262701b017cf90681033d2b4a1071b0680804851b0722393227b9bd100612cf238222960a67a
+  metadata.gz: b5639ff7909fc512270dc42c47f609b67635367b8faa5917316729e40c1506a36922d91d17f26a63fa670bac6942e7a4239f9e0e68fa46f3d7cdb81da59ee0ff
+  data.tar.gz: abc23375ee803df39d37accd78cd054f229706dfb6aa8632ef2adeb2e8d0512627d88249fe85543d424b1e63a580c524d7e1437e2b458f7f057c049899b0554b

data/lib/specinfra.rb

@@ -13,6 +13,10 @@ module Specinfra
     def configuration
       Specinfra::Configuration
     end
+
+    def commands
+      Specinfra::Command::Base.new
+    end
   end
 end
 

data/lib/specinfra/backend/base.rb

@@ -20,7 +20,7 @@ module Specinfra
       end
 
       def check_zero(cmd, *args)
-        run_command(commands.send(cmd, *args)).success?
+        run_command(Specinfra.commands.send(cmd, *args)).success?
       end
 
       def method_missing(meth, *args, &block)
@@ -28,7 +28,7 @@ module Specinfra
           if meth.to_s =~ /^check/
             backend.check_zero(meth, *args)
           else
-            backend.run_command(commands.send(meth, *args))
+            backend.run_command(Specinfra.commands.send(meth, *args))
           end
         else
           Specinfra::Command::Processor.send(meth, *args)

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

@@ -40,4 +40,3 @@ class Specinfra::Command::Base::Package < Specinfra::Command::Base
     cmd
   end
 end
-

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

@@ -2,4 +2,6 @@ class Specinfra::Command::Base::RoutingTable < Specinfra::Command::Base
   def check_has_entry(destination)
     "ip route | grep -E '^#{destination} |^default '"
   end
+
+  alias :get_entry :check_has_entry
 end

data/lib/specinfra/command/processor.rb

@@ -4,12 +4,12 @@ module Specinfra::Command
       if meth.to_s =~ /^check/
         backend.check_zero(meth, *args)
       else
-        backend.run_command(commands.send(meth, *args))
+        backend.run_command(Specinfra.commands.send(meth, *args))
       end
     end
 
     def self.check_service_is_running(service)
-      ret = backend.run_command(commands.check_service_is_running(service))
+      ret = backend.run_command(Specinfra.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.
@@ -18,14 +18,14 @@ module Specinfra::Command
 
       # 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))
+        ret = backend.run_command(Specinfra.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))
+      ret = backend.run_command(Specinfra.commands.check_service_is_monitored_by_monit(process))
       return false unless ret.stdout != nil && ret.success?
 
       retlines = ret.stdout.split(/[\r\n]+/).map(&:strip)
@@ -36,7 +36,7 @@ module Specinfra::Command
     end
 
     def self.check_file_is_readable(file, by_whom)
-      mode = sprintf('%04s',backend.run_command(commands.get_file_mode(file)).stdout.strip)
+      mode = sprintf('%04s',backend.run_command(Specinfra.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
@@ -52,7 +52,7 @@ module Specinfra::Command
     end
 
     def self.check_file_is_writable(file, by_whom)
-      mode = sprintf('%04s',backend.run_command(commands.get_file_mode(file)).stdout.strip)
+      mode = sprintf('%04s',backend.run_command(Specinfra.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
@@ -68,7 +68,7 @@ module Specinfra::Command
     end
 
     def self.check_file_is_executable(file, by_whom)
-      mode = sprintf('%04s',backend.run_command(commands.get_file_mode(file)).stdout.strip)
+      mode = sprintf('%04s',backend.run_command(Specinfra.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
@@ -84,7 +84,7 @@ module Specinfra::Command
     end
 
     def self.check_file_is_mounted(path, expected_attr, only_with)
-      ret = backend.run_command(commands.check_file_is_mounted(path))
+      ret = backend.run_command(Specinfra.commands.check_file_is_mounted(path))
       if expected_attr.nil? || ret.failure?
         return ret.success?
       end
@@ -118,7 +118,7 @@ module Specinfra::Command
 
     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]))
+      ret = backend.get_routing_table_entry(expected_attr[:destination])
       return false if ret.failure?
 
       ret.stdout.gsub!(/\r\n/, "\n")

data/lib/specinfra/helper/os.rb

@@ -1,10 +1,6 @@
 require 'specinfra/helper/detect_os'
 
 module Specinfra::Helper::Os
-  def commands
-    Specinfra::Command::Base.new
-  end
-
   def os
     property[:os_by_host] = {} if ! property[:os_by_host]
     host_port = current_host_and_port

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta12"
+  VERSION = "2.0.0.beta13"
 end

data/spec/command/base/file_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 set :os, { :family => nil }
 
-describe  commands.check_file_is_directory('/tmp') do
+describe  Specinfra.commands.check_file_is_directory('/tmp') do
   after do
     property[:os_by_host] = nil
   end

data/spec/command/redhat/interface_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 property[:os_by_host] = {}
 set :os, { :family => 'redhat', :release => 7 }
 
-describe commands.command_class('interface').create do
+describe Specinfra.commands.command_class('interface').create do
    it { should be_an_instance_of(Specinfra::Command::Linux::Base::Interface) }
 end
 

data/spec/command/redhat/package_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 property[:os_by_host] = {}
 set :os, { :family => 'redhat' }
 
-describe  commands.check_package_is_installed('httpd') do
+describe  Specinfra.commands.check_package_is_installed('httpd') do
   after do
     property[:os_by_host] = nil
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta12
+  version: 2.0.0.beta13
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh