wassup 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f87d844cff97f244776ec05d7047073141d88d6cdd7e0e080eda481e122b25c8
-  data.tar.gz: 32972375b4b106dbd57f9cda2dd746f6ccd301ee06320599703c2f6e0f66b71a
+  metadata.gz: e0460f6c9734dcfa48fe6d0561d1de6d5c81d1d49a6f8f6e89cfe8dbb54bb78a
+  data.tar.gz: f017aea6ab05afe32a5c21ba470f4aa82400d08a54d666172596c27c9f74659c
 SHA512:
-  metadata.gz: 2910d981fb3626748f48827bb4920d0de6d55f98adeb856d04f454e5bc781adca950ca58999714f55cb147e67f6256a5dbab366fe5f2d707314a5d1fa6ca58da
-  data.tar.gz: 817a8a4d02b25094287c1357083f9e1814f9ffba920e1691e9284a9680a04963f9ff8745099e9662472fd56e117f808577cbf662f564e1874f6ceef9f46376bc
+  metadata.gz: 0a4d4e533f3519c77053a5388a00ad584b84203ae18926e7a105a05a72bbe27b68fac844c22ec152baa394b1dcdf1aafc6ae30bbe1b51c80f6a415baf70540c0
+  data.tar.gz: 447c01199ef5ee734f9836d30d1ee7fe24fdf01d6652b7499d1c053f4903cfba6e63ee979b26122b44b3ef0ba4c213a2ae0f9dc196effe3537d5cf00a2ef9bb7

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [joshdholtz]

data/README.md

@@ -1,8 +1,42 @@
 # Wassup
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/wassup`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+A scriptable terminal dashboard
+
+
+https://user-images.githubusercontent.com/401294/144465499-a8903d4c-f003-4550-b47c-f70c17cc02d8.mov
+
+## Example `Supfile`
+
+```rb
+require 'json'
+require 'rest-client'
+
+add_pane do |pane|                                                                                                   
+  pane.height = 0.5                                                                                                  
+  pane.width = 00.5                                                                                                   
+  pane.top = 0                                                                                                   
+  pane.left = 0
+
+  pane.highlight = true
+  pane.title = "Open PRs - fastlane/fastlane"
+
+  pane.interval = 60 * 5
+  pane.content do
+    resp = RestClient.get "https://api.github.com/repos/fastlane/fastlane/pulls"
+    json = JSON.parse(resp)
+    json.map do |pr|
+      display = "##{pr["number"]} pr["title"]"
+      
+      # First element is displayed
+      # Second element is passed to pane.selection
+      [display, pr["html_url"]]   
+    end
+  end
+  pane.selection do |url|
+    `open #{url}`
+  end
+end
+```
 
 ## Installation
 

data/examples/basic/Supfile

@@ -0,0 +1,28 @@
+require 'json'
+require 'rest-client'
+
+add_pane do |pane|
+  pane.height = 0.5
+  pane.width = 0.5
+  pane.top = 0
+  pane.left = 0
+
+  pane.highlight = true
+  pane.title = "Open PRs - fastlane/fastlane"
+
+  pane.interval = 60 * 5
+  pane.content do
+    resp = RestClient.get "https://api.github.com/repos/fastlane/fastlane/pulls"
+    json = JSON.parse(resp)
+    json.map do |pr|
+      display = "##{pr["number"]} #{pr["title"]}"
+      
+      # First element is displayed
+      # Second element is passed to pane.selection
+      [display, pr["html_url"]]   
+    end
+  end
+  pane.selection do |url|
+    `open #{url}`
+  end
+end

data/examples/debug/Supfile

@@ -0,0 +1,54 @@
+add_pane do |pane|
+  pane.height = 0.25
+  pane.width = 0.25
+  pane.top = 0
+  pane.left = 0
+
+  pane.highlight = false
+  pane.title = "Time Update - Every Second"
+
+  pane.interval = 1
+  pane.content do
+    [
+      `date`
+    ]
+  end
+end
+
+add_pane do |pane|
+  pane.height = 0.25
+  pane.width = 0.25
+  pane.top = 0.25
+  pane.left = 0
+
+  pane.highlight = false
+  pane.title = "Time Update - Every 5 Seconds"
+
+  pane.interval = 5
+  pane.content do
+    [
+      `date`
+    ]
+  end
+end
+
+add_pane do |pane|
+  pane.height = 0.25
+  pane.width = 0.35
+  pane.top = 0
+  pane.left = 0.25
+
+  pane.highlight = false
+  pane.title = "Maybe Error - Every 10 Seconds"
+
+  pane.interval = 10
+  pane.content do
+    if [true, false].sample
+      raise "An error occured! Oh no!"
+    end
+
+    [
+      "[fg=cyan]No error occured[fg=white]"
+    ]
+  end
+end

