webconsole 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc8e172d83ccc1442f084eba2bc72ce312b8cf05
-  data.tar.gz: 3b2840ec862428cb116f46affe14c0f226d92827
+  metadata.gz: 70395a2c52eb177d5822716aac4e2abfeec7e95f
+  data.tar.gz: aec4858a911a98087d24565ae96a0eb737e3589d
 SHA512:
-  metadata.gz: 473ea562500056a29d217eb1598d4fe793b9aca2f803caee62e6618215a3c6110a194ed76dbcfbeee850651447c7d3b4177ddd6832a94c27b9835d72be94417b
-  data.tar.gz: 4c76fa4f13d0a7d0ec4cbace78bc9b4ee89ba64578bc3b68123db8ce5fada1e15a9b20a688c34a20509e7b7cdba7c4eda85c896f791513a4c93343f5881060ed
+  metadata.gz: 35ae7c659a3f1eba971b886723cc4c470311111f259660e539ff26b2872919f3c1908688e78e7029e47a11c8ff3615d0b705e04f87a11ec62c20025234d3b266
+  data.tar.gz: 5ca14d43ea863d47b7e02abc0e016a8e158c45d938a95c3ce3ee09c7c9ff209a4e6675a754df85be6634e630433b0f06aa38485e11e096c719a65f00f50adf71

data/lib/webconsole.rb

@@ -1,6 +1,7 @@
 module WebConsole
-  require_relative "webconsole/constants"
-  require_relative "webconsole/window_manager"
-  require_relative "webconsole/controller"
-  require_relative "webconsole/module"
+  require_relative "webconsole/lib/constants"
+  require_relative "webconsole/lib/window"
+  require_relative "webconsole/lib/controller"
+  require_relative "webconsole/lib/view"
+  require_relative "webconsole/lib/module"
 end

data/lib/webconsole/dependencies.rb

@@ -0,0 +1,41 @@
+require_relative 'extension_constants'
+require WEBCONSOLE_FILE
+
+module WebConsole::Dependencies
+  class Checker
+    require_relative 'dependencies/lib/model'
+    require_relative 'dependencies/lib/controller'
+
+    def check_dependencies(dependencies)
+      passed = true
+      dependencies.each { |dependency|  
+        dependency_passed = check(dependency)
+        if !dependency_passed
+          passed = false
+        end
+      }
+      return passed
+    end
+
+    def check(dependency)
+      name = dependency.name
+      type = dependency.type
+      passed = Tester::check(name, type)
+      if !passed
+        controller.missing_dependency(dependency)
+      end
+      return passed
+    end
+
+    private
+
+    def controller
+      if !@controller
+        @controller = Controller.new
+      end
+      return @controller
+    end
+
+  end
+
+end

data/lib/webconsole/dependencies/css/style.css

@@ -0,0 +1,15 @@
+body, h5 {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+}
+h5 {
+  font-weight: normal;
+  color: red;
+}
+blockquote {
+  margin-left: 2em;
+}
+code {
+  background-color: #DBE2EC;
+	font-family: "Menlo", monospace;  
+}

data/lib/webconsole/dependencies/js/wcdependencies.js

@@ -0,0 +1,10 @@
+function addMissingDependency(name, type, installationInstructions) {
+	var source   = $("#dependency-template").html();
+	var template = Handlebars.compile(source);
+	var data = { 
+		name: name,
+		type: type,
+    installationInstructions: installationInstructions
+	};
+	$(template(data)).appendTo("body");
+}

data/lib/webconsole/dependencies/lib/controller.rb

@@ -0,0 +1,36 @@
+require_relative 'tester'
+require_relative 'model'
+require_relative 'view'
+
+module WebConsole::Dependencies
+
+  class Controller < WebConsole::Controller
+
+    def initialize
+      @view = View.new
+    end
+
+    def missing_dependency(dependency)
+      name = dependency.name
+      type = self.class.string_for_type(dependency.type)
+      options = dependency.options
+
+      if options.has_key?(:installation_instructions)
+        installation_instructions = options[:installation_instructions]
+      end      
+
+      @view.add_missing_dependency(name, type, installation_instructions)
+    end
+
+    private
+
+    def self.string_for_type(type)
+      case type
+      when :shell_command
+        return "shell command"
+      end
+      return nil
+    end
+
+  end
+end

