[DRE-commits] [librarian-puppet] 51/97: Add open3_backport in ruby 1.8

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository librarian-puppet.

commit 1d9ab9aeaac0ec6fc7e14d3606a45a62ea4b07f0
Author: Carlos Sanchez <csanchez at maestrodev.com>
Date:   Fri Jan 3 14:11:15 2014 +0100

    Add open3_backport in ruby 1.8
---
 lib/librarian/puppet.rb  | 13 +++++++++----
 librarian-puppet.gemspec |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/librarian/puppet.rb b/lib/librarian/puppet.rb
index 3ddec44..320a8c2 100644
--- a/lib/librarian/puppet.rb
+++ b/lib/librarian/puppet.rb
@@ -1,27 +1,32 @@
 require 'librarian'
 require 'fileutils'
 require 'open3'
+require 'open3_backport' if RUBY_VERSION < '1.9'
 
 status = nil
-puppet_version = nil
+out = nil
+error = nil
 
 begin
   Open3.popen3('puppet --version') {|stdin, stdout, stderr, wait_thr|
     pid = wait_thr.pid # pid of the started process.
-    puppet_version = stdout.read
+    out = stdout.read
     status = wait_thr.value # Process::Status object returned.
   }
-rescue
+rescue => e
+  error = e
 end
 
 if status.nil? or status.exitstatus != 0
   $stderr.puts <<-EOF
 Unable to load puppet. Please install it using native packages for your platform (eg .deb, .rpm, .dmg, etc).
+#{out.nil? or out.empty? ? "puppet --version returned #{status.exitstatus}" : out}
+#{error.message unless error.nil?}
 EOF
   exit 1
 end
 
-PUPPET_VERSION=puppet_version.split(' ').first.strip
+PUPPET_VERSION=out.split(' ').first.strip
 
 require 'librarian/puppet/extension'
 require 'librarian/puppet/version'
diff --git a/librarian-puppet.gemspec b/librarian-puppet.gemspec
index 462571c..c120f0b 100644
--- a/librarian-puppet.gemspec
+++ b/librarian-puppet.gemspec
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "librarian", ">=0.1.1"
   s.add_dependency "json"
+  s.add_dependency "open3_backport" if RUBY_VERSION < '1.9'
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/librarian-puppet.git