data/examples/josh-fastlane/README.md

@@ -0,0 +1,14 @@
+# Josh's _fastlane_ Example
+
+## Purpose
+I need to view a lot of different _fastlane_ things at one glance between _fastlane_'s two organizations:
+- https://github.com/fastlane
+- https://github.com/fastlane-community
+
+I mainly need to watch PRs on https://github.com/fastlane/fastlane/ but also all PRs from all the repos in https://github.com/fastlane-community
+
+I also like to see some stats on PR count (and eventually issues and hot/trending issues)
+
+It's also nice to have a quick glace of CircleCI jobs
+
+![Demo](/examples/josh-fastlane/demo.png)

data/examples/josh-fastlane/Supfile

@@ -3,6 +3,8 @@ require 'rest-client'
 require 'json'
 require 'colorize'
 
+require 'curses'
+
 fastlane_community_prs = []
 fastlane_prs = []
 
@@ -135,17 +137,32 @@ add_pane do |pane|
       workflow = json["items"].first
       status = workflow["status"]
 
-      ["#{number} (#{status}) by #{login} - #{message}", workflow]
+      if status == "failed"
+        status = "[fg=red]#{status}[fg=white]"
+      elsif status == "success"
+        status = "[fg=green]#{status}[fg=white]"
+      else
+        status = "[fg=yellow]#{status}[fg=white]"
+      end
+
+      ["#{number} (#{status}) by #{login} - #{message}", [item, workflow]]
     end
   end
   pane.selection do |data|
-    slug = data["project_slug"]
-    pipeline_number = data["pipeline_number"]
-    workflow_id = data["id"]
+    workflow = data[1]
+
+    slug = workflow["project_slug"]
+    pipeline_number = workflow["pipeline_number"]
+    workflow_id = workflow["id"]
 
     url = "https://app.circleci.com/pipelines/#{slug}/#{pipeline_number}/workflows/#{workflow_id}"
     `open #{url}`
   end
+  pane.selection('o') do |data|
+    pipeline = data[0]
+    url = pipeline["vcs"]["review_url"]
+    `open #{url}`
+  end
 end
 
 #
@@ -196,7 +213,7 @@ add_pane do |pane|
         days = (Time.now - date).to_i / (24 * 60 * 60)
         days_formatted = '%3.3s' % days.to_s
 
-        ["#{number_formatted} #{days_formatted}d ago #{title}",pr]
+        ["[fg=yellow]#{number_formatted}[fg=cyan] #{days_formatted}d ago[fg=white] #{title}",pr]
       end
 
       {
@@ -247,7 +264,7 @@ add_pane do |pane|
       days = (Time.now - date).to_i / (24 * 60 * 60)
       days_formatted = '%3.3s' % days.to_s
 
-      ["##{number} #{days_formatted}d ago #{title}",pr]
+      ["[fg=yellow]##{number}[fg=cyan] #{days_formatted}d ago[fg=white] #{title}",pr]
     end
   end
   pane.selection do |data|

data/lib/wassup/app.rb

@@ -10,10 +10,12 @@ module Wassup
 
       Curses.stdscr.scrollok true
 
-      Curses.init_pair(1, 15, 0) #white foreground, black background
-      Curses.init_pair(2, 2, 0) # red foreground, black background
-      Curses.init_pair(3, 7, 3) # white foreground, yellow background
-      Curses.init_pair(4, 0, 15) # white foreground, yellow background
+      Wassup::Color.init
+
+      # Determines the colors in the 'attron' below
+
+      #Curses.init_pair(Curses::COLOR_BLUE,Curses::COLOR_BLUE,Curses::COLOR_BLACK) 
+      #Curses.init_pair(Curses::COLOR_RED,Curses::COLOR_RED,Curses::COLOR_BLACK)
 
       app = App.new(path: path)
     end
@@ -33,7 +35,7 @@ module Wassup
         focus_number: number,
         interval: pane_builder.interval,
         content_block: pane_builder.content_block,
-        selection_block: pane_builder.selection_block
+        selection_blocks: pane_builder.selection_blocks
       )
       pane.focus_handler = @focus_handler
       @panes[number.to_s] = pane
