chitin 1.0.3 → 1.0.4

data/ANNOUNCEMENT

@@ -76,6 +76,8 @@ Anyways, I really like it and find it useful. I much prefer it over Bash. I
 encourage you all to take a quick look at the README and maybe try it out
 yourselves.
 
+Hate mail welcome.
+
 - Ari/seydar
 ari@aribrown.com
 

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright 2013 Ari Brown. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY Ari Brown "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL Ari Brown OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README

@@ -238,7 +238,7 @@ Congratulations! You are now a second class scout!
 
 Alright, hotshot. Let's see if you've got what it takes to be first class.
 Your boss rolls into your office and asks to speak with you. You know it
-couldn't be about your porn collection because you fixed that in attaining
+couldn't be about your pokemon collection because you fixed that in attaining
 second class; now he just thinks you're a nerd for having a 40GB digimon
 collection. So bossman rolls in and says "Yo dawg, delete every file and folder
 in a directory." Naturally, he decides not to open up a GUI and do that himself
@@ -309,7 +309,7 @@ do this here because tar does NOT want any dashes.
 So back to the installation process:
 
   ari: ~/src/chitin % here 'configure', :prefix => '/Users/ari/local'
-  ari: ~/src/chitin % make & make.install
+  ari: ~/src/chitin % [make, make.install]
 
 `here` is the method we use to refer to an executable file relative to the
 current directory. We're using hash notation in configure to automatically
@@ -374,7 +374,7 @@ The string methods which take precedence over executables are:
   pack
   unpack
 
-== Globbing: Globins and Hobglobins
+== Globbing: Globlins and Hobgloblins
 
 Globbing is simple in Chitin: there is none. However, that's ok because
 globbing is a really really cheap hack. So here's what Chitin offers in its

data/TODO

@@ -4,12 +4,22 @@ FUTURE:
 *   remove/edit history
     -> important for removing passwords if accidentally typed
 *   improve library usage of executables
+*   interprocess communication
+    -> sharing of variables between chitin processes
+*   remove trailing whitespace from lines somehow. maybe as a final transformation when you hit enter?
+*   `other_ls = method(:ls)` would be cool. note that ls is mapped to a binary and is not actually a method
+*   pass environment to child processes
+*   tab complete ruby/shell things
 
 QUIRKS:
 *   menu doesn't erase itself sometimes
     -> cat and tabcomplete a file that is empty. output is correct but confusing
+*   does not play nice with GDB if it is called within the bash profile file
 
 FAILURES:
+*   ^C on running ruby programs kills the whole interpreter... womp.
+*   slashes in filenames
+*   `include Math; sin(5)` fails
 
 Questions:
 *   Why do you have to do @line = '' in Coolline in order to not affect the

data/bin/chitin

@@ -11,13 +11,8 @@ end
 
 require File.join(File.dirname(follow_link(__FILE__)), "..", "lib", "chitin")
 
-FileUtils
-if ARGV[0]
-  rc = ARGV[0]
-else
-  FileUtils.touch File.expand_path('~/.chitinrc')
-  rc = File.expand_path('~/.chitinrc')
-end
+rc = ARGV[0] || File.expand_path('~/.chitinrc')
+FileUtils.touch rc
 
 Chitin::Builtins.class_eval File.read(rc)
 

data/lib/chitin.rb

@@ -2,6 +2,10 @@ def need(file)
   require(File.dirname(File.expand_path(__FILE__)) + '/' + file)
 end
 
+require 'date'
+require 'fileutils'
+require 'pp'
+
 need 'chitin/version'
 need 'chitin/support'
 need 'chitin/file'
@@ -20,7 +24,3 @@ need 'chitin/tools/string_methods'
 need 'chitin/sandbox'
 need 'chitin/session'
 
-require 'date'
-require 'fileutils'
-require 'pp'
-

data/lib/chitin/commands/builtins.rb

@@ -45,11 +45,6 @@ module Chitin
       end
     end
 
-    # L for Lambda. Creates a proc as a RubyMethod
-    def L(&block)
-      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
@@ -77,6 +72,17 @@ module Chitin
       end
     end
 
+    # Do nothing. this is so that we don't accidentally delete a word we're trying to quote
+    bind(?\C-w) {}
+
+    # Automatically add *f(..) around something
+    bind ?\C-f do |c|
+      if beg = c.word_beginning_before(c.pos) and last = c.word_end_before(c.pos)
+        c.line[beg..last] = '*f(' + c.line[beg..last] + ')'
+        c.pos = last + 5 # 4 for the characters and 1 for the cursor
+      end
+    end
+
     # Clear the line, don't add it to history
     bind ?\C-g do |c|
       c.line.clear
@@ -124,6 +130,21 @@ module Chitin
   
       def gem(*a); raw_exec("gem", *a); end
       def all; D('.'); end
+
+      def to_num; L {|i| i.to_i }; end
+      def p(*args)
+        args.map do |arg|
+          if Runnable === arg
+            puts arg[:inspect]
+          else
+            puts arg.inspect
+          end
+        end
+
+        # i know puts returns nil, but this is to emphasize
+        # the fact that we want it to return nil
+        nil 
+      end
     end
     include Aliases
     
@@ -157,6 +178,21 @@ module Chitin
       end
       
       def method_missing(name, *args, &block)
+        if meth = lookup(name, *args, &block)
+          return meth
+        end
+      
+        # If we made it this far, there is no executable to be had. Super it up.
+        super
+      end
+  
+      def raw_exec(path, *args)
+        Executable.new path, *args
+      end
+      alias_method :here, :raw_exec
+      alias_method :h, :raw_exec
+
+      def lookup(name, *args, &block)
         if PRIORITY_METHODS.include? name
           return StringMethod.new(name, *args, &block)
         end
@@ -168,15 +204,9 @@ module Chitin
         if "".public_methods(false).include? name
           return StringMethod.new(name, *args, &block)
         end
-      
-        # If we made it this far, there is no executable to be had. Super it up.
-        super
-      end
-  
-      def raw_exec(path, *args)
-        Executable.new path, *args
+
+        nil
       end
-      alias_method :here, :raw_exec
     end
     include ExecutableBinaries
   

data/lib/chitin/commands/executable.rb

@@ -5,15 +5,12 @@ module Chitin
     include Runnable
   
     def initialize(path, *args)
+      super()
+
       @path = path
       @args = process_args(args)
     end
   
-    def |(other)
-      Pipe.new self, other
-    end
-    alias_method :<=>, :|
-  
     # EVERYTHING will be sent to the command. ERRTHANG!!!!
     def method_missing(name, *arr, &blk)
       setup name.to_s, *process_args(arr)
@@ -30,18 +27,37 @@ module Chitin
       processed = args.map do |arg|
         if arg.is_a? Hash
           arg.map do |k, v|
-            if k.is_a? Symbol
-              ["#{k.to_s.size > 1 ? '--' : '-'}#{k}", v.to_s]
-            else
-              [k.to_s, v.to_s]
-            end
+            key = if k.is_a? Symbol
+                    "#{k.to_s.size > 1 ? '--' : '-'}#{k}"
+                  else
+                    k
+                  end
+
+            val = v.is_a?(FSObject) ? v.to_a : v
+
+            [key, val]
           end
         else
-          arg.to_s
+          # I'm leaving this here so that I know what went down in this
+          # battlefield. I tried automatically expanding globs, but that
+          # in conjunction with * means things get expanded twice, resulting
+          # in a lot of duplicates.
+          #
+          # Maybe an answer is to get rid of * and only do automatic expansion
+          # for executables.
+          #
+          # NO YOU CAN'T! What if you want to pass a directory to program that
+          # you have save as a Chitin::Directory? It would end up being globbed
+          # open which is NOT what you wanted. Globbing must be done explicitly.
+          #
+          # a = arg.is_a?(FSObject) ? arg.to_a : arg
+          # pp a.map(&:to_s) if arg.is_a? FSObject
+          # a
+          arg
         end
       end
   
