rvm2-ui 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: e9d620b2ab7b9614bbe190c16c3621374597241b
-  data.tar.gz: 5189ea015f85edb6e0c3a77ec81721c43750686c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjFkZWM3ZWJhNzNhZTY4OTdmMzdiOTA3NWFmZDk5MjIzYjZkNGEwNw==
+  data.tar.gz: !binary |-
+    ZWY4NmM2YTBkMTZhNmRlZDNiOTYxNGU5NDhlMjAzNWE4NzgxYjIzNg==
 SHA512:
-  metadata.gz: cbdcb4ba42ae9a28e1f4c1e0bdbafecaf7b6321504a5044630f317f64a0b9ccbf20f91e6ac4a61b2d0b85f47f6eed68f9dec3a342e2067d703f4d1d5f5756463
-  data.tar.gz: b616024af9297757e1d9ba388aa36d45c15fd87361ac9d764b771098ae88b969fca169950a88f1134283e8cd104610fbc5993e10fb00bf4fb7488ae1086002d5
+  metadata.gz: !binary |-
+    YjYwMjYzOWIzNTI1MTA1ZjVhMTgwZTdiNWU4MjliZDI2MjBhNzM5MTVkZGZi
+    NTYwYmNkNWUwZTg4NWRjMGExZTYzZTdmZTUyNzVlZmVlNTZkNzE0MTM2NDEw
+    NjQ5OWZjMjVjOWJlZDI5YTMzZTYyMDc0MTYwYTExMmYxYTNkMTQ=
+  data.tar.gz: !binary |-
+    NGUzMzZmMjgzZGQxMWYzZGVhNDBlNDg4ZmQ1NDg2NmJjMTI2ZTlmYTVjYjU2
+    NjBlOGVhODgzN2ZiMTJkMmQwNTIwMmQ5ZWVkNzQ0MGY5ZWRhMTY2YjU1NTRl
+    ZTRlOGY1ZmVjNmI5Mjk4ZGFhMDgyYWE1ZDAwMTI4YmI5MDZlOGI=

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
 rvm:
-  - ruby
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2
+  - jruby
 notifications:
   irc:
     channels:

data/Guardfile

@@ -0,0 +1,30 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+## Guard internally checks for changes in the Guardfile and exits.
+## If you want Guard to automatically start up again, run guard in a
+## shell loop, e.g.:
+##
+##  $ while bundle exec guard; do echo "Restarting Guard..."; done
+##
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+guard :minitest, :bundler => false do
+  watch(%r{^test/(.*)\/?(.*)_test\.rb$})
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r{^test/test_helper\.rb$})      { 'test' }
+end

data/README.md

@@ -110,4 +110,4 @@ Example - temporarily use logger:
       @ui.log("text")
     end
 
-In bot examples the output will be written to both standard output and log file.
+In both examples the output will be written to both standard output and log file.

data/lib/plugins/rvm2/ui/output/console.rb

@@ -1,3 +1,5 @@
+require 'io/console'
+
 module Rvm2
   module Ui
     module Output
@@ -31,6 +33,13 @@ module Rvm2
           def levels
             @console_parent.levels
           end
+
+          def winsize
+            rows, columns = super
+            [rows, columns - levels*2]
+          rescue
+            nil
+          end
         end
 
         attr_reader :stdout, :stderr
@@ -39,7 +48,8 @@ module Rvm2
           @names.size
         end
 
-        def initialize(stdout = $stdout, stderr = $stderr)
+        def initialize(rvm2_plugins, stdout = $stdout, stderr = $stderr)
+          @rvm2_plugins = rvm2_plugins
           @stdout = stdout.extend(ConsoleIO)
           @stdout.console_parent = self
           @stderr = stderr.extend(ConsoleIO)
@@ -73,6 +83,10 @@ module Rvm2
           end
         end
 
+        def progress(type, *args)
+          @rvm2_plugins.first_class!("ui/progress/console", type).new(@rvm2_plugins, self, *args)
+        end
+
       private
 
         def group_message(name, result)

data/lib/plugins/rvm2/ui/output/fake.rb

@@ -28,7 +28,8 @@ module Rvm2
         end
 
         attr_reader :root, :current
-        def initialize
+        def initialize(rvm2_plugins)
+          @rvm2_plugins = rvm2_plugins
           @root = Element.new(nil, :group, nil)
           @current = @root
         end

data/lib/plugins/rvm2/ui/output/log.rb

