chitin 1.0.5 → 1.0.6

data/README

@@ -404,3 +404,7 @@ Did you know?
   * ^q quotes the word just behind your cursor
   * I think this train might ACTUALLY get to Chicago on time!
 
+== Thanks
+
+A huge thank you to Roger Pack. You know why.
+

data/TODO

@@ -12,6 +12,9 @@ FUTURE:
 *   tab complete ruby/shell things
 *   post_processing for shell commands
     -> make it asynchronous and use pipes
+*   ability to 'neuter' a command, so that it won't automatically be run
+    -> i think i just did this in a commit (6/11/13)
+*   grep through history
 
 QUIRKS:
 *   menu doesn't erase itself sometimes
@@ -19,9 +22,11 @@ QUIRKS:
 *   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
+*   too many open pipes
+    -> don't close them in the first place
+*   unable to do "STDIN > ls > NULLOUT ^ NULLERR"
 
 Questions:
 *   Why do you have to do @line = '' in Coolline in order to not affect the

data/bin/chitin

@@ -12,9 +12,12 @@ end
 require File.join(File.dirname(follow_link(__FILE__)), "..", "lib", "chitin")
 
 rc = ARGV[0] || File.expand_path('~/.chitinrc')
-FileUtils.touch rc
 
-Chitin::Builtins.class_eval File.read(rc)
+Chitin::Builtins.class_eval File.read(rc) if rc
+
+if rc && File.exists?(rc)
+  Chitin::Builtins.class_eval File.read(rc)
+end
 
 SESSION = Chitin::Session.new Chitin::Builtins
 SESSION.start

data/lib/chitin/commands/builtins.rb

@@ -1,5 +1,6 @@
 # Things are contained in modules or functions so that they play well with
 # code folding.
+# Picked up that trick from Sinatra
 
 require 'etc'
 ENV['USER'] ||= Etc.getlogin
@@ -47,7 +48,17 @@ module Chitin
 
     # 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
+    def `(*args)
+      res = eval args.join
+
+      if Runnable === res
+        composed = res | L {|str| str }
+        res = composed[:raw_run].chomp
+        composed[:wait]
+      end
+
+      res.to_s
+    end
 
     # Place the last argument on the line
     # This is a total hack. It would need proper parsing to accomodate for
@@ -109,6 +120,41 @@ module Chitin
       def prompt
         "#{ENV['USER']}: #{short_pwd} % "
       end
+
+      # Get the elapsed time of the last command.
+      def last_elapsed
+        SESSION.last_elapsed || 0.0
+      end
+
+      def last_elapsed_formatted
+        hours = (last_elapsed / 3600).floor
+        min   = ((last_elapsed - 3600 * hours) / 60).floor
+        sec   = last_elapsed - 3600 * hours - 60 * min
+
+        if hours > 0
+          "%02d:%02d:%f" % [hours, min, sec]
+        elsif min > 0
+          "%02d:%f" % [min, sec]
+        else
+          "%f" % sec
+        end
+      end
+
+      # My personal fancy shell.
+      # On the first line it has the time, elapsed time of the last
+      # run command, and the shortened working directory.
+      # On the second line, it has three colored dots.
+      def time_elapsed_working_multiline_prompt
+        "(".purple + Time.now.to_s + ") ".purple +
+          "(".purple + "last => " + "#{last_elapsed_formatted}".cyan + ") ".purple +
+          "(".purple + short_pwd.yellow + ")\n".purple +
+          '.'.red + '.'.yellow + '.'.cyan + ' '
+      end
+
+      # Minimalist.
+      def minimalist_prompt
+        '.'.red + '.'.yellow + '.'.cyan + ' '
+      end
     end
     include Prompts
   
@@ -141,14 +187,16 @@ module Chitin
           end
         end
 
-        # i know puts returns nil, but this is to emphasize
-        # the fact that we want it to return nil
+        # i know puts returns nil and p returns the object, but this is to
+        # emphasize the fact that we want it to return nil. also, so that
+        # we don't accidentally run a Runnable while inspecting it
         nil 
       end
     end
     include Aliases
     
     # Fixnum math is now floating-point math
+    # hashtag gitonmahlevel
     class ::Fixnum
       alias_method :old_div, :/
       

data/lib/chitin/commands/executable.rb

@@ -1,5 +1,7 @@
 module Chitin
   class Executable
+    # this is needed to work in tandem with #method_missing.
+    # this will sweep all inherited methods BUT #[] under the rug.
     __sweep__ :[]
 
     include Runnable
@@ -9,12 +11,17 @@ module Chitin
 
       @path = path
       @args = process_args(args)
+      @suspended = false
     end
   
     # EVERYTHING will be sent to the command. ERRTHANG!!!!
     def method_missing(name, *arr, &blk)
-      setup name.to_s, *process_args(arr)
-      self
+      if @suspended
+        super(name, *arr, &blk)
+      else
+        setup name.to_s, *process_args(arr)
+        self
+      end
     end
 
     private
@@ -39,9 +46,9 @@ module Chitin
           end
         else
           # 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.
+          # battlefield. I tried automatically expanding FileObject 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.
@@ -137,6 +144,21 @@ module Chitin
       end
     end
 
+    # Make it so you can treat it like a normal object.
+    # This stops method forwarding
+    def suspend
+      @suspended_methods = private_methods.dup
+      @suspended_methods.each {|m| public m }
+
+      @suspended = true
+    end
+
+    def unsuspend
+      @suspended_methods.each {|m| private m }
+      @suspended_methods = []
+      @suspended = false
+    end
+
     def inspect
       "#<Chitin::Executable #{super}>"
     end
@@ -146,7 +168,6 @@ module Chitin
   
       [path, *arr.flatten].join ' '
     end
-  
   end
 end
 

data/lib/chitin/commands/ruby.rb

@@ -1,5 +1,5 @@
 module Chitin
-  class StringMethod
+  class PVC
     __sweep__ :[]
 
     include Runnable
@@ -26,8 +26,13 @@ module Chitin
 
     private
 
+    # prepare the initial input to be sent down through `@chains`
+    def prepare
+      self[:in]
+    end
+
     def result
-      val = self[:in].read
+      val = prepare
       @chains.each do |arr|
         val = if Proc === arr.last
                 val.send *arr[0..-2], &arr[-1]
@@ -87,12 +92,30 @@ module Chitin
       end.join '.'
     end
   
+    def inspect
+      "#<PVC #{to_s}>"
+    end
+  end
+
+  class StringMethod < PVC
+    private
+
+    # the only difference is that we have `self[:in]`
+    # instead of just `self[:in].read`
+    def prepare
+      self[:in].read
+    end
+
     def inspect
       "#<StringMethod #{to_s}>"
     end
   end
 end
 
+# I'm leaving this all here because it's important in understanding the
+# motivation for the above classes (PVC and StringMethod).
+# But the Proc stuff below was replaced by PVC above.
+
 # class Proc
 #   # So let's quick chat about what including Runnable to a proc means.
 #   # It means that it can be chained with pipes.

data/lib/chitin/core_ext/array.rb

@@ -0,0 +1,7 @@
+class Array
+  # [[k, v], [k, v], ...]
+  def to_hash
+    self.inject({}) {|h, (k, v)| h[k] = v; h }
+  end
+end
+

data/lib/chitin/core_ext/coolline.rb

@@ -49,6 +49,8 @@ class Coolline
   # 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.
+  # Notice how I went back to `@input.getch`, since Roger Pack was saying
+  # that `@input.raw { @input.getc }` wasn't working on Windows.
   def read_char
     #@input.raw { @input.getc }
     @input.getch
@@ -68,7 +70,14 @@ class Coolline
   #
   # Also, @history_moved appears to be a useless variable.
   def readline(prompt = ">> ")
-    @prompt = prompt
+    lines = prompt.split("\n")
+
+    if lines.size == 1
+      @prompt = prompt
+    else
+      puts lines[0..-2]
+      @prompt = lines.last
+    end
 
     @history.delete_empty
 

data/lib/chitin/core_ext/kernel.rb

@@ -0,0 +1,21 @@
+module Kernel
+  def D(path); Chitin::Directory.new path; end
+  def F(path); Chitin::FileObject.new path; end
+  def S(path); Chitin::Symlink.new path; end
+
+  alias_method :d, :D
+  alias_method :f, :F
+  alias_method :s, :S
+
+  # L for Lambda. Creates a proc as a RubyMethod
+  def L(&block)
+    Chitin::StringMethod.new :bottle, &block
+  end
+
+  def P(&block)
+    Chitin::PVC.new :bottle, &block
+  end
+
+  NULLIN = NULLOUT = NULLERR = File.open(File::NULL, 'w+')
+end
+

data/lib/chitin/file.rb

@@ -143,20 +143,3 @@ module Chitin
   end
 end
 
-module Kernel
-  def D(path); Chitin::Directory.new path; end
-  def F(path); Chitin::FileObject.new path; end
-  def S(path); Chitin::Symlink.new path; end
-
-  alias_method :d, :D
-  alias_method :f, :F
-  alias_method :s, :S
-
-  # 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/manifests/manifest.rb

@@ -0,0 +1,36 @@
+require 'openssl'
+
+module Chitin
+  class Manifest
+
+    def self.register(hash)
+      @@password_hash = hash
+    end
+
+    # retrieve the manifest entry for the name
+    def self.find(name)
+      manifest_path = File.expand_path '.chitin_manifest'
+      manifest      = File.read manifest_path
+      manifest_hmac = manifest_data[0..511]
+      manifest_data = manifest_data[512..-1]
+
+      # verify the authenticity of the file
+      computed_hmac = OpenSSL::HMAC.hexdigest('sha256',
+                                              @@password_hash,
+                                              manifest_data)
+
+      unless computed_hmac == manifest_hmac
+        puts "MANIFEST FILE HAS BEEN TAMPERED WITH"
+        return {}
+      end
+
+      @@data ||= {}
+      @@data[manifest_path] ||= YAML.load manifest_data
+      @@data[manifest_path][name]
+    end
+
+    def initialize
+    end
+  end
+end
+

data/lib/chitin/session.rb

@@ -7,17 +7,21 @@ module Chitin
   
     attr_reader :config
     attr_reader :editor
+    attr_reader :last_elapsed
   
     def initialize(config=nil)
       @config  = config
       @out     = STDOUT
       @sandbox = Sandbox.new # give it its own private space to work
-      (class << @sandbox; self; end).send :include, @config # include the config and builtins
+
+      # include the config and builtins
+      (class << @sandbox; self; end).send :include, @config
 
       @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
@@ -40,9 +44,6 @@ module Chitin
           # if there's a quote, remove it. we'll add it back in later, but it ruins
           # 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] != '/'
@@ -65,6 +66,9 @@ module Chitin
       while (val = read)
         next if val.empty?
   
+        # a little bit of infrastructure for timing purposes
+        timing = Time.now
+
         begin
           res = evaluate val
           display res unless val.lstrip[0, 1] == '#'
@@ -75,6 +79,8 @@ module Chitin
           puts "#{e.message} (#{e.class})"
           e.backtrace[1..-1].each {|l| puts "\t#{l}" }
           nil
+        ensure
+          @last_elapsed = Time.now - timing
         end
   
       end

data/lib/chitin/version.rb

@@ -1,4 +1,4 @@
 module Chitin
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chitin
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wirble
@@ -85,13 +85,16 @@ files:
 - lib/chitin/commands/pipe.rb
 - lib/chitin/commands/ruby.rb
 - lib/chitin/commands/runnable.rb
+- lib/chitin/core_ext/array.rb
 - lib/chitin/core_ext/class.rb
 - lib/chitin/core_ext/coolline.rb
 - lib/chitin/core_ext/io.rb
+- lib/chitin/core_ext/kernel.rb
 - lib/chitin/core_ext/object.rb
 - lib/chitin/core_ext/string.rb
 - lib/chitin/core_ext/symbol.rb
 - lib/chitin/file.rb
+- lib/chitin/manifests/manifest.rb
 - lib/chitin/sandbox.rb
 - lib/chitin/session.rb
 - lib/chitin/support.rb