progress 0.2.2 → 0.3.0

data/Rakefile

@@ -18,9 +18,8 @@ begin
   task 'ghost' do
     gem_path = Pathname(Gem.searcher.find(name).full_gem_path)
     current_path = Pathname('.').expand_path
-    cmd = gem_path.writable? && gem_path.parent.writable? ? %w() : %w(sudo)
-    system(*cmd + %W[rm -r #{gem_path}])
-    system(*cmd + %W[ln -s #{current_path} #{gem_path}])
+    system('rm', '-r', gem_path)
+    system('ln', '-s', current_path, gem_path)
   end
 
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/progress.rb

@@ -10,6 +10,11 @@ class Progress
     attr_accessor :title, :current, :total
     attr_reader :current_step
     def initialize(title, total)
+      if title.is_a?(Numeric) && total.nil?
+        title, total = nil, title
+      elsif total.nil?
+        total = 1
+      end
       total = Float(total)
       @title, @current, @total = title, 0.0, total == 0.0 ? 1.0 : total
     end
@@ -62,7 +67,7 @@ class Progress
     #   Progress.lines = true
     # ==== To force highlight
     #   Progress.highlight = true
-    def start(title, total = 1)
+    def start(title = nil, total = nil)
       levels << new(title, total)
       print_message(true)
       if block_given?
@@ -152,7 +157,7 @@ class Progress
         levels.reverse.each do |l|
           current = l.to_f(inner)
           value = current == 0 ? '......' : "#{'%5.1f' % (current * 100.0)}%"
-          messages << "#{l.title}: #{!highlight? || value == '100.0%' ? value : "\e[1m#{value}\e[0m"}"
+          messages << "#{"#{l.title}: " if l.title}#{!highlight? || value == '100.0%' ? value : "\e[1m#{value}\e[0m"}"
           inner = current
         end
         message = messages.reverse * ' > '
@@ -181,7 +186,7 @@ require 'progress/integer'
 
 # like Pathname
 module Kernel
-  def Progress(title, total = 1, &block)
+  def Progress(title = nil, total = nil, &block)
     Progress.start(title, total, &block)
   end
   private :Progress

data/lib/progress/enumerable.rb

@@ -9,7 +9,7 @@ module Enumerable
   #   [1, 2, 3].with_progress('Numbers').each_cons(2) do |numbers|
   #     p numbers
   #   end
-  def with_progress(title)
+  def with_progress(title = nil)
     Progress::WithProgress.new(self, title)
   end
 
@@ -18,8 +18,8 @@ module Enumerable
   #   [1, 2, 3].each_with_progress('Numbers') do |number|
   #     sleep(number)
   #   end
-  def each_with_progress(title, *args, &block)
-    with_progress(title).each(*args, &block)
+  def each_with_progress(title = nil, &block)
+    with_progress(title).each(&block)
   end
 
   # note that Progress.step is called automatically
@@ -27,8 +27,8 @@ module Enumerable
   #   [1, 2, 3].each_with_index_and_progress('Numbers') do |number, index|
   #     sleep(number)
   #   end
-  def each_with_index_and_progress(title, *args, &block)
-    with_progress(title).each_with_index(*args, &block)
+  def each_with_index_and_progress(title, &block)
+    with_progress(title).each_with_index(&block)
   end
 
 end

data/lib/progress/integer.rb

@@ -4,8 +4,8 @@ class Integer
   #   100.times_with_progress('Numbers') do |number|
   #     sleep(number)
   #   end
-  def times_with_progress(name)
-    Progress.start(name, self) do
+  def times_with_progress(title = nil)
+    Progress.start(title, self) do
       times do |i|
         yield i
         Progress.step

data/progress.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{progress}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Boba Fat"]
-  s.date = %q{2010-01-20}
+  s.date = %q{2010-11-13}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/toy/progress}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Show progress of long running tasks}
   s.test_files = [
     "spec/progress_spec.rb",
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: progress
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Boba Fat
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 +03:00
+date: 2010-11-13 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -44,21 +50,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Show progress of long running tasks