inprovise 0.2.5 → 0.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQ5MmNkZGZjZmJlZjZhNmYxOWE0ZTM3Y2U1MWVjYWQ0ZGM2N2U5Mw==
+    MzU2MGE3MGU3MWMzZDIxZTUyYmRjODFmMWUyYWE1NTRmZDZjOTUxMg==
   data.tar.gz: !binary |-
-    MjUyY2E2M2M3MWY2OTQwZDY2ZTFhODRhMTM0OWU5ZWFhNTk0Y2MxYQ==
+    YjkxODRlNzYzMGE4ODBmNDAwM2E1ZmEwNzUyMmQ0M2UwOWEyYmY4Mg==
 SHA512:
   metadata.gz: !binary |-
-    YTA0MjcyMGE0YWI3OWYxNzQ2MDEwYzBhZjEwMWFhYTY4ZGZjYTNlNzdiZmUy
-    ZGM0ZGFhNmUyMjAwMjdiMzYyZjY0YjA4YTYzOTNiMDY1OGE4ODdlYWE2YWU5
-    NTdjOGZlMDRjYmNmOWJjMGRiZjJiN2IwMmQ4YzBjZGExYzZjNDM=
+    OGU0OTM0ZWE0NTY1OTQ1MzM0ODhmMGI2MjkxOTQ2ZGNkOTI2MTYzMzQ0ZTVj
+    NGY0NTM2MWQ2Mjk2MDVkYmI2NzNhY2JiNzg4Mzk1ZWZkYjEwYTNkOWY1YTRj
+    NjkxZmQ5N2Y4ZjQ1MGRiZTMxNjg3YWMzNGE1Yjk5NmM2YzczZGQ=
   data.tar.gz: !binary |-
-    MGExZGNlNzFmZGRmMDM4MjU4OTE0NWY2OGEyZDg3Y2M1OGZlZmVhZDYyZjg4
-    NjVjMGUyZWUzMjBiNGEyOWQ5OTRiMTFiMmQ5YTI0ZGY4NTk5ZjA3NjUzNzEx
-    MjE1N2RjMTQzM2I0ZWM0MDM2N2VkOGNhNzhiMGRkOTlkZTNlOTk=
+    Njc2Y2E0YTczM2Q5NzdjNjQwYjUyOWU1MDg0OTEzN2E4YmVjZDkwMjNjMjlh
+    Y2U3ZmNlMzdhODMwYTU3MzYwYzZhZDMyOTZiMTBhMGRlZTdiMjE1MzZjYTll
+    Mjc2MDQ2N2Q5MzMxOThhMDQ3MWJkYzE4MjRhNjE2ZTZmNzRkOGM=

data/appveyor.yml

@@ -0,0 +1,27 @@
+version: "master-{build}"
+
+os: Windows Server 2012 R2
+platform:
+  - x64
+
+environment:
+  matrix:
+    - ruby_version: "21"
+
+branches:
+  only:
+    - master
+
+install:
+  - ps: $env:PATH="C:\Ruby$env:ruby_version\bin;$env:PATH"
+  - ps: Write-Host $env:PATH
+  - ps: ruby --version
+  - ps: gem --version
+  - ps: gem install bundler --quiet --no-ri --no-rdoc
+  - ps: bundler --version
+
+build_script:
+  - bundle install || bundle install || bundle install
+
+test_script:
+  - bundle exec rake test

data/bin/rig

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+#!ruby
 require_relative '../lib/inprovise'
 
 exit Inprovise::Cli.run(ARGV)

data/bin/rig.bat

@@ -0,0 +1,15 @@
+@echo off
+if not "%~f0" == "~f0" goto WinNT
+ruby -Sx "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto endofruby
+:WinNT
+if not exist "%~d0%~p0ruby" goto rubyfrompath
+if exist "%~d0%~p0ruby" "%~d0%~p0ruby" -x "%~dp0\rig" %*
+goto endofruby
+:rubyfrompath
+ruby -x "%~dp0\rig" %*
+goto endofruby
+#!/bin/ruby
+#
+Kernel.system('ruby', '-Sx', File.join(File.dirname(__FILE__), FILE.basename(__FILE__, '.*')), *ARGV)
+:endofruby

data/lib/inprovise/logger.rb

@@ -57,8 +57,13 @@ class Inprovise::Logger
     Thread.exclusive do
       $stdout.print "#{@node.to_s} [#{@task.bold}] " if @nl
       $stdout.print msg.sub("\r", "\r".to_eol << "#{@node.to_s} [#{@task.bold}] ")
