progress 0.1.1.0 → 0.1.1.1

data/Rakefile

@@ -1,10 +1,11 @@
+require 'pathname'
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
 require 'fileutils'
 require 'echoe'
 
-version = YAML.load_file(File.join(File.dirname(__FILE__), 'VERSION.yml')).join('.') rescue nil
+version = YAML.load_file(Pathname(__FILE__).dirname + 'VERSION.yml').join('.') rescue nil
 
 echoe = Echoe.new('progress', version) do |p|
   p.author = 'toy'
@@ -12,8 +13,10 @@ echoe = Echoe.new('progress', version) do |p|
 end
 
 desc "Replace system gem with symlink to this folder"
-task :ghost do
-  path = Gem.searcher.find(echoe.name).full_gem_path
-  system 'sudo', 'rm', '-r', path
-  symlink File.expand_path('.'), path
+task 'ghost' do
+  gem_path = Pathname(Gem.searcher.find(echoe.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}])
 end

data/VERSION.yml

@@ -1 +1 @@
-[0, 1, 1, 0]
+[0, 1, 1, 1]

data/lib/progress.rb

@@ -131,10 +131,13 @@ class Progress
 
     def print_message
       messages = []
+      messages_hl = []
       inner = 0
       levels.reverse.each do |l|
         current = l.to_f(inner)
-        messages << "#{l.title}: #{(current == 0 ? '......' : '%5.1f%%' % (current * 100.0))[0, 6]}"
+        value = current == 0 ? '......' : '%5.1f%%' % (current * 100.0)
+        messages << "#{l.title}: #{value}"
+        messages_hl << "#{l.title}: #{value == '100.0' ? value : "\e[1m#{value}\e[0m"}" if highlight?
         inner = current
       end
       message = messages.reverse * ' > '
@@ -145,7 +148,7 @@ class Progress
         message = message.ljust(previous_length, ' ') + "\r"
       end
 
-      message.gsub!(/\d+\.\d+/){ |s| s == '100.0' ? s : "\e[1m#{s}\e[0m" } if highlight?
+      message = messages_hl.reverse * ' > ' if highlight?
 
       lines? ? io.puts(message) : io.print(message)
     end

data/progress.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{progress}
-  s.version = "0.1.1.0"
+  s.version = "0.1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["toy"]
-  s.date = %q{2009-09-21}
+  s.date = %q{2009-09-28}
   s.description = %q{A library to show progress of long running tasks.}
   s.email = %q{}
   s.extra_rdoc_files = ["README.rdoc", "lib/progress.rb", "lib/progress/enumerable.rb", "lib/progress/integer.rb", "lib/progress/with_progress.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: progress
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.0
+  version: 0.1.1.1
 platform: ruby
 authors: 
 - toy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 +04:00
+date: 2009-09-28 00:00:00 +04:00
 default_executable: 
 dependencies: []