specinfra 2.0.0.beta6 → 2.0.0.beta7

data/lib/specinfra/helper/detect_os/aix.rb

@@ -0,0 +1,7 @@
+class Specinfra::Helper::DetectOs::Aix < Specinfra::Helper::DetectOs
+  def self.detect
+    if run_command('uname -s').stdout =~ /AIX/i
+      { :family => 'aix', :release => nil }
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/arch.rb

@@ -0,0 +1,7 @@
+class Specinfra::Helper::DetectOs::Arch < Specinfra::Helper::DetectOs
+  def self.detect
+    if run_command('uname -sr').stdout =~ /Arch/i
+      { :family => 'arch', :release => nil }
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/darwin.rb

@@ -0,0 +1,7 @@
+class Specinfra::Helper::DetectOs::Darwin < Specinfra::Helper::DetectOs
+  def self.detect
+    if run_command('uname -s').stdout =~ /Darwin/i
+      { :family => 'darwin', :release => nil }
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/debian.rb

@@ -0,0 +1,24 @@
+class Specinfra::Helper::DetectOs::Debian < Specinfra::Helper::DetectOs
+  def self.detect
+    if run_command('ls /etc/debian_version').success?
+      lsb_release = run_command("lsb_release -ir")
+      if lsb_release.success?
+        if lsb_release.stdout =~ /:/
+          distro = lsb_release.stdout.split("\n").first.split(':').last
+          release = lsb_release.stdout.split("\n").last.split(':').last.strip
+        end
+      else
+        lsb_release = run_command("cat /etc/lsb-release")
+        if lsb_release.success?
+          lsb_release.stdout.each_line do |line|
+            distro = line.split('=').last if line =~ /^DISTRIB_ID=/
+            release = line.split('=').last.strip if line =~ /^DISTRIB_RELEASE=/
+          end
+        end
+      end
+      distro ||= 'debian'
+      release ||= nil
+      { :family => distro.strip.downcase, :release => release }
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/freebsd.rb

@@ -0,0 +1,11 @@
+class Specinfra::Helper::DetectOs::Freebsd < Specinfra::Helper::DetectOs
+  def self.detect
+    if ( uname = run_command('uname -sr').stdout ) && uname =~ /FreeBSD/i
+      if uname =~ /10./
+        { :family => 'freebsd', :release => 10 }
+      else
+        { :family => 'freebsd', :release => nil }
+      end
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/gentoo.rb

@@ -0,0 +1,7 @@
+class Specinfra::Helper::DetectOs::Gentoo < Specinfra::Helper::DetectOs
+  def self.detect
+    if run_command('ls /etc/gentoo-release').success?
+      { :family => 'gentoo', :release => nil }
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/nixos.rb

@@ -0,0 +1,7 @@
+class Specinfra::Helper::DetectOs::Nixos < Specinfra::Helper::DetectOs
+  def self.detect
+    if run_command('ls /var/run/current-system/sw').success?
+      { :family => 'nixos', :release => nil }
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/openbsd.rb

@@ -0,0 +1,7 @@
+class Specinfra::Helper::DetectOs::Openbsd < Specinfra::Helper::DetectOs
+  def self.detect
+    if run_command('uname -s').stdout =~ /OpenBSD/i
+      { :family => 'OpenBSD', :release => nil }
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/plamo.rb

@@ -0,0 +1,7 @@
+class Specinfra::Helper::DetectOs::Plamo < Specinfra::Helper::DetectOs
+  def self.detect
+    if run_command('ls /usr/lib/setup/Plamo-*').success?
+      { :family => 'plamo', :release => nil }
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/redhat.rb

@@ -0,0 +1,27 @@
+class Specinfra::Helper::DetectOs::Redhat < Specinfra::Helper::DetectOs
+  def self.detect
+    # 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 }
+    elsif run_command('ls /etc/system-release').success?
+      { :family => 'redhat', :release => nil  } # Amazon Linux
+    end
+  end
+end
+
+
+
+
+

data/lib/specinfra/helper/detect_os/solaris.rb

@@ -0,0 +1,15 @@
+class Specinfra::Helper::DetectOs::Solaris < Specinfra::Helper::DetectOs
+  def self.detect
+    if ( uname = run_command('uname -sr').stdout) && uname =~ /SunOS/i
+      if uname =~ /5.10/
+        { :family => 'solaris', :release => 10 }
+      elsif run_command('grep -q "Oracle Solaris 11" /etc/release').success?
+        { :family => 'solaris', :release => 11 }
+      elsif run_command('grep -q SmartOS /etc/release').success?
+        { :family => 'smartos', :release => nil }
+      else
+        { :family => 'solaris', :release => nil }
+      end
+    end
+  end
+end

data/lib/specinfra/helper/detect_os/suse.rb

@@ -0,0 +1,15 @@
+class Specinfra::Helper::DetectOs::Suse < Specinfra::Helper::DetectOs
+  def self.detect
+    if run_command('ls /etc/SuSE-release').success?
+      line = run_command('cat /etc/SuSE-release').stdout
+      if line =~ /SUSE Linux Enterprise Server (\d+)/
+        release = $1
+        family = 'suse'
+      elsif line =~ /openSUSE (\d+\.\d+|\d+)/
+        release = $1
+        family = 'opensuse'
+      end
+      { :family => family, :release => release }
+    end
+  end
+end

data/lib/specinfra/helper/os.rb

@@ -1,36 +1,50 @@
-module Specinfra
-  module Helper
-    [
-      'Base',
-      'AIX',
-      'Arch',
-      'Darwin',
-      'Debian',
-      'Fedora',
-      'FreeBSD',
-      'FreeBSD10',
-      'Gentoo',
-      'NixOS',
-      'OpenBSD',
-      'Plamo',
-      'RedHat',
-      'RedHat7',
-      'SuSE',
-      'OpenSUSE',
-      'SmartOS',
-      'Solaris',
-      'Solaris10',
-      'Solaris11',
-      'Ubuntu',
-      'Windows',
-    ].each do |os|
-      eval <<-EOF
-        module #{os}
-          def commands
-            Specinfra::Command::#{os}.new
-          end
-        end
-      EOF
+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
+
+    if property[:os_by_host][host_port]
+      os_by_host = property[:os_by_host][host_port]
+    else
+      # Set command object explicitly to avoid `stack too deep`
+      os_by_host = detect_os
+      property[:os_by_host][host_port] = os_by_host
+    end
+    os_by_host
+  end
+
+  private
+
+  # put this in a module for better reuse
+  def current_host_and_port
+    if Specinfra.configuration.ssh
+      "#{Specinfra.configuration.ssh.host}:#{Specinfra.configuration.ssh.options[:port]}"
+    elsif Specinfra.configuration.ssh_options
+          
+      "#{Specinfra.configuration.host}:#{Specinfra.configuration.ssh_options[:port]}"
+    else
+      "#{Specinfra.configuration.host}:0"
+    end
+  end
+
+  def run_command(cmd)
+    backend.run_command(cmd)
+  end
+
+  def detect_os
+    return Specinfra.configuration.os if Specinfra.configuration.os
+    Specinfra::Helper::DetectOs.subclasses.each do |c|
+      res = c.detect
+      if res
+        res[:arch] ||= run_command('uname -m').stdout.strip
+        return res
+      end
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta6"
+  VERSION = "2.0.0.beta7"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -74,9 +74,14 @@ describe Specinfra::Backend::Exec do
   end
 end
 
-describe 'check_os' do
+describe 'os' do
+  before do
+    # clear os information cache
+    property[:os_by_host] = {}
+  end
+
   context 'test ubuntu with lsb_release command' do
-    subject { backend.check_os }
+    subject { os }
     it do
       expect(backend).to receive(:run_command).at_least(1).times do |args|
         if ['ls /etc/debian_version', 'lsb_release -ir'].include? args
@@ -88,15 +93,15 @@ describe 'check_os' do
         elsif args == 'uname -m'
           double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
-          double :run_command_response, :success? => false
+          double :run_command_response, :success? => false, :stdout => nil
         end
       end
-      should eq({:family => 'Ubuntu', :release => '12.04', :arch => 'x86_64' })
+      should eq({:family => 'ubuntu', :release => '12.04', :arch => 'x86_64' })
     end
   end
 
   context 'test ubuntu with /etc/lsb-release' do
-    subject { backend.check_os }
+    subject { os }
     it do
       expect(backend).to receive(:run_command).at_least(1).times do |args|
         if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
@@ -113,26 +118,26 @@ EOF
         elsif args == 'uname -m'
           double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
-          double :run_command_response, :success? => false
+          double :run_command_response, :success? => false, :stdout => nil
         end
       end
-      should eq({:family => 'Ubuntu', :release => '12.04', :arch => 'x86_64' })
+      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 }
+    subject { os }
     it do
       expect(backend).to receive(:run_command).at_least(1).times do |args|
         if args == 'ls /etc/debian_version'
-          double :run_command_response, :success? => true
+          double :run_command_response, :success? => true, :stdout => nil
         elsif args == 'uname -m'
           double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
-          double :run_command_response, :success? => false
+          double :run_command_response, :success? => false, :stdout => nil
         end
       end
-      should eq({:family => 'Debian', :release => nil, :arch => 'x86_64' })
+      should eq({:family => 'debian', :release => nil, :arch => 'x86_64' })
     end
   end
 end

data/spec/command/base/file_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+set :os, { :family => nil }
+
+describe  commands.check_file_is_directory('/tmp') do
+  after do
+    property[:os_by_host] = nil
+  end
+
+  it { should eq 'test -d /tmp' }
+end

data/spec/command/base_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Specinfra::Command::Base do
+  after do
+    property[:os_by_host] = nil
+  end
+
+  context 'family: base, release: nil' do
+    before do
+      set :os, :family => 'base'
+    end
+    it { expect(subject.command_class('file')).to be Specinfra::Command::Base::File }
+  end
+
+  context 'family: redhat, release: nil' do
+    before do
+      set :os, :family => 'redhat'
+    end
+    it { expect(subject.command_class('file')).to be Specinfra::Command::Redhat::Base::File }
+  end
+
+  context 'family: redhat, release: 7' do
+    before do
+      set :os, :family => 'redhat', :release => 7
+    end
+    xit { expect(subject.command_class('file')).to be Specinfra::Command::Redhat::V7::File }
+  end
+end

data/spec/command/module/systemd_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Specinfra::Command::Redhat::V7::Service do
+  it { expect(subject.check_is_enabled('httpd')).to eq "systemctl --plain list-dependencies multi-user.target | grep '^httpd.service$'" }
+  it { expect(subject.check_is_enabled('httpd', 'multi-user.target')).to eq "systemctl --plain list-dependencies multi-user.target | grep '^httpd.service$'" }
+  it { expect(subject.check_is_enabled('httpd', 3)).to eq "systemctl --plain list-dependencies runlevel3.target | grep '^httpd.service$'" }
+  it { expect(subject.check_is_enabled('httpd', '3')).to eq "systemctl --plain list-dependencies runlevel3.target | grep '^httpd.service$'" }
+end

data/spec/command/redhat/package_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+property[:os_by_host] = {}
+set :os, { :family => 'redhat' }
+
+describe  commands.check_package_is_installed('httpd') do
+  after do
+    property[:os_by_host] = nil
+  end
+
+  it { should eq 'rpm -q httpd' }
+end

data/spec/helper/os_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+def set_stub_chain(keys, value)
+    allow(Specinfra).to receive_message_chain([:configuration, keys].flatten).and_return(value)
+end
+
+describe 'no ssh connection without cache' do
+  before do
+    set_stub_chain(:ssh, nil)
+    set_stub_chain(:ssh_options, nil)
+    set_stub_chain(:host, 'localhost')
+    set_stub_chain(:os, :family => 'redhat')
+  end
+
+  it { expect(property[:os_by_host]).to eq nil }
+  it { expect(os[:family]).to eq 'redhat' }
+end
+
+describe 'no ssh connection with cache' do
+  it { expect(property[:os_by_host]['localhost:0']).to eq(:family => 'redhat') }
+end
+
+describe 'ssh_options without cache' do
+  before do
+    set_stub_chain(:ssh, nil)
+    set_stub_chain(:ssh_options, :port => 22)
+    set_stub_chain(:host, 'localhost')
+    set_stub_chain(:os, :family => 'ubuntu')
+  end
+
+  it { expect(property[:os_by_host]['localhost:22']).to eq nil }
+  it { expect(os[:family]).to eq 'ubuntu' }
+end
+
+describe 'ssh_options with cache' do
+  it { expect(property[:os_by_host]['localhost:22']).to eq(:family => 'ubuntu') }
+end
+
+describe 'ssh_connection without cache' do
+  before do
+    set_stub_chain([:ssh, :host], 'localhost')
+    set_stub_chain([:ssh, :options], :port => 2222)
+    set_stub_chain(:os, :family => 'nixos')
+  end
+
+  it { expect(property[:os_by_host]['localhost:2222']).to eq nil }
+  it { expect(os[:family]).to eq 'nixos' }
+end
+
+describe 'ssh_connection wit cache' do
+  before do
+    set_stub_chain([:ssh, :host], 'localhost')
+    set_stub_chain([:ssh, :options], :port => 2222)
+    set_stub_chain(:os, :family => 'nixos')
+  end
+
+  it { expect(property[:os_by_host]['localhost:2222']).to eq(:family => 'nixos') }
+end