hardstatus 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573b9cf310275c4edd2fc8e5f68ac1f3e1bb96d7
-  data.tar.gz: 7a6bc21f0b9b9b3e93b4b6e16ce72bdfd5484c73
+  metadata.gz: 14fc6fbb716b65ee97a981108320fa02097de872
+  data.tar.gz: 4db2b18accb34ff7a05601ff40f2c98d1bfa5042
 SHA512:
-  metadata.gz: 73706e6604dd64f6e9b9771d54ff511d3995c4014ca360edd1227f96e873c9bcba54fa3d1016f48c851ade6abf12a53caebce7ca5b229f562550475b0b19e333
-  data.tar.gz: 3f43737450231c0c0504f9e6578ad360f86a5915c0626fb9f2e1ecd2d20a19e79db97b2df16527aba34a30c5789e7fe530193588c307eef1f894e4b0ec3592f7
+  metadata.gz: a31cf21118c9d73294737a941cd7edf1741f09215eed0142cdbe51d9b6eb0007c578424ea3b4a26a490d44a28853e9beced0ec8e560817abda6a08bcd1fdb0b9
+  data.tar.gz: 78f09ebcd17bbe07a1b23f2ad7383df47065b48f3295e693199dc652481033fe8959ecea8f75664e88fea5d0159eaf1b4224c5463d12fdfb5ac58a49649f8ac2

data/README.md

@@ -26,13 +26,17 @@ Example
 -------
 
 ```ruby
+require 'json'
+require 'socket'
+require 'timeout'
+
 right '#{irssi}#{email}#{hackers}#{processor}#{temperature}#{wireless}#{battery}'
 
 def wrap (string)
 	"\005{= r}[\005{+b W}#{string}\005{= dr}] "
 end
 
-backtick :irssi, every: 1.second do
+backtick :irssi, every: second do
 	notifications = File.read(File.expand_path('~/.irssi/notifications')).gsub(':', '@').split(/, /)
 
 	unless notifications.empty?
@@ -42,11 +46,7 @@ backtick :irssi, every: 1.second do
 	end
 end
 
-require 'json'
-require 'socket'
-require 'timeout'
-
-backtick :email, every: 3.second do
+backtick :email, every: second do
 	socket = TCPSocket.new('localhost', '9001')
 	socket.puts '* list unread'
 
@@ -101,8 +101,8 @@ backtick :battery, every: 5.seconds do
 
 	current = state.match(/([^\s]+%.*)$/)[1].sub(/, /, "\005{-b r}|\005{+b W}")
 
-	if state.match(/discharging/)
-		wrap "v|\005{+b W}#{current}"
+	if state.match(/discharging/i)
+		wrap "\005{-b r}v|\005{+b W}#{current}"
 	else
 		wrap "^\005{-b r}|\005{+b W}#{current}"
 	end

data/ext/hardstatus.c

@@ -26,6 +26,9 @@ main (int argc, char* argv[])
 		path    = argv[1];
 		command = argv[2];
 	}
+	else {
+		return EXIT_FAILURE;
+	}
 
 	if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
 		perror("socket error");
@@ -47,5 +50,5 @@ main (int argc, char* argv[])
 	recv(fd, buf, 4096, 0);
 	printf("%s", buf);
 
-  return 0;
+  return EXIT_SUCCESS;
 }

data/hardstatus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new {|s|
 	s.name         = 'hardstatus'
-	s.version      = '0.0.1'
+	s.version      = '0.0.2'
 	s.author       = 'meh.'
 	s.email        = 'meh@schizofreni.co'
 	s.homepage     = 'http://github.com/meh/hardstatus'

data/lib/hardstatus.rb

@@ -24,6 +24,9 @@ class Hardstatus
 	def initialize
 		@backticks = {}
 		@controller = File.expand_path('~/.hardstatus.ctl')
+
+		@left  = ""
+		@right = ""
 	end
 
 	def load (path = nil, &block)
@@ -81,13 +84,10 @@ class Hardstatus
 	end
 
 	def render (side)
-		template = case side
-		             when :left  then @left || ""
-		             when :right then @right || ""
-		           end
-
-		template.gsub(/\#{.*?}/) { |m|
-			@backticks[m.match(/\#{(.*?)}/)[1].to_sym].value!.to_s
+		instance_variable_get(:"@#{side}").gsub(/\#{.*?}/) { |m|
+			if backtick = @backticks[m.match(/\#{(.*?)}/)[1].to_sym]
+				backtick.value!.to_s
+			end
 		}
 	end
 end

data/lib/hardstatus/controller.rb

@@ -18,7 +18,11 @@ class Controller < EventMachine::Protocols::LineAndTextProtocol
 	end
 
 	def receive_line (line)
-		send_line @hardstatus.render(line.strip.to_sym)
+		send_line begin
+			@hardstatus.render(line.strip.to_sym)
+		rescue Exception => e
+			e.inspect
+		end
 
 		close_connection_after_writing
 	end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: hardstatus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - meh.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -62,18 +62,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Hardstatus helpers for screen, because tmux just does not cut it for me.
 test_files: []
+has_rdoc: