shell-spinner 1.0.3 → 1.0.4

data/lib/shell-spinner.rb

@@ -2,58 +2,80 @@ require "shell-spinner/version"
 
 module ShellSpinner
 
-  def self.wrap text = nil, &block
-    with_message text do
-      join_spinner_thread(block)
+  class Runner
+    def initialize
+      require 'stringio'
+      @buffer, @original_output = StringIO.new, $stdout
     end
-  end
 
-  private
+    def wrap_block text = nil, &block
+      with_message text do
+        with_spinner &block
+      end
+    end
 
-    def self.with_message text = nil
-      require 'colorize'
+    private
 
-      begin
-        print "#{text}... " unless text.nil?
+      def catch_user_output
+        $stdout = @buffer
         yield
-        print "done\n".colorize(:green) unless text.nil?
-      rescue Exception => e
-        print "fail\n".colorize(:red) unless text.nil?
-        re_raise_exception e
+      ensure
+        $stdout = @original_output
       end
-    end
 
-    def self.join_spinner_thread proc
-      chars  = %w{ | / - \\ }
-      thread = Thread.new { proc.call }
+      def with_message text = nil
+        require 'colorize'
 
-      while thread.alive?
-        print chars[0]
-        sleep 0.1
-        print "\b"
+        begin
+          print "#{text}... " unless text.nil?
+          catch_user_output { yield }
+          print "done\n".colorize(:green) unless text.nil?
+          print user_output.colorize(:blue)
+        rescue Exception => e
+          print "fail\n".colorize(:red) unless text.nil?
+          print user_output.colorize(:blue)
+          re_raise_exception e
+        end
+      end
 
-        chars.push chars.shift
+      def user_output
+        @buffer.rewind
+        @buffer.read
       end
 
-      thread.join
-    end
+      def with_spinner
+        chars  = %w{ | / - \\ }
+        thread = Thread.new { yield }
+
+        while thread.alive?
+          @original_output.print chars[0]
+          sleep 0.1
+          @original_output.print "\b"
 
-    def self.re_raise_exception e
-      raise begin
-        new_exception = build_new_exception(e)
-        new_exception.set_backtrace e.backtrace
-        new_exception
+          chars.push chars.shift
+        end
+
+        thread.join
       end
-    end
 
-    # Needs for cases when custom exceptions needs a several required arguments
-    def self.build_new_exception e
-      e.class.new(e.message)
-    rescue
-      Exception.new e.message
+      def re_raise_exception e
+        raise begin
+          new_exception = build_new_exception(e)
+          new_exception.set_backtrace e.backtrace
+          new_exception
+        end
+      end
+
+      # Needs for cases when custom exceptions needs a several required arguments
+      def build_new_exception e
+        e.class.new(e.message)
+      rescue
+        Exception.new e.message
+      end
     end
 end
 
 def ShellSpinner text = nil, &block
-  ShellSpinner.wrap text, &block
+  runner = ShellSpinner::Runner.new
+  runner.wrap_block text, &block
 end

data/lib/shell-spinner/version.rb

@@ -1,3 +1,3 @@
 module ShellSpinner
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shell-spinner
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -35,13 +35,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Gemfile
-- README.markdown
-- Rakefile
-- lib/shell-spinner.rb
+- README.md
 - lib/shell-spinner/version.rb
-- shell-spinner.gemspec
+- lib/shell-spinner.rb
 homepage: https://github.com/cheef/shell-spinner
 licenses: []
 post_install_message: 

data/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-.idea

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in shell-spinner.gemspec
-gemspec

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/shell-spinner.gemspec

@@ -1,18 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "shell-spinner/version"
-
-Gem::Specification.new do |s|
-  s.name        = "shell-spinner"
-  s.version     = ShellSpinner::VERSION
-  s.authors     = ["Ivan Garmatenko"]
-  s.email       = %w(cheef.che@gmail.ru)
-  s.homepage    = "https://github.com/cheef/shell-spinner"
-  s.summary     = %q{Animated spinner for shell}
-  s.description = %q{Gem provides animated spinner for UNIX shell and could be used with rake tasks and any console scripts}
-
-  s.files         = `git ls-files`.split("\n")
-  s.require_paths = %w(lib)
-
-  s.add_runtime_dependency "colorize"
-end