r3status 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a0f7b146cec610563175f09c27651110f1cc009
-  data.tar.gz: 1ff0569ec99476d1c1e1f7be73dd85fb274cd264
+  metadata.gz: 5c2c2e2a5985350fdd7009f16224f8d0ce2aa225
+  data.tar.gz: cdfe3f6a14611a3159ff9c362809e77fe62e224c
 SHA512:
-  metadata.gz: ebe6cdeb3ce62d85c12777276c336bd21fa1d237cb2bb287e92d341c762f770b0d9a12baf212a7200ef1cd8c155a54dd6d55017d45a9befc67f51c46a3c81465
-  data.tar.gz: aec9b989dd1df12877ddcd254959f5f40ef1f0c621304ff111d6f262684b4006960b3863f05048b390b3164e050153c4f14c8376edbcff7561fb4f9d8da7e245
+  metadata.gz: 6671a6a365fff74396378124de0da333ecf9bec77a1f78fed5fdf54bbf3e70ac79a2662d211814d31eb83ef34f3943d69dff37e5d3e6e25dd4d9d939bea149e3
+  data.tar.gz: 6ee838c35dd8b83b2900eff0cdd522d1a9e3cb239e4e389869978459c643840abb0afee8ae2dd01379d47c5fad2a755386658fa1acef1ca530109a337a2a27c4

data/lib/r3status.rb

@@ -2,6 +2,7 @@ require_relative './r3status/blocks.rb'
 require 'json'
 
 module R3Status
+
   def loop_with_interval secs
     loop do
       start = Time.now
@@ -29,28 +30,37 @@ module R3Status
       @blocks.map { |i| i.to_s(postfix: @postfix, prefix: @prefix) }.
               reject { |i| i.nil? }.inject { |i, j| i << ",#{j}"}
     end
+    
     def parse str
       return if str.length < 2
       obj = nil
+      str = str.strip.sub(/\A\,/ , "")
       
-      str = str.sub(/\A\,/ , "")
-      File.open("input.txt", 'a') {|f| f.puts str }
       begin
         obj = JSON.parse(str)
       rescue Exception => e
-        File.open("log.txt", 'a') {|f| f.puts e.to_s }
         return
       end
+      
       block = @blocks.find { |b| b.name == obj["name"] }
       block.clicked(obj["button"], obj["x"], obj["y"]) unless block.nil?
     end
-    def run
     
-      fork do
+    def run
+      @reader_thread = Thread.new do
+        begin
         loop do
           s = gets.chomp
           parse s
         end
+        rescue Exception => e
+          File.open("log.txt", 'a') {|f| f.puts e.backtrace }
+        end
+      end.run
+      
+      at_exit do
+        @reader_thread.kill
+        @blocks.each { |b| b.terminate }
       end
       
       puts "{\"version\":1, \"click_events\":true}["
@@ -58,6 +68,7 @@ module R3Status
         @blocks.each {|b| b.update }
         puts "[#{transmission}],"
       end
+      
     end
   end
 end

data/lib/r3status/async_block.rb

@@ -0,0 +1,24 @@
+module R3Status
+  class AsyncBlock < Block
+    attr_accessor :update_interval, :updater_thread
+    
+    def initialize(**args)
+      args = {update_interval: 3}.merge(args)
+      super(args)
+    end
+    
+    def update
+      @full_text
+      return if @updater_pid.is_a? Fixnum
+      @updater_thread = Thread.new do
+        loop_with_interval(update_interval) { async_update }
+      end
+    end
+    
+    def terminate
+      @updater_thread.kill
+    end
+    
+    def async_update; end
+  end
+end

data/lib/r3status/block.rb

@@ -6,16 +6,18 @@ module R3Status
     attr_accessor :full_text, :text_color, :name, :formats, :colors
     
     def initialize(**args)
+      self.colors ||= {}
+      self.formats ||= Hash.new(DEFAULT_FORMAT)
       args.each do |k, v|
         v.default = v[:default] if (v.is_a? Hash) && (v.key? :default)
         send "#{k}=", v
       end
-      
-      self.colors ||= {}
-      self.formats ||= Hash.new(DEFAULT_FORMAT)
     end
     
     def update; end
+     
+    def terminate; end
+     
     def clicked(button, x, y); end
     
     def to_s(prefix: nil, postfix: nil)
@@ -24,5 +26,12 @@ module R3Status
           "separator": false})
     end
     
+    def format
+      formats.default 
+    end
+    
+    def format=(fmt)
+      @formats.default = fmt 
+    end
   end
 end

data/lib/r3status/blocks.rb

@@ -9,3 +9,7 @@ require_relative './volume_block.rb'
 require_relative './battery_block.rb'
 
 require_relative './keyboard_layout_block.rb'
+
+require_relative './shell_block.rb'
+
+require_relative './async_block.rb'

data/lib/r3status/shell_block.rb

@@ -0,0 +1,32 @@
+module R3Status
+  class ShellBlock < StaticBlock
+    attr_accessor :command, :click_commands
+    
+    def initialize(**args, &block)
+      super(args, &block)
+    end
+    
+    def update
+      return if command.nil?
+      
+      cmd = `#{command}`.split.map {|str| str.chomp}
+      return if cmd.length == 0
+      
+      @full_text = cmd[0]
+      @text_color = cmd[1] if cmd.length >= 2
+    end
+    
+    def clicked(button, x, y)
+      super(button, x, y)
+      
+      case click_commands.class
+      when String
+        `#{click_commands}`
+      when Array
+        `#{click_commands[button - 1]}`
+      when Hash
+        `#{click_commands[button]}`
+      end
+    end
+  end
+end

data/lib/r3status/static_block.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module R3Status
   class StaticBlock < Block
     attr_accessor :clicked_block
@@ -6,12 +8,15 @@ module R3Status
       @clicked_block = block
       
       super(args)
+      
+      @full_text ||= format
+      @name ||= SecureRandom.uuid
     end
     
     def clicked(button, x, y)
-      return if clicked_block.nil?
-      args = [self, button, x, y].take(clicked_block.arity)
-      clicked_block.call(*args)
+      return if @clicked_block.nil?
+      args = [self, button, x, y].take(@clicked_block.arity)
+      @clicked_block.(*args)
     end
   end
 end

data/lib/r3status/time_block.rb

@@ -1,12 +1,11 @@
 module R3Status
   class TimeBlock < Block
-    attr_accessor :format
     
-    def initialize(format: "%H:%m @ %e/%M/%Y", **args)
-      @format = format
-      
-      super()
+    def initialize(**args)
+      args = {format: "%H:%m @ %e/%M/%Y"}.merge(args)
+      super(args)
     end
+    
     def update
       self.full_text = Time.now.strftime(format)
     end

data/lib/r3status/volume_block.rb

@@ -1,6 +1,6 @@
 module R3Status
   class VolumeBlock < Block
-    attr_accessor :format, :format_muted, :default_color, :color_muted, :step
+    attr_accessor :step
     
     def initialize(**args)
       args = {formats: {muted: " %{volume}%", unmuted: " %{volume}%"},
@@ -19,11 +19,11 @@ module R3Status
     
     def clicked button, x, y
       case button
-      when 1, 4
+      when 4
         increase
       when 2
         toggle_mute
-      when 3, 5
+      when 5
         decrease
       end
     end
@@ -33,10 +33,10 @@ module R3Status
       `amixer -q set Master toggle`
     end
     def increase
-      `amixer -c 0 set Master #{step}+ unmute`
+      `amixer -c 0 set Master #{step}%+ unmute`
     end
     def decrease
-      `amixer -c 0 set Master #{step}- unmute`
+      `amixer -c 0 set Master #{step}%- unmute`
     end
     def volume
       `amixer -c 0 get Master | grep Mono: | cut -d " " -f6 | tr -d [,],%`.to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r3status
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Gilad Naaman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies: []
 description: r3status is ruby implmentation of the i3bar protocol, and is an alternative
   to the default i3status.
@@ -18,14 +18,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/r3status.rb
+- lib/r3status/async_block.rb
 - lib/r3status/battery_block.rb
 - lib/r3status/block.rb
 - lib/r3status/blocks.rb
 - lib/r3status/keyboard_layout_block.rb
+- lib/r3status/shell_block.rb
 - lib/r3status/static_block.rb
 - lib/r3status/time_block.rb
 - lib/r3status/volume_block.rb
-homepage: https://rubygems.org/gems/example
+homepage: https://github.com/Gilnaa/R3Status
 licenses:
 - LGPL3
 metadata: {}