wassup 0.1.0 → 0.2.1

data/examples/starter/Supfile

@@ -0,0 +1,44 @@
+add_pane do |pane|
+  pane.height = 0.5
+  pane.width = 0.4
+  pane.top = 0
+  pane.left = 0
+
+  pane.highlight = false
+  pane.title = "Current Time"
+
+  pane.interval = 1
+  pane.content do |content|
+    date = `date`
+
+    content.add_row(date)
+  end
+end
+
+add_pane do |pane|
+  pane.height = 0.5
+  pane.width = 0.6
+  pane.top = 0
+  pane.left = 0.4
+
+  pane.highlight = false
+  pane.title = "Open PRs - fastlane/fastlane"
+
+  pane.interval = 60 * 5
+  pane.content do |content|
+		require 'uri'
+		require 'net/http'
+		require 'json'
+
+		uri = URI('https://api.github.com/repos/fastlane/fastlane/pulls')
+		res = Net::HTTP.get_response(uri)
+
+		JSON.parse(res.body).each do |pr|
+			display = "[fg=cyan]##{pr['number']} - [fg=white]#{pr['title']}"
+    	content.add_row(display)
+		end
+  end
+	pane.selection do |pr|
+		`open #{pr['html_url']}`
+	end
+end

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
@@ -29,11 +31,14 @@ module Wassup
         pane_builder.top, 
         pane_builder.left, 
         title: pane_builder.title,
+        description: pane_builder.description,
         highlight: pane_builder.highlight, 
         focus_number: number,
         interval: pane_builder.interval,
+        show_refresh: pane_builder.show_refresh,
         content_block: pane_builder.content_block,
-        selection_block: pane_builder.selection_block
+        selection_blocks: pane_builder.selection_blocks,
+        selection_blocks_description: pane_builder.selection_blocks_description
       )
       pane.focus_handler = @focus_handler
       @panes[number.to_s] = pane
@@ -41,10 +46,21 @@ module Wassup
 
     def initialize(path:)
       @hidden_pane = nil
+      @help_pane = nil
       @focused_pane = nil
       @panes = {}
 
+      @redraw_panes = false
+
+      # TODO: this could maybe get replaced with selection_blocks now
       @focus_handler = Proc.new do |input|
+        if input == "q"
+          exit
+        elsif input == "?"
+          toggle_help
+          next true
+        end
+
         if (pane = @panes[input.to_s])
           @focused_pane.focused = false
 
@@ -66,8 +82,7 @@ module Wassup
       end
 
       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, show_refresh: false, content_block: nil, selection_blocks: nil, selection_blocks_description: nil)
         @hidden_pane.focus_handler = @focus_handler
         @focused_pane = @hidden_pane
 
@@ -75,13 +90,71 @@ module Wassup
 
         loop do
           @focused_pane.handle_keyboard
-          @panes.each do |id, pane|
-            pane.refresh()
+
+          if @redraw_panes
+            Curses.clear
+            Curses.refresh
+          end
+
+          # This isn't ideal to now refresh other panes when help is open
+          # But it prevents things from getting drawn where the help is showing
+          if @help_pane.nil?
+            @panes.each do |id, pane|
+              pane.redraw() if @redraw_panes
+              pane.refresh()
+            end
+            @redraw_panes = false
+          else
+            @help_pane.refresh()
           end
         end
       ensure
         Curses.close_screen
       end
     end
+
+    def toggle_help
+      if @help_pane.nil?
+        if @focused_pane == @hidden_pane
+          content_block = Proc.new do |content|
+            items = [
+              "Welcome to Wassup!",
+              "",
+              "Press any number key to focus a pane",
+              "j - moves row highlight down",
+              "k - moves row highlight up",
+              "<Enter> - perform selection on highlighted row",
+              "",
+              "? - opens help for focused pane"
+            ]
+
+            items.each do |item|
+              content.add_row(item)
+            end
+          end
+        else
+          content_block = Proc.new do |content|
+            items = [
+              @focused_pane.description,
+              "",
+              @focused_pane.selection_blocks_description.map do |k,v|
+                "#{k} - #{v}" 
+              end
+            ].flatten.compact
+
+            items.each do |item|
+              content.add_row(item)
+            end
+          end 
+        end
+
+        # Maybe find a way to add some a second border or an clear border to add more space to show its floating
+        @help_pane = Pane.new(0.5, 0.5, 0.25, 0.25, title: "Help", highlight: false, focus_number: nil, interval: 100, show_refresh: false, content_block: content_block, selection_blocks: nil, selection_blocks_description: nil)
+      else
+        @help_pane.close
+        @help_pane = nil 
+        @redraw_panes = true
+      end
+    end
   end
 end

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