canals 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a051bf7606f3bf20a6727995d041bd4f255a0c72
-  data.tar.gz: d6f1405b54aa0fc4fe2c4b148d2adb30e325f9d0
+  metadata.gz: 3107607c509286a1c20f22603fb6f255e5dd7efc
+  data.tar.gz: ddecefb0c57a4603b045d57b9e72dcfc2be84d8c
 SHA512:
-  metadata.gz: 869dc7b20185f5836205c62ad2e7fa7a4093e21d6a94cc7bd8c9794906ede0a2d19625109c0d8ed2f07c100b2d52ec6ddfca2c0bb551d2a89e038d3e136a26f8
-  data.tar.gz: cb6560d16949056b16e085b48a890af7645312be6915d72ce13664a73c053ba743a377c348532690d1a324949b0e7a81fcf96c5c6fbcd98389d93d6b86c8bdaf
+  metadata.gz: a81dfea378befa22549c703250dd975fc63d6b47b8dcf02535189b29799d7ecd8799467f8f6c56075c9eac3ce43ca15213694f05d8b6b7784ff91b8279bc27f5
+  data.tar.gz: 556a129076478c4886c3225155b94eb85d983ec9c8821afa4f795495b098b490f5290b3010b139e98bc3648befc878ca40d87692af88f6bb1a86b5c986579155

data/lib/canals/cli/helpers.rb

@@ -35,6 +35,11 @@ module Canals
           end
         end
       end
+
+      # transform boolean into ✓ / ✗
+      def checkmark(bool)
+        bool ? "\u2713".encode('utf-8') : "\u2717".encode('utf-8')
+      end
     end
   end
 end

data/lib/canals/cli/session.rb

@@ -1,5 +1,6 @@
 require 'canals'
 require 'canals/cli/helpers'
+require 'canals/core_ext/shell_colors'
 require 'thor'
 
 
@@ -14,9 +15,11 @@ module Canals
         return if session_empty?
         require 'terminal-table'
         require 'canals/core_ext/string'
-        columns = ["pid", "name", "local_port", "socket"]
-        rows = Canals.session.map{ |s| columns.map{ |c| s[c.to_sym] || get_session_col_val(s, c) } }
-        table = Terminal::Table.new :headings => columns.map{|c| c.sub("_"," ").titleize }, :rows => rows
+        columns = ["up", "pid", "name", "local_port", "socket"]
+        rows = Canals.session.sort{ |a,b| a[:name] <=> b[:name] }
+                             .map { |s| columns.map{ |c| session_col_val(s, c) } }
+        table = Terminal::Table.new :headings => columns.map{|c| session_col_title(c) }, :rows => rows
+        table.align_column(3, :right)
         say table
       end
 
@@ -57,13 +60,41 @@ module Canals
           say "#{command} done.", :green
         end
 
-        def get_session_col_val(session, key)
-          case key
-          when "local_port"
-            entry = Canals.repository.get(session[:name])
-            return entry.local_port if entry
+        def session_color(session)
+          if session_alive(session)
+            :white
+          else
+            [:dark_gray, :dim]
           end
-          nil
+        end
+
+        def session_alive(session)
+          @alive ||= {}
+          pid = session[:pid]
+          @alive[pid] ||= Canals.session.alive? pid
+        end
+
+        def session_col_title(col)
+          case col
+          when "pid"
+            "PID"
+          else
+            col.sub("_", " ").titleize
+          end
+        end
+
+        def session_col_val(session, key)
+          c = session_color(session)
+          val = case key
+                when "local_port"
+                  entry = Canals.repository.get(session[:name])
+                  entry.local_port if entry
+                when "up"
+                  checkmark(session_alive(session))
+                else
+                  session[key.to_sym]
+                end
+          set_color(val, *c)
         end
 
         def session_empty?

data/lib/canals/session.rb

@@ -40,6 +40,11 @@ module Canals
       end
     end
 
+    def alive?(session_id)
+      sess = get(session_id)
+      File.exist?(sess[:socket])
+    end
+
     def save!
       FileUtils.mkdir_p(session_file.dirname)
       File.open(session_file, 'w') do |file|

data/lib/canals/version.rb

@@ -1,6 +1,6 @@
 module Canals
 
   # Canals gem current version
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canals
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Ido Abramovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor