cygnus 0.0.2 → 0.0.3

data/bin/cygnus

@@ -8,17 +8,18 @@
 #       Author: rkumar http://github.com/rkumar/mancurses/
 #         Date: 2011-11-09 - 16:59
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2013-03-19 01:03
+#  Last update: 2013-03-19 14:02
 #
 #  == CHANGES
 #  == BUGS
-#     _ we have overridden textpad bindings yet they show / n gg etc.
-#       Need to write our own from the hash  bindings and add form ones to it.
-#     _ our bindings from the hash do not show up..
+#     x we have overridden textpad bindings yet they show / n gg etc.
+#     _ show form bindings too
+#     x our bindings from the hash do not show up..
 #     _ white line at bottom and right
 #
 #  == TODO 
 #
+#     _ use BS to cycle files visited as in mancurses
 #     _ show how many files 1-5 or 15 etc
 #     _ toggle edit mode and view mode
 #     _ long listing toggle + other toggles
@@ -383,24 +384,6 @@ def full_indexed_list dir=Dir.pwd, config={}, &block
         #alert "char got (#{ch.chr})"
         chr = ch.chr
         select_hint $viewport, chr
-        #ix = get_index chr
-        #if ix
-          #file = $viewport[ix]
-          #if file
-            #file = File.expand_path file
-            #if File.directory? file
-              #change_dir file
-              #next
-            #elsif File.file? file
-              #pad_display_file file, DefaultFileRenderer.new
-              #next
-            #else
-              #alert "Some new error has crept in. Neither file not directory: (#{file})"
-              #$log.warn "XXXXX: FILE Neither file not directory: (#{file})"
-            #end
-          #end
-        #else
-        #end
         next
       end
 
@@ -487,6 +470,11 @@ def pad_display_file filename, renderer, config={}, &block
   window = VER::Window.new(layout)
   form = RubyCurses::Form.new window
 
+  # maintain a stack of filename so we can backspace through them
+  fn = filename
+  fn = "#{Dir.pwd}/#{filename}" unless filename[0] == "/"
+  @file_stack << fn unless @file_stack.include? fn
+
   listconfig = config[:listconfig] || {}
   #listconfig[:list] = list
   listconfig[:width] = width
@@ -518,9 +506,48 @@ def pad_display_file filename, renderer, config={}, &block
   begin
     while((ch = window.getchar()) != 999 )
 
+      # we need to show bindings if user does ? or M-?
       case ch
+
+      when ?\C-j.getbyte(0), ?\C-n.getbyte(0)
+        # jump to next file so user does not need to go out and in again
+        $cursor += 1
+        if $view[$cursor]
+          _f = $view[$cursor]
+          lb.text(get_file_contents(_f))
+          lb.title(_f)
+          form.repaint
+          next
+        end
+
+      when ?\C-k.getbyte(0), ?\C-p.getbyte(0)
+        # jump to previous file so user does not need to go out and in again
+        $cursor -= 1
+        if $view[$cursor]
+          _f = $view[$cursor]
+          lb.text(get_file_contents(_f))
+          lb.title(_f)
+          form.repaint
+          next
+        end
       when ?q.getbyte(0), ?\C-q.getbyte(0), 13, 10, 27, 2727
+        # close window on q or enter or double escape
         break
+      when 127
+        # hitting backspace cycles through list of files viewed
+        # FIXME first time we have to hit BS 2 times since we get same file we are viewing
+        _f = @file_stack.pop
+        if _f
+          # push it to first
+          @file_stack.insert 0, _f
+          #lb.filename(_f)
+          lb.text(get_file_contents(_f))
+          form.repaint
+          next
+        else
+          #alert "No file to pop"
+        end
+
       else
         lb.handle_key ch
         form.repaint
@@ -649,6 +676,7 @@ end
       return ix
     end
     @dir_stack = []
+    @file_stack = []
     def change_dir dir, filename=nil
       @dir_stack << Dir.pwd unless @dir_stack.include? Dir.pwd
       $sta = $cursor = 0
@@ -723,6 +751,7 @@ end
       elsif text =~ /(archive|zip)/
         return :zip
       else
+        return :directory if File.directory? f
         return :unknown
       end
     end
@@ -747,6 +776,8 @@ end
           return t
       when :zip
         return `tar ztvf #{f}`.split("\n")
+      when :directory
+        return Dir.glob("*")
       else
         return ["unknown type", `file #{f}`]
       end

data/lib/cygnus.rb

@@ -186,8 +186,42 @@ def columnate_with_indexing ary, sz
   end
   return buff
 end
+# print in columns
+# ary - array of data
+# sz  - lines in one column
+# This is the original which did not format or color, but since we cannot truncate unless
+# we have unformatted data i need to mix the functionality into columnate_with_indexing
+def columnate ary, sz
+  buff=Array.new
+  return buff if ary.nil? || ary.size == 0
+  
+  # ix refers to the index in the complete file list, wherease we only show 60 at a time
+  ix=0
+  while true
+    ## ctr refers to the index in the column
+    ctr=0
+    while ctr < sz
+
+      f = ary[ix]
+      # deleted truncate and pad part since we expect cols to be sized same
+
+      if buff[ctr]
+        buff[ctr] += f
+      else
+        buff[ctr] = f
+      end
+
+      ctr+=1
+      ix+=1
+      break if ix >= ary.size
+    end
+    break if ix >= ary.size
+  end
+  return buff
+end
 ## formats the data with number, mark and details 
 def format ary
+  alert "deprecated, can be removed if not called"
   #buff = Array.new
   buff = Array.new(ary.size)
   return buff if ary.nil? || ary.size == 0
@@ -443,6 +477,26 @@ def show_marks
   #ch = get_char
   goto_bookmark(ch) if ch =~ /^[0-9A-Z]$/
 end
+def print_help
+  h = @bindings
+  row = 1
+  list = []
+  longestval = h.values.max_by(&:length)
+  llen = longestval.length
+  # they must all be of same size so i can easily columnate
+  h.each_pair { |k, v| list << " #[fg=yellow, bold]#{k.ljust(6)}#[/end] #[fg=green]#{v.ljust(llen)}#[/end]" }
+  lines = FFI::NCurses.LINES - row
+  list = columnate list, lines - 2
+  config = {}
+  config[:row] = row
+  config[:col] = 1
+  config[:title] = "Key Bindings"
+  #config[:width] = [longestval.length + 5, FFI::NCurses.COLS - 5].min
+  config[:width] = FFI::NCurses.COLS - config[:col]
+  config[:height] = lines
+  ch = padpopup list, config
+  return unless ch
+end
 # MENU MAIN -- keep consistent with zfm
 def main_menu
   h = { 

data/lib/cygnus/version.rb

@@ -1,3 +1,3 @@
 module Cygnus
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cygnus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -68058794029463024
+      hash: -4394376758347789343
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -68058794029463024
+      hash: -4394376758347789343
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25