ripl-fresh 0.1.0 → 0.1.1

data/README.rdoc

@@ -1,6 +1,6 @@
 = Fresh Ruby Enhanced SHell
 
-We love Ruby. We love the command line. So... the shell needs to be rubyfied ;).
+We love Ruby. And we love the command line. So... the shell needs to be rubyfied ;).
 
 == How does it work?
 
@@ -22,6 +22,8 @@ Start it with:
 
 == 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>.
 
 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.
@@ -69,6 +71,11 @@ There are lots of things which can get better:
 
 Feel free to fork in your improvements ;)
 
+== Other gems you might find interesting
+
+* {rush}[https://github.com/adamwiggins/rush] - Another Ruby shell, different concept
+* {ripl}[https://github.com/cldwalker/ripl] - An irb alternative, +fresh+ is based on it
+
 == Copyright
 
 Copyright (c) 2010 Jan Lelis <http://code-needs-smileys.com> released under the MIT license.

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

@@ -1,5 +1,5 @@
 # no advanced auto completion, yet
-# only do some file completion - because it's the most important completion ;)
+# todo: not only default options
 
 require 'readline'
 
@@ -7,11 +7,17 @@ file_completion = proc{ |input|
   ::Readline::FILENAME_COMPLETION_PROC.call(input) || []
 }
 
-complete :on => Ripl.config[:fresh_system_regexp],
-         :search=>false,
+system_command_completion = proc{ Ripl.config[:fresh_system_words] }
+
+#everything_completion = proc{}
+
+complete :on => Ripl.config[:fresh_match_regexp],
+         :search => false,
           &file_completion
 
 # TODO fires only when space after ^
 complete :on => Ripl::Fresh.option_array_to_regexp( Ripl.config[:fresh_system_prefix] ),
-         :search=>false,
-          &file_completion
+#         :search => false,
+          &system_command_completion
+
+# J-_-L

data/lib/ripl/fresh.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 
 module Ripl
   module Fresh
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
 
     class << self
       # helper to parse options
@@ -31,8 +31,6 @@ module Ripl
         # register bond completion
         Ripl.config[:completion][:gems] ||= []
         Ripl.config[:completion][:gems] << 'ripl-fresh'
-        # load :mixed commands
-        require File.dirname(__FILE__) + '/fresh/commands'
       end
 
       # determine @command_mode
@@ -50,30 +48,20 @@ module Ripl
         when Ripl::Fresh.option_array_to_regexp( Ripl.config[:fresh_ruby_prefix] )
           input = input[$1.size..-1]
           :ruby
-        # single words
-        when /^\w+$/i
-          if Ripl.config[:fresh_ruby_words].include?($&)
+        # single words, and main regex to match shell commands
+        when /^(\w+)$/i, Ripl.config[:fresh_match_regexp]
+          if Ripl.config[:fresh_ruby_words].include?($1)
             :ruby
-          elsif Ripl.config[:fresh_mixed_words].include?($&)
+          elsif Ripl.config[:fresh_mixed_words].include?($1)
             :mixed
-          elsif Ripl.config[:fresh_system_words].include?($&)
+          elsif Ripl.config[:fresh_system_words].include?($1)
             :system
           else
-            :ruby
-          end
-        # set of commands that call the ruby method but have command line style calling (args without "")
-        when Ripl::Fresh.option_array_to_regexp( Ripl.config[:fresh_mixed_words] )
-          :mixed
-        # here is the important magical regex for shell commands
-        when Ripl.config[:fresh_system_regexp]
-          if Ripl.config[:fresh_ruby_words].include? $1
-            :ruby
-          else
-            :system
+            Ripl.config[:fresh_match_default]
           end
         # default is still ruby ;)
         else
-          :ruby
+          Ripl.config[:fresh_default]
         end
 
         input
@@ -134,18 +122,28 @@ Ripl.config[:readline] = false
 require 'ripl/readline'
 Ripl::Shell.send :include, Ripl::Fresh::Shell
 
+# load :mixed commands
+require File.dirname(__FILE__) + '/fresh/commands'
+
 ## fresh config ###
 
 # 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]
+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] 
+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 directory prompt
 Ripl.config[:prompt] = proc{
   path = FileUtils.pwd

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +01:00
+date: 2010-11-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency