arsh 1.0.5 → 1.0.6

data/bin/arsh

@@ -5,13 +5,13 @@ require 'rb-readline'
 
 Dir.glob("#{ARSH_INSTALL_PATH}/libs/*.rb").each { |mod| load(mod) }
 trap('QUIT',"IGNORE")
-trap('INT') do
-  begin
-    break
-  rescue
-    print "^C"
-  end
-end
+#trap('INT') do
+#  begin
+#    break
+#  rescue
+#    print "^C"
+#  end
+#end
 ## Set up some default variables
 $ps1="(arsh)<% ENV['USER'] %>@<% Dir.pwd %>$ "
 $ps2=">"
@@ -31,6 +31,9 @@ Readline.completion_proc = lambda do |search|
     if files.select { |f| f =~ %r[^#{search}] }.empty?
       files = ArshCommands.search_path(files)
     end
+    if files.select { |f| f =~ %r[^#{search}] }.empty?
+      files = ArshCommands.search_all(search)
+    end
   end
   # Complete builtin methods
   ArshCommands.singleton_methods.each { |method| files << method if method =~ /^#{search}/ }
@@ -74,8 +77,8 @@ module ArshCommands
         puts "#{$!}" 
       end
     # If (full path) file is executable..
-    elsif File.exists?(cmd) && File.executable?(cmd) 
-      system("#{cmd} #{parms}")
+    elsif File.exists?(cmd) && File.executable?(cmd)
+      system("#{cmd} #{parms.join(' ')}")
     # If file is in PATH
     elsif ArshCommands.in_path?(cmd,parms) == false
     # Try to run input as ruby code.
@@ -84,7 +87,7 @@ module ArshCommands
   end
 
   def self.search_current_directory(files,search)
-    Dir["#{search.gsub(%r[^/],"")}*"].each { |f| files << f }
+    Dir["#{search.gsub(%r[^/],"")}*"].each { |f| files << f if File.directory?(f) || File.executable?(f) }
 
     files.map! { |f| f.gsub(%r[#{Dir.pwd}/],"") }.map! { |f| File.directory?(f) ? f + "/" : f }
 
@@ -103,6 +106,12 @@ module ArshCommands
     end
     return files
   end
+
+  def self.search_all(search)
+    files = Dir.glob("#{search}*")
+    files.map! { |f| File.directory?(f) ? "#{f}/" : f }
+    return files
+  end
 end
 
 # Load Plugins
@@ -121,12 +130,19 @@ end
 end
 
 while true
-  
-# Get input
+  trap('INT') do
+    begin
+      break
+    rescue
+      print "^C"
+      break
+    end
+  end
   begin
    prompt = ArshCommands.rubyeval_indent == 0 ? $ps1 : "#{$ps2 * ArshCommands.rubyeval_indent} "
    input = Readline::readline(ArshCommands.replacestring(prompt)).to_s.strip
-  rescue 
+  rescue Exception => e
+    puts e 
     puts ""
     input = ""
   end

data/libs/version.rb

@@ -1,3 +1,3 @@
 module Arsh
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arsh
 version: !ruby/object:Gem::Version 
-  hash: 817493827709346980
+  hash: 1414957331145679041
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - James Paterni
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-23 00:00:00 -05:00
+date: 2012-01-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency