r3status 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bafcfeb5316e7a7e409f3a17553495aa16c245ba
-  data.tar.gz: 23b1bdd423b22a0477455529117a6ff345580a11
+  metadata.gz: b8a154a3255e9e8e5cdfe31306e1c98866379c8c
+  data.tar.gz: 6c40ceb70d47ed22db148730b9d7b53a0c258fb3
 SHA512:
-  metadata.gz: 617319555169430b21f652e533283527b259fad49d806bc11ac2bdf5543efb57187ebf350880640b3abe270aef48586f47208dd9deb0ef77f286de505295eca3
-  data.tar.gz: f3dc133d86ae42da95eb48d895f2ea1933265262dc561447cf33fb3a7e6939cc0102e182124169fe120dae54d5beccef8e06bd9d9ee1cfa674dc22cb45f66eee
+  metadata.gz: 5c120c143b1c4b60b19a061da45cbe5b30661a009882eec58ecf1722b371e03d5fa010cf97f23ea9868859e91a4d45406c5fa9bb8afda6747836c69e2170cf3c
+  data.tar.gz: 318fa6bea9e738df75e67c3ba040e8231d107974c9f069c66415e35bc63b17fbdb819de041dcf0ecda0e9f0610efe1565cd208ab1a4eeeff4bfa7891860c8b3c

data/lib/r3status.rb

@@ -74,9 +74,8 @@ module R3Status
     private
     # Generates a single transmission.
     def transmission
-      @blocks.map { |i| i.to_s(postfix: @postfix, prefix: 
-      @prefix) }.
-              reject { |i| i.nil? }.inject { |i, j| i << ",#{j}"}
+      @blocks.map { |i| i.to_s(postfix: @postfix, prefix: @prefix) }
+             .reject(&:nil?).inject { |i, j| i << ",#{j}"}
     end
     
     # Parses a single input from i3bar.
@@ -91,7 +90,14 @@ module R3Status
         return
       end
       
-      block = @blocks.find { |b| b.name == obj["name"] }
+      block = @blocks.map do |b| 
+        if b.respond_to? :blocks
+          b.blocks
+        else
+          b
+        end
+      end.flatten.find { |b| b.name == obj["name"] }
+      
       block.clicked(obj["button"], obj["x"], obj["y"]) unless block.nil?
     end
   end

data/lib/r3status/blocks.rb

@@ -14,6 +14,13 @@ require_relative './blocks/shell.rb'
 
 require_relative './blocks/async.rb'
 
+require_relative './blocks/memory.rb'
+
+require_relative './blocks/block_group.rb'
+
+require_relative './blocks/disk.rb'
+
+require_relative './blocks/playerctl.rb'
 module R3Status
   # Alias for Blocks::Base
   Block               = Blocks::Base

data/lib/r3status/blocks/base.rb

@@ -14,21 +14,26 @@ module R3Status::Blocks
     # The default format. Will be used if no format was supplied, or +nil+ was given.
     DEFAULT_FORMAT = '%{val}'
     
-    attr_accessor( 
-      :full_text,
-      :text_color,
-      :name,
-      :formats, 
-      :colors, 
-      :clicked_block
-    )
+    # The maximum length of the block's text. Longer texts will be truncated. Ignored if 0 or lower.
+    attr_accessor :max_length
+    # The block's current text. Might be overwritten by #update.
+    attr_accessor :full_text
+    # The block's current text color. Might be overwritten by #update.
+    attr_accessor :text_color
+    # The name of the block. Used for click handling. Will be assigned automatically if empty. 
+    attr_accessor :name
+    # A hash of formats to be used by the block.
+    attr_accessor :formats
+    # A hash of colors to be used by the block.
+    attr_accessor :colors
+    # A proc that will be invoked when the block is clicked.
+    attr_accessor :clicked_block
     
     # Creates a new instance of this class.
     # If a block is passed, it will be stored and yielded when the block is clicked.
     def initialize(**args, &block)
-      @colors ||= {}
-      @formats ||= Hash.new(DEFAULT_FORMAT)
-      
+      args = {colors: {}, formats: Hash.new(DEFAULT_FORMAT), max_length: 0}.merge(args)
+
       args.each do |k, v|
         v.default = v[:default] if (v.is_a? Hash) && (v.key? :default)
         send "#{k}=", v
@@ -37,6 +42,7 @@ module R3Status::Blocks
       @clicked_block = block
       @name ||= SecureRandom.uuid
       @full_text ||= format
+      formats.default ||= DEFAULT_FORMAT
     end
     
     # When implemented in derived classes, updates the text and color of this block.
@@ -47,16 +53,24 @@ module R3Status::Blocks
     # If a block was supplied to the constructor, it will be yielded.
     # button (Fixnum):: The mouse button that was used.
     # x, y (Fixnum / Float):: The pointer coordinates on the screen.
+    # 
+    # Returns true if the click is handled, false otherwise.
     def clicked(button, x, y)
-      return if @clicked_block.nil?
+      return false if @clicked_block.nil?
       args = [self, button, x, y].take(@clicked_block.arity)
       @clicked_block.(*args)
+      return true
     end
     
     # Returns the string representation of this block.
-    # prefix::
     def to_s(prefix: nil, postfix: nil)
-      %({"full_text": "#{prefix}#{full_text}#{postfix}", 
+      txt = if max_length > 0 && full_text.length > max_length
+        "#{prefix}#{full_text[0..(max_length - 2)]}…#{postfix}"
+      else
+        "#{prefix}#{full_text}#{postfix}"
+      end
+      
+      %({"full_text": "#{txt}", 
           "color": "#{text_color || DEFAULT_COLOR}", "name": "#{name}",
           "separator": false})
     end

data/lib/r3status/blocks/clock.rb

@@ -18,6 +18,7 @@ module R3Status::Blocks
     # Updates the text and color of this block.
     def update
       self.full_text = Time.now.strftime(formats[state])
+      self.text_color = colors[state]
     end
     
     # Returns the current state of the block

data/lib/r3status/blocks/keyboard_layout.rb

@@ -6,7 +6,7 @@ module R3Status::Blocks
   # as specified by the system. (e.g. +:us+ for US English, +:ru+ for Russian)
   #
   # ==== Format values
-  # +%{val}+, +%{sym}+: The current language symbol.
+  # 8 <tt>%{val}</tt>, <tt>%{sym}</tt>: The current language symbol.
   class KeyboardLayout < Base
     
     # Creates a new instance of this class.

data/lib/r3status/blocks/power.rb

@@ -5,7 +5,7 @@ module R3Status::Blocks
   #   :charging, :discharging, :full, :unknown, :no_battery
   #
   # ==== Format Values
-  # +%{val}+, +%{capacity}+: The current battery capacity.
+  # * <tt>%{val}</tt>, <tt>%{capacity}</tt>: The current battery capacity.
   class Power < Base
     # The path of the battery on the disk. Examples:
     #  * /sys/class/power_supply/BAT1/

data/lib/r3status/blocks/volume.rb

@@ -7,7 +7,7 @@ module R3Status::Blocks
   #   :muted, :unmuted
   #
   # ==== Format values
-  # +%{val}+, +%{volume}+: The current system volume.
+  # * <tt>+%{val}</tt>, <tt>%{volume}</tt>: The current system volume.
   class Volume < Base
     # The amount of volume (in percents) to change with scroll.
     attr_accessor :step

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r3status
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Gilad Naaman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,14 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: iconv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: vmstat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: r3status is ruby implmentation of the i3bar protocol, and is an alternative
   to the default i3status.
 email: gilad.doom@gmail.com
@@ -65,3 +93,4 @@ signing_key:
 specification_version: 4
 summary: i3status replacement written in ruby.
 test_files: []
+has_rdoc: