mars_base_10 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd093ec957e418592f791bb2dfc1e1e7efa56973fd553534278a6dcb818f3482
-  data.tar.gz: 478b185df1d0c2280788691e4bd61bfac817c200348e63bb29a7a36e05f1eb84
+  metadata.gz: 9ea353d6a59cf0d1ad388a521fa07a121cd94942eb4556c23ee4a11603622141
+  data.tar.gz: 6fd28ad9bd47d54172c4a3c6a0f64e5e4da244af6065ad8514f779cc388dc0c6
 SHA512:
-  metadata.gz: e9044477c9eb149f2212f5dd5e7e44eb8d0fa247e0db7a382aa5256708ba53027e8c48c18f992b4c2c7dde36281cd5f725f86662283d71f713f50ed6a08662a2
-  data.tar.gz: ac4c86d4ab841a92e262138bdf6a290af01d93e65d1afe514d6076681bb217dc59bde4ec2e90ccd3e10d4936ae298387ae0d662565e3030e88658a1f0a78deb6
+  metadata.gz: 248ae50be666debca25a7c253822e941af1c3ba19ac484b6e21423526497c9777419b4b2417756a565bc890afb9dc817d0eb3060eb0b7db34bab0ae5c396ac58
+  data.tar.gz: 20e525d483036e6a815f0e46a3529cdf6d1bee8e4a96bc8c32cc0d27b774331e13d1ae3c76177904da39b845224ed12cfa6b4dc3cb667e943704c75799cb7360

data/lib/mars_base_10/action_bar.rb

@@ -11,7 +11,7 @@ module MarsBase10
     end
 
     def self.Default
-      ActionBar.new actions: {'j': 'Move Down', 'k': 'Move Up', 'J': 'Page Down', 'K': 'Page Up', 'q': 'Quit'}
+      ActionBar.new actions: {'j': 'Move Down', 'k': 'Move Up', 'J': 'Page Down', 'K': 'Page Up', 'X': 'Switch App', 'q': 'Quit'}
     end
 
     def actions_first_col

data/lib/mars_base_10/comm_central.rb

@@ -2,6 +2,7 @@
 require 'urbit'
 
 require_relative  'graph_rover'
+require_relative  'group_room'
 require_relative  'viewport'
 
 module MarsBase10
@@ -10,22 +11,38 @@ module MarsBase10
   class CommCentral
     def initialize(config_filename:)
       @viewport = Viewport.new
-      @rover    = GraphRover.new ship_connection: Urbit.connect(config_file: config_filename),
-                                 viewport:        @viewport
+      @ship = Urbit.connect(config_file: config_filename)
+      @ship.login
+      sleep 2  # This is temporary for now, we need a way to know that the subscription callbacks have finished.
+      @controller = GroupRoom.new manager: self, ship_connection: @ship, viewport: @viewport
     end
 
     def activate
-      self.rover.start
+      self.controller.start
+    end
+
+    def swap_controller
+      self.controller.stop
+      if GroupRoom == self.controller.class
+        @controller = GraphRover.new manager: self, ship_connection: self.ship, viewport: @viewport
+      else
+        @controller = GroupRoom.new  manager: self, ship_connection: self.ship, viewport: @viewport
+      end
+      self.controller.start
     end
 
     def shutdown
-      self.rover.stop
+      self.controller.stop
     end
 
     private
 
-    def rover
-      @rover
+    def controller
+      @controller
+    end
+
+    def ship
+      @ship
     end
   end
 end

data/lib/mars_base_10/graph_rover.rb

@@ -6,9 +6,10 @@ require_relative 'subject'
 
 module MarsBase10
   class GraphRover
-    attr_reader :panes, :ship, :viewport
+    attr_reader :manager, :panes, :ship, :viewport
 
-    def initialize(ship_connection:, viewport:)
+    def initialize(manager:, ship_connection:, viewport:)
+      @manager = manager
       @ship = Ship.new connection: ship_connection
       @stack = Stack.new
       @viewport = viewport
@@ -75,6 +76,8 @@ module MarsBase10
             self.viewport.action_bar.remove_action(:p)
           end
         end
+      when 'X'
+        self.manager.swap_controller
       end
       self.resync if resync_needed
     end

