specinfra 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: affb586181cbed5a5df08b7051e34fe1b825862b
-  data.tar.gz: 38a773ddead03328e9f581ff9ba2bae517f7968d
+  metadata.gz: e6f99779115167f0d7345a3ba9261f32f01754b5
+  data.tar.gz: f9643ec0810fddd98b30816509711d7d6b64db09
 SHA512:
-  metadata.gz: 76f82c0a871297f8b98ee2bad8fa982bdae82d06515200fe9ac5ccc8ea896d1194f6354dddeb49d896ebb5da10df1e906a6f8e5a398cbda9f6ccb624e06a80e0
-  data.tar.gz: d5f364ea6e222a2d8ac6d82e7a4b4759ae6f126b5a0f14cb1d1dbe2ff3af8778b78e3792ee6212948e38a6cfbc24cb5cc03ce436c951557be3e1f37ba54669c8
+  metadata.gz: eb6aee27e06d5116f93650bec947195de18b01abc9d2be7eeabf4491827549e166e568cb2261187f15bc24001b6f56eee31cbb3332f455504c096e63c0a2a8fb
+  data.tar.gz: 9c80d72827ac059467fcd71b34d562fb3232220a40cd5c204c9f9a7d5cbcb04761d1dc9cade8dc79deb8d1e56b43fc3333d966ba3cb7055622ed703b14eb4cc4

data/lib/specinfra.rb

@@ -1,9 +1,10 @@
-require "specinfra/version"
-require "specinfra/helper"
-require "specinfra/backend"
-require "specinfra/command"
-require "specinfra/command_result"
-require "specinfra/configuration"
+require 'specinfra/version'
+require 'specinfra/helper'
+require 'specinfra/backend'
+require 'specinfra/command'
+require 'specinfra/command_result'
+require 'specinfra/configuration'
+require 'specinfra/runner'
 
 include Specinfra
 

data/lib/specinfra/backend/exec.rb

@@ -185,20 +185,34 @@ module Specinfra
 
       def check_os
         return Specinfra.configuration.os if Specinfra.configuration.os
-        if run_command('ls /etc/redhat-release').success?
+        arch = run_command('uname -m').stdout.strip
+        # Fedora also has an /etc/redhat-release so the Fedora check must
+        # come before the RedHat check
+        if run_command('ls /etc/fedora-release').success?
+          line = run_command('cat /etc/redhat-release').stdout
+          if line =~ /release (\d[\d]*)/
+            release = $1
+          end
+          { :family => 'Fedora', :release => release }
+        elsif run_command('ls /etc/redhat-release').success?
           line = run_command('cat /etc/redhat-release').stdout
           if line =~ /release (\d[\d.]*)/
             release = $1
           end
-          { :family => 'RedHat', :release => release }
+
+          if release =~ /7./
+            { :family => 'RedHat7', :release => release, :arch => arch }
+          else
+            { :family => 'RedHat', :release => release, :arch => arch }
+          end
         elsif run_command('ls /etc/system-release').success?
-          { :family => 'RedHat', :release => nil } # Amazon Linux
+          { :family => 'RedHat', :release => nil, :arch => arch } # Amazon Linux
         elsif run_command('ls /etc/SuSE-release').success?
           line = run_command('cat /etc/SuSE-release').stdout
           if line =~ /SUSE Linux Enterprise Server (\d+)/
             release = $1
           end
-          { :family => 'SuSE', :release => release }
+          { :family => 'SuSE', :release => release, :arch => arch }
         elsif run_command('ls /etc/debian_version').success?
           lsb_release = run_command("lsb_release -ir")
           if lsb_release.success?
@@ -217,37 +231,37 @@ module Specinfra
           end
           distro ||= 'Debian'
           release ||= nil
-          { :family => distro.strip, :release => release }
+          { :family => distro.strip, :release => release, :arch => arch }
         elsif run_command('ls /etc/gentoo-release').success?
-          { :family => 'Gentoo', :release => nil }
+          { :family => 'Gentoo', :release => nil, :arch => arch }
         elsif run_command('ls /usr/lib/setup/Plamo-*').success?
-          { :family => 'Plamo', :release => nil }
+          { :family => 'Plamo', :release => nil, :arch => arch }
         elsif run_command('uname -s').stdout =~ /AIX/i
-          { :family => 'AIX', :release => nil }
-        elsif (os = run_command('uname -sr').stdout) && os =~ /SunOS/i
-          if os =~ /5.10/
-            { :family => 'Solaris10', :release => nil }
+          { :family => 'AIX', :release => nil, :arch => arch }
+        elsif ( uname = run_command('uname -sr').stdout) && uname =~ /SunOS/i
+          if uname =~ /5.10/
+            { :family => 'Solaris10', :release => nil, :arch => arch }
           elsif run_command('grep -q "Oracle Solaris 11" /etc/release').success?
-            { :family => 'Solaris11', :release => nil }
+            { :family => 'Solaris11', :release => nil, :arch => arch }
           elsif run_command('grep -q SmartOS /etc/release').success?
-            { :family => 'SmartOS', :release => nil }
+            { :family => 'SmartOS', :release => nil, :arch => arch }
           else
-            { :family => 'Solaris', :release => nil }
+            { :family => 'Solaris', :release => nil, :arch => arch }
           end
         elsif run_command('uname -s').stdout =~ /Darwin/i
           { :family => 'Darwin', :release => nil }
-        elsif (os = run_command('uname -sr').stdout) && os =~ /FreeBSD/i
-          if os =~ /10./
-            { :family => 'FreeBSD10', :release => nil }
+        elsif ( uname = run_command('uname -sr').stdout ) && uname =~ /FreeBSD/i
+          if uname =~ /10./
+            { :family => 'FreeBSD10', :release => nil, :arch => arch }
           else
-            { :family => 'FreeBSD', :release => nil }
+            { :family => 'FreeBSD', :release => nil, :arch => arch }
           end
         elsif run_command('uname -sr').stdout =~ /Arch/i
-          { :family => 'Arch', :release => nil }
+          { :family => 'Arch', :release => nil, :arch => arch }
         elsif run_command('uname -s').stdout =~ /OpenBSD/i
-          { :family => 'OpenBSD', :release => nil }
+          { :family => 'OpenBSD', :release => nil, :arch => arch }
         else
-          { :family => 'Base', :release => nil }
+          { :family => 'Base', :release => nil, :arch => arch }
         end
       end
 

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

@@ -0,0 +1,7 @@
+function FindScheduledTask
+{
+  param($name)
+
+  $task = schtasks /query /v /fo csv /TN "$name" | ConvertFrom-CSV
+  return $task
+}

data/lib/specinfra/command.rb

@@ -8,7 +8,9 @@ require "specinfra/command/ubuntu"
 require "specinfra/command/gentoo"
 require "specinfra/command/plamo"
 require "specinfra/command/redhat"
+require "specinfra/command/redhat7"
 require "specinfra/command/suse"
+require "specinfra/command/fedora"
 
 # Solaris
 require "specinfra/command/solaris"

data/lib/specinfra/command/fedora.rb

@@ -0,0 +1,29 @@
+module Specinfra
+  module Command
+    class Fedora < RedHat
+      def check_enabled(service, target="multi-user.target")
+        host = Specinfra.configuration.ssh ? Specinfra.configuration.ssh.host : 'localhost'
+        if property.has_key?(:os_by_host) && property[:os_by_host][host][:release].to_i < 15
+          super
+        else
+          # Fedora 15+ uses systemd which no longer has runlevels but targets
+          # For backwards compatibility, Fedora provides pseudo targets for
+          # runlevels
+          if target.is_a? Integer
+            target = "runlevel#{target}.target"
+          end
+          "systemctl --plain list-dependencies #{target} | grep '^#{escape(service)}.service$'"
+        end
+      end
+
+      def check_running(service)
+        host = Specinfra.configuration.ssh ? Specinfra.configuration.ssh.host : 'localhost'
+        if property.has_key?(:os_by_host) && property[:os_by_host][host][:release].to_i < 15
+          super
+        else
+          "systemctl is-active #{escape(service)}.service"
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/redhat7.rb

@@ -0,0 +1,9 @@
+module Specinfra
+  module Command
+    class RedHat7 < RedHat
+      def check_enabled(service, level=3)
+        "systemctl --plain list-dependencies runlevel#{level}.target | grep '^#{escape(service)}.service$'"
+      end
+    end
+  end
+end

data/lib/specinfra/command/windows.rb

@@ -305,6 +305,13 @@ module Specinfra
         end
       end
 
+      def check_scheduled_task(name)
+        Backend::PowerShell::Command.new do
+          using 'find_scheduled_task.ps1'
+          exec "(FindScheduledTask -name '#{name}').TaskName -eq '\\#{name}'"
+        end
+      end
+
       private
 
       def item_has_attribute item, attribute

data/lib/specinfra/configuration.rb

@@ -20,6 +20,15 @@ module Specinfra
         VALID_OPTIONS_KEYS.inject({}) { |o, k| o.merge!(k => send(k)) }
       end
 
+      # Define os method explicitly to avoid stack level
+      # too deep caused by Helpet::DetectOS#os
+      def os
+        if @os.nil? && defined?(RSpec) && RSpec.configuration.respond_to?(:os)
+          @os = RSpec.configuration.os
+        end
+        @os
+      end
+
       def method_missing(meth, val=nil)
         key = meth.to_s
         key.gsub!(/=$/, '')

data/lib/specinfra/helper/detect_os.rb

@@ -2,17 +2,21 @@ module Specinfra
   module Helper
     module DetectOS
       def commands
+        self.class.const_get('Specinfra').const_get('Command').const_get(os[:family]).new
+      end
+
+      def os
         property[:os_by_host] = {} if ! property[:os_by_host]
         host = Specinfra.configuration.ssh ? Specinfra.configuration.ssh.host : 'localhost'
 
         if property[:os_by_host][host]
-          os = property[:os_by_host][host]
+          os_by_host = property[:os_by_host][host]
         else
           # Set command object explicitly to avoid `stack too deep`
-          os = backend(Specinfra::Command::Base.new).check_os
-          property[:os_by_host][host] = os
+          os_by_host = backend(Specinfra::Command::Base.new).check_os
+          property[:os_by_host][host] = os_by_host
         end
-        self.class.const_get('Specinfra').const_get('Command').const_get(os[:family]).new
+        os_by_host
       end
     end
   end

data/lib/specinfra/helper/os.rb

@@ -6,12 +6,14 @@ module Specinfra
       'Arch',
       'Darwin',
       'Debian',
+      'Fedora',
       'FreeBSD',
       'FreeBSD10',
       'Gentoo',
       'OpenBSD',
       'Plamo',
       'RedHat',
+      'RedHat7',
       'SuSE',
       'SmartOS',
       'Solaris',

data/lib/specinfra/runner.rb

@@ -0,0 +1,8 @@
+module Specinfra
+  class Runner
+    include Singleton
+    def method_missing(meth, *args, &block)
+      backend.send(meth, *args)
+    end
+  end
+end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta2"
+  VERSION = "2.0.0.beta3"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -78,56 +78,61 @@ describe 'check_os' do
   context 'test ubuntu with lsb_release command' do
     subject { backend.check_os }
     it do
-      mock_success_response = double(
-        :run_command_response,
-        :success? => true,
-        :stdout => "Distributor ID:\tUbuntu\nRelease:\t12.04\n"
-      )
-      mock_failure_response = double :run_command_response, :success? => false
       backend.should_receive(:run_command).at_least(1).times do |args|
         if ['ls /etc/debian_version', 'lsb_release -ir'].include? args
-          mock_success_response
+          double(
+            :run_command_response,
+            :success? => true,
+            :stdout => "Distributor ID:\tUbuntu\nRelease:\t12.04\n"
+          )
+        elsif args == 'uname -m'
+          double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
-          mock_failure_response
+          double :run_command_response, :success? => false
         end
       end
-      should eq({:family => 'Ubuntu', :release => '12.04'})
+      should eq({:family => 'Ubuntu', :release => '12.04', :arch => 'x86_64' })
     end
   end
 
   context 'test ubuntu with /etc/lsb-release' do
     subject { backend.check_os }
     it do
-      mock_success_response = double(
-        :run_command_response,
-        :success? => true,
-        :stdout => %Q(DISTRIB_ID=Ubuntu
+      backend.should_receive(:run_command).at_least(1).times do |args|
+        if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
+          double(
+            :run_command_response,
+            :success? => true,
+            :stdout => <<-EOF
+DISTRIB_ID=Ubuntu
 DISTRIB_RELEASE=12.04
 DISTRIB_CODENAME=precise
 DISTRIB_DESCRIPTION="Ubuntu 12.04.2 LTS"
-)
-      )
-      mock_failure_response = double :run_command_response, :success? => false
-      backend.should_receive(:run_command).at_least(1).times do |args|
-        if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
-          mock_success_response
+EOF
+          )
+        elsif args == 'uname -m'
+          double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
-          mock_failure_response
+          double :run_command_response, :success? => false
         end
       end
-      should eq({:family => 'Ubuntu', :release => '12.04'})
+      should eq({:family => 'Ubuntu', :release => '12.04', :arch => 'x86_64' })
     end
   end
 
   context 'test debian (no lsb_release or lsb-release)' do
     subject { backend.check_os }
     it do
-      mock_success_response = double :run_command_response, :success? => true
-      mock_failure_response = double :run_command_response, :success? => false
       backend.should_receive(:run_command).at_least(1).times do |args|
-        args == 'ls /etc/debian_version' ? mock_success_response : mock_failure_response
+        if args == 'ls /etc/debian_version'
+          double :run_command_response, :success? => true
+        elsif args == 'uname -m'
+          double :run_command_response, :success? => true, :stdout => "x86_64\n"
+        else
+          double :run_command_response, :success? => false
+        end
       end
-      should eq({:family => 'Debian', :release => nil})
+      should eq({:family => 'Debian', :release => nil, :arch => 'x86_64' })
     end
   end
 end

data/spec/configuration_spec.rb

@@ -7,3 +7,8 @@ end
 describe RSpec.configuration.path do
   it { should eq Specinfra.configuration.path }
 end
+
+Specinfra.configuration.os = 'foo'
+describe Specinfra.configuration.os do
+  it { should eq 'foo' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,6 +110,7 @@ files:
 - lib/specinfra/backend/powershell/support/find_iis_component.ps1
 - lib/specinfra/backend/powershell/support/find_installed_application.ps1
 - lib/specinfra/backend/powershell/support/find_installed_hot_fix.ps1
+- lib/specinfra/backend/powershell/support/find_scheduled_task.ps1
 - lib/specinfra/backend/powershell/support/find_service.ps1
 - lib/specinfra/backend/powershell/support/find_user.ps1
 - lib/specinfra/backend/powershell/support/find_usergroup.ps1
@@ -125,6 +126,7 @@ files:
 - lib/specinfra/command/base.rb
 - lib/specinfra/command/darwin.rb
 - lib/specinfra/command/debian.rb
+- lib/specinfra/command/fedora.rb
 - lib/specinfra/command/freebsd.rb
 - lib/specinfra/command/freebsd10.rb
 - lib/specinfra/command/gentoo.rb
@@ -132,6 +134,7 @@ files:
 - lib/specinfra/command/openbsd.rb
 - lib/specinfra/command/plamo.rb
 - lib/specinfra/command/redhat.rb
+- lib/specinfra/command/redhat7.rb
 - lib/specinfra/command/smartos.rb
 - lib/specinfra/command/solaris.rb
 - lib/specinfra/command/solaris10.rb
@@ -150,6 +153,7 @@ files:
 - lib/specinfra/helper/os.rb
 - lib/specinfra/helper/properties.rb
 - lib/specinfra/properties.rb
+- lib/specinfra/runner.rb
 - lib/specinfra/version.rb
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/ssh/build_command_spec.rb