1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
Subject: fix ruby-progressbar mess
Author: vdanjean@debian.org
Forwarded: yes
--- a/kameleon-builder.gemspec
+++ b/kameleon-builder.gemspec
@@ -30,7 +30,7 @@
s.require_paths = ['lib']
s.add_dependency 'childprocess', '~> 4.0'
- s.add_dependency 'progressbar', '~> 1.10'
+ s.add_dependency 'ruby-progressbar', '~> 1.10'
s.add_dependency 'psych', '~> 5.0'
s.add_dependency 'ruby-graphviz', '~> 1.2'
s.add_dependency 'table_print', '~> 1.5'
--- a/lib/kameleon/utils.rb
+++ b/lib/kameleon/utils.rb
@@ -1,9 +1,10 @@
# The progressbar and ruby-progressbar gems are the same code from
# https://github.com/jfelchner/ruby-progressbar/tree/master
# Only the lib head file is named progressbar.rb vs. ruby-progressbar.rb.
-# The progressbar gem is the one packaged as ruby-progressbar in Debian.
-# Using that one (see gemspec) and require "progressbar" not "ruby-progessbar".
-require 'progressbar'
+# On Debian, the ruby-progressbar is installed, but patched in order to provide
+# not only ruby-progressbar.rb but also progressbar.rb (same content)
+# Using ruby-progessbar that seems more frequently used.
+require 'ruby-progressbar'
module Kameleon
module Utils
|