-      processed.flatten
+      processed.flatten.map {|a| a.to_s }
     end
 
     def args
@@ -61,9 +77,6 @@ module Chitin
       :io
     end
   
-    # TODO fix it so that self.err isn't alone in the whole `if self.err`
-    # bit. figure out a good way to make it default or something. i dunno.
-    # just do it.
     def run
       child = fork do
         # Like the comments in +open_pipes+, the user writes to +@in+.
@@ -71,14 +84,13 @@ module Chitin
         # since executables normally read from STDIN, we can link them.
         IO.open(0).reopen self[:in] # STDIN to the program comes from 
         IO.open(1).reopen self[:out]
-        IO.open(2).reopen self[:err] if self[:err]
+        IO.open(2).reopen self[:err]
   
-        self[:in].close  # These can be closed
-        self[:out].close # because there is already an opening
-        self[:err].close if self[:err] # via IO 0, 1, and 2.
+        # These can be closed because there is already an opening
+        # via IO 0, 1, and 2.
+        close_all
         # And it is important that they be closed, otherwise
         # we'll have a hanging pipe that will hold everything up.
-        # In the future, we'll use `close_all` to make it simple.
   
         exec path, *args
       end
@@ -97,7 +109,14 @@ module Chitin
   
     def reset
       @opened = false
+
+      # these set them to nil (duh)
       self.in, self.out, self.err = nil
+
+      # so that THESE can then reopen them
+      set_in  STDIN
+      set_out STDOUT
+      set_err STDERR
     end
   
     def each_line
@@ -119,23 +138,11 @@ module Chitin
     end
 
     def inspect
-      "#<Chitin::Executable @path=#{@path.inspect} @args=#{@args.inspect}>"
+      "#<Chitin::Executable #{super}>"
     end
 
     def to_s
-      arr = args.map do |arg|
-        if arg.is_a? Hash
-          arg.map do |k, v|
-            if k.is_a? Symbol
-              ["#{k.to_s.size > 1 ? '--' : '-'}#{k}", v.to_s]
-            else
-              [k.to_s, v.to_s]
-            end
-          end
-        else
-          arg.to_s
-        end
-      end
+      arr = process_args(args)
   
       [path, *arr.flatten].join ' '
     end

data/lib/chitin/commands/pipe.rb

@@ -7,6 +7,8 @@ module Chitin
   
     def initialize(*parts)
       @parts = parts
+
+      super()
   
       link_all
     end
@@ -78,7 +80,6 @@ module Chitin
   
       self
     end
-    alias_method :<=>, :|
   
     def in
       @parts.first[:in]

data/lib/chitin/commands/ruby.rb

@@ -8,16 +8,14 @@ module Chitin
     attr_reader :pid
   
     def initialize(*arr, &block)
+      super()
+
       raise "Need at least a method name" unless [String, Symbol].include? arr.first.class
       @chains = []
       latest  = [*arr]
       latest << block if block
       @chains << latest
     end
-  
-    def |(other)
-      Pipe.new self, other
-    end
 
     def method_missing(*arr, &block)
       latest  = [*arr]

data/lib/chitin/commands/runnable.rb

@@ -1,6 +1,12 @@
 module Chitin
   module Runnable
 
+    def initialize
+      set_in  STDIN
+      set_out STDOUT
+      set_err STDERR
+    end
+
     def <(io)
       case io
       when IO, File
@@ -73,6 +79,10 @@ module Chitin
 
     def bg!; @bg = true; self; end
     def bg?; @bg; end
+    def fg?; !@bg; end
+
+    def |(other); Pipe.new self, other; end
+    alias_method :<=>, :|
 
     private
 
@@ -80,57 +90,53 @@ module Chitin
     attr_accessor :in
     attr_accessor :out
     attr_accessor :err
-
-    def returning
-      raise "Not Yet Implemented"
-    end
-  
-    # Generally the same as +run+, except for the ruby commands
-    # they return real ruby that can be given back to the user.
-    def raw_run
-      run
-    end
   
+    # I'm pretty sure this would induce a memory leak if Ruby
+    # weren't GCed. Suggestions are appreciated.
     def set_in(other)
-      unless self[:in]
-        r, w = IO.pipe
-        w.close
-        self[:in=, r]
-      end
+      r, w = IO.pipe
+      w.close
+      self[:in=, r]
       self[:in].reopen other
     end
   
+    # I'm pretty sure this would induce a memory leak if Ruby
+    # weren't GCed. Suggestions are appreciated.
     def set_out(other)
-      unless self[:out]
-        r, w = IO.pipe
-        r.close
-        self[:out=, w]
-      end
+      r, w = IO.pipe
+      r.close
+      self[:out=, w]
       self[:out].reopen other
     end
   
+    # I'm pretty sure this would induce a memory leak if Ruby
+    # weren't GCed. Suggestions are appreciated.
     def set_err(other)
-      unless self[:err]
-        r, w = IO.pipe
-        r.close
-        self[:err=, w]
-      end
+      r, w = IO.pipe
+      r.close
+      self[:err=, w]
       self[:err].reopen other
     end
   
-    # code smell...
+    # if one of the following is nil, bad things happen. this is deliberate.
+    # is it wise? that's an exercise left to the reader.
     def close_all
-      self[:in]  && self[:in].close
-      self[:out] && self[:out].close
-      self[:err] && self[:err].close
+      self[:in].close
+      self[:out].close
+      self[:err].close
+    end
+
+    # These methods need to be implemented by those including this module
+    def returning; raise "Not Yet Implemented"; end
+    def wait; raise "Not Yet Implemented"; end
+    def reset; raise "Not Yet Implemented"; end
+    def run; raise "Not Yet Implemented"; end
+
+    # Generally the same as +run+, except for the ruby commands.
+    # they return real ruby that can be given back to the user.
+    def raw_run
+      run
     end
-  
-    # Methods to be done by those including this:
-    # wait
-    # reset
-    # run
-    # |(other) though this is easily done with a Pipe.new(self, other)
-  
   end
 end
 

data/lib/chitin/core_ext/coolline.rb

@@ -64,6 +64,8 @@ class Coolline
   # 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.
+  #
+  # Also, @history_moved appears to be a useless variable.
   def readline(prompt = ">> ")
     @prompt = prompt
 

data/lib/chitin/core_ext/object.rb

@@ -2,6 +2,7 @@ class Object
 
   # it does NOT return self, but rather the value of block.
   # if no block is given, it returns nil
+  # it's the equivalent of `with(object=nil) {|obj| blah }`
   def bottle # since it's not tap
     if block_given?
       yield self

data/lib/chitin/core_ext/string.rb

@@ -31,5 +31,43 @@ class String
   def /(other)
     Chitin::Executable.new File.join(self, other.to_s)
   end
+
+  def >>(other)
+    case other
+    when Chitin::FileObject
+      other.to_a.each do |fo|
+        next if fo.directory?
+
+        File.open(fo.to_s, 'a') {|f| f.puts self }
+      end
+    when String
+      File.open(other, 'a') {|f| f.puts self }
+    else
+      raise "Unknown piping type: #{other.class}"
+    end
+  
+    other
+  end
+
+  def >(other)
+    case other
+    when Chitin::FileObject
+      other.to_a.each do |fo|
+        next if fo.directory?
+
+        File.open(fo.to_s, 'w') {|f| f.puts self }
+      end
+    when String
+      File.open(other, 'w') {|f| f.puts self }
+    else
+      raise "Unknown piping type: #{other.class}"
+    end
+  
+    other
+  end
+
+  def |(other)
+    NULLIN > L { self } | other
+  end
 end
 

data/lib/chitin/file.rb

@@ -61,6 +61,10 @@ module Chitin
     def symlink?
       false
     end
+
+    def directory?
+      false
+    end
   end
 
   class FileObject < FSObject
@@ -132,6 +136,10 @@ module Chitin
     def inspect
       "#<Chitin::Directory #{path.inspect}>"
     end
+
+    def directory?
+      true
+    end
   end
 end
 
@@ -144,6 +152,11 @@ module Kernel
   alias_method :f, :F
   alias_method :s, :S
 
-  NULLIN = NULLOUT = NULLERR = File.open File::NULL
+  # L for Lambda. Creates a proc as a RubyMethod
+  def L(&block)
+    Chitin::StringMethod.new :bottle, &block
+  end
+
+  NULLIN = NULLOUT = NULLERR = File.open(File::NULL, 'w+')
 end
 

data/lib/chitin/sandbox.rb

@@ -3,7 +3,7 @@ module Chitin
     attr_reader :previous
 
     def initialize
-      @binding = binding
+      @binding  = binding
       @previous = nil
     end
   

data/lib/chitin/session.rb

@@ -17,7 +17,7 @@ module Chitin
       @editor  = Coolline.new do |c|
         # Remove the default of '-' and add support for strings
         # starting after parentheses.
-        c.word_boundaries = [' ', "\t", "(", ")"]
+        c.word_boundaries = [' ', "\t", "(", ")", '[', ']']
         c.history_file    = File.join ENV['HOME'], '.chitin_history'
 
         # Make sure we don't kill the shell accidentally when we're trying to
@@ -41,6 +41,9 @@ module Chitin
           # searching so we need it removed for now.
           unquoted_line = ['"', '\''].include?(line[0, 1]) ? line[1..-1] : line
   
+          #options  = Dir[unquoted_line + '*']
+          #options += 
+
           Dir[unquoted_line + '*'].map do |w|
             slash_it = File.directory?(w) and line[-1] != '/' and w[-1] != '/'
   
@@ -130,20 +133,16 @@ module Chitin
         not returning_ruby? res
       end
     end
+    alias_method :all_shell?, :all_not_ruby?
   
     def display(res)
       # The reason that this is here instead of in #evaluate is that
       # pipes could, in fact, have NO display output, but that isn't for
-      # #evaluate to decide; rather, it is for #display
-      if all_not_ruby? res
+      # #evaluate to decide: rather, it is for #display
+      if all_shell? res
         res = [res] unless Array === res
   
         res.each do |res|
-          # set up the inputs and outputs
-          res[:set_in,  STDIN]  unless res[:in]
-          res[:set_out, STDOUT] unless res[:out]
-          res[:set_err, STDOUT] unless res[:err]
-  
           res[:run]
           res[:wait] unless res[:bg]
         end
@@ -151,11 +150,6 @@ module Chitin
       else # else it's a standard ruby type (or a pipe returning as such)
   
         if Pipe === res || StringMethod === res
-          # set up the inputs and outputs
-          res[:set_in,  STDIN]  unless res[:in]
-          res[:set_out, STDOUT] unless res[:out]
-          res[:set_err, STDOUT] unless res[:err]
-
           val = res[:raw_run]
         else
           val = res
@@ -184,5 +178,9 @@ module Chitin
     def print(*args)
       @out.print *args
     end
+
+    def inspect
+      "#<Chitin::Session #{object_id}>"
+    end
   end
 end

data/lib/chitin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chitin
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wirble
@@ -73,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ANNOUNCEMENT
+- LICENSE
 - README
 - TODO
 - bin/chitin