progress-bar 0.3.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 67db22370ee46bd79b0397d0d2bc97fad6cc0ec2
-  data.tar.gz: 8253f8eceaac27970c3461f4552c178c07ba4903
+SHA256:
+  metadata.gz: 418c16be9ef733a3d968eeeeba7d786c634f55443b7e25fb5ff6cc612d7a258f
+  data.tar.gz: ed8c34644353846ef1190f9412c9669ac4047576b55cfa64712bf65047e1cbe9
 SHA512:
-  metadata.gz: d87c0922a23b65462ef863000c52a115ded381f2f2753547106b0bcf356104c8b43fdf8549c8fcdfc4473273aa805a456f8a041a9ec906c8a93e0fa26fd58681
-  data.tar.gz: e5eeff9d0f908222cd9d217605896f4c33a1d5c059c2913f8a47e92213ded8d9fc07aba283127cbb8d3aa492f956ef14a9266504af96cd93069d85253af4fcd4
+  metadata.gz: 00afdaed674191311bb652f64f2459f831dd7a599dbe3bbb13620f3f62751348518dcbb6d10c3ea6e3a9f218342f049ca1fdb237b0ed7ac07510c30dbef67dbe
+  data.tar.gz: 1acad6c43d132077e3dfff52dcfcd50ae0db893b476e1c28783fcee896ed11da7eb6546b3728e0de84acaf4c177cb75b3ca5f8f293e0ad9702507165abb2e700

data/.gitignore

@@ -0,0 +1,11 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+.*.sw[pq]
+*.gem

data/Gemfile

@@ -1,13 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem 'ruby-dbus'
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
-  gem "simplecov", ">= 0"
-end
+# Specify your gem's dependencies in progress-bar.gemspec
+gemspec

data/Gemfile.lock

