eggsh 0.1.3 → 0.2.0

data/Gemfile

@@ -6,10 +6,11 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
+  gem "bacon", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
 end
 
 gem "rb-readline"
+gem "sfl"

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    bacon (1.1.0)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
@@ -9,14 +10,15 @@ GEM
     rake (0.8.7)
     rb-readline (0.4.0)
     rcov (0.9.9)
-    shoulda (2.11.3)
+    sfl (2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bacon
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
   rb-readline
   rcov
-  shoulda
+  sfl

data/README.rdoc

@@ -11,21 +11,21 @@ do this in base:
 
 The solution is not so obvious , and it requires the knowledge of the tools like
 grep, sed, awk, xargs ... etc.  If ruby expressions are available in the command
-line environment, things will be much easy:
+line environment, things will be much easier:
 
   rm -rf { ls['*'] - ls['*.c'] }
-  // ruby expression inside {}
+  # ruby expression inside {}
 
 == Usage
 
-Ruby 1.9 interpreter is required.
-
   gem install eggsh
 
 Call 'eggsh' to start the shell.
 Settings of the shell are placed under ~/.eggshrc.
 
-{} brackets are used to evaluate ruby expressions.
+{  } brackets are used to evaluate ruby expressions.
+{> } brackets are used to evaluate ruby expressions, too, except for the output
+will not be executed.
 
 == Example
 

data/Rakefile

@@ -26,11 +26,9 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+desc 'Run tests'
+task :test do
+  sh 'bacon -Itest --automatic'
 end
 
 require 'rcov/rcovtask'

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/bin/eggsh

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 
-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

data/eggsh.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eggsh}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Liu"]
@@ -34,7 +34,8 @@ Gem::Specification.new do |s|
     "lib/translator.rb",
     "lib/util.rb",
     "test/helper.rb",
