ripl-fresh 0.1.1 → 0.1.2

data/README.rdoc

@@ -20,34 +20,58 @@ Start it with:
 
 (or just <tt>fresh</tt>)
 
+Note, that it will also load your <tt>.irbrc</tt> file. To avoid this, you can do:
+
+  ripl -f fresh
+
 == Usage & configuration options
 
 For an example session, see {this blog entry}[http://rbjl.net/43-use-fresh-ruby-as-your-shell].
 
-The main regexp to determine if the command should be interpreted as system command is similar to this one: <tt>/^[a-z_-]+\s+.*/i</tt> (match a single word followed by at least one space). It can be adjusted in <tt>Ripl.config[:fresh_system_regexp]</tt>.
+The main regexp to determine if the command should be interpreted as system command is similar to this one: <tt>/^[a-z_-]+\s+.*/i</tt> (match a single word followed by at least one space). It can be adjusted in <tt>Ripl.config[:fresh_match_regexp]</tt>.
 
-Of course, there are also exceptions that should still get interpreted as Ruby (e.g. <tt>def </tt>). These can be found and modified in the <tt>Ripl.config[:fresh_ruby_words]</tt> array.
+If this regexp matches or the input is a single word <tt>([a-z_-]+)</tt>, _fresh_ searches through the <tt>Ripl.config[:fresh_ruby_words]</tt> array for exceptions that still should get interpreted as Ruby (e.g. <tt>def </tt>).
 
-Single words get interpreted as Ruby by default. You can set your "single system words" in <tt>Ripl.config[:fresh_system_words]</tt> (e.g. <tt>ls</tt>).
+Then, the <tt>Ripl.config[:fresh_system_words]</tt> arrays is checked, if it contains the command. This array defaults to your <tt>ENV['PATH']</tt>. You can add your own system commands there.
 
 There is also a third kind of command mode (besides <tt>:ruby</tt> and <tt>:system</tt>): <tt>:mixed</tt>. They look and feel like system commands, but redirect to the Ruby method described by the first word. You can register them in <tt> Ripl.config[:fresh_mixed_words]</tt> (e.g. +cd+).
 
+As a fallback, _fresh_ checks <tt>Kernel.respond_to?</tt>, if there is a ruby method with that name.
+
+If the regexp does match, but the command could not be found in any of the three word arrays, the command mode will be set to <tt>Ripl.config[:fresh_match_default]</tt> (<tt>:ruby</tt>). If the regexp does not match, <tt>Ripl.config[:fresh_default]</tt> is used (also defaults to <tt>:ruby</tt>).
+
 Of course, there is a way to explicitly set your command mode: You can prefix your input with a space to force Ruby mode as well as you can prefix it with <tt>^</tt> to force system mode. The strings used for this can be customized in <tt>Ripl.config[:fresh_system_prefix]</tt> and <tt>Ripl.config[:fresh_ruby_prefix]</tt>.
 
 You need to take a look at <tt>get_input</tt> method in the source file to 100% understand the command mode detection way.
 
+=== Prompt
+There is <tt>Riplc.config[:fresh_prompt]</tt> option, which takes a wide range of possible values. You can pass in a proc or a direct string. Furthermore, you can pass a symbol to get one of the following:
+* <tt>:default</tt> - usual fresh (directory) prompt
+* <tt>:PS1</tt> - use PS1 environment variable
+* <tt>:ripl</tt> - don't change prompt
+* <tt>:irb</tt> - use irbs :PROMPT_I (if set)
+* <tt>:simple</tt> - ">> "
+
 === Defaults
 
   # prefixes
-  Ripl.config[:fresh_system_prefix] = %w[^]
-  Ripl.config[:fresh_ruby_prefix]   = [' ']
-  # single words
-  Ripl.config[:fresh_system_words]  = %w[top ls] 
-  Ripl.config[:fresh_ruby_words]    = %w[begin case class def for if module undef unless until while puts warn print p pp ap raise fail loop require load lambda proc system]
-  # catch mix words
-  Ripl.config[:fresh_mixed_words]   = %w[cd] 
+  Ripl.config[:fresh_system_prefix]  = %w[^]
+  Ripl.config[:fresh_ruby_prefix]    = [' ']
+  # word arrays
+  Ripl.config[:fresh_ruby_words]     = %w[begin case class def for if module undef unless until while puts warn print p pp ap raise fail loop require load lambda proc system]
+  Ripl.config[:fresh_system_words]   =
+    ENV['PATH'].split(File::PATH_SEPARATOR).uniq.map {|e|
+      File.directory?(e) ? Dir.entries(e) : []
+    }.flatten.uniq - ['.', '..'] 
+  Ripl.config[:fresh_mixed_words]    = %w[cd] 
   # main regexp
-  Ripl.config[:fresh_system_regexp] = /^([a-z_-]+)\s+(?!(?:[=%*]|!=|\+=|-=|\/=))/i
+  Ripl.config[:fresh_match_regexp]    = /^([a-z\/_-]+)\s+(?!(?:[=%*]|!=|\+=|-=|\/=))/i
+  # regex matched but word not in one of the three arrays, possible values: :ruby, :system, :mixed
+  Ripl.config[:fresh_match_default]   = :ruby
+  # regex did not match
+  Ripl.config[:fresh_default]         = :ruby
+  # configure prompt
+  Ripl.config[:fresh_prompt] = :default
 
 == Customization
 
@@ -63,10 +87,12 @@ There are lots of things which can get better:
 
 * Improve auto-completion
 * More cool (and colorful?) <tt>:mixed</tt> Ruby commands
-* Improve interaction between system and ruby commands
+* Improve interaction between system and Ruby commands
   * <tt>ripl-multi_line</tt> for system commands
   * Result of system commands should be available for ruby, not only printed to stdout
+* Respect "..." (single argument) for :mixed commands
 * Improve default configuration
+* Add tests
 * Fresh ideas
 
 Feel free to fork in your improvements ;)

data/lib/bond/completions/ripl-fresh.rb

@@ -9,7 +9,14 @@ file_completion = proc{ |input|
 
 system_command_completion = proc{ Ripl.config[:fresh_system_words] }
 
-#everything_completion = proc{}
+everything_completion = proc{ # TODO: improve
+  # file_completion.call +
+  system_command_completion.call + 
+  Kernel.instance_methods +
+  Object.instance_methods +
+  Object.constants
+}
+
 
 complete :on => Ripl.config[:fresh_match_regexp],
          :search => false,
@@ -20,4 +27,7 @@ complete :on => Ripl::Fresh.option_array_to_regexp( Ripl.config[:fresh_system_pr
 #         :search => false,
           &system_command_completion
 
+complete :on => /^[a-z\/_-]*/i,
+          &everything_completion
+
 # J-_-L

data/lib/ripl/fresh/prompt.rb

@@ -0,0 +1,86 @@
+require 'socket'
+require 'etc'
+
+# save current prompt
+ripl_prompt = Ripl.config[:prompt] # TODO currently not working
+
+# setup default prompt
+default_prompt = proc{ |path|
+  path.gsub! /#{ File.expand_path('~') }/, '~'
+  path + '> '
+}
+
+# PS environment variable prompt
+ps_prompt = proc{ |prompt_number|
+  prompt = ENV['PS' + prompt_number.to_s].dup
+  prompt.gsub!('\a', '')                              # unsupported
+  prompt.gsub!('\d', Time.now.strftime("%a %b %d"))
+  prompt.gsub!(/\\D\{([^}]+)\}/){Time.now.strftime($1)}
+  prompt.gsub!('\e', "\033")
+  prompt.gsub!('\h', Socket.gethostname.split('.')[0])
+  prompt.gsub!('\H', Socket.gethostname.chomp)
+  prompt.gsub!('\j', '')                              # unsupported
+  prompt.gsub!('\l', '')                              # unsupported
+  prompt.gsub!('\n', "\n")
+  prompt.gsub!('\r', "\r")
+  prompt.gsub!('\s', 'fresh')
+  prompt.gsub!('\t', Time.now.strftime("%H:%M:%S"))
+  prompt.gsub!('\T', Time.now.strftime("%I:%M:%S"))
+  prompt.gsub!('\@', Time.now.strftime("%I:%M %p"))
+  prompt.gsub!('\A', Time.now.strftime("%H:%M"))
+  prompt.gsub!('\u', Etc.getlogin)
+  prompt.gsub!('\v', `#{`echo $SHELL`.chomp} --version`.gsub(/(.*(\d+\.\d+)\..*)/m){$2})
+  prompt.gsub!('\V', `#{`echo $SHELL`.chomp} --version`.gsub(/(.*(\d+\.\d+\.\d+).*)/m){$2})
+  prompt.gsub!('\w', FileUtils.pwd.gsub(/#{ File.expand_path('~') }/, '~'))
+  prompt.gsub!('\W', File.basename(FileUtils.pwd.gsub(/#{ File.expand_path('~') }/, '~')))
+  prompt.gsub!('\!', '')                              # unsupported
+  prompt.gsub!('\#', '')                              # unsupported
+  prompt.gsub!('\$'){uid = nil; Etc.passwd{|u| uid = u.uid if u.name == Etc.getlogin}; uid == 0 ? '#' : '$'}
+  prompt
+}
+
+# feel free to add your own creative one ;)
+prompt_collection = {
+  :default => default_prompt,
+  :ripl    => ripl_prompt,
+  :irb     => proc{ IRB.conf[:PROMPT][IRB.conf[:PROMPT_MODE]][:PROMPT_I] },
+  :simple  => '>> ',
+}
+
+# register proc ;)
+Ripl.config[:prompt] = proc{
+  fp = Ripl.config[:fresh_prompt]
+
+  # transform symbol to valid prompt
+  if fp.is_a? Symbol
+    fp_known = prompt_collection[fp]
+    if !fp_known
+      fp_known = 
+        case fp.to_s # maybe it's a special symbol
+        when /^PS(\d+)/
+          ps_prompt[ $1 ]
+        else # really unknown
+          Ripl.config[:fresh_prompt] = :default
+          default_prompt
+        end
+    end
+    fp = fp_known
+  end
+
+  # call if proc or return directly
+  if fp.respond_to? :call
+    fp.arity == 1 ? fp[ FileUtils.pwd ] : fp.call
+  else
+    case fp
+    when nil, false
+      ''
+    when String
+      fp
+    else
+      Ripl.config[:fresh_prompt] = :default
+      default_proc.call[ FileUtils.pwd ]
+    end
+  end
+}
+
+# J-_-L

data/lib/ripl/fresh.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 
 module Ripl
   module Fresh
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
 
     class << self
       # helper to parse options
@@ -49,13 +49,15 @@ module Ripl
           input = input[$1.size..-1]
           :ruby
         # single words, and main regex to match shell commands
-        when /^(\w+)$/i, Ripl.config[:fresh_match_regexp]
+        when /^([a-z_-]+)$/i, Ripl.config[:fresh_match_regexp]
           if Ripl.config[:fresh_ruby_words].include?($1)
             :ruby
           elsif Ripl.config[:fresh_mixed_words].include?($1)
             :mixed
           elsif Ripl.config[:fresh_system_words].include?($1)
             :system
+          elsif Kernel.respond_to? $1.to_sym
+            :ruby
           else
             Ripl.config[:fresh_match_default]
           end
@@ -130,25 +132,22 @@ require File.dirname(__FILE__) + '/fresh/commands'
 # prefixes
 Ripl.config[:fresh_system_prefix]  = %w[^]
 Ripl.config[:fresh_ruby_prefix]    = [' ']
-# single words
+# word arrays
 Ripl.config[:fresh_ruby_words]     = %w[begin case class def for if module undef unless until while puts warn print p pp ap raise fail loop require load lambda proc system]
 Ripl.config[:fresh_system_words]   =
   ENV['PATH'].split(File::PATH_SEPARATOR).uniq.map {|e|
     File.directory?(e) ? Dir.entries(e) : []
   }.flatten.uniq - ['.', '..'] 
-# catch mix words
 Ripl.config[:fresh_mixed_words]    = %w[cd] 
 # main regexp
-Ripl.config[:fresh_match_regexp]    = /^([a-z_-]+)\s+(?!(?:[=%*]|!=|\+=|-=|\/=))/i
+Ripl.config[:fresh_match_regexp]    = /^([a-z\/_-]+)\s+(?!(?:[=%*]|!=|\+=|-=|\/=))/i
 # regex matched but word not in one of the three arrays, possible values: :ruby, :system, :mixed
-Ripl.config[:fresh_match_default]   = :ruby 
+Ripl.config[:fresh_match_default]   = :ruby
 # regex did not match
-Ripl.config[:fresh_default]         = :ruby 
-# configure directory prompt
-Ripl.config[:prompt] = proc{
-  path = FileUtils.pwd
-  path.gsub! /#{ File.expand_path('~') }/, '~'
-  path + '> '
-}
+Ripl.config[:fresh_default]         = :ruby
+# configure prompt
+Ripl.config[:fresh_prompt] = :default
+
+require File.dirname(__FILE__) + '/fresh/prompt'
 
 # J-_-L

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jan Lelis
@@ -44,6 +44,7 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - lib/ripl/fresh/commands.rb
+- lib/ripl/fresh/prompt.rb
 - lib/ripl/fresh.rb
 - lib/ripl-fresh/bond_workaround.rb
 - lib/bond/completions/ripl-fresh.rb