specinfra 2.0.0.beta14 → 2.0.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26a24975924d84841a016386588bb54c094b94da
-  data.tar.gz: b0e847c24fb0dd945b0f68018ec54372eb6bdfc3
+  metadata.gz: 52cbcd87131d03d42e7afa46dbdc4fcc4d249352
+  data.tar.gz: f77e622fc12d536070800b2ed9ffcb9073aa2c9d
 SHA512:
-  metadata.gz: 5437fca57eea9b86e5a3d885c32bc48e1f8c4fe55a9606421e02b9d55736a9e40542a63b0810f3f4aae646dfae75b778a9f3892d77f1d165848e68d2e3adbd21
-  data.tar.gz: b3b5647f3d39399cc0bf073aa6958e1666f88a79a758e5f0f89142a341dd56e22130d1a8f213b3f1cf4ffa642a218b11720d6c8ac8132bc4da70c51b384d1cfc
+  metadata.gz: 8cd425df44198ad44995b4b1b4fed47f36297bde6e208abedce59aed7f3b34a0889fc94b13514befc87e59edcb187400b3b29a28ce6c185f9c10f1f7eea42ecd
+  data.tar.gz: a2f79a8bdfe210b9050f9e3560156ee1d28bb6eff02e20714f6ae901a6912ac64699bb1d2beafbccf44d7d56a3e5e4fc28b453e7156a0f0d7851d62b8fc3d761

data/lib/specinfra.rb

@@ -17,6 +17,11 @@ module Specinfra
     def command
       Specinfra::Command::Base.new
     end
+
+    def backend
+      type = Specinfra.configuration.backend.to_s.to_camel_case
+      eval "Specinfra::Backend::#{type}.instance"
+    end
   end
 end
 

data/lib/specinfra/backend/base.rb

@@ -7,31 +7,19 @@ module Specinfra
     class Base
       include Singleton
 
-      def set_commands(c)
-        @commands = c
-      end
-
       def set_example(e)
         @example = e
       end
 
-      def commands
-        @commands
-      end
-
       def check_zero(cmd, *args)
         run_command(Specinfra.command.send(cmd, *args)).success?
       end
 
       def method_missing(meth, *args, &block)
-        if os[:family] == 'windows'
-          if meth.to_s =~ /^check/
-            backend.check_zero(meth, *args)
-          else
-            backend.run_command(Specinfra.command.send(meth, *args))
-          end
+        if meth.to_s =~ /^check/
+          check_zero(meth, *args)
         else
-          Specinfra::Command::Processor.send(meth, *args)
+          run_command(Specinfra.command.send(meth, *args))
         end
       end
     end

data/lib/specinfra/command/processor.rb

@@ -1,15 +1,11 @@
 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(Specinfra.command.send(meth, *args))
-      end
+      Specinfra.backend.send(meth, *args)
     end
 
     def self.check_service_is_running(service)
-      ret = backend.run_command(Specinfra.command.check_service_is_running(service))
+      ret = Specinfra.backend.run_command(Specinfra.command.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 +14,14 @@ module Specinfra::Command
 
       # If the service is not registered, check by ps command
       if ret.exit_status == 1
-        ret = backend.run_command(Specinfra.command.check_process_is_running(service))
+        ret = Specinfra.backend.run_command(Specinfra.command.check_process_is_running(service))
       end
 
       ret.success?
     end
 
     def self.check_service_is_monitored_by_monit(process)
-      ret = backend.run_command(Specinfra.command.check_service_is_monitored_by_monit(process))
+      ret = Specinfra.backend.run_command(Specinfra.command.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 +32,7 @@ module Specinfra::Command
     end
 
     def self.check_file_is_readable(file, by_whom)
-      mode = sprintf('%04s',backend.run_command(Specinfra.command.get_file_mode(file)).stdout.strip)
+      mode = sprintf('%04s',Specinfra.backend.run_command(Specinfra.command.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 +48,7 @@ module Specinfra::Command
     end
 
     def self.check_file_is_writable(file, by_whom)
-      mode = sprintf('%04s',backend.run_command(Specinfra.command.get_file_mode(file)).stdout.strip)
+      mode = sprintf('%04s',Specinfra.backend.run_command(Specinfra.command.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 +64,7 @@ module Specinfra::Command
     end
 
     def self.check_file_is_executable(file, by_whom)
-      mode = sprintf('%04s',backend.run_command(Specinfra.command.get_file_mode(file)).stdout.strip)
+      mode = sprintf('%04s',Specinfra.backend.run_command(Specinfra.command.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 +80,7 @@ module Specinfra::Command
     end
 
     def self.check_file_is_mounted(path, expected_attr, only_with)
-      ret = backend.run_command(Specinfra.command.check_file_is_mounted(path))
+      ret = Specinfra.backend.run_command(Specinfra.command.check_file_is_mounted(path))
       if expected_attr.nil? || ret.failure?
         return ret.success?
       end
@@ -118,7 +114,7 @@ module Specinfra::Command
 
     def self.check_routing_table_has_entry(expected_attr)
       return false if ! expected_attr[:destination]
-      ret = backend.get_routing_table_entry(expected_attr[:destination])
+      ret = Specinfra.backend.get_routing_table_entry(expected_attr[:destination])
       return false if ret.failure?
 
       ret.stdout.gsub!(/\r\n/, "\n")

data/lib/specinfra/configuration.rb

@@ -2,6 +2,7 @@ module Specinfra
   module Configuration
     class << self
       VALID_OPTIONS_KEYS = [
+        :backend,
         :env,
         :path,
         :shell,

data/lib/specinfra/helper.rb

@@ -1,9 +1,6 @@
 require 'specinfra/helper/os'
 include Specinfra::Helper::Os
 
-require 'specinfra/helper/backend'
-include Specinfra::Helper::Backend
-
 require 'specinfra/helper/docker'
 require 'specinfra/helper/lxc'
 

data/lib/specinfra/helper/os.rb

@@ -30,7 +30,7 @@ module Specinfra::Helper::Os
   end
 
   def run_command(cmd)
-    backend.run_command(cmd)
+    Specinfra.backend.run_command(cmd)
   end
 
   def detect_os

data/lib/specinfra/runner.rb

@@ -2,7 +2,11 @@ module Specinfra
   class Runner
     include Singleton
     def method_missing(meth, *args, &block)
-      backend.send(meth, *args)
+      if os.include?(:family) && os[:family] == 'windows'
+        Specinfra.backend.send(meth, *args)
+      else
+        Specinfra::Command::Processor.send(meth, *args)
+      end
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta14"
+  VERSION = "2.0.0.beta15"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -1,18 +1,16 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Exec
-
 describe Specinfra::Backend::Exec do
   describe '#build_command' do
     context 'with simple command' do
       it 'should escape spaces' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
       end
     end
 
     context 'with complex command' do
       it 'should escape special chars' do
-        expect(backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
+        expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
       end
     end
 
@@ -26,7 +24,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom shell' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq '/usr/local/bin/tcsh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/usr/local/bin/tcsh -c test\ -f\ /etc/passwd'
       end
     end
 
@@ -40,7 +38,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom shell' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq '/usr/test\ \&\ spec/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/usr/test\ \&\ spec/bin/sh -c test\ -f\ /etc/passwd'
       end
     end
 
@@ -54,7 +52,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom path' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq 'env PATH="/opt/bin:/opt/foo/bin:$PATH" /bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq 'env PATH="/opt/bin:/opt/foo/bin:$PATH" /bin/sh -c test\ -f\ /etc/passwd'
       end
     end
 
@@ -68,7 +66,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom path' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq 'env PATH="/opt/bin:/opt/test & spec/bin:$PATH" /bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq 'env PATH="/opt/bin:/opt/test & spec/bin:$PATH" /bin/sh -c test\ -f\ /etc/passwd'
       end
     end
   end
@@ -83,7 +81,7 @@ describe 'os' do
   context 'test ubuntu with lsb_release command' do
     subject { os }
     it do
-      expect(backend).to receive(:run_command).at_least(1).times do |args|
+      expect(Specinfra.backend).to receive(:run_command).at_least(1).times do |args|
         if ['ls /etc/debian_version', 'lsb_release -ir'].include? args
           double(
             :run_command_response,
@@ -103,7 +101,7 @@ describe 'os' do
   context 'test ubuntu with /etc/lsb-release' do
     subject { os }
     it do
-      expect(backend).to receive(:run_command).at_least(1).times do |args|
+      expect(Specinfra.backend).to receive(:run_command).at_least(1).times do |args|
         if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
           double(
             :run_command_response,
@@ -128,7 +126,7 @@ EOF
   context 'test debian (no lsb_release or lsb-release)' do
     subject { os }
     it do
-      expect(backend).to receive(:run_command).at_least(1).times do |args|
+      expect(Specinfra.backend).to receive(:run_command).at_least(1).times do |args|
         if args == 'ls /etc/debian_version'
           double :run_command_response, :success? => true, :stdout => nil
         elsif args == 'uname -m'

data/spec/backend/exec/env_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe backend.run_command('echo $LANG').stdout.strip do
+describe Specinfra.backend.run_command('echo $LANG').stdout.strip do
   it { should eq 'C' }
 end
 
@@ -9,7 +9,7 @@ describe do
     ENV['LANG'] = 'C'
     set :env, :LANG => 'ja_JP.UTF-8'
   end
-  let(:lang) { backend.run_command('echo $LANG').stdout.strip }
+  let(:lang) { Specinfra.backend.run_command('echo $LANG').stdout.strip }
   it { expect(lang).to eq 'ja_JP.UTF-8' }
   it { expect(ENV['LANG']).to eq 'C' }
 end

data/spec/backend/ssh/build_command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Specinfra::Helper::Ssh
+set :backend, :ssh
 
 describe Specinfra::Backend::Ssh do
   describe '#build_command' do
@@ -13,11 +13,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'should not prepend sudo' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
       end
 
       it 'should escape special characters' do
-        expect(backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
+        expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
       end
     end
 
@@ -30,11 +30,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'should prepend sudo' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
+        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
       end
 
       it 'should escape special characters' do
-        expect(backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)}
+        expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)}
       end
     end
 
@@ -54,11 +54,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'command pattern 1a' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq %q{/usr/local/bin/sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
+        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq %q{/usr/local/bin/sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
       end
 
       it 'command pattern 2a' do
-        expect(backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq %q{/usr/local/bin/sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)}
+        expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq %q{/usr/local/bin/sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)}
       end
     end
 
@@ -78,11 +78,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'command pattern 1b' do
-        expect(backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
       end
 
       it 'command pattern 2b' do
-        expect(backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
+        expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
       end
 
     end
@@ -104,12 +104,12 @@ describe Specinfra::Backend::Ssh do
       end
 
       context 'command pattern 1a' do
-        subject { backend.build_command('test -f /etc/passwd') }
+        subject { Specinfra.backend.build_command('test -f /etc/passwd') }
         it { should eq %q{sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd} }
       end
 
       context 'command pattern 2a' do
-        subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
+        subject { Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
         it { should eq %q{sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)} }
       end
     end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'specinfra'
 require 'rspec/mocks/standalone'
 require 'rspec/its'
 
-include Specinfra::Helper::Exec
+set :backend, :exec
 
 module Specinfra
   module Backend

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta14
+  version: 2.0.0.beta15
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -283,7 +283,6 @@ files:
 - lib/specinfra/command_result.rb
 - lib/specinfra/configuration.rb
 - lib/specinfra/helper.rb
-- lib/specinfra/helper/backend.rb
 - lib/specinfra/helper/configuration.rb
 - lib/specinfra/helper/detect_os.rb
 - lib/specinfra/helper/detect_os/aix.rb
@@ -315,7 +314,6 @@ files:
 - spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/configuration_spec.rb
-- spec/helper/backend_spec.rb
 - spec/helper/os_spec.rb
 - spec/helper/properties_spec.rb
 - spec/helper/set_spec.rb
@@ -356,7 +354,6 @@ test_files:
 - spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/configuration_spec.rb
-- spec/helper/backend_spec.rb
 - spec/helper/os_spec.rb
 - spec/helper/properties_spec.rb
 - spec/helper/set_spec.rb

data/lib/specinfra/helper/backend.rb

@@ -1,27 +0,0 @@
-module Specinfra
-  module Helper
-    ['Exec', 'Ssh', 'Cmd', 'Docker', 'WinRM', 'ShellScript', 'Dockerfile', 'Lxc'].each do |type|
-      eval <<-EOF
-        module #{type}
-          def backend(commands_object=nil)
-            if ! respond_to?(:commands)
-              commands_object = Specinfra::Command::Base.new
-            end
-            instance = Specinfra::Backend::#{type}.instance
-            instance.set_commands(commands_object || commands)
-            instance
-          end
-        end
-      EOF
-    end
-
-    module Backend
-      def backend_for(type)
-        instance = self.class.const_get('Specinfra').const_get('Backend').const_get(type.to_s.capitalize).instance
-        commands = Specinfra::Command::Base.new
-        instance.set_commands(commands)
-        instance
-      end
-    end
-  end
-end

data/spec/helper/backend_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe 'backend_for(:type) returns correct backend object' do
-  before do
-    RSpec.configure do |c|
-      c.ssh = double(:ssh, :options => { :user => 'root' })
-    end
-  end
-
-  it 'backend_for(:exec) returns Specinfra::Backend::Exec' do
-    expect(backend_for(:exec)).to be_an_instance_of Specinfra::Backend::Exec
-  end
-
-  it 'backend_for(:ssh) returns Specinfra::Backend::Ssh' do
-    expect(backend_for(:ssh)).to be_an_instance_of Specinfra::Backend::Ssh
-  end
-end