data/lib/webconsole/dependencies/lib/model.rb

@@ -0,0 +1,10 @@
+module WebConsole::Dependencies
+  class Dependency
+    attr_reader :name, :type, :options
+    def initialize(name, type,  options = {})
+      @name = name
+      @type = type
+      @options = options
+    end    
+  end
+end

data/lib/webconsole/dependencies/lib/tester.rb

@@ -0,0 +1,19 @@
+module WebConsole::Dependencies
+  module Tester
+    def self.check(name, type)
+      case type
+      when :shell_command
+        return check_shell_command(name)
+      end
+    end
+    
+    private
+    
+    require 'shellwords'
+    def self.check_shell_command(name)
+      command = "type -a #{Shellwords.escape(name)} > /dev/null 2>&1"
+      return system(command)
+    end
+
+  end
+end

data/lib/webconsole/dependencies/lib/view.rb

@@ -0,0 +1,19 @@
+module WebConsole::Dependencies
+  
+  class View < WebConsole::View
+    BASE_DIRECTORY = File.join(File.dirname(__FILE__), '..')
+    VIEWS_DIRECTORY = File.join(BASE_DIRECTORY, "views")
+    VIEW_TEMPLATE = File.join(VIEWS_DIRECTORY, 'view.html.erb')
+
+    def initialize
+      super
+      self.base_url_path = File.expand_path(BASE_DIRECTORY)
+      load_erb_from_path(VIEW_TEMPLATE)
+    end
+
+    ADD_MISSING_DEPENDENCY_FUNCTION = "addMissingDependency"
+    def add_missing_dependency(name, type, installation_instructions = nil)
+      self.do_javascript_function(ADD_MISSING_DEPENDENCY_FUNCTION, [name, type, installation_instructions])
+    end
+  end
+end

data/lib/webconsole/dependencies/views/view.html.erb

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8" />
+	<title><%= title %></title>
+	<%= shared_stylesheet_link_tag "raster" %>
+	<link rel="stylesheet" href="css/style.css" />
+	<script id="dependency-template" type="text/x-handlebars-template">
+		<section>
+			<header>
+				<h5>Dependency <span class="type">{{type}}</span> <code class="name">{{name}}</code> not found.</h5>
+			</header>
+			{{#if installationInstructions}}
+				<p><blockquote class="installation">To install <code>{{name}}</code>: {{{installationInstructions}}}</blockquote></p>
+			{{/if}}
+		</section>
+	</script>
+	<%= shared_javascript_include_tag "handlebars" %>
+	<%= shared_javascript_include_tag "zepto" %>
+	<script type="text/javascript" src="js/wcdependencies.js"></script>
+</head>
+<body>
+
+</body>
+</html>

data/lib/webconsole/extension_constants.rb

@@ -0,0 +1 @@
+WEBCONSOLE_FILE = File.join(File.dirname(__FILE__), "../webconsole")

data/lib/webconsole/{constants.rb → lib/constants.rb}

@@ -6,5 +6,5 @@ module WebConsole
   SHARED_RESOURCES_URL_KEY = 'WC_SHARED_RESOURCES_URL'
 
   # Directories
-  APPLESCRIPT_DIRECTORY = File.join(File.dirname(__FILE__), "..", "applescript")
+  APPLESCRIPT_DIRECTORY = File.join(File.dirname(__FILE__), "..", "..", "applescript")
 end

data/lib/webconsole/lib/controller.rb

@@ -0,0 +1,5 @@
+module WebConsole
+  class Controller
+    attr_reader :view
+  end
+end

data/lib/webconsole/lib/view.rb

@@ -0,0 +1,34 @@
+require_relative "view/javascript"
+require_relative "view/erb"
+require_relative "view/resources"
+
+module WebConsole
+  class View
+
+    attr_reader :window
+    def initialize
+      @window = WebConsole::Window.new
+    end
+
+    def base_url=(value)
+      @window.base_url = value
+    end
+
+    def base_url_path=(value)
+      @window.base_url_path = value
+    end
+
+    def load_html(html)
+      @window.load_html(html)
+    end
+
+    def do_javascript(javascript)
+      return @window.do_javascript(javascript)
+    end
+
+    def close
+      @window.close
+    end
+
+  end
+end

data/lib/webconsole/lib/view/erb.rb

@@ -0,0 +1,17 @@
+module WebConsole
+  class View
+
+    require 'erb'
+
+    def load_erb_from_path(path)
+      erb = File.new(path).read
+      load_erb(erb)
+    end
+
+    def load_erb(erb)
+      template = ERB.new(erb, nil, '-')
+      html = template.result(binding)
+      load_html(html)
+    end
+  end
+end

data/lib/webconsole/lib/view/javascript.rb

@@ -0,0 +1,78 @@
+module WebConsole
+  class View
+
+    def do_javascript_function(function, arguments = nil)
+      javascript = self.class.javascript_function(function, arguments)
+      result = do_javascript(javascript)
+      result.chomp!
+
+      if result.is_integer?
+        return result.to_i
+      end
+
+      if result.is_float?
+        return result.to_f
+      end
+
+      return result
+    end
+
+    def self.javascript_function(function, arguments = nil)
+      function = function.dup
+      function << '('
+
+      if arguments
+        arguments.each { |argument|
+          if argument
+            function << argument.javascript_argument          
+          else
+            function << "null"
+          end
+          function << ', '
+        }
+        function = function[0...-2]
+      end
+
+      function << ');'
+
+      return function
+    end
+
+    private
+
+    class ::String
+      def javascript_argument
+        return "'#{self.javascript_escape}'"
+      end
+
+      def javascript_escape
+        self.gsub('\\', "\\\\\\\\").gsub("\n", "\\\\n").gsub("'", "\\\\'")
+      end
+
+      def javascript_escape!
+        replace(self.javascript_escape)
+      end
+
+      def is_float?
+        !!Float(self) rescue false
+      end
+
+      def is_integer?
+        self.to_i.to_s == self
+      end
+    end
+
+    class ::Float
+      def javascript_argument
+        return self.to_s
+      end
+    end
+
+    class ::Integer
+      def javascript_argument
+        return self.to_s
+      end
+    end
+
+  end
+end

data/lib/webconsole/lib/view/resources.rb

@@ -0,0 +1,48 @@
+module WebConsole
+  class View
+    require 'open-uri'
+
+    require_relative "../constants"
+    require_relative "../module"
+
+    attr_accessor :title
+    
+    CSS_EXTENSION = ".css"
+    CSS_PATH_COMPONENT = "css/"
+    def shared_stylesheet_link_tag(resource)
+      uri = URI.join(shared_resources_url, CSS_PATH_COMPONENT, resource + CSS_EXTENSION)
+      return stylesheet_link_tag(uri.to_s)
+    end
+
+    def stylesheet_link_tag(url)
+      return "<link rel=\"stylesheet\" href=\"#{url}\" />"
+    end
+
+    JS_EXTENSION = ".js"
+    JS_PATH_COMPONENT = "js/"
+    def shared_javascript_include_tag(resource)
+      uri = URI.join(shared_resources_url, JS_PATH_COMPONENT, resource + JS_EXTENSION)
+      return javascript_include_tag(uri.to_s)
+    end
+
+    def javascript_include_tag(url)
+      return "<script type=\"text/javascript\" src=\"#{url}\"></script>"
+    end
+
+    def title
+      if !@title && ENV.has_key?(PLUGIN_NAME_KEY)
+        @title = ENV[PLUGIN_NAME_KEY]
+      end
+      return @title
+    end
+
+    private
+
+    def shared_resources_url
+      if !@shared_resources_url
+        @shared_resources_url = ENV.has_key?(SHARED_RESOURCES_URL_KEY)? ENV[SHARED_RESOURCES_URL_KEY] : WebConsole::shared_resources_url
+      end
+      return @shared_resources_url
+    end
+  end
+end

data/lib/webconsole/{window_manager.rb → lib/window.rb}

@@ -1,5 +1,5 @@
 module WebConsole
-  class WindowManager
+  class Window
     require_relative "constants"
 
     attr_writer :base_url
@@ -13,10 +13,14 @@ module WebConsole
     end
 
     LOADHTML_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "load_html.scpt")
+    LOADHTMLWITHBASEURL_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "load_html_with_base_url.scpt")
     def load_html(html)
       arguments = [html]
 
+      script = LOADHTML_SCRIPT
+
       if @base_url
+        script = LOADHTMLWITHBASEURL_SCRIPT
         arguments.push(@base_url)
       end
 
@@ -24,7 +28,7 @@ module WebConsole
         arguments.push(window_id)
       end
 
-      result = WebConsole::run_applescript(LOADHTML_SCRIPT, arguments)
+      result = WebConsole::run_applescript(script, arguments)
       if !window_id
         # This allows a window manager created without a window_id and then be assigned the window_id when load_html is called.
         @window_id = self.class.window_id_from_result(result)        
@@ -53,5 +57,6 @@ module WebConsole
     def self.window_id_from_result(result)
       return result.split.last.to_i
     end
+
   end
 end

data/lib/webconsole/repl.rb

@@ -0,0 +1,58 @@
+require_relative 'extension_constants'
+require WEBCONSOLE_FILE
+
+module WebConsole::REPL
+  require_relative "repl/lib/input_controller"
+  require_relative "repl/lib/output_controller"
+  require_relative "repl/lib/view"
+
+  class Wrapper
+    require 'pty'
+    def initialize(command)
+
+      PTY.spawn(command) do |output, input, pid|
+        Thread.new do
+          output.each { |line|
+            output_controller.parse_output(line)
+          }
+        end
+        @input = input
+      end
+    end
+
+    def parse_input(input)
+      input_controller.parse_input(input)
+      write_input(input)
+    end
+
+    def write_input(input)
+      @input.write(input)
+    end
+
+    private
+
+    def input_controller
+      if !@input_controller
+        @input_controller = InputController.new
+        @input_controller.view = view
+      end
+      return @input_controller
+    end
+    
+    def output_controller
+      if !@output_controller
+        @output_controller = OutputController.new
+        @output_controller.view = view
+      end
+      return @output_controller
+    end
+    
+    def view
+      if !@view
+        @view = View.new
+      end
+      return @view
+    end
+
+  end
+end

data/lib/webconsole/repl/css/style.css

@@ -0,0 +1,20 @@
+body {
+	font-family: "Menlo", monospace;
+	font-size: 13px;
+}
+li {
+	list-style: none;
+	white-space: pre-wrap;
+}
+pre {
+	position: relative;
+	padding-left: 18px;
+}
+pre.output code:before
+{
+    content: '>';
+	font-weight: bold;
+	left: 7px;
+	position: absolute;
+	opacity: 0.5;
+}

data/lib/webconsole/repl/js/wcrepl.js

@@ -0,0 +1,17 @@
+var WcREPL = {
+	addCode: function(code, source) {
+		var template = Handlebars.compile(source);
+		var data = { 
+			code: code
+		};
+		return $(template(data)).appendTo("body");	
+	},
+	addInput: function(code) {
+		var source = $("#input-template").html();
+		this.addCode(code, source);
+	},
+	addOutput: function(code) {
+		var source = $("#output-template").html();
+		this.addCode(code, source);
+	}
+}

data/lib/webconsole/repl/lib/input_controller.rb

@@ -0,0 +1,17 @@
+module WebConsole::REPL
+  class InputController < WebConsole::Controller
+
+    attr_accessor :view
+    def initialize
+    end
+
+    def parse_input(input)
+      input = input.dup
+      input.chomp!
+      if !input.strip.empty? # Ignore empty lines
+        @view.add_input(input)
+      end
+    end
+
+  end
+end

data/lib/webconsole/repl/lib/output_controller.rb

@@ -0,0 +1,18 @@
+module WebConsole::REPL
+  class OutputController < WebConsole::Controller
+
+    attr_accessor :view
+    def initialize
+    end
+
+    def parse_output(output)
+      output = output.dup
+      output.gsub!(/\x1b[^m]*m/, "") # Remove escape sequences
+      output.chomp!
+      if !output.strip.empty? # Ignore empty lines
+        @view.add_output(output)
+      end
+    end
+
+  end
+end

data/lib/webconsole/repl/lib/view.rb

@@ -0,0 +1,68 @@
+module WebConsole::REPL
+  class View < WebConsole::View
+
+    BASE_DIRECTORY = File.join(File.dirname(__FILE__), "..")
+    VIEWS_DIRECTORY = File.join(BASE_DIRECTORY, "view")
+    VIEW_TEMPLATE = File.join(VIEWS_DIRECTORY, 'view.html.erb')
+    def initialize
+      super
+      self.base_url_path = File.expand_path(BASE_DIRECTORY)
+      load_erb_from_path(VIEW_TEMPLATE)
+    end
+
+    ADD_INPUT_JAVASCRIPT_FUNCTION = "WcREPL.addInput"
+    def add_input(input)
+      do_javascript_function(ADD_INPUT_JAVASCRIPT_FUNCTION, [input])      
+    end
+    
+    ADD_OUTPUT_JAVASCRIPT_FUNCTION = "WcREPL.addOutput"
+    def add_output(output)
+      do_javascript_function(ADD_OUTPUT_JAVASCRIPT_FUNCTION, [output])      
+    end
+
+    # Helpers to allow easy loading of REPL resource even from another base URL
+
+    def repl_header_tags
+      return %Q[
+    #{repl_stylesheet_link_tag}
+    #{repl_handlebars_template_tags}
+    #{shared_javascript_include_tag("handlebars")}
+  	#{shared_javascript_include_tag("zepto")}
+    #{repl_javascript_include_tag}
+      ]
+    end
+
+    def repl_handlebars_template_tags
+      return %Q[
+    <script id="output-template" type="text/x-handlebars-template">
+  		<pre class="output"><code>{{code}}</code></pre>
+  	</script>
+  	<script id="input-template" type="text/x-handlebars-template">
+  		<pre><code>{{code}}</code></pre>
+  	</script>]
+    end
+
+    def repl_stylesheet_link_tag
+      path = File.join(repl_base_resource_path, "css/style.css")
+      url = repl_url_for_path(path)
+      return stylesheet_link_tag(url)
+    end
+
+    def repl_javascript_include_tag
+      path = File.join(repl_base_resource_path, "js/wcrepl.js")
+      url = repl_url_for_path(path)
+      return javascript_include_tag(url)
+    end
+
+    require 'open-uri'
+    def repl_url_for_path(path)
+      uri = URI::encode(path)
+      return "file://" + uri
+    end
+
+    def repl_base_resource_path
+      path = File.expand_path(File.join(File.dirname(__FILE__), "../"))
+    end
+
+  end
+end

data/lib/webconsole/repl/view/view.html.erb

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8" />
+	<title><%= title %></title>
+	<%= shared_stylesheet_link_tag "raster" %>
+	<%= repl_header_tags %>
+</head>
+<body>
+
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webconsole
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Roben Kleene
@@ -16,21 +16,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/webconsole.rb
-- lib/webconsole/constants.rb
-- lib/webconsole/controller.rb
-- lib/webconsole/module.rb
-- lib/webconsole/window_manager.rb
-- lib/applescript/resource_path_for_plugin.scpt
-- lib/applescript/resource_url_for_plugin.scpt
 - lib/applescript/close_window.scpt
 - lib/applescript/do_javascript.scpt
 - lib/applescript/load_html.scpt
