conch 0.0.8 → 0.0.9

data/Gemfile

@@ -2,4 +2,5 @@ source :rubygems
 
 gemspec
 
-gem 'em-websocket', '>= 0.5'
+gem 'em-websocket', '>= 0.5'
+gem 'json'

data/conch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'conch'
-  s.version       = '0.0.8'
+  s.version       = '0.0.9'
   s.summary       = 'shell in the browser'
   s.authors       = ['limadelic']
   s.email         = 'limadelic@gmail.com'

data/lib/client.rb

@@ -1,36 +1,18 @@
 require 'em-websocket'
+require_relative 'cmd'
 
-module Client
+include Cmd
 
-  def self.run socket, cmd
-    if respond_to? cmd
-      send cmd
-    else
-      shell socket, cmd
-    end
-  end
-
-  def self.exit
-    exit! true
-  end
-
-  def self.shell socket, cmd
-    socket.send `#{cmd}`
-  rescue
-    socket.send ''
-  end
+opts = {
+  host: 'localhost',
+  port: 8888
+}
 
-  def self.listen_on socket
-    socket.onmessage { |cmd| run socket, cmd }
+EM.run do
+  EM::WebSocket.run opts do |socket|
+    @socket = socket
+    @socket.onopen { socket.send Dir.pwd }
+    @socket.onmessage { |cmd| run cmd }
   end
-
-  def self.start
-    EM.run do
-      EM::WebSocket.run(
-        host: 'localhost',
-        port: 8888
-      ) { |socket| listen_on socket }
-    end
-  end
-
 end
+

data/lib/cmd.rb

@@ -0,0 +1,46 @@
+require 'json'
+
+module Cmd
+
+  COMMANDS = ['exit', 'cd']
+
+  def run cmd
+    parse cmd
+    custom_cmd or
+    @socket.send shell
+  end
+
+  def shell
+    Dir.chdir(@cwd) { `#{@cmd} 2>&1` }
+  end
+
+  def parse cmd
+    cmd = JSON.parse cmd
+    @cmd = cmd['cmd']
+    @cwd = cmd['cwd']
+    @args = @cmd.split(' ')
+    @app = @args.shift
+  end
+
+  def custom_cmd
+    return unless COMMANDS.include? @app
+    send @app
+  end
+
+  def exit
+    exit! true
+  end
+
+  def cd
+    Dir.chdir(@cwd) do
+      Dir.chdir(@args[0]) do
+        @socket.send Dir.pwd
+      end
+    end
+  rescue
+    @socket.send @cwd
+  ensure
+    return false
+  end
+
+end

data/lib/conch.rb

@@ -1,8 +1,7 @@
-require_relative 'client'
-
 home = 'http://www.c0nch.com'
 
 `start chrome --app=#{home}`
-Client.start
+require_relative 'client'
+
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conch
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -73,6 +73,7 @@ files:
 - bin/conch
 - conch.gemspec
 - lib/client.rb
+- lib/cmd.rb
 - lib/conch.rb
 homepage: http://www.c0nch.com
 licenses: