chitin 1.0.2 → 1.0.3

data/ANNOUNCEMENT

@@ -9,9 +9,13 @@ Hai everybahdy
 
 == So what IS Chitin?
 
+Everything you type has to be valid Ruby.
+
 * Chitin is a Ruby interpreter
 * Turned into a shell.
 
+Everything you type has to be valid Ruby.
+
 I hope you all get the joke. I made it myself. The joke and the shell.
 
 Everything you type is Ruby -- remember that. So let's look at it in action.
@@ -42,6 +46,10 @@ even need closing quotes if they're the final character in a line:
   % ll | split("\n").map {|l| l.size }
    => [9, 57, 51, 49, 48, 61, 59, 53, 48, 55]
 
+Everything you type has to be valid Ruby. I am repeating this because in
+test cases, this is the one thing that everybody forgot. You can use the
+text preprocessor to change this, of course, but it's up to you.
+
 == Why use it?
 
 Because it's written in Ruby and supadupes easy to modify. Also:

data/README

@@ -399,16 +399,8 @@ Did you know?
 
   * A FULL RUBY INTERPRETER!
   * Tab completion that respects spaces in strings!
-  * Bashes' ESC-. to place the last argument!
+  * Bash's ESC-. to place the last argument!
   * Syntax highlighting as you type!
   * ^q quotes the word just behind your cursor
   * I think this train might ACTUALLY get to Chicago on time!
 
-== Bugs
-
-Coolline deletes and reprints the line with every character you type. This is
-great! We like this because it means we get syntax highlighting as we type.
-We don't like this, however, because it means that if a program prints output
-without a trailing newline, the last line of the output will be cut off by
-chitin as soon as you start typing :(
-

data/lib/chitin/commands/builtins.rb

@@ -50,6 +50,10 @@ module Chitin
       StringMethod.new :bottle, &block
     end
 
+    # ruby's backtick doesn't chomp off the newline, which makes it more
+    # or less useless for piping into other commands
+    def `(args); super(args).chomp; end
+
     # Place the last argument on the line
     # This is a total hack. It would need proper parsing to accomodate for
     # strings with spaces in them.

data/lib/chitin/commands/ruby.rb

@@ -20,7 +20,6 @@ module Chitin
     end
 
     def method_missing(*arr, &block)
-      puts caller[0]
       latest  = [*arr]
       latest << block if block
       @chains << latest

data/lib/chitin/commands/runnable.rb

@@ -1,12 +1,27 @@
 module Chitin
   module Runnable
 
+    def <(io)
+      case io
+      when IO, File
+        self[:set_in, io]
+      when String, FileObject
+        f = File.open io.to_s, 'r'
+        self[:set_in, f]
+        f.close
+      else
+        raise "Unknown piping type: #{io.class}"
+      end
+  
+      self
+    end
+
     def >(io)
       case io
       when IO, File
         self[:set_out, io]
       when String, FileObject
-        f = File.open io, 'w'
+        f = File.open io.to_s, 'w'
         self[:set_out, f]
         f.close
       else
@@ -17,11 +32,26 @@ module Chitin
     end
 
     def >>(io)
+      case io
+      when IO, File
+        self[:set_out, io]
+      when String, FileObject
+        f = File.open io.to_s, 'a'
+        self[:set_out, f]
+        f.close
+      else
+        raise "Unknown piping type: #{io.class}"
+      end
+  
+      self
+    end
+
+    def ^(io)
       case io
       when IO, File
         self[:set_err, io]
       when String, FileObject
-        f = File.open io, 'w'
+        f = File.open io.to_s, 'w'
         self[:set_err, f]
         f.close
       else

data/lib/chitin/core_ext/coolline.rb

@@ -46,17 +46,24 @@ class Coolline
     end
   end
 
-  # This is to comment out `reset_line`.
-  # Now why would we do that, you ask?
-  # Because otherwise it overwrites the entire line when printing the prompt.
-  # And what's wrong with that?
-  # This is undesirable behavior if the previous program run prints output
-  # that does NOT have a trailing newline.
-  # This was the source of a "bug" for a few days now.
-  #
-  # NB: This preserves any input on the line for ONLY the initial printing of
-  # the prompt. After that, the render call in the #getch loop will overwrite
-  # it. This needs some work, obviously.
+  # In tests, this reads the first character of buffered input.
+  # In practice, this does not do anything differently than `@input.getch`
+  # C'est la vie.
+  def read_char
+    @input.raw { @input.getc }
+  end
+
+  # This is here because the line:
+  #   until (char = @input.getch) == "\r"
+  # was replaced with:
+  #   until (char = read_char) == "\r"
+  # because I'm trying and failing to fix it so that Coolline
+  # will read buffered characters from STDIN. For example:
+  #   def test; sleep 2; STDIN.getch; end
+  # if you run that and type a bunch of characters, it will only
+  # return the first character you typed AFTER STDIN.getch got a chance
+  # to run. Ideally, with `read_char` it will read the first character that
+  # you typed regardless.
   def readline(prompt = ">> ")
     @prompt = prompt
 
@@ -76,7 +83,7 @@ class Coolline
     @history.index = @history.size - 1
     @history << @line
 
-    until (char = @input.getch) == "\r"
+    until (char = read_char) == "\r"
       @menu.erase
 
       handle(char)
@@ -98,7 +105,6 @@ class Coolline
 
     @history.save_line
 
-    @menu.erase
     @line
   end
 end

data/lib/chitin/file.rb

@@ -57,6 +57,10 @@ module Chitin
     def to_s
       path
     end
+
+    def symlink?
+      false
+    end
   end
 
   class FileObject < FSObject
@@ -89,10 +93,6 @@ module Chitin
     def inspect
       "#<Chitin::FileObject #{path.inspect}>"
     end
-
-    def symlink?
-      false
-    end
   end
 
   class Symlink < FileObject
@@ -132,10 +132,6 @@ module Chitin
     def inspect
       "#<Chitin::Directory #{path.inspect}>"
     end
-
-    def symlink?
-      false
-    end
   end
 end
 

data/lib/chitin/sandbox.rb

@@ -1,5 +1,7 @@
 module Chitin
   class Sandbox
+    attr_reader :previous
+
     def initialize
       @binding = binding
       @previous = nil
@@ -10,7 +12,11 @@ module Chitin
     end
   
     def evaluate(code)
-      @previous = eval code, @binding
+      self.previous = eval code, @binding
+    end
+
+    def previous=(val)
+      @previous = val
       eval "_ = @previous", @binding
     end
   end

data/lib/chitin/session.rb

@@ -160,6 +160,13 @@ module Chitin
         else
           val = res
         end
+
+        # if the input is ruby, then this is redundant
+        # if the input is a pipe that returns ruby,
+        # then this is needed because while the expression
+        # returns a pipe, when we run it it returns a ruby
+        # value. we want to remember the ruby value.
+        @sandbox.previous = val
   
         txt = @config.post_processing[:color].call val.inspect
         puts " => #{txt}"

data/lib/chitin/version.rb

@@ -1,4 +1,4 @@
 module Chitin
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chitin
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wirble