nirvana 0.1.0 → 0.1.1

data/.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project = 'tagaholic'
   s.executables  = ['nirvana', 'nirvana-websocket']
-  s.add_dependency 'ripl', '>= 0.2.1'
+  s.add_dependency 'ripl', '>= 0.3.0'
   s.add_dependency 'escape_utils', '>= 0.1.8'
   s.add_dependency 'json_pure', '>= 1.4.3'
   s.add_dependency 'em-websocket', '>= 0.1.4'

data/CHANGELOG.rdoc

@@ -1,2 +1,6 @@
+== 0.1.1
+* Add commandline options via a Runner
+* Fix to work with hirb
+
 == 0.1.0
 * Finally, a release

data/README.rdoc

@@ -23,6 +23,29 @@ If you close the tab, the path to nirvana's html page is (for reopening)
 
     $ echo $(dirname $(gem which nirvana))/nirvana/public/index.html
 
+To see what options nirvana takes (mostly options like ripl):
+
+    $ nirvana -h
+
+Once you're in the nirvana web shell, autocompletion should work better than irb's (argument
+autocompletion):
+
+    >> Bo[TAB]
+    >> Bond
+    >> Bond.const[TAB]
+       Bond.const_defined?
+       Bond.const_get
+       Bond.const_missing
+       Bond.const_set
+       Bond.constants
+    >> Bond.const_g[TAB]
+    >> Bond.const_get :Ag[TAB]
+    >> Bond.const_get :Agent
+
+Also notice that a subset of readline's functionality is available.  Try C-l, C-r or C-p and they
+should do what readline normally does. For more keybindings, see
+{readline.js}[http://github.com/cldwalker/readline.js].
+
 == Customize
 Since nirvana uses ripl under the hood, most shell behavior is customizable with ripl plugins which
 get loaded from ~/.riplrc. See {ripl}[http://github.com/cldwalker/ripl] for more.
@@ -40,8 +63,14 @@ report them on {readline.js}[http://github.com/cldwalker/readline.js/issues] or
 == Credits
 * {rkh's brirb}[http://github.com/rkh/brirb]: Original prototype which inspired this project
 
+== License
+nirvana is MIT licensed. nirvana comes bundled with other libraries which have the following
+licenses: jquery (GPL2 and MIT), jquery.hotkeys plugin (no license), repl.js jquery plugin (MIT) and
+readline.js jquery plugin (MIT).
+
 == Todo
 * Tests
+* Easier way to reopen an existing session
 * Load ~/.irb_history into readline.js
 * Customizable html and js
 * Use text area for multi-line input

data/deps.rip

@@ -1,4 +1,4 @@
-ripl >=0.2.1
+ripl >=0.3.0
 escape_utils >=0.1.8
 json_pure >=1.4.3
 em-websocket >=0.1.4

data/lib/nirvana.rb

@@ -2,20 +2,17 @@ require 'ripl'
 require 'ripl/web'
 require 'nirvana/shell'
 require 'nirvana/util'
+require 'nirvana/runner'
 require 'nirvana/version'
 
 module Nirvana
-  def self.start_shell
-    stdout, stderr = Util.capture_all {
-      Ripl::Runner.load_rc(Ripl.config[:riplrc])
-      Ripl.shell(:name=>'nirvana', :readline=>false).before_loop
-    }
-    (result = stdout.to_s + stderr.to_s) ? Util.format_output(result) : result
-  end
-
   def self.start
-    system "nirvana-websocket &"
-    html_file = File.expand_path(File.dirname(__FILE__) + '/nirvana/public/index.html')
-    RUBY_PLATFORM[/darwin/i]  ? system('open', html_file) : puts(html_file)
+    if Runner::EXIT_OPTIONS.include? ARGV[0]
+      Nirvana::Runner.run ARGV
+    else
+      system %[nirvana-websocket #{ARGV.join(' ')} &]
+      html_file = File.expand_path(File.dirname(__FILE__) + '/nirvana/public/index.html')
+      RUBY_PLATFORM[/darwin/i]  ? system('open', html_file) : puts(html_file)
+    end
   end
 end

data/lib/nirvana/runner.rb

@@ -0,0 +1,28 @@
+module Nirvana
+  class Runner < Ripl::Runner
+    self.app = 'nirvana'
+    EXIT_OPTIONS = %w{-h --help -v --version}
+
+    def self.run_command(argv)
+      begin
+        cmd = argv.shift
+        require "ripl/#{cmd}"
+      rescue LoadError
+        abort "`#{cmd}' is not a nirvana command."
+      end
+      start
+    end
+
+    def self.start(options={})
+      @argv = options[:argv]
+      parse_options @argv.dup
+      stdout, stderr = Util.capture_all {
+        load_rc(Ripl.config[:riplrc]) unless @argv.include? '-F'
+        Ripl::Shell.include Nirvana::Shell
+        (Ripl.config[:hirb] ||= {})[:pager] = false if defined? Hirb
+        Ripl.shell(:name=>'nirvana', :readline=>false).before_loop
+      }
+      (result = stdout.to_s + stderr.to_s) ? Util.format_output(result) : result
+    end
+  end
+end

data/lib/nirvana/shell.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'ripl/completion'
 
 module Nirvana
+  # Included into Ripl::Shell at runtime
   module Shell
     def web_loop_once(input)
       super
@@ -26,7 +27,10 @@ module Nirvana
     end
 
     def format_result(result)
-      output = Util.format_output @stdout + super
+      stdout, stderr, output = Util.capture_all { super }
+      @stdout << (stdout.empty? ? output : stdout)
+      @stderr << stderr
+      output = Util.format_output @stdout
       output = "<div class='nirvana_warning'>#{@stderr}</div>" + output unless @stderr.to_s.empty?
       output
     end
@@ -51,5 +55,3 @@ module Nirvana
     end
   end
 end
-
-Ripl::Shell.send :include, Nirvana::Shell

data/lib/nirvana/version.rb

@@ -1,3 +1,3 @@
 module Nirvana
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/nirvana/websocket.rb

@@ -7,7 +7,7 @@ module Nirvana
       EventMachine.run do
         EventMachine::WebSocket.start(:host => '127.0.0.1', :port => 8080) do |ws|
           ws.onopen {
-            result = Nirvana.start_shell
+            result = Nirvana::Runner.run ARGV
             ws.send(result) unless result.to_s.empty?
           }
           ws.onmessage {|msg| ws.send Ripl.shell.web_loop_once(msg) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nirvana
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 -05:00
+date: 2011-01-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 0
-        - 2
-        - 1
-        version: 0.2.1
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE.txt
 files: 
+- lib/nirvana/runner.rb
 - lib/nirvana/shell.rb
 - lib/nirvana/util.rb
 - lib/nirvana/version.rb