-    "test/test_eggsh.rb"
+    "test/test_translator.rb",
+    "test/test_util.rb"
   ]
   s.homepage = %q{http://github.com/eggegg/eggsh}
   s.licenses = ["MIT"]
@@ -43,7 +44,8 @@ Gem::Specification.new do |s|
   s.summary = %q{An interactive shell with Ruby power}
   s.test_files = [
     "test/helper.rb",
-    "test/test_eggsh.rb"
+    "test/test_translator.rb",
+    "test/test_util.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -52,20 +54,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rb-readline>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<sfl>, [">= 0"])
+      s.add_development_dependency(%q<bacon>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<rb-readline>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<sfl>, [">= 0"])
+      s.add_dependency(%q<bacon>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<rb-readline>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<sfl>, [">= 0"])
+    s.add_dependency(%q<bacon>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/runner.rb

@@ -1,5 +1,5 @@
-require_relative 'shell'
-require_relative 'util'
+require File.expand_path('../shell.rb', __FILE__)
+require File.expand_path('../util.rb', __FILE__)
 require 'readline'
 
 module Eggsh
@@ -18,11 +18,7 @@ module Eggsh
       Readline.basic_word_break_characters = ''
 
       while line = read
-        if line =~ /^(?<p>[^\{\}]*(\{\g<p>*\})*)*$/
-          @shell.exec line
-        else
-          puts 'eggsh: Unbalanced parentheses'
-        end
+        @shell.exec line
       end
     end
 

data/lib/shell.rb

@@ -1,4 +1,6 @@
-require_relative 'translator'
+require 'rubygems'
+require 'sfl'
+require File.expand_path('../translator.rb', __FILE__)
 
 module Eggsh
   class Shell
@@ -36,8 +38,11 @@ module Eggsh
         elsif line.empty?
         else
           begin
-            spawn(@env, @translator.translate(line).gsub("\n", ' '), :chdir => @pwd)
-            Process.wait
+            shell_line = @translator.translate(line)
+            unless shell_line.empty?
+              Kernel.spawn(@env, shell_line, :chdir => @pwd)
+              Process.wait
+            end
           rescue Exception => e
             puts e.display
           end
@@ -47,8 +52,8 @@ module Eggsh
 
   private
     def pwd arg = ''
-      short = @pwd.split '/'
-      (0...(short.size - 1)).each {|i| short[i] = short[i][0]}
+      short = @pwd.sub(/^#{ENV['HOME']}/, '~').split '/'
+      (0...(short.size - 1)).each {|i| short[i] = short[i][0..0]}
       short.join '/'
     end
 

data/lib/translator.rb

@@ -1,13 +1,36 @@
-require_relative 'ls'
+require File.expand_path('../ls.rb', __FILE__)
 
 module Eggsh
   class Translator
+    # translate a certain line with ruby expression
     def translate line
-      ls = Eggsh::Ls.new
+      eval_str, result, count = "", "", 0
+      for i in line.split ''
+        count += 1 if i == '{'
+        if count == 0
+          result += eval_part(eval_str).to_cmd + i
+          eval_str = ''
+        else
+          eval_str += i
+        end
+        count -= 1 if i == '}'
+      end
+      result += eval_part(eval_str).to_cmd
+      raise 'eggsh: Unbalanced parenthesis' if count != 0
+      result
+    end
 
-      nested = /(\{[^\{\}]*\})/
-      if line =~ nested
-        translate(line.sub(nested, eval($1[1..-2]).to_cmd))
+  private
+    def eval_part line
+      return '' if line.empty?
+      ls = Eggsh::Ls.new
+      if line =~ /\{\>?(.*)\}/
+        str = eval($1) unless line.empty?
+        if line =~ /\{\>(.*)\}/
+          return nil
+        else
+          return str
+        end
       else
         line
       end

data/test/helper.rb

@@ -7,12 +7,7 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
-require 'shoulda'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'eggsh'
+require 'bacon'
+Dir[File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', '*.rb'))].each {|f| require f }
 
-class Test::Unit::TestCase
-end

data/test/test_translator.rb

@@ -0,0 +1,45 @@
+require 'helper'
+
+describe 'translator' do
+  before do
+    @translator = Eggsh::Translator.new
+  end
+
+  it 'should translate empty string' do
+    @translator.translate('').should.equal ''
+  end
+
+  it 'should translate ruby with bracket' do
+    @translator.translate('{ 123 }').should.equal '123'
+  end
+
+  it 'should not have problem with nested bracket' do
+    @translator.translate('{(1..3).to_a.join}').should.equal '123'
+    @translator.translate('{(0..2).to_a.map{|i| i + 1}.join}').should.equal '123'
+  end
+
+  it 'should not evaluate expressions not in bracket' do
+    @translator.translate('(1..3).to_a.join').should.equal '(1..3).to_a.join'
+  end
+
+  it 'should work with two sets of brackets' do
+    @translator.translate('{(0..2).to_a.map{|i| i + 1}.map{|i| i + 1}.join}').should.equal '234'
+  end
+
+  it 'should no return with {>}' do
+    @translator.translate('{> 123 }').should.equal ''
+  end
+
+  it 'should execute within {>}' do
+    $TEST = nil
+    @translator.translate('{> $TEST = "abc"}').should.equal ''
+    $TEST.should.equal 'abc'
+  end
+
+  it 'should raise error with unbalanced parenthesis' do
+    should.raise(RuntimeError) { @translator.translate('{') }
+    should.raise(RuntimeError) { @translator.translate('}') }
+    should.raise(RuntimeError) { @translator.translate('{}}') }
+  end
+end
+

data/test/test_util.rb

@@ -0,0 +1,18 @@
+require 'helper'
+
+describe 'to_cmd' do
+  it 'should convert array to command line with to_cmd' do
+    %[ab cd ef].to_cmd.should.equal 'ab cd ef'
+  end
+
+  it 'should remain string with to_cmd' do
+    'abc'.to_cmd.should.equal 'abc'
+  end
+end
+
+describe 'to_color' do
+  it 'should output color escape with red' do
+    'abc'.to_color(:red).should.equal "\x1b[31mabc\x1b[m"
+  end
+end
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eggsh
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andrew Liu
@@ -18,74 +19,93 @@ date: 2011-01-25 00:00:00 +08:00
 default_executable: eggsh
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
   name: rb-readline
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: sfl
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *id002
+  name: bacon
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 5
         - 2
         version: 1.5.2
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id005
+  requirement: *id006
 description: Use Ruby expressions instead of unfriendly shell script
 email: andrewliu33@gmail.com
 executables: 
@@ -111,7 +131,8 @@ files:
 - lib/translator.rb
 - lib/util.rb
 - test/helper.rb
-- test/test_eggsh.rb
+- test/test_translator.rb
+- test/test_util.rb
 has_rdoc: true
 homepage: http://github.com/eggegg/eggsh
 licenses: 
@@ -126,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4197712127916392614
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -135,6 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -147,4 +169,5 @@ specification_version: 3
 summary: An interactive shell with Ruby power
 test_files: 
 - test/helper.rb
-- test/test_eggsh.rb
+- test/test_translator.rb
+- test/test_util.rb

data/test/test_eggsh.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestEggsh < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end