-- lib/applescript/run_plugin.scpt
+- lib/applescript/load_html_with_base_url.scpt
 - lib/applescript/load_plugin.scpt
 - lib/applescript/plugin_has_windows.scpt
 - lib/applescript/plugin_read_from_standard_input.scpt
+- lib/applescript/resource_path_for_plugin.scpt
+- lib/applescript/resource_url_for_plugin.scpt
+- lib/applescript/run_plugin.scpt
 - lib/applescript/window_id_for_plugin.scpt
+- lib/webconsole/dependencies/css/style.css
+- lib/webconsole/dependencies/js/wcdependencies.js
+- lib/webconsole/dependencies/lib/controller.rb
+- lib/webconsole/dependencies/lib/model.rb
+- lib/webconsole/dependencies/lib/tester.rb
+- lib/webconsole/dependencies/lib/view.rb
+- lib/webconsole/dependencies/views/view.html.erb
+- lib/webconsole/dependencies.rb
+- lib/webconsole/extension_constants.rb
+- lib/webconsole/lib/constants.rb
+- lib/webconsole/lib/controller.rb
+- lib/webconsole/lib/module.rb
+- lib/webconsole/lib/view/erb.rb
+- lib/webconsole/lib/view/javascript.rb
+- lib/webconsole/lib/view/resources.rb
+- lib/webconsole/lib/view.rb
+- lib/webconsole/lib/window.rb
+- lib/webconsole/repl/css/style.css
+- lib/webconsole/repl/js/wcrepl.js
+- lib/webconsole/repl/lib/input_controller.rb
+- lib/webconsole/repl/lib/output_controller.rb
+- lib/webconsole/repl/lib/view.rb
+- lib/webconsole/repl/view/view.html.erb
+- lib/webconsole/repl.rb
+- lib/webconsole.rb
 homepage: 
 licenses: []
 metadata: {}

data/lib/webconsole/controller.rb

@@ -1,54 +0,0 @@
-require 'erb'
-require 'open-uri'
-
-module WebConsole
-  class Controller
-    require_relative "constants"
-    require_relative "module"
-
-    attr_reader :name
-    def initialize(delegate = nil, erb_template_path = nil)
-      @delegate = delegate
-
-      template_erb = ERB.new(File.new(erb_template_path).read, nil, '-')
-      html = template_erb.result(binding)
-
-      if @delegate
-        @delegate.load_html(html)
-      end
-    end
-
-    CSS_EXTENSION = ".css"
-    CSS_PATH_COMPONENT = "css/"
-    def shared_stylesheet_link_tag(resource)
-      uri = URI.join(shared_resources_url, CSS_PATH_COMPONENT, resource + CSS_EXTENSION)
-      return "<link rel=\"stylesheet\" href=\"#{uri.to_s}\" />"
-    end
-    JS_EXTENSION = ".js"
-    JS_PATH_COMPONENT = "js/"
-    def shared_javascript_include_tag(resource)
-      uri = URI.join(shared_resources_url, JS_PATH_COMPONENT, resource + JS_EXTENSION)
-      return "<script type=\"text/javascript\" src=\"#{uri.to_s}\"></script>"
-    end
-    
-    private
-
-    def shared_resources_url
-      if !@shared_resources_url
-        @shared_resources_url = ENV.has_key?(SHARED_RESOURCES_URL_KEY)? ENV[SHARED_RESOURCES_URL_KEY] : WebConsole::shared_resources_url
-      end
-      return @shared_resources_url
-    end
-
-    class ::String
-      def javascript_escape
-        self.gsub('\\', "\\\\\\\\").gsub("\n", "\\\\n").gsub("'", "\\\\'")
-      end
-
-      def javascript_escape!
-        replace(self.javascript_escape)
-      end
-    end
-
-  end
-end