wassup 0.1.0 → 0.2.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
@@ -27,14 +28,41 @@ module Wassup
     attr_accessor :interval
     attr_accessor :last_refreshed
     attr_accessor :content_block
-    attr_accessor :selection_block
+    attr_accessor :selection_blocks
+    attr_accessor :selection_blocks_description
+
+    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_block:)
+		class Content
+			class Row
+				attr_accessor :display
+				attr_accessor :object
+
+				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:)
       self.win_height = Curses.lines * height	
       self.win_width = Curses.cols * width
       self.win_top = Curses.lines * top
@@ -50,20 +78,22 @@ 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
 
       self.title = title
+      self.description = description
 
       self.interval = interval
       self.content_block = content_block
-      self.selection_block = selection_block
+      self.selection_blocks = selection_blocks || {}
+      self.selection_blocks_description = selection_blocks_description || {}
     end
 
     def setup_subwin
@@ -75,16 +105,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])
@@ -104,6 +134,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?
@@ -111,61 +151,160 @@ 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 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.refresh_content(nil)
+    end
 
-      return unless content.is_a?(Array)
-      return if content.first.nil?
+    def refresh(force: false)
+      if force
+        self.last_refreshed = nil
+      end
 
-      if content.first.is_a?(Hash)
-        self.all_view_data_objects = content
+      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
+          return
+        elsif thread.status == false
+          rtn = thread.value
+          if rtn.is_a?(Ope)
+						content = Wassup::Pane::Content.new
+
+						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]")
+
+            self.refresh_content([content])
+          elsif rtn.is_a?(Wassup::PaneBuilder::ContentBuilder)
+            self.refresh_content(rtn.contents)
+          end
+
+					self.update_box
+					self.update_title
+        else
+          # This shouldn't happen
+          # TODO: also fix this
+          return
+        end
       else
-        self.all_view_data_objects = [
-          content
-        ]
+        the_block = self.content_block
+        self.content_thread = Thread.new {
+          begin
+						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
 
-      self.load_current_view()
+    def refresh_content(contents)
+      self.contents = contents unless contents.nil?
 
+      self.load_current_view()
       self.last_refreshed = Time.now
+
+      self.content_thread = nil
     end
 
     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
+
+    attr_accessor :refresh_char_count
+    def refresh_char
+      return "" unless self.show_refresh
 
-      require 'pp'
-      if view_content.is_a?(Hash) && view_content[:content]
-        view_content = view_content[:content]
+      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)
@@ -182,21 +321,17 @@ 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.box()
-      self.win.attron(Curses.color_pair(1))
+      show_focused = self.focused
 
-      self.win.refresh
-    end
+      if self.focus_number.nil?
+        show_focused = true
+      end
 
-    def add_line(text)
-      data_lines << text
+      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))
 
-      if self.virtual_scroll
-        self.virtual_reload
-      else
-        self.load_thing
-      end
+      self.win.refresh
     end
 
     # Load the file into memory and
@@ -211,23 +346,59 @@ 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|
 
-        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 
+       
+				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
@@ -289,7 +460,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
@@ -297,7 +468,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
 
@@ -327,10 +498,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 +519,29 @@ 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?
-          data = @data_objects[self.highlighted_line]
-          self.selection_block.call(data)
+        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?
+					content = self.contents[self.selected_view_index]
+					row = content.data[self.highlighted_line]
+					data = row.object || row.display
+          selection_block.call(data)
         end
       end
     end

data/lib/wassup/pane_builder.rb

@@ -9,16 +9,87 @@ 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_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
+      @weight = 1
+      @top = 0
+      @left = 0
+
+      @highlight = false
+      @interval = 60 * 5 
+
+      @selection_blocks = {}
+      @selection_blocks_description = {}
+    end
 
     def content(&block)
       self.content_block = block
     end
-    def selection(&block)
-      self.selection_block = 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"
+        input = "<Enter>"
+      end
+
+      self.selection_blocks[input] = block
+      self.selection_blocks_description[input] = description
     end
   end
 end

data/lib/wassup/version.rb

@@ -1,3 +1,3 @@
 module Wassup
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 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.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Josh Holtz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2021-12-21 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,48 @@ files:
 - bin/console
 - bin/setup
 - bin/wassup
+- docs/.gitignore
+- docs/README.md
+- docs/babel.config.js
+- docs/blog/2021-12-09-welcome/index.md
+- docs/blog/authors.yml
+- docs/docs/Supfile-basics/_category_.json
+- docs/docs/Supfile-basics/understanding-the-supfile.md
+- docs/docs/intro.md
+- docs/docusaurus.config.js
+- docs/package-lock.json
+- docs/package.json
+- docs/sidebars.js
+- docs/src/components/HomepageFeatures.module.css
+- docs/src/components/HomepageFeatures.tsx
+- docs/src/css/custom.css
+- docs/src/pages/index.module.css
+- docs/src/pages/index.tsx
+- docs/src/pages/markdown-page.md
+- docs/static/.nojekyll
+- docs/static/img/demo-supfile.png
+- docs/static/img/favicon.ico
+- docs/static/img/logo.svg
+- docs/static/img/tutorial-intro-starter-screenshot.png
+- docs/static/img/tutorial/docsVersionDropdown.png
+- docs/static/img/tutorial/localeDropdown.png
+- docs/static/img/undraw_docusaurus_mountain.svg
+- docs/static/img/undraw_docusaurus_react.svg
+- docs/static/img/undraw_docusaurus_tree.svg
+- docs/static/img/wassup-long.png
+- docs/static/img/wassup-screenshot.png
+- docs/static/img/wassup.png
+- docs/static/video/wassup-demo.mov
+- docs/tsconfig.json
+- examples/basic/Supfile
+- examples/debug/Supfile
+- examples/josh-fastlane/README.md
 - examples/josh-fastlane/Supfile
+- examples/josh-fastlane/demo.png
+- examples/starter/Supfile
 - lib/wassup.rb
 - lib/wassup/app.rb
+- lib/wassup/color.rb
 - lib/wassup/pane.rb
 - lib/wassup/pane_builder.rb
 - lib/wassup/version.rb