progress 1.1.0 → 1.1.1

data/Rakefile

@@ -1,34 +1,27 @@
-begin
-  require 'jeweler'
-
-  name = 'progress'
-  summary = 'Show progress of long running tasks'
-
-  jewel = Jeweler::Tasks.new do |j|
-    j.name = name
-    j.summary = summary
-    j.homepage = "http://github.com/toy/#{name}"
-    j.authors = ["Boba Fat"]
-  end
-
-  Jeweler::GemcutterTasks.new
+require 'rubygems'
+require 'rake'
+require 'jeweler'
+require 'rake/gem_ghost_task'
+require 'spec/rake/spectask'
 
-  require 'pathname'
-  desc "Replace system gem with symlink to this folder"
-  task 'ghost' do
-    gem_path = Pathname(Gem.searcher.find(name).full_gem_path)
-    current_path = Pathname('.').expand_path
-    system('rm', '-r', gem_path)
-    system('ln', '-s', current_path, gem_path)
-  end
+name = 'progress'
 
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+Jeweler::Tasks.new do |gem|
+  gem.name = name
+  gem.summary = %Q{Show progress of long running tasks}
+  gem.homepage = "http://github.com/toy/#{name}"
+  gem.license = 'MIT'
+  gem.authors = ['Boba Fat']
+  gem.add_development_dependency 'jeweler', '~> 1.5.1'
+  gem.add_development_dependency 'rake-gem-ghost'
+  gem.add_development_dependency 'rspec'
 end
+Jeweler::RubygemsDotOrgTasks.new
+Rake::GemGhostTask.new
 
-require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
+  spec.spec_opts = ['--colour --format progress --loadby mtime --reverse']
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/progress.rb

@@ -91,7 +91,6 @@ class Progress
       elsif block
         block.call
       end
-      self.note = nil
     end
 
     def set(value, &block)
@@ -103,6 +102,7 @@ class Progress
           levels.last.current = Float(value)
         end
         print_message
+        self.note = nil
         ret
       elsif block
         block.call
@@ -215,7 +215,7 @@ class Progress
         message = "#{parts.reverse * ' > '}#{eta_string}"
         message_cl = "#{parts_cl.reverse * ' > '}#{eta_string}"
 
-        if note = levels.last.note
+        if note = levels.last && levels.last.note
           message << " - #{note}"
           message_cl << " - #{note}"
         end

data/progress.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{progress}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Boba Fat"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/toy/progress}
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Show progress of long running tasks}
@@ -42,9 +43,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<rake-gem-ghost>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
     else
+      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<rake-gem-ghost>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
+    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<rake-gem-ghost>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: progress
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Boba Fat
@@ -17,8 +17,51 @@ cert_chain: []
 
 date: 2010-12-07 00:00:00 +03:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake-gem-ghost
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: 
 email: 
 executables: []
@@ -43,8 +86,8 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/toy/progress
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []