rubikon 0.2.0 → 0.2.1

data/VERSION.yml

@@ -1,5 +1,4 @@
---- 
+---
 :major: 0
 :minor: 2
-:patch: 0
-:build: 
+:patch: 1

data/lib/rubikon/progress_bar.rb

@@ -29,9 +29,10 @@ module Rubikon
       @maximum.round
 
       @progress_char = options[:char] || '#'
-      @factor   = (options[:size] || 20).round.to_f / @maximum
       @ostream  = options[:ostream] || $stdout
       @progress = 0
+      @size     = options[:size] || 20
+      @factor   = @size.round.to_f / @maximum
       @value    = 0
 
       self + (options[:start] || 0)
@@ -48,19 +49,21 @@ module Rubikon
     #  progress_bar + 5 # (will add 5)
     #  progress_bar.+   # (will add 1)
     def +(value = 1)
-      return if value <= 0
-      value = value.round
-      old_progress = @progress
+      return if (value <= 0) || (@value == @maximum)
       @value += value
-      add_progress = (value * @factor).round
+      old_progress = @progress
+      add_progress = ((@value - @progress / @factor) * @factor).round
       @progress += add_progress
 
-      @progress = 100 if @progress > 100
+      if @progress > @size
+        @progress = @size
+        add_progress = @size - old_progress
+      end
 
-      difference = @progress - old_progress
-      if difference > 0 && @progress <= @maximum
-        @ostream << @progress_char * difference
+      if add_progress > 0
+        @ostream << @progress_char * add_progress
         @ostream.flush
+        @ostream.puts '' if @progress == @size
       end
     end
 

data/test/action_tests.rb

@@ -10,12 +10,12 @@ class ActionTests < Test::Unit::TestCase
   context 'A Rubikon action' do
 
     should 'throw an exception when no code block is given' do
-      assert_raise Rubikon::BlockMissingError do
-        Rubikon::Action.new
+      assert_raise BlockMissingError do
+        Action.new
       end
-      assert_raise Rubikon::BlockMissingError do
+      assert_raise BlockMissingError do
         options = {}
-        Rubikon::Action.new options
+        Action.new options
       end
     end
 
@@ -25,7 +25,7 @@ class ActionTests < Test::Unit::TestCase
         :param_type  => String
       }
       assert_nothing_raised do
-        action = Rubikon::Action.new action_options do end
+        action = Action.new action_options do end
         assert_equal action_options[:description], action.description
         assert_equal action_options[:param_type], action.param_type
       end

data/test/application_tests.rb

@@ -61,26 +61,26 @@ class ApplicationTests < Test::Unit::TestCase
     end
 
     should 'not run without a mandatory argument' do
-      assert_raise Rubikon::MissingArgumentError do
+      assert_raise MissingArgumentError do
         @app.run(%w{--required})
       end
     end
 
     should 'require an argument type if it has been defined' do
-      assert_raise Rubikon::ArgumentTypeError do
+      assert_raise ArgumentTypeError do
         @app.run(['--output', 6])
       end
-      assert_raise Rubikon::ArgumentTypeError do
+      assert_raise ArgumentTypeError do
         @app.run(['--number_string', 6, 7])
       end
-      assert_raise Rubikon::ArgumentTypeError do
+      assert_raise ArgumentTypeError do
         @app.run(['--number_string', 'test' , 6])
       end
     end
 
     should 'raise an exception when calling an action with the wrong number of
             arguments' do
-      assert_raise Rubikon::MissingArgumentError do
+      assert_raise MissingArgumentError do
         @app.run(%w{--output})
       end
       assert_raise ArgumentError do
@@ -89,13 +89,13 @@ class ApplicationTests < Test::Unit::TestCase
     end
 
     should 'raise an exception when using an unknown option' do
-      assert_raise Rubikon::UnknownOptionError do
+      assert_raise UnknownOptionError do
         @app.run(%w{--unknown})
       end
-      assert_raise Rubikon::UnknownOptionError do
+      assert_raise UnknownOptionError do
         @app.run(%w{--noarg --unknown})
       end
-      assert_raise Rubikon::UnknownOptionError do
+      assert_raise UnknownOptionError do
         @app.run(%w{--unknown --noarg})
       end
     end

data/test/progress_bar_tests.rb

@@ -10,7 +10,7 @@ class ProgressBarTests < Test::Unit::TestCase
   context 'A progress bar' do
 
     should 'have default settings' do
-      @bar = Rubikon::ProgressBar.new
+      @bar = ProgressBar.new
       assert_equal 0.2,     @bar.instance_variable_get(:@factor)
       assert_equal 100,     @bar.instance_variable_get(:@maximum)
       assert_equal $stdout, @bar.instance_variable_get(:@ostream)
@@ -27,7 +27,7 @@ class ProgressBarTests < Test::Unit::TestCase
         :size    => 100,
         :start   => 5
       }
-      @bar = Rubikon::ProgressBar.new(options)
+      @bar = ProgressBar.new(options)
       assert_equal options[:size].to_f / options[:maximum], @bar.instance_variable_get(:@factor)
       assert_equal options[:maximum], @bar.instance_variable_get(:@maximum)
       assert_equal options[:ostream], @bar.instance_variable_get(:@ostream)
@@ -40,15 +40,15 @@ class ProgressBarTests < Test::Unit::TestCase
       ostream = StringIO.new
       options = { :ostream => ostream, :start => 50 }
 
-      @bar = Rubikon::ProgressBar.new(options)
+      @bar = ProgressBar.new(options)
       assert_equal "#" * 10, ostream.string
       @bar + 50
-      assert_equal "#" * 20, ostream.string
+      assert_equal ("#" * 20) << "\n", ostream.string
 
       ostream.string = ''
       options[:size] = 10
 
-      @bar = Rubikon::ProgressBar.new(options)
+      @bar = ProgressBar.new(options)
       assert_equal "#" * 5, ostream.string
       @bar + 10
       assert_equal "#" * 6, ostream.string
@@ -56,7 +56,7 @@ class ProgressBarTests < Test::Unit::TestCase
       ostream.string = ''
       options[:size] = 100
 
-      @bar = Rubikon::ProgressBar.new(options)
+      @bar = ProgressBar.new(options)
       assert_equal "#" * 50, ostream.string
       @bar + 30
       assert_equal "#" * 80, ostream.string
@@ -66,26 +66,26 @@ class ProgressBarTests < Test::Unit::TestCase
       ostream = StringIO.new
       options = { :ostream => ostream, :size => 100 }
 
-      @bar = Rubikon::ProgressBar.new options
+      @bar = ProgressBar.new options
       @bar + 101
-      assert_equal "#" * 100, ostream.string
+      assert_equal ("#" * 100) << "\n", ostream.string
       assert_equal 100, @bar.instance_variable_get(:@progress)
       assert_equal 101, @bar.instance_variable_get(:@value)
 
       ostream.string = ''
       options[:start] = 50
 
-      @bar = Rubikon::ProgressBar.new options
+      @bar = ProgressBar.new options
       @bar + 51
-      assert_equal "#" * 100, ostream.string
+      assert_equal ("#" * 100) << "\n", ostream.string
       assert_equal 100, @bar.instance_variable_get(:@progress)
       assert_equal 101, @bar.instance_variable_get(:@value)
 
       ostream.string = ''
       options[:start] = 101
-      
-      @bar = Rubikon::ProgressBar.new options
-      assert_equal "#" * 100, ostream.string
+
+      @bar = ProgressBar.new options
+      assert_equal ("#" * 100) << "\n", ostream.string
       assert_equal 100, @bar.instance_variable_get(:@progress)
       assert_equal 101, @bar.instance_variable_get(:@value)
     end

data/test/testapp.rb

@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2009, Sebastian Staudt
 
-class RubikonTestApp < Rubikon::Application::Base
+class RubikonTestApp < Application::Base
 
   set :autorun, false
   set :name, 'Rubikon test application'

data/test/throbber_tests.rb

@@ -10,12 +10,17 @@ class ThrobberTests < Test::Unit::TestCase
   context 'A throbber' do
 
     should 'be a subclass of Thread' do
-      assert_equal Thread, Rubikon::Throbber.superclass
+      assert_equal Thread, Throbber.superclass
     end
 
     should 'have default throbber strings' do
-      assert_equal %w{SPINNER}, Throbber.constants
-      assert_equal '-\|/', Rubikon::Throbber.const_get(:SPINNER)
+      unless RUBY_VERSION[0..2] == '1.9'
+        consts = %w{SPINNER}
+      else
+        consts = [:SPINNER, :MUTEX_FOR_THREAD_EXCLUSIVE]
+      end
+      assert_equal consts, Throbber.constants
+      assert_equal '-\|/', Throbber.const_get(:SPINNER)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubikon
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-07 00:00:00 +01:00
+date: 2009-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -34,7 +34,6 @@ files:
 - lib/rubikon/application/instance_methods.rb
 - lib/rubikon/exceptions.rb
 - lib/rubikon/progress_bar.rb
-- lib/rubikon/setter.rb
 - lib/rubikon/throbber.rb
 - test/action_tests.rb
 - test/application_tests.rb
@@ -78,6 +77,6 @@ test_files:
 - test/action_tests.rb
 - test/application_tests.rb
 - test/progress_bar_tests.rb
-- test/test_helper.rb
 - test/testapp.rb
+- test/test_helper.rb
 - test/throbber_tests.rb

data/lib/rubikon/setter.rb

@@ -1,17 +0,0 @@
-# This code is free software; you can redistribute it and/or modify it under the
-# terms of the new BSD License.
-#
-# Copyright (c) 2009, Sebastian Staudt
-
-module Rubikon
-
-  class Setter < Action
-
-    def run(*args)
-      
-      super
-    end
-
-  end
-
-end