+      @nl = false
     end
-    @nl = false
+  end
+
+  def println(msg)
+    print(msg)
+    Thread.exclusive { $stdout.puts; @nl = true }
   end
 
   def stdout(msg, force=false)
@@ -72,8 +77,7 @@ class Inprovise::Logger
   def say(msg, color=nil, stream=$stdout)
     msg.to_s.split("\n").each do |line|
       out = color ? line.send(color) : line
-      Thread.exclusive { stream.puts unless @nl; stream.puts "#{@node.to_s} [#{@task.bold}] #{out}" }
-      @nl = true
+      Thread.exclusive { stream.puts unless @nl; stream.puts "#{@node.to_s} [#{@task.bold}] #{out}"; @nl = true }
     end
   end
 end

data/lib/inprovise/sniffer/linux.rb

@@ -9,19 +9,46 @@ Inprovise::Sniffer.define('linux', false) do
 
   action('main') do |attrs|
     attrs[:machine] = run('uname -m').chomp
-    if remote('/etc/os-release').exists?
-      trigger 'sniff[linux]:os-release', attrs
-    elsif remote('/etc/redhat-release').exists?
-      trigger 'sniff[linux]:redhat-release', attrs
-    elsif remote('/etc/SuSE-release').exists?
-      trigger 'sniff[linux]:suse-release', attrs
+    if binary_exists?('lsb_release')
+      trigger 'sniff[linux]:lsb_release', attrs
+    elsif binary_exists?('lsb-release')
+      trigger 'sniff[linux]:lsb_release', attrs, 'lsb-release'
+    end
+    unless attrs[:os_distro]
+      if remote('/etc/os-release').exists?
+        trigger 'sniff[linux]:os-release', attrs
+      elsif remote('/etc/redhat-release').exists?
+        trigger 'sniff[linux]:redhat-release', attrs
+      elsif remote('/etc/SuSE-release').exists?
+        trigger 'sniff[linux]:suse-release', attrs
+      elsif remote('/etc/debian-version').exists?
+        trigger 'sniff[linux]:debian-version', attrs
+      end
     end
     attrs[:pkgman] = case attrs[:os_distro]
-                     when 'fedora', 'centos', 'rhel'
-                       binary_exists?('dnf') ? 'dnf' : 'yum'
-                     when /suse/
-                       'zypper'
-                     end
+      when 'fedora', 'centos', 'rhel'
+      binary_exists?('dnf') ? 'dnf' : 'yum'
+      when 'linuxmint', 'ubuntu', 'debian'
+      'apt'
+      when /suse/
+      'zypper'
+    end
+  end
+
+  action('lsb_release') do |attrs, bin='lsb_release'|
+    if /distributor\s+id:\s+(.*)/i =~ run("#{bin} -i").chomp
+      attrs[:os_distro] = case distro = $1
+        when /RedHat/i
+        'rhel'
+        when /SUSE/i
+        run("#{bin} -d").chomp =~ /opensuse/i ? 'opensuse' : 'suse'
+        else
+        distro.downcase
+      end
+      if /release:\s+(.*)/i =~ run("#{bin} -r").chomp
+        attrs[:os_version] = $1
+      end
+    end
   end
 
   action('os-release') do |attrs|
@@ -63,6 +90,21 @@ Inprovise::Sniffer.define('linux', false) do
     end
   end
 
+  action('suse-release') do |attrs|
+    data = remote('/etc/SuSE-release').content.split("\n").collect {|l| l.strip }
+    attrs[:os_distro] = data.shift.split(' ').first.downcase
+    data.each do |l|
+      if data =~ /\AVERSION\s*=\s*(.*)/i
+        attrs[:os_version] = $1.strip
+      end
+    end
+  end
+
+  action('debian-version') do |attrs|
+    attrs[:os_distro] = 'debian'
+    attrs[:os_version] = remote('/etc/debian-version').content.strip
+  end
+
   # :nocov:
 
 end

data/lib/inprovise/version.rb

@@ -5,6 +5,6 @@
 
 module Inprovise
 
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inprovise
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -85,6 +85,7 @@ email:
 - mcorino@remedy.nl
 executables:
 - rig
+- rig.bat
 extensions: []
 extra_rdoc_files: []
 files:
@@ -95,7 +96,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile.rb
+- appveyor.yml
 - bin/rig
+- bin/rig.bat
 - inprovise.gemspec
 - lib/inprovise.rb
 - lib/inprovise/channel/ssh.rb