eggsh 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/eggsh

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/runner'
-
 if RUBY_VERSION < '1.9'
   puts 'Ruby interpreter version 1.9 is needed!'
   exit
 end
 
+require File.dirname(__FILE__) + '/../lib/runner'
+
 # Store the state of the terminal
 stty_save = `stty -g`.chomp
 

data/eggsh.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eggsh}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Liu"]

data/lib/shell.rb

@@ -8,28 +8,13 @@ module Eggsh
     SHELL_CMD = {'cd' => :cd, 'pwd' => :pwd, 'fullpwd' => :full_pwd}
 
     def initialize
+      @env = ENV.to_hash
       @pwd = ENV['PWD']
       @translator = Eggsh::Translator.new
     end
 
-    def pwd arg
-      short = @pwd.split['/']
-      (0...short.size).each {|i| short[i] = short[i][0]}
-      puts short.join '/'
-    end
-
-    def full_pwd arg
-      puts @pwd
-    end
-
-    def cd arg
-      new_path = @pwd + arg.split(' ')[1]
-      if File.directory? new_path
-        @pwd = new_path
-        ENV['PATH'] = new_path
-      else
-        puts 'Invalid path'
-      end
+    def env
+      @env
     end
 
     def exec line
@@ -44,12 +29,36 @@ module Eggsh
         if line != '' && SHELL_CMD.has_key?(line.split(' ')[0])
           send(SHELL_CMD[line.split(' ')[0]], line)
         else
-          system @translator.translate(line).gsub("\n", ' ')
+          begin
+            spawn(@env, @translator.translate(line).gsub("\n", ' '), :chdir => @pwd)
+          rescue Errno::ENOENT => e
+            puts e.display
+          end
         end
       #rescue
       #  puts 'Syntax error'
       end
     end
+
+  private
+    def pwd arg
+      short = @pwd.split '/'
+      (0...(short.size - 1)).each {|i| short[i] = short[i][0]}
+      puts short.join '/'
+    end
+
+    def full_pwd arg
+      puts @pwd
+    end
+
+    def cd arg
+      new_path = File.expand_path arg.split(' ')[1], @pwd
+      if File.directory? new_path
+        @pwd = new_path
+      else
+        puts "cd: Invalid path #{arg.split(' ')[1]}"
+      end
+    end
   end
 end
 

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: 
 - Andrew Liu
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -530874701
+      hash: 170263165
       segments: 
       - 0
       version: "0"