data/lib/mars_base_10/group_room.rb

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+require_relative 'ship'
+require_relative 'stack'
+require_relative 'subject'
+
+module MarsBase10
+  class GroupRoom
+    attr_reader :manager, :panes, :ship, :viewport
+
+    def initialize(manager:, ship_connection:, viewport:)
+      @manager = manager
+      @ship = Ship.new connection: ship_connection
+      @stack = Stack.new
+      @viewport = viewport
+      @viewport.controller = self
+
+      self.wire_up_panes
+      self.viewport.action_bar = ActionBar.Default.add_action({'i': 'Inspect'})
+      self.viewport.activate pane: @pane_1
+      self.resync
+    end
+
+    def active_node
+      self.ship.fetch_node(resource: self.active_resource, index: self.active_node_index)
+    end
+
+    def active_resource
+      @pane_1.current_subject_index
+    end
+
+    def active_subject(pane:)
+      pane.current_subject_index
+    end
+
+    def load_history
+      return 0 unless @pane_3 == self.viewport.active_pane
+      new_content = self.ship.fetch_older_nodes(resource: self.active_resource, node: self.active_node)
+      @pane_3.subject.prepend_content(ary: new_content)
+      new_content.length
+    end
+
+    #
+    # Called by a pane in this controller for bubbling a key press up
+    #
+    def send(key:)
+      resync_needed = true
+      case key
+      when 'g'    # (G)raph View
+        unless @pane_1.active?
+          self.viewport.activate pane: @pane_1
+        end
+      when 'i'    # (I)nspect
+        begin
+          self.viewport.activate pane: @pane_3
+          self.viewport.action_bar = ActionBar.Default.add_action({'g': 'Group List'})
+          resync_needed = false
+        end
+      when 'X'
+        self.manager.swap_controller
+      end
+      self.resync if resync_needed
+    end
+
+    def start
+      self.viewport.open
+    end
+
+    def stop
+      self.viewport.close
+    end
+
+    private
+
+    def resync
+      self.resync_node_list
+      self.resync_node_view
+    end
+
+    def resync_node_list
+      if @pane_1 == self.viewport.active_pane
+        group_title = self.active_subject(pane: @pane_1)
+        @pane_2.clear
+        @pane_2.subject.title = "#{group_title}"
+        @pane_2.subject.contents = self.ship.fetch_group(group_title: group_title)
+
+        @pane_3.clear
+        @pane_3.subject.title = "Channels of #{self.active_subject(pane: @pane_1)}"
+        @pane_3.subject.contents = self.ship.fetch_group_channels(group_title: self.active_subject(pane: @pane_1))
+      end
+      nil
+    end
+
+    def resync_node_view
+      channel_title = self.active_subject(pane: @pane_3)
+      @pane_4.subject.title = "#{channel_title}"
+      @pane_4.clear
+      @pane_4.subject.contents = self.ship.fetch_channel(group_title: self.active_subject(pane: @pane_1), channel_title: channel_title)
+      nil
+    end
+
+    def wire_up_panes
+      @panes = []
+
+      # Pane #1 is the Group list, It is a fixed height and width in the upper left corner.
+      @pane_1 = @viewport.add_pane height_pct: 0.5, width_pct: 0.5
+      # if @ship.group_names.empty?
+        # @pane_1.view(subject: @ship.graph_names)
+      # else
+        @pane_1.view(subject: @ship.group_names)
+      # end
+
+      # Pane 2 displays the properties of the selected Group. It is variable height in the bottom left corner.
+      @pane_2 = @viewport.add_variable_height_pane at_row: @pane_1.last_row, width_pct: 0.5
+      @pane_2.view(subject: @ship.empty_node)
+      @pane_2.highlight = false
+
+      # The node list is a variable width, fixed height pane in the upper right.
+      @pane_3 = @viewport.add_variable_width_pane at_col: @pane_1.last_col, height_pct: 0.5
+      @pane_3.view(subject: @ship.empty_node_list)
+
+      # The single node viewer is a variable width, variable height pane in the lower right.
+      @pane_4 = @viewport.add_variable_both_pane at_row: @pane_3.last_row, at_col: @pane_1.last_col
+      @pane_4.view(subject: @ship.empty_node)
+      @pane_4.highlight = false
+    end
+  end
+end

data/lib/mars_base_10/pane.rb

@@ -3,13 +3,14 @@ require 'curses'
 
 module MarsBase10
   class Pane
-    attr_accessor :draw_row, :draw_col, :index, :latch, :subject
+    attr_accessor :draw_row, :draw_col, :highlight, :index, :latch, :subject
     attr_reader   :height_pct, :left_edge_col, :top_row, :viewport, :width_pct
 
     def initialize(viewport:, at_row:, at_col:, height_pct: 1, width_pct: 1)
       @top_row       = at_row
       @left_edge_col = at_col
       @height_pct    = height_pct
+      @highlight     = true
       @index         = 1
       @latch         = ''
       @latch_depth   = 0
@@ -48,10 +49,10 @@ module MarsBase10
       (first_draw_row..last_draw_row).each do |index|
         self.draw_line
         item_index = index + @visible_content_shift
-        self.window.attron(Curses::A_REVERSE) if item_index == self.index
+        self.window.attron(Curses::A_REVERSE) if (item_index == self.index) && self.highlight
 
         if self.subject.line_length_at(index: item_index) > self.last_col
-          chunks = self.subject.line_at(index: item_index).chars.each_slice(self.last_col).map(&:join)
+          chunks = self.subject.line_at(index: item_index).chars.each_slice(self.last_col - 2).map(&:join)
           chunks.each do |c|
             self.window.addstr(c)
             self.draw_row += 1
@@ -63,7 +64,7 @@ module MarsBase10
           self.window.addstr("#{self.subject.line_at(index: item_index)}")
         end
 
-        self.window.attroff(Curses::A_REVERSE) if item_index == self.index
+        self.window.attroff(Curses::A_REVERSE) if (item_index == self.index) && self.highlight
         self.window.clrtoeol
         self.draw_row += 1
       end
@@ -244,6 +245,16 @@ module MarsBase10
     end
   end
 
+  class VariableHeightPane < Pane
+    def last_col
+      (self.viewport.max_cols * self.width_pct).floor
+    end
+
+    def last_row
+      self.viewport.max_rows - self.top_row
+    end
+  end
+
   class VariableWidthPane < Pane
     def last_col
       self.viewport.max_cols - self.left_edge_col

data/lib/mars_base_10/ship.rb

@@ -20,6 +20,44 @@ module MarsBase10
       Subject.new title: 'Graphs', contents: @ship.graph_names
     end
 
+    def group_names
+      Subject.new title: 'Groups', contents: (@ship.groups.map {|g| g.to_list})
+    end
+
+    def fetch_channel(group_title:, channel_title:)
+      if (group = @ship.groups[title: group_title])
+        if (channel = group.graphs.select {|c| channel_title == c.title unless c.nil?}.first)
+          # What we are calling a channel here is really a graph in the urbit-ruby bridge.
+          # This is the equivalent of node.to_pretty_array
+          props = {
+            title:       channel.title,
+            description: channel.description,
+            creator:     channel.creator,
+            host_ship:   channel.host_ship,
+            resource:    channel.resource,
+            type:        channel.type
+          }
+          return props.each.map {|k, v| "#{k}#{(' ' * [(18 - k.length), 0].max)}#{v}"}
+        end
+      end
+      ["Group not found."]
+    end
+
+    def fetch_group(group_title:)
+      if (group = @ship.groups[title: group_title])
+        # This is the equivalent of node.to_pretty_array
+        return group.to_h.each.map {|k, v| "#{k}#{(' ' * [(18 - k.length), 0].max)}#{v}"}
+      end
+      ["Group not found."]
+    end
+
+    def fetch_group_channels(group_title:)
+      if (group = @ship.groups[title: group_title])
+        return group.graphs.map {|g| g.nil? ? "Unnamed" : g.title}
+      end
+      ["No Channels Available."]
+    end
+
     def fetch_node(resource:, index:)
       @ship.graph(resource: resource).node(index: index)
     end

data/lib/mars_base_10/subject.rb

@@ -27,6 +27,10 @@ module MarsBase10
       @contents = a_contents_array
     end
 
+    def empty?
+      self.contents.empty?
+    end
+
     def index_width
       [self.item_count.to_s.length, 2].max
     end

data/lib/mars_base_10/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MarsBase10
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/mars_base_10/viewport.rb

@@ -70,15 +70,6 @@ module MarsBase10
       @active_pane = p
     end
 
-    def add_variable_width_pane(at_row: self.min_row, at_col: self.min_col, height_pct:)
-      p = VariableWidthPane.new viewport: self,
-                                  at_row: at_row,
-                                  at_col: at_col,
-                              height_pct: height_pct
-      @panes << p
-      p
-    end
-
     #
     # Adds a new variable width drawable area (VariableBothPane) to the
     #   right-hand side of the viewport.
@@ -95,6 +86,24 @@ module MarsBase10
       p
     end
 
+    def add_variable_height_pane(at_row:, width_pct:)
+      p = VariableHeightPane.new viewport: self,
+                                  at_row: at_row,
+                                  at_col: self.min_col,
+                               width_pct: width_pct
+      @panes << p
+      p
+    end
+
+    def add_variable_width_pane(at_row: self.min_row, at_col: self.min_col, height_pct:)
+      p = VariableWidthPane.new viewport: self,
+                                  at_row: at_row,
+                                  at_col: at_col,
+                              height_pct: height_pct
+      @panes << p
+      p
+    end
+
     def close
       Curses.close_screen
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mars_base_10
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Daryl Richter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -152,6 +152,7 @@ files:
 - lib/mars_base_10/cli.rb
 - lib/mars_base_10/comm_central.rb
 - lib/mars_base_10/graph_rover.rb
+- lib/mars_base_10/group_room.rb
 - lib/mars_base_10/pane.rb
 - lib/mars_base_10/ship.rb
 - lib/mars_base_10/stack.rb