lib/powerbar.rb in powerbar-1.0.7 vs lib/powerbar.rb in powerbar-1.0.8
- old
+ new
@@ -234,11 +234,11 @@
# Render the actual bar-portion of the PowerBar.
# The length of the bar is determined from the template.
# Returns nil if the bar-length would be == 0.
def bar
return nil if state.total.is_a? Symbol
- skel = render_template(:main, skip=[:bar])
+ skel = render_template(:main, [:bar])
lwid = state.scope_at[0] == :tty ? terminal_width() : scope.line_width
barlen = [lwid - skel.gsub(STRIP_ANSI, '').length, 0].max
fill = [0,[(state.done.to_f/state.total*barlen).to_i,barlen].min].max
thebar = scope.template.barchar * fill + scope.template.padchar * [barlen - fill,0].max
thebar.length == 0 ? nil : thebar
@@ -265,11 +265,11 @@
return nil unless scope.show_eta
1 < eta ? humanize_interval(eta) : nil
end
def elapsed
- e = (state.time_now - state.time_start).to_f
+ (state.time_now - state.time_start).to_f
end
def h_elapsed
humanize_interval(elapsed)
end
@@ -331,10 +331,10 @@
sub = nil
r = var.gsub(/<[^>]+>/) do |t|
t = t[1..-2]
begin
sub = self.send(('h_'+t).to_sym)
- rescue NoMethodError => e
+ rescue NoMethodError
raise NameError, "Invalid token '#{t}' in template '#{tplid}'"
end
end[2..-2]
sub.nil? ? '' : r
end