@@ -1,82 +1,36 @@
+PATH
+  remote: .
+  specs:
+    progress-bar (0.5.0)
+      ruby-dbus (~> 0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activesupport (4.2.0)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    builder (3.2.2)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.1.5)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.8)
-    github_api (0.12.2)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
-      oauth2
-    hashie (3.3.2)
-    highline (1.6.21)
-    i18n (0.7.0)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    jwt (1.2.0)
-    mini_portile (0.6.1)
-    minitest (5.5.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.0)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    ruby-dbus (0.11.0)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
-    shoulda-matchers (2.7.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    diff-lcs (1.4.4)
+    rake (12.3.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby-dbus (0.16.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0)
-  jeweler (~> 2.0.1)
-  rdoc (~> 3.12)
-  ruby-dbus
-  shoulda
-  simplecov
+  progress-bar!
+  rake (~> 12)
+  rspec (~> 3)
+
+BUNDLED WITH
+   2.2.11

data/LICENSE.txt

@@ -1,20 +1,165 @@
-Copyright (c) 2014 Denis Knauf
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

data/README.md

@@ -1,23 +1,56 @@
 ProgressBar
 ===========
 
-Usage
-=====
-
-This example will use your Terminal, if possible.
-If your program will be started without a Terminal,
-it will use kdialog for display a window.
-
-	pb = ProgressBar.new 100, 'Initial Text...'
-	pb.i += 5
-	pb.inc! 5
-	pb.text = 'Something different'
-	pb.inc! 20
-	pb.text = 'Second phase'
-	pb.inc! 60
-	pb.text = 'Last Steps'
-	pb.inc! 20
-	pb.text = 'Done!'
-
-If you want to force to use kdialog use ProgressBar::KDialog.new or
-if you want to use your Console, use ProgressBar::Console.
+Installation
+------------
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'progress-bar'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install progress-bar
+
+## Usage
+
+There exist three different handlers for ProgressBar: `ProgressBar::KDE`, `ProgressBar::KDialog` and `ProgressBar::Console`.
+These can be used directly, or you can use `ProgressBar.new` to determine the best solution.
+
+If the process runs in a terminal, the `ProgressBar::Console` would be the best solution.
+If you run KDE, `ProgressBar::KDE`, which uses JobViewer via DBUS, would be nice.
+Else `ProgressBar::KDialog` will be tried.
+Other handlers could be added in future.
+
+```ruby
+pb = ProgressBar.new 100, 'Initialization...'  # You expect 100 units (eg. percent)
+ph.start
+pb.i += 5                                      # 5 units done
+pb.inc! 5                                      # additional 5 units done
+pb.text = "Working..."
+pb.i += 80
+pb.text = "Last steps"
+pb.i += 10
+pb.text = "Done!"
+pb.finish
+```
+
+## Development
+
+After checking out the repo, run `bundle install` to install dependencies. Then, run `rake test` to run the tests.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on [https://git.denkn.at/deac/progress-bar]().
+
+## License
+
+The gem is available as open source under the terms of the [LGPL-3.0 License](https://opensource.org/licenses/LGPL-3.0).

data/Rakefile

@@ -1,51 +1,2 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = "progress-bar"
-  gem.homepage = "http://github.com/DenisKnauf/progress-bar"
-  gem.license = "MIT"
-  gem.summary = %Q{Progress Bar for terminal and KDE}
-  gem.description = %Q{Displays a Progress Bar in terminal or via kdialog}
-  gem.email = %q{#{"de"}nis}+?@+'den'+%Q{kn}+"#{?.}at"
-  gem.authors = ["Denis Knauf"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-desc "Code coverage detail"
-task :simplecov do
-  ENV['COVERAGE'] = "true"
-  Rake::Task['test'].execute
-end
-
-task :default => :test
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "progress-bar #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"
+task :default => :spec

data/lib/progress-bar.rb

@@ -1,23 +1,31 @@
 require 'dbus'
+require 'pathname'
 
 module ProgressBar
-	def self.new *a
-		if STDERR.tty?
-			Console.new *a
-		elsif 'KDE' == ENV['XDG_CURRENT_DESKTOP']
-			KDialog.new *a
-		else
-			KDialog.new *a
+	@klasses ||= []
+
+	class <<self
+		def register klass
+			@klasses.push klass
+		end
+
+		def new *a, **o
+			@klasses.map {|cl| cl.new *a, **o}.find &:possible?
 		end
 	end
 end
 
 class ProgressBar::Base
-	attr_reader :max, :i, :text, :error
-	attr_accessor :start
-	def initialize max = nil, text = nil
-		@start, @max, @i, @text, @error = Time.now, max || 100, 0, text || '', nil
+	attr_reader :max, :i, :text
+	attr_accessor :startts
+	def initialize max = nil, text = nil, **_options
+		@startts, @max, @i, @text = nil, max || 100, 0, text || ''
+	end
+
+	def start
 		at_exit {finish}
+		@startts = Time.now
+		self
 	end
 
 	def i= x
@@ -34,7 +42,7 @@ class ProgressBar::Base
 	alias to_i i
 	alias inc! increment!
 	def done_rel() 100.0*i/max end
-	def done_dur() Time.now-@start end
+	def done_dur() Time.now-@startts end
 
 	def total_dur
 		done_dur * max / i
@@ -45,21 +53,30 @@ class ProgressBar::Base
 		change_text
 	end
 
-	def error= x
-		@error = x
-		change_error
-	end
-
+	def error( text)  end
 	def change_progress()  end
 	def change_text()  end
-	def change_error()  end
 	def finish()  end
+	def possible?()  false  end
 end
 
 class ProgressBar::Console < ProgressBar::Base
-	def initialize *a
-		super *a
+	attr_reader :outfd, :errfd
+
+	def initialize *a, outfd: nil, errfd: nil, **options
+		@outfd = outfd || STDERR
+		@errfd = errfd || @outfd
+		super *a, **options
+	end
+
+	def possible?
+		@outfd.tty?
+	end
+
+	def start
+		super
 		change_text
+		self
 	end
 
 	def format_time t
@@ -75,37 +92,122 @@ class ProgressBar::Console < ProgressBar::Base
 		dd, td = done_dur, total_dur
 		b = ?= * l
 		b[-1] = ?>  unless 0 == l or 100 == l
-		STDOUT.printf "\r\e[J%s / %s [%-*s] %s", format_time(dd), format_time(td), 100, b, text
+		@outfd.printf "\r\e[J%s / %s [%-*s] %s", format_time(dd), format_time(td), 100, b, text
 	end
 	alias change_progress change_text
 
-	def change_error
-		STDERR.printf "\r\e[J%s\n", error
-		change_text
+	def error text
+		@errfd.printf "\r\e[J%s\n", text
+		@errfd.flush
+	end
+
+	def finish
+		@outfd.puts
+		@outfd.flush
+	end
+end
+
+class ProgressBar::KDE < ProgressBar::Base
+	attr_reader :bus, :service, :view
+
+	def initialize max, text = nil, title: nil,
+				app_name: nil,
+				app_icon_name: nil,
+				unit: nil,
+				is_cancable: nil,
+				is_suspendable: nil,
+				**_options
+
+		super max, text
+		text = @text
+		text = nil   if text.nil?  or text.empty?
+		title = nil  if title.nil? or title.empty?
+		unit = ''    if unit.nil?  or unit.empty?
+		@title, @text, @unit, @app_name, @app_icon_name, @is_cancable, @is_suspendable =
+			title, text, unit, app_name || $0, app_icon_name || '', is_cancable, is_suspendable
+		@errors = []
+	end
+
+	def possible?
+		'KDE' == ENV['XDG_CURRENT_DESKTOP']
+	end
+
+	def start
+		@finished = false
+		@bus = DBus::SessionBus.instance
+		@service = @bus['org.kde.JobViewServer']
+		jvs = @service['/JobViewServer'] #['org.kde.JobViewServer']
+		jvs.introspect
+		flags = (@is_cancable ? 0x1 : 0) | (@is_suspendable ? 0x2 : 0)
+		view_path = jvs.requestView @app_name, @app_icon_name, flags
+		@view = @service[view_path] #['org.kde.JobViewV2']
+		@view.introspect
+		super
+		@view.setTotalAmount @max, @unit
+		self
+	end
+
+	def change_text
+		@view.setInfoMessage text
+	end
+
+	def change_progress
+		@view.setProcessedAmount i, @unit
+		@view.setPercent done_rel
+	end
+
+	def error text
+		#STDERR.puts @view.object.introspect
+		#@view.setError text
+		@view.setDescriptionField 0, "Error", text
+		#@view.setInfoMessage "#{text}\nError: #{error}"
 	end
 
 	def finish
-		STDERR.puts
+		return  if @finished
+		@view.terminate ''
+		@finished = true
+	end
+
+	def max= value
+		super value
+		@view.setTotalAmount value, @unit
 	end
 end
 
 class ProgressBar::KDialog < ProgressBar::Base
 	attr_reader :dialog_service_path, :dialog_object_path, :errors, :dialog_object
-	def initialize max, text = nil, title = nil
+
+	def initialize max, text = nil, title: nil, **_options
 		super max, text
 		text = @text
-		text = nil  if text.nil? or text.empty?
+		text = nil   if text.nil? or text.empty?
 		title = nil  if title.nil? or title.empty?
+		@title = title
 		@errors = []
-		args = ['kdialog', *(title ? ['--title', title] : []), '--progressbar', text || '.', max.to_s]
-		@dialog_service_path, @dialog_object_path = IO.popen( args, 'r', &:readlines).join("\n").split ' '
+	end
+
+	def possible?
+		path = Pathname.new `which kdialog`.chomp
+		$?.exitstatus  and  path.executable?
+	end
+
+	def start
+		@finished = false
+		args = ['kdialog', @title ? ['--title', @title] : [], '--progressbar', @text || '.', @max].flatten.compact.map &:to_s
+		@dialog_service_path, @dialog_object_path =
+			IO.popen( args, 'r', &:readlines).join( "\n").split ' '
 		@dialog_bus = DBus.session_bus
 		@dialog_service = @dialog_bus[@dialog_service_path]
-		@dialog_object = @dialog_service.object @dialog_object_path
-		@dialog_object.introspect
-		@dialog_object.showCancelButton true
+		@dialog_object = @dialog_service[ @dialog_object_path]
+		#STDERR.puts "%p" %
+			@dialog_object.introspect
+		@dialog_object.showCancelButton 1
+		super
 		change_text  if text.nil?
 		change_progress
+		self
+
 	rescue DBus::Error
 		raise Interrupt  if $!.name == 'org.freedesktop.DBus.Error.ServiceUnknown'
 		raise
@@ -119,8 +221,9 @@ class ProgressBar::KDialog < ProgressBar::Base
 	def kdialog(*a)  self.class.kdialog *a  end
 
 	def change_progress()
-		@dialog_object.Set '', 'value', i
-		raise Interrupt  if @dialog_object.wasCancelled.first
+		#@dialog_object.Set 'org.kde.kdialog.ProgressDialog', 'value', i
+		@dialog_object['value'] = i
+		raise Interrupt  if @dialog_object.wasCancelled
 	rescue DBus::Error
 		raise Interrupt  if $!.name == 'org.freedesktop.DBus.Error.ServiceUnknown'
 		raise
@@ -128,23 +231,28 @@ class ProgressBar::KDialog < ProgressBar::Base
 
 	def change_text()
 		@dialog_object.setLabelText text
-		raise Interrupt  if @dialog_object.wasCancelled.first
+		raise Interrupt  if @dialog_object.wasCancelled
 	rescue DBus::Error
 		raise Interrupt  if $!.name == 'org.freedesktop.DBus.Error.ServiceUnknown'
 		raise
 	end
 
-	def change_error()  @errors.push error  end
-	def finish()
-		@dialog_object.close rescue DBus::Error
-		kdialog '--detailederror', "Some errors occured:", errors.join( "<br/>\n")  unless errors.empty?
+	def error text
+		kdialog '--error', text
 	end
 
-	def max= val
-		@dialog_object.Set '', 'maximum', val
+	def finish()
+		return  if @finished
+		@dialog_object.close  rescue DBus::Error
+		@finished = true
 	end
 
-	def max
-		@dialog_object.Get '', 'maximum'
+	def max= val
+		super val
+		@dialog_object['maximum'] = val
 	end
 end
+
+ProgressBar.register ProgressBar::Console
+ProgressBar.register ProgressBar::KDE
+ProgressBar.register ProgressBar::KDialog

data/lib/progress-bar/version.rb

@@ -0,0 +1,3 @@
+module ProgressBar
+	VERSION = "0.5.0"
+end

data/progress-bar.gemspec

@@ -1,65 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+require_relative "lib/progress-bar/version"
 
-Gem::Specification.new do |s|
-  s.name = "progress-bar"
-  s.version = "0.3.7"
+Gem::Specification.new do |spec|
+	spec.name          = "progress-bar"
+	spec.version       = ProgressBar::VERSION
+	spec.authors       = ["Denis Knauf"]
+	spec.email         = ["denis+gems@denkn.at"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Denis Knauf"]
-  s.date = "2014-12-24"
-  s.description = "Displays a Progress Bar in terminal or via kdialog"
-  s.email = "\#{\"de\"}nis@denkn.at"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/progress-bar.rb",
-    "progress-bar.gemspec",
-    "test/helper.rb",
-    "test/test_progress-bar.rb"
-  ]
-  s.homepage = "http://github.com/DenisKnauf/progress-bar"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.14"
-  s.summary = "Progress Bar for terminal and KDE"
+	spec.summary       = %q{Progress Bar for terminal and KDE}
+	spec.description   = %q{Displays a Progress Bar in terminal, via KDE-JobViewer or via kdialog}
+	spec.homepage      = "https://git.denkn.at/deac/progress-bar"
+	spec.licenses      = ["LGPL-3.0"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+	# Specify which files should be added to the gem when it is released.
+	# The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+	spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+		`git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+	end
+	#spec.bindir        = "bin"
+	#spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+	spec.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby-dbus>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-    else
-      s.add_dependency(%q<ruby-dbus>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<ruby-dbus>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-  end
+	spec.add_development_dependency "rake", "~> 12"
+	spec.add_development_dependency "rspec", "~> 3"
+	spec.add_dependency "ruby-dbus", '~> 0'
 end
-

metadata

@@ -1,121 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: progress-bar
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Denis Knauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-dbus
+  name: rake
   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: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  name: ruby-dbus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Displays a Progress Bar in terminal or via kdialog
-email: '#{"de"}nis@denkn.at'
+description: Displays a Progress Bar in terminal, via KDE-JobViewer or via kdialog
+email:
+- denis+gems@denkn.at
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
-- .document
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - lib/progress-bar.rb
+- lib/progress-bar/version.rb
 - progress-bar.gemspec
-- test/helper.rb
-- test/test_progress-bar.rb
-homepage: http://github.com/DenisKnauf/progress-bar
+homepage: https://git.denkn.at/deac/progress-bar
 licenses:
-- MIT
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -123,17 +78,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Progress Bar for terminal and KDE

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/VERSION

@@ -1 +0,0 @@
-0.3.7

data/test/helper.rb

@@ -1,34 +0,0 @@
-require 'simplecov'
-
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_adapter 'test_frameworks'
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'progress-bar'
-
-class Test::Unit::TestCase
-end

data/test/test_progress-bar.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestProgressBar < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end