eggsh 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/eggsh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eggsh}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Liu"]
-  s.date = %q{2011-01-13}
+  s.date = %q{2011-01-24}
   s.default_executable = %q{eggsh}
   s.description = %q{Use Ruby expressions instead of unfriendly shell script}
   s.email = %q{andrewliu33@gmail.com}

data/lib/runner.rb

@@ -23,7 +23,7 @@ module Eggsh
     end
 
     def read
-      line = Readline.readline('> ', true)
+      line = Readline.readline(@shell.prompt, true)
       return nil if line.nil?
       if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
         Readline::HISTORY.pop

data/lib/shell.rb

@@ -5,7 +5,8 @@ $alias_hash = {'ls' => 'ls --color=auto'}
 
 module Eggsh
   class Shell
-    SHELL_CMD = {'cd' => :cd, 'pwd' => :pwd, 'fullpwd' => :full_pwd}
+    SHELL_CMD = {'cd' => :cd, 'pwd' => :pwd, 'fullpwd' => :full_pwd,
+                 'quit' => :quit, 'exit' => :quit}
 
     def initialize
       @env = ENV.to_hash
@@ -17,6 +18,10 @@ module Eggsh
       @env
     end
 
+    def prompt
+      "#{pwd.to_color(:bold_green)}$ "
+    end
+
     def exec line
       begin
         # alias first
@@ -25,40 +30,46 @@ module Eggsh
           splitted[0] = $alias_hash[splitted[0]]
           line = splitted.join ' '
         end
-        #puts line
-        if line != '' && SHELL_CMD.has_key?(line.split(' ')[0])
-          send(SHELL_CMD[line.split(' ')[0]], line)
+
+        if !line.empty? && SHELL_CMD.has_key?(line.split(' ')[0])
+          msg = send(SHELL_CMD[line.split(' ')[0]], line)
+          puts msg if msg
+        elsif line.empty?
         else
           begin
             spawn(@env, @translator.translate(line).gsub("\n", ' '), :chdir => @pwd)
+            Process.wait
           rescue Errno::ENOENT => e
             puts e.display
           end
         end
-      #rescue
-      #  puts 'Syntax error'
       end
     end
 
   private
-    def pwd arg
+    def pwd arg = ''
       short = @pwd.split '/'
       (0...(short.size - 1)).each {|i| short[i] = short[i][0]}
-      puts short.join '/'
+      short.join '/'
     end
 
-    def full_pwd arg
-      puts @pwd
+    def full_pwd arg = ''
+      @pwd
     end
 
-    def cd arg
+    def cd arg = '.'
       new_path = File.expand_path arg.split(' ')[1], @pwd
       if File.directory? new_path
         @pwd = new_path
+        return nil
       else
-        puts "cd: Invalid path #{arg.split(' ')[1]}"
+        return "cd: Invalid path #{arg.split(' ')[1]}"
       end
     end
+
+    def quit arg = ''
+      exit
+    end
   end
 end
 

data/lib/util.rb

@@ -1,5 +1,5 @@
-# define to_cmd for every object
 class Object
+  # define to_cmd for every object
   def to_cmd
     if self.kind_of? Array
       return self.join ' '
@@ -7,5 +7,18 @@ class Object
       return self.to_s
     end
   end
+
+  # define to_color for terminal output
+  COLOR_CODE = {
+    :black => '30', :red => '31', :green => '32', :yellow => '33', :blue => '34',
+    :purple => '35', :cyan => '36', :white => '37', :bold_black => '1;30',
+    :bold_red => '1;31', :bold_green => '1;32', :bold_yellow => '1;33',
+    :bold_blue => '1;34', :bold_purple => '1;35', :bold_cyan => '1;36',
+    :bold_white => '1;37'
+  }
+
+  def to_color color
+    "\x1b[#{COLOR_CODE[color]}m#{to_s}\x1b[m"
+  end
 end
 

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: 
 - Andrew Liu
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +08:00
+date: 2011-01-24 00:00:00 +08:00
 default_executable: eggsh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 170263165
+      hash: -1614003115125705715
       segments: 
       - 0
       version: "0"