termvana 0.2.0.beta2 → 0.2.0.beta3

data/CHANGELOG.rdoc

@@ -5,3 +5,4 @@
 * build simple site
 _ fix timeout error when you run a long command and then other commands
 * more specs for CD - home dir, expanded paths, CDPATH, multiple terminals
+_ show home dir

data/lib/termvana/app/actions/websocket_action.rb

@@ -11,6 +11,10 @@ class Termvana::WebsocketAction < Cramp::Websocket
 
   def opened_conn
     @environment = Termvana::Environment.new(:env => {"HOME" => ENV['HOME']})
+    # Setup
+    Dir.chdir(@environment.fullpath(@environment.cwd))
+    @environment.env["PWD"] = @environment.cwd = Dir.pwd
+    
     @environment.messenger do |message|
       render message.to_s
     end

data/lib/termvana/app/commands/cd.rb

@@ -7,6 +7,9 @@ module Termvana
       dir = request[1] || "~"
       Dir.chdir(environment.fullpath(dir))
       environment.env["PWD"] = environment.cwd = Dir.pwd
+      # Send system env update to JS
+      respond_with(:data => {:environment => environment}, :type => :system)
+      # Terminate with null message
       finish
     end
   end

data/lib/termvana/app/commands/load_environment.rb

@@ -0,0 +1,15 @@
+module Termvana
+  class LoadEnvironmentCommand < Command
+    type :builtin
+    response :system
+    name "load_environment"
+    def call
+      respond_with(:data => {:environment => environment})
+      respond_with(:null)
+    end
+  end
+end
+
+Termvana::CommandProcessor.register(Termvana::LoadEnvironmentCommand)
+
+

data/lib/termvana/app/models/command.rb

@@ -12,14 +12,20 @@ module Termvana
       end
     end
 
-    def respond_with(opts = {})
-      if opts == :null
-        environment.send_message Termvana::Response.new
+    def respond_with(*args)
+      opts = args.extract_options!
+      opts[:message] ||= args.shift if args.first.is_a? String
+      
+      if args.first == :null
+        opts = {}
       elsif data = opts.delete(:text)
-        environment.send_message Termvana::Response.new(:message => data)
+        opts[:message] ||= data
       elsif data = opts.delete(:error)
-        environment.send_message Termvana::Response.new(:message => data, :type => :error)
+        opts[:message] ||= data
+        opts[:type] = :error
       end
+      opts[:type] ||= self.class.response
+      environment.send_message Termvana::Response.new(opts)
     end
 
 

data/lib/termvana/app/models/response.rb

@@ -2,6 +2,7 @@ module Termvana
   class Response
     include Virtus
     attribute :message, String, :default => ""
+    attribute :data, Hash
     attribute :type, Symbol, :default => :output
 
     def to_s

data/lib/termvana/public/css/nirvana.css

@@ -18,7 +18,8 @@ body .nirvana_warning {
 }
 
 html {
-  height: 100%;
+  background-color: transparent;
+  
 }
 body {
   background: #000;
@@ -26,17 +27,70 @@ body {
   padding: 0;
   margin: 0;
   height: 100%;
+  overflow-y: hidden;
+  
+}
+::-webkit-scrollbar {
+width: 10px;
+height: 10px;
+}
+
+::-webkit-scrollbar-button:start:decrement,
+::-webkit-scrollbar-button:end:increment  {
+height: 30px;
+display: block;
+background-color: transparent;
+}
+
+::-webkit-scrollbar-track-piece  {
+background-color: #3b3b3b;
+-webkit-border-radius: 6px;
+}
+
+::-webkit-scrollbar-thumb:vertical {
+height: 50px;
+background-color: #666;
+border: 1px solid #eee;
+-webkit-border-radius: 6px;
+}
+
+footer{
+  position: fixed;
+  bottom: 0;
+  height: 30px;
+  font-size: smaller;
+  font-family: "BitStream Vera Sans Mono", "Lucida Console", monospace;
+  width: 100%;
+  background-color: #336699;  
+  background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0), rgba(10, 20, 60, 0.7));
+  background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0), rgba(10, 20, 60, 0.7));
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(0, 0, 0, 0)), color-stop(1, rgba(10, 20, 60, 0.7)));
+  background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(10, 20, 60, 0.7));
+  background-image: linear-gradient(top, rgba(0, 0, 0, 0), rgba(10, 20, 60, 0.7));
+}
+
+footer div{
+  margin: 6px 8px;
 }
 
+
 .termkitCommandView {
   font-family: "BitStream Vera Sans", "Lucida Grande", "Helvetica", Arial, sans-serif;
   font-size: 70%;
-  padding: 1em;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 10px;
+  overflow-y: scroll;
+  overflow-x: hidden;
 }
 
 #terminal {
   background: #000;
-  min-height: 100%;
+  padding: 1em;
+  padding-bottom: 50px;
 }
 
 .nirvana_exception::-webkit-scrollbar {

data/lib/termvana/public/index.html

@@ -24,13 +24,19 @@
               $.ws().send(JSON.stringify({full_command: val}));
             }
             });
+
         $(window).click(function(){ $('#input').focus(); });
       });
     </script>
   </head>
-  <body class="termkitCommandView">
-    <form id="terminal">
-      <input id='input' type='text'>
-    </form>
+  <body>
+    <section class="termkitCommandView">
+      <form id="terminal">
+        <input id='input' type='text'>
+      </form>
+    </section>
+    <footer>
+      <div id="current_working_dir"></div>
+    </footer>
   </body>
 </html>

data/lib/termvana/public/js/jquery.repl.js

@@ -67,7 +67,7 @@
       $("code", node).append($("<pre>").text(str));
       screen.append(node);
 
-      return $('body').scrollTop($('body').attr('scrollHeight'));
+      return $('.termkitCommandView').scrollTop($('.termkitCommandView').height());
     },
     disable: function() {
       $('#'+prompt_id).hide();

data/lib/termvana/public/js/nirvana.js

@@ -3,7 +3,10 @@
     alert("This browser does NOT support websockets and thus termvana fail :("); 
   }
   if(window.WebSocket) var ws = new WebSocket("ws://"+window.location.host+"/socket");
-      else if(window.MozWebSocket) var ws = new MozWebSocket("ws://"+window.location.host+"/socket");
+  else if(window.MozWebSocket) var ws = new MozWebSocket("ws://"+window.location.host+"/socket");
+  ws.onopen = function(e){
+    ws.send(JSON.stringify({full_command: "load_environment"}));
+  }
   ws.onmessage = function(e) {
     var data = e.data;
     data = JSON.parse(data);
@@ -12,8 +15,13 @@
       $.readline.finishCompletion(completions);
     } else {
 
-      console.log("Got message of ", data.message, data);
-      $.repl.logResult(data.message);
+      if(data.type == "system"){
+        if(data['data'] && data['data']['environment'])
+          $('#current_working_dir').text(data.data.environment.cwd);
+      }
+      else{
+        $.repl.logResult(data.message);
+      }
     }
   };
   ws.onclose = function() {
@@ -26,5 +34,5 @@
   };
 
   $.ws = function() { return ws };
-  $.ws.nirvanaComplete = function(val) { ws.send(':AUTOCOMPLETE: '+val); };
+  $.ws.nirvanaComplete = function(val) { console.log("No auto complete yet") };
 })(jQuery);

data/lib/termvana/version.rb

@@ -1,3 +1,3 @@
 module Termvana
-  VERSION = '0.2.0.beta2'
+  VERSION = '0.2.0.beta3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: termvana
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta2
+  version: 0.2.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-17 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cramp
-  requirement: &2152839680 !ruby/object:Gem::Requirement
+  requirement: &2152810580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152839680
+  version_requirements: *2152810580
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2152839220 !ruby/object:Gem::Requirement
+  requirement: &2152810040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152839220
+  version_requirements: *2152810040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152838800 !ruby/object:Gem::Requirement
+  requirement: &2152809600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152838800
+  version_requirements: *2152809600
 - !ruby/object:Gem::Dependency
   name: http_router
-  requirement: &2152838340 !ruby/object:Gem::Requirement
+  requirement: &2152809100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152838340
+  version_requirements: *2152809100
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: &2152837920 !ruby/object:Gem::Requirement
+  requirement: &2152808620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152837920
+  version_requirements: *2152808620
 - !ruby/object:Gem::Dependency
   name: virtus
-  requirement: &2152837480 !ruby/object:Gem::Requirement
+  requirement: &2152808200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152837480
+  version_requirements: *2152808200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152837060 !ruby/object:Gem::Requirement
+  requirement: &2152807680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152837060
+  version_requirements: *2152807680
 description: A ruby web shell that has autocompletion and readline behavior. It uses
   websockets, repl.js, readline.js and ripl for the shell engine.
 email: therabidbanana@gmail.com
@@ -102,6 +102,7 @@ files:
 - lib/termvana/app/actions/websocket_action.rb
 - lib/termvana/app/command_processor.rb
 - lib/termvana/app/commands/cd.rb
+- lib/termvana/app/commands/load_environment.rb
 - lib/termvana/app/commands/set.rb
 - lib/termvana/app/models/command.rb
 - lib/termvana/app/models/environment.rb