@@ -44,7 +46,12 @@ module Wassup
       @focused_pane = nil
       @panes = {}
 
+      # TODO: this could maybe get replaced with selection_blocks now
       @focus_handler = Proc.new do |input|
+        if input == "q"
+          exit
+        end
+
         if (pane = @panes[input.to_s])
           @focused_pane.focused = false
 
@@ -67,7 +74,7 @@ module Wassup
 
       begin
 
-        @hidden_pane = Pane.new(0, 0, 0, 0, highlight: false, focus_number: 0, interval: nil, content_block: nil, selection_block: nil)
+        @hidden_pane = Pane.new(0, 0, 0, 0, highlight: false, focus_number: 0, interval: nil, content_block: nil, selection_blocks: nil)
         @hidden_pane.focus_handler = @focus_handler
         @focused_pane = @hidden_pane
 

data/lib/wassup/color.rb

@@ -0,0 +1,76 @@
+require 'curses'
+
+module Wassup
+  class Color
+    attr_accessor :color_pair
+
+    module Pair
+      BLACK = 0
+      BLUE = 1
+      CYAN = 2
+      GREEN = 3
+      MAGENTA = 4
+      RED = 5
+      WHITE = 15
+      YELLOW = 7
+
+      NORMAL = 20
+      HIGHLIGHT = 21
+
+      BORDER = 20
+      BORDER_FOCUS = 7
+
+      TITLE = 20
+      TITLE_FOCUS = 20
+    end
+
+    def self.init
+      Curses.use_default_colors()
+
+      Curses.init_pair(Pair::NORMAL, Pair::WHITE, 0) #white foreground, black background
+      Curses.init_pair(Pair::HIGHLIGHT, 0, Pair::WHITE) # black foreground, white background
+
+#      Curses.init_pair(Pair::BORDER, Pair::WHITE, 0) #white foreground, black background
+#      Curses.init_pair(Pair::BORDER_FOCUS, Pair::MAGENTA, 0) #white foreground, black background
+#
+#      Curses.init_pair(Pair::TITLE, Pair::WHITE, 0) #white foreground, black background
+#      Curses.init_pair(Pair::TITLE_FOCUS, Pair::WHITE, 0) #white foreground, black background
+
+      Curses.init_pair(Pair::BLACK, Curses::COLOR_BLACK, 0) 
+      Curses.init_pair(Pair::BLUE, Curses::COLOR_BLUE, 0) 
+      Curses.init_pair(Pair::CYAN, Curses::COLOR_CYAN, 0) 
+      Curses.init_pair(Pair::GREEN, Curses::COLOR_GREEN, 0) 
+      Curses.init_pair(Pair::MAGENTA, Curses::COLOR_MAGENTA, 0) 
+      Curses.init_pair(Pair::RED, Curses::COLOR_RED, 0)
+      Curses.init_pair(Pair::WHITE, Pair::WHITE, 0)
+      Curses.init_pair(Pair::YELLOW, Curses::COLOR_YELLOW, 0)
+    end
+
+    def initialize(string_name)
+      @color_pair = case string_name
+               when "black"
+                 Pair::BLACK
+               when "blue"
+                 Pair::BLUE
+               when "cyan"
+                 Pair::CYAN
+               when "green"
+                 Pair::GREEN
+               when "magenta"
+                 Pair::MAGENTA
+               when "red"
+                 Pair::RED
+               when "white"
+                 Pair::WHITE
+               when "yellow"
+                 Pair::YELLOW
+               else
+                 if string_name.to_i.to_s == string_name
+                   string_name.to_i
+                 else
+                  Pair::WHITE
+                 end
+               end 
+    end
+  end
+end

data/lib/wassup/pane.rb

@@ -27,14 +27,16 @@ module Wassup
     attr_accessor :interval
     attr_accessor :last_refreshed
     attr_accessor :content_block
-    attr_accessor :selection_block
+    attr_accessor :selection_blocks
+
+    attr_accessor :content_thread
 
     attr_accessor :selected_view_index
     attr_accessor :all_view_data_objects
 
     attr_accessor :win_height, :win_width, :win_top, :win_left
 
-    def initialize(height, width, top, left, title: nil, highlight: true, focus_number: nil, interval:, content_block:, selection_block:)
+    def initialize(height, width, top, left, title: nil, highlight: true, focus_number: nil, interval:, content_block:, selection_blocks:)
       self.win_height = Curses.lines * height	
       self.win_width = Curses.cols * width
       self.win_top = Curses.lines * top
@@ -63,7 +65,7 @@ module Wassup
 
       self.interval = interval
       self.content_block = content_block
-      self.selection_block = selection_block
+      self.selection_blocks = selection_blocks || {}
     end
 
     def setup_subwin
@@ -111,11 +113,53 @@ module Wassup
       return Time.now - self.interval > self.last_refreshed
     end
 
-    def refresh
-      return unless needs_refresh?
+    class Ope
+      attr_accessor :error 
+      def initialize(error)
+        @error = error
+      end
+    end
 
-      content = self.content_block.call()
+    def refresh(force: false)
+      return if !needs_refresh? && !force
+
+      thread = self.content_thread
+      if !thread.nil?
+        if thread.status == "sleep" || thread.status == "run" || thread.status == "aborting"
+          return
+        elsif thread.status == nil
+          self.add_line("thread status is nil")
+          return
+        elsif thread.status == false
+          content = thread.value
+          if content.is_a?(Ope)
+            self.refresh_content([
+              "[fg=red]Error during refersh[fg=white]",
+              "[fg=red]at #{Time.now}[fg=while]",
+              "",
+              "[fg=yellow]Will try again next interval[fg=white]"
+            ])
+          else
+            self.refresh_content(content)
+          end
+        else
+          # This shouldn't happen
+          # TODO: also fix this
+          return
+        end
+      else
+        the_block = self.content_block
+        self.content_thread = Thread.new {
+          begin
+            content = the_block.call()
+          rescue => ex
+            next Ope.new(ex)
+          end
+        }
+      end
+    end
 
+    def refresh_content(content)
       return unless content.is_a?(Array)
       return if content.first.nil?
 
@@ -128,8 +172,9 @@ module Wassup
       end
 
       self.load_current_view()
-
       self.last_refreshed = Time.now
+
+      self.content_thread = nil
     end
 
     def load_current_view
@@ -164,6 +209,8 @@ module Wassup
     end
       
     def update_title
+      return unless self.should_box
+
       title = self.title || "<No Title>"
       full_title = "#{self.focus_number} - #{title}"
 
@@ -182,9 +229,9 @@ module Wassup
     def update_box
       return unless self.should_box
 
-      self.win.attron(self.focused ? Curses.color_pair(2) : Curses.color_pair(1))
+      self.win.attrset(self.focused ? Curses.color_pair(Wassup::Color::Pair::BORDER_FOCUS) : Curses.color_pair(Wassup::Color::Pair::BORDER))
       self.win.box()
-      self.win.attron(Curses.color_pair(1))
+      self.win.attrset(Curses.color_pair(Wassup::Color::Pair::NORMAL))
 
       self.win.refresh
     end
@@ -215,19 +262,70 @@ module Wassup
 
       self.data_lines[self.top..(self.top+self.subwin.maxy-1)].each_with_index do |line, idx|
 
-        if self.focused && self.highlight && (idx + self.top) == self.highlighted_line
-          self.subwin.attron(Curses.color_pair(4))
-        else
-          self.subwin.attron(Curses.color_pair(1))
-        end
-
-        short_line = line[0...self.subwin.maxx()-3]
-
-        self.subwin.setpos(idx, 0)
-        self.subwin.addstr(short_line)
-        self.subwin.clrtoeol()
-
-        self.subwin.attron(Curses.color_pair(1))
+        write_full_line = false
+        should_highlight = self.focused && self.highlight && (idx + self.top) == self.highlighted_line
+
+        max_char = self.subwin.maxx()-3 
+       
+#        if false && write_full_line || should_highlight
+#          if should_highlight
+#            self.subwin.attrset(Curses.color_pair(Wassup::Color::Pair::HIGHLIGHT))
+#          else
+#            self.subwin.attrset(Curses.color_pair(Wassup::Color::Pair::NORMAL))
+#          end
+#
+#          short_line = line[0...max_char]
+#
+#          self.subwin.setpos(idx, 0)
+#          self.subwin.addstr(short_line)
+#          self.subwin.clrtoeol()
+#
+#          self.subwin.attrset(Curses.color_pair(Wassup::Color::Pair::NORMAL))
+#        else
+          self.subwin.attrset(Curses.color_pair(Wassup::Color::Pair::NORMAL))
+
+          splits = line.split(/\[.*?\]/) # returns ["hey something", "other thing", "okay"]
+          scans = line.scan(/\[.*?\]/) #returns ["red", "white"]
+          scans = scans.map do |str|
+            if str.start_with?('[fg=')
+              str = str.gsub('[fg=', '').gsub(']','')
+              Wassup::Color.new(str)
+            else
+              str
+            end
+          end
+
+          all_parts = splits.zip(scans).flatten.compact
+      
+          char_count = 0
+
+          if should_highlight
+            self.subwin.attrset(Curses.color_pair(Wassup::Color::Pair::HIGHLIGHT))
+          end
+
+          all_parts.each do |part|
+            if part.is_a?(Wassup::Color)
+              #color = Curses.color_pair([1,2,3,4].sample)
+              if !should_highlight
+                self.subwin.attrset(Curses.color_pair(part.color_pair))
+              end
+            else
+              new_char_count = char_count + part.size
+              if new_char_count >= max_char
+                part = part[0...(max_char - char_count)]  
+              end
+
+              self.subwin.setpos(idx, char_count)
+              self.subwin.addstr(part)
+
+              char_count += part.size
+            end
+
+          end
+
+          self.subwin.attrset(Curses.color_pair(Wassup::Color::Pair::NORMAL))
+          self.subwin.clrtoeol()
+        #end
       end
       self.subwin.refresh
     end
@@ -327,10 +425,10 @@ module Wassup
         self.top += 1
         str = self.data_lines[self.top + self.subwin.maxy - 1]
         if str
-          self.subwin.attron(Curses.color_pair(1))
+          self.subwin.attrset(Curses.color_pair(Wassup::Color::Pair::NORMAL))
           self.subwin.setpos(self.subwin.maxy - 1, 0)
           self.subwin.addstr(str)
-          self.subwin.attron(Curses.color_pair(1))
+          self.subwin.attrset(Curses.color_pair(Wassup::Color::Pair::NORMAL))
         end
         return true
       else
@@ -348,27 +446,27 @@ module Wassup
 
       if input == "j"
         if virtual_scroll
-          virtual_scroll_down
+          self.virtual_scroll_down
         else
           scroll_down
         end
       elsif input == "k"
         if virtual_scroll
-          virtual_scroll_up
+          self.virtual_scroll_up
         else
           scroll_up
         end
       elsif input == "h"
-        scroll_left
+        self.scroll_left
       elsif input == "l"
-        scroll_right
-      elsif input == "q"
-        # TODO: This needs to quit
-        # Need to kill the loop or something
-      elsif input == 10 # enter
-        if !self.selection_block.nil? && !self.highlighted_line.nil?
+        self.scroll_right
+      elsif input == "r"
+        self.refresh(force: true)
+      else
+        selection_block = self.selection_blocks[input]
+        if !selection_block.nil? && !self.highlighted_line.nil?
           data = @data_objects[self.highlighted_line]
-          self.selection_block.call(data)
+          selection_block.call(data)
         end
       end
     end

data/lib/wassup/pane_builder.rb

@@ -12,13 +12,25 @@ module Wassup
 
     attr_accessor :interval
     attr_accessor :content_block
-    attr_accessor :selection_block
+    attr_accessor :selection_blocks
+
+    def initialize()
+      @height = 1
+      @weight = 1
+      @top = 0
+      @left = 0
+
+      @highlight = false
+      @interval = 60 * 5 
+
+      @selection_blocks = {}
+    end
 
     def content(&block)
       self.content_block = block
     end
-    def selection(&block)
-      self.selection_block = block
+    def selection(input=10, &block)
+      self.selection_blocks[input] = block
     end
   end
 end

data/lib/wassup/version.rb

@@ -1,3 +1,3 @@
 module Wassup
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/wassup.rb

@@ -1,5 +1,6 @@
 require "wassup/version"
 require "wassup/app"
+require "wassup/color"
 require "wassup/pane"
 require "wassup/pane_builder"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wassup
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Josh Holtz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -32,6 +32,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -44,9 +45,14 @@ files:
 - bin/console
 - bin/setup
 - bin/wassup
+- examples/basic/Supfile
+- examples/debug/Supfile
+- examples/josh-fastlane/README.md
 - examples/josh-fastlane/Supfile
+- examples/josh-fastlane/demo.png
 - lib/wassup.rb
 - lib/wassup/app.rb
+- lib/wassup/color.rb
 - lib/wassup/pane.rb
 - lib/wassup/pane_builder.rb
 - lib/wassup/version.rb