barr 0.1.2 → 0.2.0

data/examples/all_in.rb

@@ -5,65 +5,60 @@ require 'barr'
 
 @man = Barr::Manager.new
 
+who = Barr::Blocks::Whoami.new align: :r, icon: "\uf007"
 
-who = Barr::Blocks::WhoAmI.new align: :r, icon: "\uf007"
-
-
-i3 = Barr::Blocks::I3.new fcolor: "#FFF",
-                          bcolor: "#145266",
-                          focus_markers: [">","<"],
+i3 = Barr::Blocks::I3.new(fgcolor: '#FFF',
+                          bgcolor: '#145266',
+                          focus_markers: %w(> <),
                           align: :r,
-                          icon: "\uf009"
+                          icon: "\uf009")
 
-artist = Barr::Blocks::Rhythmbox.new bcolor: "#466B41",
+artist = Barr::Blocks::Rhythmbox.new(bgcolor: '#466B41',
                                      icon: "\uf028",
-                                     show_title: false,
-                                     show_buttons: false
+                                     title: false,
+                                     buttons: false)
 
-song = Barr::Blocks::Rhythmbox.new bcolor: "#1E6614",
-                                   show_buttons: false,
-                                   show_artist: false
+song = Barr::Blocks::Rhythmbox.new(bgcolor: '#1E6614',
+                                   buttons: false,
+                                   artist: false)
 
-controls = Barr::Blocks::Rhythmbox.new bcolor: "#0A4D02",
-                                       show_artist: false,
-                                       show_title: false,
-                                       align: :r
+controls = Barr::Blocks::Rhythmbox.new(bgcolor: '#0A4D02',
+                                       artist: false,
+                                       title: false,
+                                       align: :r)
 
-clock = Barr::Blocks::Clock.new bcolor: "#371E5E",
-                                format: "%H:%M - %d %b %Y",
+clock = Barr::Blocks::Clock.new(bgcolor: '#371E5E',
+                                format: '%H:%M - %d %b %Y',
                                 icon: "\uf073",
-                                align: :r
+                                align: :r)
 
-weather = Barr::Blocks::Temperature.new bcolor: "#4A072B",
-                                  align: :l,
-                                  location: "2471217",
-                                  icon: "\uf0c2 Philadelphia: ",
-                                  interval: 1500
+weather = Barr::Blocks::Temperature.new(bgcolor: '#4A072B',
+                                        align: :l,
+                                        location: '2471217',
+                                        icon: "\uf0c2 Philadelphia: ",
+                                        interval: 1500)
 
-cpu = Barr::Blocks::Cpu.new icon: "\uf1fe"
+cpu = Barr::Blocks::CPU.new icon: "\uf1fe"
 
-mem = Barr::Blocks::Mem.new bcolor: "#333333"
+mem = Barr::Blocks::Mem.new bgcolor: '#333333'
 
-hdd = Barr::Blocks::Hdd.new bcolor: "#444444", device: "sda2", interval: 300
+hdd = Barr::Blocks::HDD.new bgcolor: '#444444', device: 'sdc2', interval: 300
 
-local = Barr::Blocks::Ip.new bcolor: "#937739", align: :r, icon: "\uf1ce"
+local = Barr::Blocks::IP.new bgcolor: '#937739', align: :r, icon: "\uf1ce"
 
 # Left
-@man.add_block artist
-@man.add_block song
-@man.add_block weather
-@man.add_block cpu
-@man.add_block mem
-@man.add_block hdd
-
+@man.add artist
+@man.add song
+@man.add weather
+@man.add cpu
+@man.add mem
+@man.add hdd
 
 # Right 
-@man.add_block i3
-@man.add_block local
-@man.add_block who
-@man.add_block controls
-@man.add_block clock
-
-
+@man.add i3
+@man.add local
+@man.add who
+@man.add controls
+@man.add clock
 
-@man.run
+@man.run!

data/examples/barr_example.rb

@@ -8,25 +8,25 @@ require 'barr'
 # The manager is responsible for organising the blocks and delivering their output to lemonbar 
 @manager = Barr::Manager.new
 
-# Add a 'WhoAmI' block. This just outputs logged in username
+# Add a 'Whoami' block. This just outputs logged in username
 # Give it a peach background, grey text and updates every 10000 seconds
 # It will be aligned to the left of the bar