@@ -1,9 +1,12 @@
+require_relative "console"
+
 module Rvm2
   module Ui
     module Output
       class Log < Console
         attr_reader :file_name
-        def initialize(file_name, flags = "w")
+        def initialize(rvm2_plugins, file_name, flags = "w")
+          @rvm2_plugins = rvm2_plugins
           @file_name = file_name
           @file = File.new(@file_name, flags)
           super(@file, @file)

data/lib/plugins/rvm2/ui/progress/console/closed_text.rb

@@ -0,0 +1,28 @@
+module Rvm2
+  module Ui
+    module Progress
+      module Console
+        class ClosedText
+
+          def initialize(rvm2_plugins, parent, name, size, start)
+            @rvm2_plugins = rvm2_plugins
+            @parent  = parent
+            @name    = name
+            @size    = size
+            change(start)
+          end
+
+          def change(size)
+            @parent.stdout.write("\r#{@name}: #{size}/#{@size}")
+            @parent.stdout.was_new_line = false
+          end
+
+          def finish(message = "Finished")
+            @parent.stdout.puts("\r#{@name}: #{message}")
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/plugins/rvm2/ui/progress/console/open_text.rb

@@ -0,0 +1,27 @@
+module Rvm2
+  module Ui
+    module Progress
+      module Console
+        class OpenText
+
+          def initialize(rvm2_plugins, parent, name, start)
+            @rvm2_plugins = rvm2_plugins
+            @parent  = parent
+            @name    = name
+            change(start)
+          end
+
+          def change(size)
+            @parent.stdout.write("\r#{@name}: #{size}")
+            @parent.stdout.was_new_line = false
+          end
+
+          def finish(message = "Finished")
+            @parent.stdout.puts("\r#{@name}: #{message}")
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/rvm2/ui/multi.rb

@@ -5,12 +5,12 @@ module Rvm2
       attr_reader :handlers
 
       def initialize(rvm2_plugins = nil)
-        @rvm2_plugins = rvm2_plugins || Pluginator.find("rvm2", extends: %i{first_class})
+        @rvm2_plugins = rvm2_plugins || Pluginator.find("rvm2", extends: [:first_class])
         @handlers = []
       end
 
       def add(handler, *args)
-        @handlers << @rvm2_plugins.first_class!('ui/output', handler).new(*args)
+        @handlers << @rvm2_plugins.first_class!('ui/output', handler).new(@rvm2_plugins, *args)
       end
 
       def remove

data/lib/rvm2/ui/single.rb

@@ -7,8 +7,8 @@ module Rvm2
       attr_reader :handler
 
       def initialize(handler = :console, rvm2_plugins = nil, *args)
-        @rvm2_plugins = rvm2_plugins || Pluginator.find("rvm2", extends: %i{first_class})
-        @handler = @rvm2_plugins.first_class!('ui/output', handler).new(*args)
+        @rvm2_plugins = rvm2_plugins || Pluginator.find("rvm2", extends: [:first_class])
+        @handler = @rvm2_plugins.first_class!('ui/output', handler).new(@rvm2_plugins, *args)
       end
 
       # ui.command "message" { do_something; }

data/lib/rvm2/ui/version.rb

@@ -1,5 +1,5 @@
 module Rvm2
   module Ui
-    VERSION = '0.9.0'
+    VERSION = '0.9.1'
   end
 end

data/rvm2-ui.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.required_ruby_version = ">= 2.0.0"
   s.add_dependency('pluginator')
-  %w{rake minitest simplecov coveralls redcarpet}.each do |name|
+  %w{rake minitest simplecov coveralls guard guard-minitest}.each do |name|
     s.add_development_dependency(name)
   end
   # s.add_development_dependency("smf-gem")

data/test/plugins_test/rvm2/ui/output/console_test.rb

@@ -2,6 +2,10 @@ require 'test_helper'
 require 'plugins/rvm2/ui/output/console'
 require 'stringio'
 
+module AddWinSize
+  attr_accessor :winsize
+end
+
 describe Rvm2::Ui::Output::Console do
   before do
     @stdout = StringIO.new
@@ -9,7 +13,11 @@ describe Rvm2::Ui::Output::Console do
   end
 
   subject do
-    Rvm2::Ui::Output::Console.new(@stdout, @stderr)
+    Rvm2::Ui::Output::Console.new(
+      Pluginator.find("rvm2", extends: [:first_class]),
+      @stdout,
+      @stderr
+    )
   end
 
   it "adds messages" do
@@ -110,4 +118,33 @@ Example 2
     EXPECTED
   end
 
+  it "has no winsize when it's not available in the subject" do
+    subject.stdout.winsize.must_equal(nil)
+  end
+
+  describe "ConsoleIO.winsize" do
+    before do
+      @stdout.extend(AddWinSize)
+      @stdout.winsize = [100, 100]
+    end
+
+    it "has winsize when it's available" do
+      subject.stdout.winsize.must_equal([100,100])
+    end
+
+    it "winsize is decreased on every level" do
+      subject.start("one")
+      subject.stdout.winsize.must_equal([100,98])
+      subject.start("two")
+      subject.stdout.winsize.must_equal([100,96])
+    end
+  end
+
+  it "does progress" do
+    progress = subject.progress(:open_text, "Downloading file", 0)
+    progress.change("1")
+    progress.finish("Done")
+    @stdout.string.must_equal("\rDownloading file: 0\rDownloading file: 1\rDownloading file: Done\n")
+  end
+
 end

data/test/plugins_test/rvm2/ui/output/fake_test.rb

@@ -3,7 +3,7 @@ require 'plugins/rvm2/ui/output/fake'
 
 describe Rvm2::Ui::Output::Fake do
   subject do
-    Rvm2::Ui::Output::Fake.new
+    Rvm2::Ui::Output::Fake.new(Pluginator.find("rvm2", extends: [:first_class]))
   end
 
   it "adds messages" do

data/test/plugins_test/rvm2/ui/output/log_test.rb

@@ -11,7 +11,10 @@ describe Rvm2::Ui::Output::Log do
     @tempfile.unlink
   end
   subject do
-    Rvm2::Ui::Output::Log.new(@tempfile.path)
+    Rvm2::Ui::Output::Log.new(
+      Pluginator.find("rvm2", extends: [:first_class]),
+      @tempfile.path
+    )
   end
 
   it "adds messages" do

data/test/plugins_test/rvm2/ui/progress/console/closed_text_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+require 'plugins/rvm2/ui/output/console'
+require 'plugins/rvm2/ui/progress/console/open_text'
+require 'stringio'
+
+describe Rvm2::Ui::Progress::Console::ClosedText do
+  before do
+    @stdout     = StringIO.new
+    @stderr     = StringIO.new
+    @pluginator = Pluginator.find("rvm2", extends: [:first_class])
+    @console    = Rvm2::Ui::Output::Console.new(@pluginator, @stdout, @stderr)
+  end
+
+  subject do
+    Rvm2::Ui::Progress::Console::ClosedText
+  end
+
+  it "starts at new line" do
+    @console.log("test")
+    test = subject.new(@pluginator, @console, "TestMe", 100, 0)
+    @stdout.string.must_equal("test\n\rTestMe: 0/100")
+    @stderr.string.must_equal("")
+  end
+
+  it "starts progress with 0" do
+    test = subject.new(@pluginator, @console, "TestMe", 100, 0)
+    @stdout.string.must_equal("\rTestMe: 0/100")
+    @stderr.string.must_equal("")
+  end
+
+  it "starts progress with 1" do
+    test = subject.new(@pluginator, @console, "TestMe", 100, 1)
+    @stdout.string.must_equal("\rTestMe: 1/100")
+    @stderr.string.must_equal("")
+  end
+
+  it "adds new size" do
+    test = subject.new(@pluginator, @console, "TestMe", 100, 0)
+    test.change(2)
+    @stdout.string.must_equal("\rTestMe: 0/100\rTestMe: 2/100")
+    @stderr.string.must_equal("")
+  end
+
+  it "finishes without message" do
+    test = subject.new(@pluginator, @console, "TestMe", 100, 0)
+    test.finish
+    @stdout.string.must_equal("\rTestMe: 0/100\rTestMe: Finished\n")
+    @stderr.string.must_equal("")
+  end
+
+  it "finishes with message" do
+    test = subject.new(@pluginator, @console, "TestMe", 100, 0)
+    test.finish("Done")
+    @stdout.string.must_equal("\rTestMe: 0/100\rTestMe: Done\n")
+    @stderr.string.must_equal("")
+  end
+
+end

data/test/plugins_test/rvm2/ui/progress/console/open_text_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+require 'plugins/rvm2/ui/output/console'
+require 'plugins/rvm2/ui/progress/console/open_text'
+require 'stringio'
+
+describe Rvm2::Ui::Progress::Console::OpenText do
+  before do
+    @stdout     = StringIO.new
+    @stderr     = StringIO.new
+    @pluginator = Pluginator.find("rvm2", extends: [:first_class])
+    @console    = Rvm2::Ui::Output::Console.new(@pluginator, @stdout, @stderr)
+  end
+
+  subject do
+    Rvm2::Ui::Progress::Console::OpenText
+  end
+
+  it "starts at new line" do
+    @console.log("test")
+    test = subject.new(@pluginator, @console, "TestMe", 0)
+    @stdout.string.must_equal("test\n\rTestMe: 0")
+    @stderr.string.must_equal("")
+  end
+
+  it "starts progress with 0" do
+    test = subject.new(@pluginator, @console, "TestMe", 0)
+    @stdout.string.must_equal("\rTestMe: 0")
+    @stderr.string.must_equal("")
+  end
+
+  it "starts progress with 1" do
+    test = subject.new(@pluginator, @console, "TestMe", 1)
+    @stdout.string.must_equal("\rTestMe: 1")
+    @stderr.string.must_equal("")
+  end
+
+  it "adds new size" do
+    test = subject.new(@pluginator, @console, "TestMe", 0)
+    test.change(2)
+    @stdout.string.must_equal("\rTestMe: 0\rTestMe: 2")
+    @stderr.string.must_equal("")
+  end
+
+  it "finishes without message" do
+    test = subject.new(@pluginator, @console, "TestMe", 0)
+    test.finish
+    @stdout.string.must_equal("\rTestMe: 0\rTestMe: Finished\n")
+    @stderr.string.must_equal("")
+  end
+
+  it "finishes with message" do
+    test = subject.new(@pluginator, @console, "TestMe", 0)
+    test.finish("Done")
+    @stdout.string.must_equal("\rTestMe: 0\rTestMe: Done\n")
+    @stderr.string.must_equal("")
+  end
+
+end

data/test/rvm2/ui/multi/io_write_router_test.rb

@@ -5,7 +5,8 @@ require 'plugins/rvm2/ui/output/fake'
 class HandlersParent
   attr_reader :handlers
   def initialize
-    @handlers = [Rvm2::Ui::Output::Fake.new, Rvm2::Ui::Output::Fake.new]
+    pluginator = Pluginator.find("rvm2", extends: [:first_class])
+    @handlers = [Rvm2::Ui::Output::Fake.new(pluginator), Rvm2::Ui::Output::Fake.new(pluginator)]
   end
 end
 

data/test/test_helper.rb

@@ -15,3 +15,8 @@ Coveralls.noisy = true unless ENV['CI']
 
 require 'minitest/autorun'
 require 'minitest/unit'
+
+Dir["lib/**/*.rb"].each{|file|
+  file = file.split(/lib\//).last
+  require file
+}

metadata

@@ -1,97 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: rvm2-ui
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluginator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -101,15 +115,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/plugins/rvm2/ui/output/console.rb
 - lib/plugins/rvm2/ui/output/fake.rb
 - lib/plugins/rvm2/ui/output/log.rb
+- lib/plugins/rvm2/ui/progress/console/closed_text.rb
+- lib/plugins/rvm2/ui/progress/console/open_text.rb
 - lib/rvm2/ui.rb
 - lib/rvm2/ui/multi.rb
 - lib/rvm2/ui/multi/io_write_router.rb
@@ -120,6 +137,8 @@ files:
 - test/plugins_test/rvm2/ui/output/console_test.rb
 - test/plugins_test/rvm2/ui/output/fake_test.rb
 - test/plugins_test/rvm2/ui/output/log_test.rb
+- test/plugins_test/rvm2/ui/progress/console/closed_text_test.rb
+- test/plugins_test/rvm2/ui/progress/console/open_text_test.rb
 - test/rvm2/ui/multi/io_write_router_test.rb
 - test/rvm2/ui/multi_test.rb
 - test/rvm2/ui/single_test.rb
@@ -135,17 +154,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Abstract user interface handling in RVM2
@@ -154,8 +173,11 @@ test_files:
 - test/plugins_test/rvm2/ui/output/console_test.rb
 - test/plugins_test/rvm2/ui/output/fake_test.rb
 - test/plugins_test/rvm2/ui/output/log_test.rb
+- test/plugins_test/rvm2/ui/progress/console/closed_text_test.rb
+- test/plugins_test/rvm2/ui/progress/console/open_text_test.rb
 - test/rvm2/ui/multi/io_write_router_test.rb
 - test/rvm2/ui/multi_test.rb
 - test/rvm2/ui/single_test.rb
 - test/rvm2/ui_test.rb
 - test/test_helper.rb
+has_rdoc: