barr 0.1.2 → 0.2.0

data/lib/barr/blocks/cpu.rb

@@ -1,9 +1,23 @@
+require 'barr/block'
+
 module Barr
   module Blocks
-    class Cpu < Block 
-      def update
-        @output = `top -bn1 | grep load | awk '{print $(NF-2)+$(NF-1)+$(NF)}'`.chomp + "%"
+    class CPU < Block
+
+      def update!
+        idle = sys_cmd.scan(/(\d{1,3}\.\d) id/).flatten.first.to_f
+
+        @output = "#{(100 - idle).round(1)}%"
       end
+
+      private
+
+      def sys_cmd
+        `top -bn1 | grep 'Cpu(s)'`.chomp
+      end
+
     end
+
+    Cpu = CPU
   end
 end

data/lib/barr/blocks/hdd.rb

@@ -1,21 +1,29 @@
+require 'barr/block'
+
 module Barr
   module Blocks
-    class Hdd < Block
-      attr_reader :device
-      def initialize opts={}
+    class HDD < Block
+
+      def initialize(opts = {})
         super
+
         @device = opts[:device]
       end
 
-      def update
-        total, used, perc = sys_cmd.chomp.split(" ")
-        @output = "#{used} / #{total} (#{perc})"                                                              
+      def update!
+        total, used, perc = sys_cmd.split(' ')
+
+        @output = "#{used} / #{total} (#{perc})"
       end
 
+      private
+
       def sys_cmd
-        `df -h | grep #{@device} | awk '{printf "%s %s %s", $2, $3, $5}'`
+        `df -h | grep #{@device} | awk '{printf "%s %s %s", $2, $3, $5}'`.chomp
       end
+
     end
 
+    Hdd = HDD
   end
 end

data/lib/barr/blocks/i3.rb

@@ -1,15 +1,20 @@
+require 'i3ipc'
+require 'barr/block'
+
 module Barr
   module Blocks
-
     class I3 < Block
+
       attr_reader :focus_markers, :i3, :workspaces
-      def initialize opts={}
+
+      def initialize(opts = {})
         super
-        @focus_markers = opts[:focus_markers] || [">", "<"]
+
+        @focus_markers = opts[:focus_markers] || %w(> <)
         @i3 = i3_connection
       end
 
-      def update
+      def update!
         @workspaces = @i3.workspaces.map do |wsp|
           if wsp.focused
             "#{l_marker}#{wsp.name}#{r_marker}"
@@ -17,10 +22,11 @@ module Barr
             "%{A:barr_i3ipc workspace #{wsp.num}:} #{wsp.name} %{A}"
           end
         end
-        @output = @workspaces.join("")
+
+        @output = @workspaces.join('')
       end
 
-      def destroy
+      def destroy!
         @i3.close
       end
 
@@ -28,6 +34,8 @@ module Barr
         I3Ipc::Connection.new
       end
 
+      private
+
       def l_marker
         @focus_markers[0]
       end
@@ -35,6 +43,7 @@ module Barr
       def r_marker
         @focus_markers[1]
       end
+
     end
   end
 end

data/lib/barr/blocks/ip.rb

@@ -1,24 +1,29 @@
+require 'barr/block'
+
 module Barr
   module Blocks
-    class Ip < Block
+    class IP < Block
 
       attr_reader :device
-      
-      def initialize opts={}
+
+      def initialize(opts = {})
         super
-        @device = opts[:device] || "192"
+        @device = opts[:device] || 'lo'
+        @version = opts[:ipv6] ? 'inet6' : 'inet'
       end
 
-      def update
-        ip, dev = sys_cmd.chomp.split(" ")
-        ip = ip.split("/")[0]                                                                             
-        
-        @output = "#{dev} > #{ip}"                                                                        
+      def update!
+        ip = sys_cmd.split('/').first
+
+        @output = "#{@device} > #{ip}"
       end
-      
+
+      private
+
       def sys_cmd
-        `ip addr | grep #{@device} | tail -n1 | awk '{printf "%s %s", $2, $8}'`
+        `ip addr show #{@device} | grep '#{@version}\s' | awk '{print $2}'`.chomp
       end
     end
+    Ip = IP
   end
 end

data/lib/barr/blocks/mem.rb

@@ -1,13 +1,17 @@
+require 'barr/block'
+
 module Barr
   module Blocks
     class Mem < Block
 
-      def update
-        @output = sys_cmd.chomp
+      def update!
+        @output = sys_cmd
       end
 
+      private
+
       def sys_cmd
-        `free -m | grep Mem | awk '{printf "%sM / %sM", $3, $2}'`
+        `free -h | grep 'cache:' | awk '{printf "%s / %sG", $(NF-1), $(NF-1)+$(NF)}'`.chomp
       end
     end
   end

data/lib/barr/blocks/rhythmbox.rb

@@ -0,0 +1,65 @@
+require 'barr/block'
+
+module Barr
+  module Blocks
+    class Rhythmbox < Block
+      attr_reader :view_opts
+
+      def initialize(opts = {})
+        super
+        reassign_deprecated_option opts, :show_artist, :artist
+        reassign_deprecated_option opts, :show_title, :title
+        reassign_deprecated_option opts, :show_buttons, :buttons
+
+        @view_opts = {
+          artist:   opts[:artist].nil? || opts[:artist],
+          buttons: opts[:buttons].nil? || opts[:buttons],
+          title: opts[:title].nil? || opts[:title]
+        }
+      end
+
+      def update!
+        op = []
+
+        if @view_opts[:artist] || @view_opts[:title]
+          if(running?)
+            info = sys_cmd.split(' - ')
+
+            if @view_opts[:artist] && @view_opts[:title]
+              op << info.join(' - ')
+            elsif @view_opts[:artist]
+              op << info[0]
+            elsif @view_opts[:title]
+              op << info[1]
+            end
+          else
+            op << 'None'
+          end
+        end
+
+        op << buttons if @view_opts[:buttons]
+
+        @output = op.join(' ')
+
+      end
+
+      def running?
+        `pgrep rhythmbox`.chomp.length != 0
+      end
+
+      def buttons
+        [
+          "%{A:rhythmbox-client --previous:}\uf048%{A}",
+          "%{A:rhythmbox-client --play-pause:}\uf04b%{A}",
+          "%{A:rhythmbox-client --next:}\uf051%{A}"
+        ].join(' ').freeze
+      end
+
+      private
+
+      def sys_cmd
+        `rhythmbox-client --print-playing`.chomp
+      end
+    end
+  end
+end

data/lib/barr/blocks/temperature.rb

@@ -1,26 +1,35 @@
 # coding: utf-8
+require 'weather-api'
+require 'barr/block'
+
 module Barr
   module Blocks
     class Temperature < Block
-      attr_reader :location, :unit
 
-      def initialize opts={}
+      attr_reader :location
+
+      def initialize(opts = {})
         super
+
         @location = opts[:location]
-        @unit = opts[:unit] || "C"
+        @unit = opts[:unit] || 'C'
       end
 
-      def update
-        res = weather_data
-        temp = (@unit == 'C' ? ((res.condition.temp.to_i-32)*(5/9.0)).round : res.condition.temp)
-        action = "xdg-open weather.yahoo.com\/country\/state\/city-#{@location}\/".chomp
-        @output = "%{A:#{action}:}#{temp}°#{@unit} #{res.condition.text}%{A}"
+      def update!
+        action = "xdg-open weather.yahoo.com\/country\/state\/city-#{@location}\/"
+        @output = "%{A:#{action}:}#{weather.condition.temp}°#{@unit} #{weather.condition.text}%{A}"
       end
 
-      def weather_data
-        Weather.lookup(@location, Weather::Units::FAHRENHEIT)
+      private
+
+      def weather
+        Weather.lookup(@location, weather_units)
       end
-      
+
+      def weather_units
+        @unit == 'F' ? Weather::Units::FAHRENHEIT : Weather::Units::CELSIUS
+      end
+
     end
   end
 end

data/lib/barr/blocks/whoami.rb

@@ -0,0 +1,25 @@
+require 'barr/block'
+
+module Barr
+  module Blocks
+    class Whoami < Block
+
+      def initialize(opts = {})
+        super
+      end
+
+      def update!
+        @output = sys_cmd
+      end
+
+      private
+
+      def sys_cmd
+        `whoami`.chomp
+      end
+
+    end
+
+    WhoAmI = Whoami
+  end
+end

data/lib/barr/manager.rb

@@ -1,63 +1,76 @@
+require 'barr/block'
+
 module Barr
   class Manager
+
+    ERROR_ICON = "%{F#FF0000}\uf071%{F-}"
+
     attr_reader :count, :blocks
-    ERROR_ICON = "%{F#FF0000}\uf071"
+
     def initialize
       @count = 0
       @blocks = []
     end
 
-    def update
-      # STDERR.puts "update"
-      @blocks.each do |block|
-        begin
-          block.update if @count == 0 || @count%block.interval==0
-        rescue StandardError => e
-          STDERR.puts e.message
-          block.append_output(ERROR_ICON) unless block.output.include?(ERROR_ICON)
-          next
-        end
-      end
-      @count += 1
+    def add(block)
+      @blocks << block
+    end
+
+    def destroy!
+      @blocks.each(&:destroy!)
     end
 
     def draw
-      # STDERR.puts "draw"
-      outputs = { l: [], c: [], r: []}
+      outputs = { l: [], c: [], r: [] }
 
       @blocks.each do |block|
-        outputs[block.align]  << block.draw 
+        outputs[block.align] << block.draw
       end
 
-      opl = outputs[:l].join(" ")
-      opc = outputs[:c].join(" ")
-      opr = outputs[:r].join(" ")
-
-      bar_render = ""
-      bar_render += "%{l}#{opl} %{F-}%{B-}"  if opl.length > 0
-      bar_render += "%{c} #{opc} %{F-}%{B-}" if opc.length > 0
-      bar_render += "%{r} #{opr}%{F-}%{B-}" if opr.length > 0
-      bar_render.gsub!("\n","")
+      left_blocks = outputs[:l].join ''
+      centre_blocks = outputs[:c].join ''
+      right_blocks = outputs[:r].join ''
 
-      system("echo", "-e", bar_render.encode("UTF-8"))
-      # STDERR.puts bar_render
-    end
+      bar_render = ''
+      bar_render << "%{l}#{left_blocks} " if left_blocks.length > 0
+      bar_render << "%{c} #{centre_blocks} " if centre_blocks.length > 0
+      bar_render << "%{r} #{right_blocks}" if right_blocks.length > 0
 
-    def destroy
-      @blocks.each(&:destroy)
-    end
+      bar_render.gsub! "\n", ''
 
-    def add_block block
-      @blocks << block
+      system('echo', '-e', bar_render.encode('UTF-8'))
     end
 
-    def run
+    def run!
       while true
-        # STDERR.puts "hello?"
-        self.update
+        self.update!
         self.draw
         sleep 1
       end
     end
+
+    def update!
+      @blocks.each do |block|
+        begin
+          block.update! if @count == 0 || (@count % block.interval == 0)
+        rescue StandardError => e
+          STDERR.puts e.message
+          block << ERROR_ICON unless block.output.include?(ERROR_ICON)
+          next
+        end
+      end
+
+      @count += 1
+    end
+    
+    # compatibility methods.
+    # alias_method would work here, but for consistency with Block
+    # I'll define them this way
+
+    def update; update!; end
+    def run; run!; end
+    def destroy; destroy!; end
+    def add_block(block); add(block); end
+
   end
 end

data/lib/barr/version.rb

@@ -1,3 +1,3 @@
 module Barr
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Dave Russell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: i3ipc
   requirement: !ruby/object:Gem::Requirement
@@ -118,9 +132,9 @@ files:
 - lib/barr/blocks/i3.rb
 - lib/barr/blocks/ip.rb
 - lib/barr/blocks/mem.rb
-- lib/barr/blocks/rhythm_box.rb
+- lib/barr/blocks/rhythmbox.rb
 - lib/barr/blocks/temperature.rb
-- lib/barr/blocks/who_am_i.rb
+- lib/barr/blocks/whoami.rb
 - lib/barr/manager.rb
 - lib/barr/version.rb
 homepage: https://github.com/OkayDave/barr
@@ -150,5 +164,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Barr is a status line generate for use with Lemonbar
+summary: Barr is a status line generator for use with Lemonbar
 test_files: []