-@manager.add_block Barr::Blocks::WhoAmI.new(bcolor: "#FFAAAA", fcolor: "#333333", interval: 10000)
+@manager.add Barr::Blocks::Whoami.new(bgcolor: '#FFAAAA', fgcolor: '#333333', interval: 10000)
 
 # Add a 'Clock' block.
 # Clocks can be formatted in the type strftime fashion. This example outputs the current Hour and Minute
 # It will update every second.
 # By default, the background text colour will be deferred to the Lemonbar config
 # If FontAwesome font is available to lemonbar, it will be prepended with a clock icon.
-@manager.add_block Barr::Blocks::Clock.new(icon: "\uf017", format: "%H:%M", align: :c, interval: 1)
+@manager.add Barr::Blocks::Clock.new(icon: "\uf017", format: '%H:%M', align: :c, interval: 1)
 
 
-# Add a 'Cpu' block. This shows the current CPU usage (averaged across all cores if present)
+# Add a 'CPU' block. This shows the current CPU usage (averaged across all cores if present)
 # It will be aligned to the right side of of the bar
 # As an interval is not provided, it will update every 5 seconds.
 # It will be prepended with the text 'Cpu:'
-@manager.add_block Barr::Blocks::Cpu.new(icon: "Cpu:", align: :r)
+@manager.add Barr::Blocks::CPU.new(icon: 'Cpu:', align: :r)
 
 
 # Tell the manager to run the loop. This will continue indefinitely, outputing the data ready to be piped in to lemonbar.
-@manager.run
+@manager.run!

data/examples/fizzbuzz.rb

@@ -4,34 +4,33 @@ require 'rubygems'
 require 'barr'
 
 class FizzBuzz < Barr::Block
-  def initialize opts={}
+  def initialize(opts = {})
     super
     @count = opts[:count] || 0
   end
 
-  def update
+  def update!
     @count += 1
 
     @output = if (@count % 3 == 0) && (@count % 5 == 0)
-               "FizzBuzz"
-             elsif @count % 3 == 0
-               "Fizz"
-             elsif @count % 5 == 0
-               "Buzz"
-             else
-               @count.to_s
-               
-             end 
+              'FizzBuzz'
+            elsif @count % 3 == 0
+              'Fizz'
+            elsif @count % 5 == 0
+              'Buzz'
+            else
+              @count.to_s
+            end 
   end
 end
 
 
 clock = Barr::Blocks::Clock.new align: :r
-counter = FizzBuzz.new align: :l, bcolor: "#8CB8FF", fcolor: "#333333", icon: "\uf1ec", interval: 1
+counter = FizzBuzz.new align: :l, bgcolor: '#8CB8FF', fgcolor: '#333333', icon: "\uf1ec", interval: 1
 
 @man = Barr::Manager.new
 
-@man.add_block clock
-@man.add_block counter
+@man.add clock
+@man.add counter
 
-@man.run
+@man.run!

data/examples/i3_cpu_mem.rb

@@ -5,14 +5,17 @@ require 'barr'
 
 @man = Barr::Manager.new
 
-i3 = Barr::Blocks::I3.new icon: "\uf108", bcolor: "#114152", fcolor: "#DAC1DE", align: :l, focus_markers: ["\uf0a4",""]
-cpu = Barr::Blocks::Cpu.new icon: "\uf108 CPU:", bcolor: "#491A5E", align: :r
-mem = Barr::Blocks::Mem.new icon: "RAM:", align: :r, bcolor: "#2F113D"
-disk = Barr::Blocks::Hdd.new icon: "SSD:", align: :r, bcolor: "#380B4D", device: "sda2"
+i3 = Barr::Blocks::I3.new icon: "\uf108", bgcolor: '#114152', fgcolor: '#DAC1DE', align: :l, focus_markers: ["\uf0a4",'']
 
-@man.add_block i3
-@man.add_block cpu
-@man.add_block mem
-@man.add_block disk
+cpu = Barr::Blocks::CPU.new icon: "\uf108 CPU:", bgcolor: '#491A5E', align: :r
 
-@man.run
+mem = Barr::Blocks::Mem.new icon: 'RAM:', align: :r, bgcolor: '#2F113D'
+
+disk = Barr::Blocks::HDD.new icon: 'SSD:', align: :r, bgcolor: '#380B4D', device: 'sda2'
+
+@man.add i3
+@man.add cpu
+@man.add mem
+@man.add disk
+
+@man.run!

data/examples/rhythm.rb

@@ -5,15 +5,14 @@ require 'barr'
 
 @man = Barr::Manager.new
 
-artist = Barr::Blocks::Rhythmbox.new align: :l, show_title: false, show_buttons: false, bcolor: "#266623", icon: "\uf028"
-title = Barr::Blocks::Rhythmbox.new align: :l, show_artist: false, show_buttons: false, bcolor: "#0D450A"
-btns = Barr::Blocks::Rhythmbox.new align: :r, show_artist: false, show_title: false, bcolor: "#033B00", interval: 10000
+artist = Barr::Blocks::Rhythmbox.new align: :l, title: false, buttons: false, bgcolor: '#266623', icon: "\uf028"
 
+title = Barr::Blocks::Rhythmbox.new align: :l, artist: false, buttons: false, bgcolor: '#0D450A'
 
+btns = Barr::Blocks::Rhythmbox.new align: :r, artist: false, title: false, bgcolor: '#033B00', interval: 10000
 
-@man.add_block artist
-@man.add_block title
-@man.add_block btns
-
-@man.run
+@man.add artist
+@man.add title
+@man.add btns
 
+@man.run!

data/examples/time_and_date.rb

@@ -5,10 +5,10 @@ require 'barr'
 
 @man = Barr::Manager.new
 
-time = Barr::Blocks::Clock.new format: "%H:%M", icon: "\uf017", bcolor: "#114152", fcolor: "#DAC1DE", align: :l
-date = Barr::Blocks::Clock.new format: "%m of %b %Y", bcolor: "#570B7A", fcolor: "#FFFFFF", align: :r, icon: "\uf073"
+time = Barr::Blocks::Clock.new format: '%H:%M', icon: "\uf017", bgcolor: '#114152', fgcolor: '#DAC1DE', align: :l
+date = Barr::Blocks::Clock.new format: '%m of %b %Y', bgcolor: '#570B7A', fgcolor: '#FFFFFF', align: :r, icon: "\uf073"
 
-@man.add_block time
-@man.add_block date
+@man.add time
+@man.add date
 
-@man.run
+@man.run!

data/examples/two_temperatures.rb

@@ -5,20 +5,20 @@ require 'barr'
 
 @man = Barr::Manager.new
 
-nyc = Barr::Blocks::Temperature.new bcolor: "#42C7AA",
-                                    fcolor: "#FFF",
-                                    icon: "New York: ",
-                                    location: "2459115",
+nyc = Barr::Blocks::Temperature.new bgcolor: '#42C7AA',
+                                    fgcolor: '#FFF',
+                                    icon: 'New York: ',
+                                    location: '2459115',
                                     interval: 1800
 
-sanfran = Barr::Blocks::Temperature.new bcolor: "#92A084",
-                                        fcolor: "#FFF",
-                                        icon: "San Francisco: ",
-                                        location: "2487956",
+sanfran = Barr::Blocks::Temperature.new bgcolor: '#92A084',
+                                        fgcolor: '#FFF',
+                                        icon: 'San Francisco: ',
+                                        location: '2487956',
                                         align: :r,
                                         interval: 1800
 
-@man.add_block nyc
-@man.add_block sanfran
+@man.add nyc
+@man.add sanfran
 
-@man.run
+@man.run!

data/exe/barr_example

@@ -8,25 +8,25 @@ require 'barr'
 # The manager is responsible for organising the blocks and delivering their output to lemonbar 
 @manager = Barr::Manager.new
 
-# Add a 'WhoAmI' block. This just outputs logged in username
+# Add a 'Whoami' block. This just outputs logged in username
 # Give it a peach background, grey text and updates every 10000 seconds
 # It will be aligned to the left of the bar
-@manager.add_block Barr::Blocks::WhoAmI.new(bcolor: "#FFAAAA", fcolor: "#333333", interval: 10000)
+@manager.add_block Barr::Blocks::Whoami.new(bcolor: '#FFAAAA', fcolor: '#333333', interval: 10000)
 
 # Add a 'Clock' block.
 # Clocks can be formatted in the type strftime fashion. This example outputs the current Hour and Minute
 # It will update every second.
 # By default, the background text colour will be deferred to the Lemonbar config
 # If FontAwesome font is available to lemonbar, it will be prepended with a clock icon.
-@manager.add_block Barr::Blocks::Clock.new(icon: "\uf017", format: "%H:%M", align: :c, interval: 1)
+@manager.add_block Barr::Blocks::Clock.new(icon: "\uf017", format: '%H:%M', align: :c, interval: 1)
 
 
-# Add a 'Cpu' block. This shows the current CPU usage (averaged across all cores if present)
+# Add a 'CPU' block. This shows the current CPU usage (averaged across all cores if present)
 # It will be aligned to the right side of of the bar
 # As an interval is not provided, it will update every 5 seconds.
 # It will be prepended with the text 'Cpu:'
-@manager.add_block Barr::Blocks::Cpu.new(icon: "Cpu:", align: :r)
+@manager.add_block Barr::Blocks::CPU.new(icon: 'Cpu:', align: :r)
 
 
 # Tell the manager to run the loop. This will continue indefinitely, outputing the data ready to be piped in to lemonbar.
-@manager.run
+@manager.run!

data/exe/barr_i3ipc

@@ -4,6 +4,6 @@ require 'rubygems'
 require 'i3ipc'
 
 @i3 = I3Ipc::Connection.new
-cmd = ARGV.join(" ")
+cmd = ARGV.join(' ')
 @i3.command(cmd)
 @i3.close

data/lib/barr.rb

@@ -1,13 +1,16 @@
-require "barr/version"
-require "barr/manager"
-require "barr/block"
+require 'barr/version'
+require 'barr/manager'
+require 'barr/block'
 
-require 'weather-api'
-require 'i3ipc'
-
-Dir[File.dirname(__FILE__) + '/barr/blocks/*.rb'].each do |file|
-  require file
-end
+require 'barr/blocks/clock'
+require 'barr/blocks/cpu'
+require 'barr/blocks/hdd'
+require 'barr/blocks/i3'
+require 'barr/blocks/ip'
+require 'barr/blocks/mem'
+require 'barr/blocks/rhythmbox'
+require 'barr/blocks/temperature'
+require 'barr/blocks/whoami'
 
 module Barr
 end

data/lib/barr/block.rb

@@ -1,30 +1,55 @@
 module Barr
-  class Block                                        
-    attr_reader :output, :align, :fcolor, :bcolor, :interval, :icon                            
+  class Block
+    attr_reader :align, :bgcolor, :fgcolor, :icon, :interval, :output
+
+    def initialize(opts = {})
+      reassign_deprecated_option opts, :fcolor, :fgcolor
+      reassign_deprecated_option opts, :bcolor, :bgcolor
+      @align = opts[:align] || :l
+      @bgcolor = opts[:bgcolor] || '-'
+      @fgcolor = opts[:fgcolor] || '-'
+      @icon = opts[:icon] || ''
+      @interval = opts[:interval] || 5
+
+      @output = ''
+    end
+
+    def <<(str)
+      @output << str
+    end
+
+    def colors
+      "%{B#{bgcolor}}%{F#{fgcolor}}"
+    end
+
+    def draw
+      "#{colors} #{icon} #{@output} #{reset_colors}"
+    end
+
+    def destroy!
+    end
+    
+    def update!
+    end
+
+    # Backwards compatiblity methods.
+    # can't use alias/alias_method as they don't
+    # trickle down to subclasses 
+    def update; update!; end
+    def destroy; destroy!; end
     
+    def reassign_deprecated_option opts, old, new
+      if opts[new].nil? && !opts[old].nil?
+        STDERR.puts "Warning: the '#{old}' option will soon be deprecated in favour of '#{new}'. \n Please update your script."
+        opts[new] = opts[old]
+      end
+    end
+
+    private
+
+    def reset_colors
+      '%{F-}%{B-}'
+    end
 
-    def align; @align; end                           
-    def fcolor; @fcolor; end                         
-    def bcolor; @bcolor; end                         
-    def color_out; "%{B#{bcolor}}%{F#{fcolor}}"; end 
-    def interval; @interval; end                     
-    def icon; @icon; end                             
-                                                     
-    def update; @update = ""; end                            
-    def draw; "#{color_out} #{icon} #{@output} "; end
-    def destroy; true; end                           
-                                                     
-    def initialize(opts={})                          
-      @align = opts[:align] || :l                    
-      @fcolor = opts[:fcolor] || "-"           
-      @bcolor = opts[:bcolor] || "-"           
-      @interval = opts[:interval] || 5               
-      @icon = opts[:icon] || ""
-      @output = ""
-    end
-
-    def append_output str
-      @output += str
-    end
-  end                                                
+  end
 end

data/lib/barr/blocks/clock.rb

@@ -1,16 +1,18 @@
+require 'barr/block'
+
 module Barr
   module Blocks
     class Clock < Block
-      attr_reader :format
 
-      def initialize opts={}
+      def initialize(opts = {})
         super
-        @format = opts[:format] || "%H:%M %m %b %Y"
+        @format = opts[:format] || '%H:%M %d %b %Y'
       end
 
-      def update
+      def update!
         @output = Time.now.strftime(@format)
       end
+
     end
   end
 end