wassup 0.1.2 → 0.3.1

data/lib/wassup/pane.rb

@@ -6,11 +6,12 @@ module Wassup
   class Pane
     attr_accessor :win
     attr_accessor :subwin
-    attr_accessor :data_lines
-    attr_accessor :data_objects
     attr_accessor :top
 
+		attr_accessor :contents
+
     attr_accessor :title
+    attr_accessor :description
 
     attr_accessor :focused
     attr_accessor :focus_number
@@ -28,22 +29,52 @@ module Wassup
     attr_accessor :last_refreshed
     attr_accessor :content_block
     attr_accessor :selection_blocks
+    attr_accessor :selection_blocks_description
+
+    attr_accessor :caught_error
 
     attr_accessor :content_thread
+    attr_accessor :show_refresh
 
     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_blocks:)
-      self.win_height = Curses.lines * height	
-      self.win_width = Curses.cols * width
-      self.win_top = Curses.lines * top
-      self.win_left = Curses.cols * left
+		class Content
+			class Row
+				attr_accessor :display
+				attr_accessor :object
 
-      self.win = Curses::Window.new(self.win_height, self.win_width, self.win_top, self.win_left)
-      self.setup_subwin()
+				def initialize(display, object)
+					@display = display
+					@object = object || display
+				end
+			end
+
+			attr_accessor :title
+			attr_accessor :data
+
+			def initialize(title = nil)
+				@title = title
+				@data = []	
+			end
+
+			def add_row(display, object = nil)
+				@data << Row.new(display, object)
+			end
+		end
+
+    def initialize(height, width, top, left, title: nil, description: nil, highlight: true, focus_number: nil, interval:, show_refresh:, content_block:, selection_blocks:, selection_blocks_description:, debug: false)
+
+      if !debug
+        self.win_height = Curses.lines * height	
+        self.win_width = Curses.cols * width
+        self.win_top = Curses.lines * top
+        self.win_left = Curses.cols * left
+
+        self.win = Curses::Window.new(self.win_height, self.win_width, self.win_top, self.win_left)
+        self.setup_subwin()
+      end
 
       self.focused = false
       self.focus_number = focus_number
@@ -52,20 +83,24 @@ module Wassup
       self.virtual_scroll = true
 
       self.top = 0
-      self.data_lines = []
-      self.data_objects = []
+
+			self.contents = []
+      self.show_refresh = show_refresh
      
       self.selected_view_index = 0
-      self.all_view_data_objects = [] # Array of array
 
-      self.win.refresh
-      self.subwin.refresh
+      if !debug
+        self.win.refresh
+        self.subwin.refresh
+      end
 
       self.title = title
+      self.description = description
 
       self.interval = interval
       self.content_block = content_block
       self.selection_blocks = selection_blocks || {}
+      self.selection_blocks_description = selection_blocks_description || {}
     end
 
     def setup_subwin
@@ -77,16 +112,16 @@ module Wassup
         self.subwin = nil
       end
 
-      if (@all_view_data_objects || []).size > 1
+      if (self.contents || []).size > 1
         top_bump = 4
 
-        view_title = (self.all_view_data_objects[self.selected_view_index] || {})[:title]
+        view_title = self.contents[self.selected_view_index].title || "<No Title>"
         view_title += " " * 100
 
         self.win.setpos(2, 2)
         self.win.addstr(view_title[0...self.win.maxx()-3])
 
-        subtitle = "(#{self.selected_view_index + 1} out of #{self.all_view_data_objects.size})"
+        subtitle = "(#{self.selected_view_index + 1} out of #{self.contents.size})"
         subtitle += " " * 100
         self.win.setpos(3, 2)
         self.win.addstr(subtitle[0...self.win.maxx()-3])
@@ -106,6 +141,16 @@ module Wassup
       self.subwin.scrollok(true)
     end
 
+    def close
+      unless self.subwin.nil?
+        self.subwin.clear
+        self.subwin.close
+      end
+
+      self.win.clear
+      self.win.close
+    end
+
     def needs_refresh?
       return false if self.content_block.nil?
       return false if self.interval.nil?
@@ -120,28 +165,72 @@ module Wassup
       end
     end
 
+		def data_lines
+			return [] if self.selected_view_index.nil?
+			content = (self.contents || [])[self.selected_view_index]
+
+			if content.nil?
+				return []
+			else
+				content.data.map(&:display)
+			end
+		end
+
+		def refreshing?
+			return !self.content_thread.nil?
+		end
+
+    def redraw
+      self.update_box
+      self.update_title
+      self.load_current_view()
+    end
+
     def refresh(force: false)
-      return if !needs_refresh? && !force
+      if force
+        self.last_refreshed = nil
+      end
+
+      if !needs_refresh?
+        return
+      end
 
       thread = self.content_thread
       if !thread.nil?
         if thread.status == "sleep" || thread.status == "run" || thread.status == "aborting"
+          self.update_refresh
           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)
+          rtn = thread.value
+          if rtn.is_a?(Ope)
+            self.caught_error = rtn.error
+						content = Wassup::Pane::Content.new("Overview")
+						content.add_row("[fg=red]Error during refersh[fg=white]")
+						content.add_row("[fg=red]at #{Time.now}[fg=while]")
+						content.add_row("")
+						content.add_row("[fg=yellow]Will try again next interval[fg=white]")
+
+						content_directions = Wassup::Pane::Content.new("Directions")
+            content_directions.add_row("1. Press 'c' to copy the stacktrace")
+            content_directions.add_row("2. Debug pane content block with:")
+            content_directions.add_row("    $: wassup --debug")
+            content_directions.add_row("3. Stacktrace viewable in next page")
+
+						content_stacktrace = Wassup::Pane::Content.new("Stacktrace")
+            rtn.error.backtrace.each do |line|
+						  content_stacktrace.add_row(line)
+            end
+
+            self.refresh_content([content, content_directions, content_stacktrace])
+          elsif rtn.is_a?(Wassup::PaneBuilder::ContentBuilder)
+            self.caught_error = nil
+            self.refresh_content(rtn.contents)
           end
+
+					self.update_box
+					self.update_title
         else
           # This shouldn't happen
           # TODO: also fix this
@@ -151,25 +240,21 @@ module Wassup
         the_block = self.content_block
         self.content_thread = Thread.new {
           begin
-            content = the_block.call()
+						builder = Wassup::PaneBuilder::ContentBuilder.new(self.contents)
+            content = the_block.call(builder)
+
+						builder
           rescue => ex
             next Ope.new(ex)
           end
         }
+				self.update_box
+				self.update_title
       end
     end
 
-    def refresh_content(content)
-      return unless content.is_a?(Array)
-      return if content.first.nil?
-
-      if content.first.is_a?(Hash)
-        self.all_view_data_objects = content
-      else
-        self.all_view_data_objects = [
-          content
-        ]
-      end
+    def refresh_content(contents)
+      self.contents = contents
 
       self.load_current_view()
       self.last_refreshed = Time.now
@@ -179,40 +264,73 @@ module Wassup
 
     def load_current_view
       self.setup_subwin()
-      view_content = self.all_view_data_objects[self.selected_view_index]
 
       # this might be bad
       self.highlighted_line = nil
+			self.virtual_reload()
+    end
+
+    def title=(title)
+      @title = title
+      self.update_box()
+      self.update_title()
+    end
 
-      require 'pp'
-      if view_content.is_a?(Hash) && view_content[:content]
-        view_content = view_content[:content]
+    def highlight
+      if self.caught_error
+        return true
+      end 
+      return @highlight
+    end
+
+    attr_accessor :refresh_char_count
+    def refresh_char
+      return "" unless self.show_refresh
+
+      if self.refresh_char_count.nil?
+        self.refresh_char_count = 0
       end
 
-      @data_lines = []
-      @data_objects = []
-      view_content.each do |item|
-        if item.is_a?(String)
-          @data_objects << item
-          self.add_line(item)
-        elsif item.is_a?(Array)
-          @data_objects << item[1]
-          self.add_line(item[0])
+      if self.refreshing?
+        array = ['\\', '|', '/', '|']
+        rtn = array[self.refresh_char_count]
+
+        self.refresh_char_count += 1
+        if self.refresh_char_count >= array.size
+          self.refresh_char_count = 0
         end
+
+        return rtn
+      else
+        return ""
       end
     end
 
-    def title=(title)
-      @title = title
-      self.update_box()
-      self.update_title()
+    attr_accessor :last_refresh_char_at
+    def update_refresh
+      return unless self.should_box
+
+      self.last_refresh_char_at ||= Time.now
+
+      if Time.now - self.last_refresh_char_at >= 0.15
+        self.win.setpos(0, 1)
+        self.win.addstr(self.refresh_char)
+        self.win.refresh
+
+        self.last_refresh_char_at = Time.now
+      end
     end
       
     def update_title
       return unless self.should_box
 
       title = self.title || "<No Title>"
-      full_title = "#{self.focus_number} - #{title}"
+      
+      if self.focus_number.nil?
+        full_title = title
+      else 
+        full_title = "#{self.focus_number} - #{title}"
+      end
 
       self.win.setpos(0, 3)
       self.win.addstr(full_title)
@@ -229,23 +347,19 @@ module Wassup
     def update_box
       return unless self.should_box
 
-      self.win.attrset(self.focused ? Curses.color_pair(Wassup::Color::Pair::BORDER_FOCUS) : Curses.color_pair(Wassup::Color::Pair::BORDER))
+      show_focused = self.focused
+
+      if self.focus_number.nil?
+        show_focused = true
+      end
+
+      self.win.attrset(show_focused ? Curses.color_pair(Wassup::Color::Pair::BORDER_FOCUS) : Curses.color_pair(Wassup::Color::Pair::BORDER))
       self.win.box()
       self.win.attrset(Curses.color_pair(Wassup::Color::Pair::NORMAL))
 
       self.win.refresh
     end
 
-    def add_line(text)
-      data_lines << text
-
-      if self.virtual_scroll
-        self.virtual_reload
-      else
-        self.load_thing
-      end
-    end
-
     # Load the file into memory and
     # put the first part on the curses display.
     def load_thing
@@ -258,8 +372,9 @@ module Wassup
     end
 
     def virtual_reload
-      return if self.data_lines.nil?
+      return if self.data_lines.nil? || self.data_lines.empty?
 
+      # TODO: This errored out but might be because thread stuff???
       self.data_lines[self.top..(self.top+self.subwin.maxy-1)].each_with_index do |line, idx|
 
         write_full_line = false
@@ -267,65 +382,49 @@ module Wassup
 
         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
+				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
       self.subwin.refresh
     end
@@ -387,7 +486,7 @@ module Wassup
     def scroll_left
       self.selected_view_index -= 1
       if self.selected_view_index < 0
-        self.selected_view_index = self.all_view_data_objects.size - 1
+        self.selected_view_index = self.contents.size - 1
       end
 
       self.load_current_view
@@ -395,7 +494,7 @@ module Wassup
 
     def scroll_right
       self.selected_view_index += 1
-      if self.selected_view_index >= self.all_view_data_objects.size
+      if self.selected_view_index >= self.contents.size
         self.selected_view_index = 0
       end
 
@@ -462,10 +561,21 @@ module Wassup
         self.scroll_right
       elsif input == "r"
         self.refresh(force: true)
+      elsif input == "c"
+        if !self.caught_error.nil?
+          text = self.caught_error.backtrace.join("\n")
+          if RUBY_PLATFORM.downcase =~ /win32/
+            IO.popen('clip', 'w') { |pipe| pipe.puts text }
+          else
+            IO.popen('pbcopy', 'w') { |pipe| pipe.puts text }
+          end
+        end
       else
         selection_block = self.selection_blocks[input]
         if !selection_block.nil? && !self.highlighted_line.nil?
-          data = @data_objects[self.highlighted_line]
+					content = self.contents[self.selected_view_index]
+					row = content.data[self.highlighted_line]
+					data = row.object || row.display
           selection_block.call(data)
         end
       end

data/lib/wassup/pane_builder.rb

@@ -9,10 +9,58 @@ module Wassup
     attr_accessor :highlight
 
     attr_accessor :title
+    attr_accessor :description
+
+    attr_accessor :show_refresh
 
     attr_accessor :interval
     attr_accessor :content_block
     attr_accessor :selection_blocks
+    attr_accessor :selection_blocks_description
+
+    class ContentBuilder
+      attr_accessor :contents
+
+      def initialize(contents)
+        @contents = contents
+        @need_to_clear = true
+        @show_refresh = true
+      end
+
+      def clear=(clear)
+        @need_to_clear = clear
+      end
+
+      def add_row(display, object=nil, page:nil)
+        if @need_to_clear
+          @need_to_clear = false
+          self.contents = []
+        end
+
+        content = nil
+
+        # Create contents if none
+        if page.nil?
+          if self.contents.empty?
+            content = Pane::Content.new
+            self.contents << content
+          else
+            content = self.contents.first
+          end
+        elsif page.is_a?(String)
+          content = self.contents.find do |content|
+            content.title == page
+          end
+
+          if content.nil?
+            content = Pane::Content.new(page)
+            self.contents << content
+          end
+        end
+
+        content.add_row(display, object)
+      end
+    end
 
     def initialize()
       @height = 1
@@ -24,13 +72,24 @@ module Wassup
       @interval = 60 * 5 
 
       @selection_blocks = {}
+      @selection_blocks_description = {}
     end
 
     def content(&block)
       self.content_block = block
     end
-    def selection(input=10, &block)
+    def selection(input=10, description=nil, &block)
+      if input.to_s.downcase == "enter"
+        input = 10
+      end
+
+      description_input = input
+      if input.to_s == "10"
+        description_input = "enter"
+      end
+
       self.selection_blocks[input] = block
+      self.selection_blocks_description[description_input] = description
     end
   end
 end

data/lib/wassup/version.rb

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

data/lib/wassup.rb

@@ -4,6 +4,11 @@ require "wassup/color"
 require "wassup/pane"
 require "wassup/pane_builder"
 
+require "wassup/helpers/circleci"
+require "wassup/helpers/github"
+require "wassup/helpers/netlify"
+require "wassup/helpers/shortcut"
+
 module Wassup
   class Error < StandardError; end
   # Your code goes here...

data/wassup.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = "https://github.com/joshdholtz/wassup"
 
   spec.add_runtime_dependency 'curses'
+  spec.add_runtime_dependency 'rest-client'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.