cygnus 0.0.3 → 0.0.4

data/bin/cygnus

@@ -8,7 +8,7 @@
 #       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 14:02
+#  Last update: 2013-03-19 20:04
 #
 #  == CHANGES
 #  == BUGS
@@ -334,6 +334,7 @@ def full_indexed_list dir=Dir.pwd, config={}, &block
 
   #config[:suppress_border] = true
   $files = get_file_list(dir)
+  enhance_file_list
   lb = Cygnus::TextPad.new @form, config, &block
   form_bindings @form
   $grows = lb.rows
@@ -448,14 +449,25 @@ def c_process_key c
     ch = "end"
   end
 
-  binding = h[ch]
-  binding = h[ch.to_sym] unless binding
-  if binding
-    if respond_to?(binding, true)
-      send(binding)
+  x = h[ch]
+  x = h[ch.to_sym] unless x
+  x = x.split if x
+  if x
+    binding = x.shift
+    args = x
+    if binding && respond_to?(binding, true)
+      send(binding, *args)
       return true
     end
+  else
+    #perror "No binding for #{ch}"
   end
+  #if binding
+    #if respond_to?(binding, true)
+      #send(binding)
+      #return true
+    #end
+  #end
   return false
 end
 def pad_display_file filename, renderer, config={}, &block
@@ -473,7 +485,8 @@ def pad_display_file filename, renderer, config={}, &block
   # 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
+  #@file_stack << fn unless @file_stack.include? fn
+  $visited_files << fn unless $visited_files.include? fn
 
   listconfig = config[:listconfig] || {}
   #listconfig[:list] = list
@@ -536,10 +549,10 @@ def pad_display_file filename, renderer, config={}, &block
       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
+        _f = $visited_files.pop
         if _f
           # push it to first
-          @file_stack.insert 0, _f
+          $visited_files.insert 0, _f
           #lb.filename(_f)
           lb.text(get_file_contents(_f))
           form.repaint
@@ -676,7 +689,6 @@ 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
@@ -701,6 +713,8 @@ end
     def display_dir filename=nil
       $sta = $cursor = 0
       list = get_file_list
+      $files = list
+      enhance_file_list
       if filename
         ix = list.index filename
         if ix 
@@ -712,7 +726,7 @@ end
         end
       end
       #alist = index_this_list list
-      alist = columnate_with_indexing list, $grows
+      alist = columnate_with_indexing $files, $grows
       lb = @form.by_name["fitp"]
       lb.formatted_text(alist, :tmux)
       lb.title = Dir.pwd
@@ -721,8 +735,7 @@ end
       @header.text_center Dir.pwd
       @header.text_right "#{$sta}, #{$cursor}"
       @form.repaint
-      $files = list
-      return list
+      $files
     end
     def get_file_list dir="."
       list = Dir.entries dir
@@ -783,6 +796,7 @@ end
       end
     end
     def show
+      # used still ? XXX
       list = get_file_list
       ix = padpopuplist list, :title => "Files", :bgcolor => :blue, :color => :white
       return unless ix
@@ -835,6 +849,7 @@ end
         "M-+"   => "columns_incdec 1",
         "S"     =>  "command_file list y ls -lh",
         "L"     =>  "command_file Page n less",
+        "V"     =>  "command_file edit n vim",
         "C-d"   =>  "cursor_scroll_dn",
         "C-b"   =>  "cursor_scroll_up",
         "up"   =>  "cursor_up",

data/lib/cygnus.rb

@@ -846,7 +846,7 @@ def subcommand
     $quitting = true
     $writing = true if $modified
   elsif command == "p"
-    system "echo $PWD | pbcopy"
+    c_system "echo $PWD | pbcopy"
     get_single "Stored PWD in clipboard (using pbcopy)"
   end
 end
@@ -993,8 +993,8 @@ def command_file prompt, *command
   file = File.expand_path(file)
   if File.exists? file
     file = Shellwords.escape(file)
-    pbold "#{command} #{file} (#{pauseyn})"
-    system "#{command} #{file}"
+    pbold "#{command} #{file} (press a key)"
+    c_system "#{command} #{file}"
     pause if pauseyn == "y"
     c_refresh
   else
@@ -1386,7 +1386,7 @@ def newfile
   str = get_line "Enter file name: "
   #str = Readline::readline('>', true)
   return if str.nil? || str == ""
-  system "$EDITOR #{str}"
+  c_system "$EDITOR #{str}"
   $visited_files.insert(0, str) if File.exists?(str)
   c_refresh
 end
@@ -1433,13 +1433,18 @@ def enhance_file_list
   # if only one entry and its a dir
   # get its children and maybe the recent mod files a few
   
+  # zsh gives errors which stick on stdscr and don't get off!
+  # Rather than using N I'll try to convert to ruby, but then we lose
+  # similarity to cetus and its tough to redo all the sorting stuff.
   if $files.size == 1
     # its a dir, let give the next level at least
     if $files.first[-1] == "/"
       d = $files.first
-      f = `zsh -c 'print -rl -- #{d}*(omM)'`.split("\n")
+      #f = `zsh -c 'print -rl -- #{d}*(omM)'`.split("\n")
+      f = get_file_list d
       if f && f.size > 0
         $files.concat f
+        $files.concat get_important_files(d)
         return
       end
     else
@@ -1454,15 +1459,16 @@ def enhance_file_list
   if $files.index("Gemfile") || $files.grep(/\.gemspec/).size > 0
     # usually the lib dir has only one file and one dir
     flg = false
+    $files.concat get_important_files(Dir.pwd)
     if $files.index("lib/")
-      f = `zsh -c 'print -rl -- lib/*(om[1,5]M)'`.split("\n")
+      f = `zsh -c 'print -rl -- lib/*(om[1,5]MN)'`.split("\n")
       if f && f.size() > 0
         insert_into_list("lib/", f)
         flg = true
       end
       dd = File.basename(Dir.pwd)
       if f.index("lib/#{dd}/")
-        f = `zsh -c 'print -rl -- lib/#{dd}/*(om[1,5]M)'`.split("\n")
+        f = `zsh -c 'print -rl -- lib/#{dd}/*(om[1,5]MN)'`.split("\n")
         if f && f.size() > 0
           insert_into_list("lib/#{dd}/", f)
           flg = true
@@ -1470,7 +1476,7 @@ def enhance_file_list
       end
     end
     if $files.index("bin/")
-      f = `zsh -c 'print -rl -- bin/*(om[1,5]M)'`.split("\n")
+      f = `zsh -c 'print -rl -- bin/*(om[1,5]MN)'`.split("\n")
       insert_into_list("bin/", f) if f && f.size() > 0
       flg = true
     end
@@ -1482,23 +1488,23 @@ def enhance_file_list
   return if $files.size > 15
 
   ## first check accessed else modified will change accessed
-  moda = `zsh -c 'print -rn -- *(/oa[1]M)'`
+  moda = `zsh -c 'print -rn -- *(/oa[1]MN)'`
   if moda && moda != ""
-    modf = `zsh -c 'print -rn -- #{moda}*(oa[1]M)'`
+    modf = `zsh -c 'print -rn -- #{moda}*(oa[1]MN)'`
     if modf && modf != ""
       insert_into_list moda, modf
     end
-    modm = `zsh -c 'print -rn -- #{moda}*(om[1]M)'`
+    modm = `zsh -c 'print -rn -- #{moda}*(om[1]MN)'`
     if modm && modm != "" && modm != modf
       insert_into_list moda, modm
     end
   end
   ## get last modified dir
-  modm = `zsh -c 'print -rn -- *(/om[1]M)'`
+  modm = `zsh -c 'print -rn -- *(/om[1]MN)'`
   if modm != moda
-    modmf = `zsh -c 'print -rn -- #{modm}*(oa[1]M)'`
+    modmf = `zsh -c 'print -rn -- #{modm}*(oa[1]MN)'`
     insert_into_list modm, modmf
-    modmf1 = `zsh -c 'print -rn -- #{modm}*(om[1]M)'`
+    modmf1 = `zsh -c 'print -rn -- #{modm}*(om[1]MN)'`
     insert_into_list(modm, modmf1) if modmf1 != modmf
   else
     # if both are same then our options get reduced so we need to get something more
@@ -1507,9 +1513,30 @@ def enhance_file_list
   end
 end
 def insert_into_list dir, file
-  ix = $files.index(dir)
-  raise "something wrong can find #{dir}." unless ix
-  $files.insert ix, *file
+  ## earlier we were inserting these files at helpful points (before the dirs), but they are touch to find.
+  # I think it;s better to put at end
+  #ix = $files.index(dir)
+  #raise "something wrong can find #{dir}." unless ix
+  #$files.insert ix, *file
+  $files.concat file 
+end
+def get_important_files dir
+  # checks various lists like visited_files and bookmarks
+  # to see if files from this dir or below are in it.
+  # More to be used in a dir with few files.
+  list = []
+  l = dir.size + 1
+  $visited_files.each do |e|
+    if e.index(dir) == 0
+      list << e[l..-1]
+    end
+  end
+  # bookmarks have : which needs to be removed
+  #list1 = $bookmarks.values.select do |e|
+    #e.index(dir) == 0
+  #end
+  #list.concat list1
+  return list
 end
 #
 # prints a prompt at bottom of screen, takes a character and returns textual representation

data/lib/cygnus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cygnus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4394376758347789343
+      hash: 849870953013136634
 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: -4394376758347789343
+      hash: 849870953013136634
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25