webconsole 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36cac7f11fec06a59f3a1e8a21d531df13d95a7f
-  data.tar.gz: 907811064f3e83a2da3091ee16ec82d87e7fc3d3
+  metadata.gz: b8f200f0d4c9363e825360b36228c122eb27d7a6
+  data.tar.gz: 88e1354ed11b95876358b9f55d21cd9371c4b1f4
 SHA512:
-  metadata.gz: e43dccf68af6db8a6bae3567cea1535525724ae8efa29b5f4e44e615a63ec439b49c05c51004bd5acfd17f65ba82037a0d275fc69f1ad955deef6fbd68947d1e
-  data.tar.gz: f0cdd0ac39679578f10f2dc7083e535149b65c936152c8c55a088d74a7ca2956ecf1d24247577cbff74e0f04417488f3360384c15c5788f54fdf5027aa274f19
+  metadata.gz: 12b03c52f08299e47056df30960e523703afee479986b0d0fd3e75cc2875c424c78e623df2329da35d028438bf207cefebb3a155ea8b0195bc94e7a89bcef952
+  data.tar.gz: 09148ae88d698a0b1d392dc301e22cf84e4324386b30e1cbe9caa84897eaf76b7b9a3cfe8d904d3d290b64b6903d980c355dfd7985b53430318b1453d26cb133

data/lib/webconsole/dependencies.rb

@@ -10,30 +10,23 @@ module WebConsole::Dependencies
       passed = true
       dependencies.each { |dependency|  
         dependency_passed = check(dependency)
-        if !dependency_passed
-          passed = false
-        end
+        passed = false unless dependency_passed
       }
-      return passed
+      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
+      controller.missing_dependency(dependency) unless passed
+      passed
     end
 
     private
 
     def controller
-      if !@controller
-        @controller = Controller.new
-      end
-      return @controller
+      @controller ||= Controller.new
     end
 
   end

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

@@ -14,11 +14,9 @@ module WebConsole::Dependencies
       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
 
@@ -29,7 +27,7 @@ module WebConsole::Dependencies
       when :shell_command
         return "shell command"
       end
-      return nil
+      nil
     end
 
   end

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

@@ -12,7 +12,7 @@ module WebConsole::Dependencies
     require 'shellwords'
     def self.check_shell_command(name)
       command = "type -a #{Shellwords.escape(name)} > /dev/null 2>&1"
-      return system(command)
+      system(command)
     end
 
   end

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

@@ -13,7 +13,7 @@ module WebConsole::Dependencies
 
     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])
+      do_javascript_function(ADD_MISSING_DEPENDENCY_FUNCTION, [name, type, installation_instructions])
     end
   end
 end

data/lib/webconsole/lib/module.rb

@@ -8,64 +8,51 @@ module WebConsole
   EXISTS_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "exists.scpt")
   def self.application_exists
     result = self.run_applescript(EXISTS_SCRIPT)
-    if result == "true"
-      return true
-    else
-      return false
-    end
+    result == "true" ? true : false
   end
 
   RUN_PLUGIN_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "run_plugin.scpt")
   def self.run_plugin(name, directory = nil, arguments = nil)
     parameters = [name]
-    if directory
-      parameters.push(directory)
-    end
-    if arguments
-      parameters = parameters + arguments
-    end
-
-    return self.run_applescript(RUN_PLUGIN_SCRIPT, parameters)
+    parameters.push(directory) unless directory.nil?
+    parameters += arguments unless arguments.nil?
+    self.run_applescript(RUN_PLUGIN_SCRIPT, parameters)
   end
   
   RUN_PLUGIN_IN_SPLIT_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "run_plugin_in_split.scpt")
   def self.run_plugin_in_split(name, window_id, split_id)
     parameters = [name, window_id, split_id]
-    return self.run_applescript(RUN_PLUGIN_IN_SPLIT_SCRIPT, parameters)
+    self.run_applescript(RUN_PLUGIN_IN_SPLIT_SCRIPT, parameters)
   end
 
   WINDOW_ID_FOR_PLUGIN_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "window_id_for_plugin.scpt")
   def self.window_id_for_plugin(name)
-    return self.run_applescript(WINDOW_ID_FOR_PLUGIN_SCRIPT, [name])
+    self.run_applescript(WINDOW_ID_FOR_PLUGIN_SCRIPT, [name])
   end
 
   SPLIT_ID_IN_WINDOW_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "split_id_in_window.scpt")
   def self.split_id_in_window(window_id, pluginName = nil)
     arguments = [window_id]
-
-    if pluginName
-      arguments.push(pluginName)
-    end
-
-    return self.run_applescript(SPLIT_ID_IN_WINDOW_SCRIPT, arguments)
+    arguments.push(pluginName) unless pluginName.nil?
+    self.run_applescript(SPLIT_ID_IN_WINDOW_SCRIPT, arguments)
   end
 
   SPLIT_ID_IN_WINDOW_LAST_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "split_id_in_window_last.scpt")
   def self.split_id_in_window_last(window_id)
     arguments = [window_id]
-    return self.run_applescript(SPLIT_ID_IN_WINDOW_LAST_SCRIPT, arguments)
+    self.run_applescript(SPLIT_ID_IN_WINDOW_LAST_SCRIPT, arguments)
   end
 
   CREATE_WINDOW_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "create_window.scpt")
   def self.create_window
-    return self.run_applescript(CREATE_WINDOW_SCRIPT)
+    self.run_applescript(CREATE_WINDOW_SCRIPT)
   end
 
   # Shared Resources
 
   RESOURCE_PATH_FOR_PLUGIN_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "resource_path_for_plugin.scpt")
   def self.resource_path_for_plugin(name)
-    return self.run_applescript(RESOURCE_PATH_FOR_PLUGIN_SCRIPT, [name])
+    self.run_applescript(RESOURCE_PATH_FOR_PLUGIN_SCRIPT, [name])
   end
 
   # Shared Resource Path
@@ -73,81 +60,74 @@ module WebConsole
   SHARED_RESOURCES_PLUGIN_NAME = "Shared Resources"
   SHARED_TEST_RESOURCES_PLUGIN_NAME = "Shared Test Resources"
   def self.shared_resources_path
-    return resource_path_for_plugin(SHARED_RESOURCES_PLUGIN_NAME)
+    resource_path_for_plugin(SHARED_RESOURCES_PLUGIN_NAME)
   end
   def self.shared_test_resources_path
-    return resource_path_for_plugin(SHARED_TEST_RESOURCES_PLUGIN_NAME)
+    resource_path_for_plugin(SHARED_TEST_RESOURCES_PLUGIN_NAME)
   end
 
   def self.shared_resource(resource)
-    return File.join(self.shared_resources_path, resource)
+    File.join(self.shared_resources_path, resource)
   end
   def self.shared_test_resource(resource)
-    return File.join(self.shared_test_resources_path, resource)    
+    File.join(self.shared_test_resources_path, resource)    
   end
 
   # Shared Resource URL
 
   RESOURCE_URL_FOR_PLUGIN_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "resource_url_for_plugin.scpt")
   def self.resource_url_for_plugin(name)
-    return self.run_applescript(RESOURCE_URL_FOR_PLUGIN_SCRIPT, [name])
+    self.run_applescript(RESOURCE_URL_FOR_PLUGIN_SCRIPT, [name])
   end
   def self.shared_resources_url
-    return resource_url_for_plugin(SHARED_RESOURCES_PLUGIN_NAME)
+    resource_url_for_plugin(SHARED_RESOURCES_PLUGIN_NAME)
   end
 
   private
 
   def self.run_applescript(script, arguments = nil)
-    command = "osascript #{Shellwords.escape(script)}"
+    command = "osascript #{script.shell_escape}"
+
     if arguments
-      arguments.each { |argument|
-        if argument
-          argument = argument.to_s
-          command = command + " " + Shellwords.escape(argument)
-        end
-      }
+      command += " " + arguments.compact.map(&:to_s).map(&:shell_escape).join(' ')
     end
 
     result = `#{command}`
 
     result.chomp!
 
-    if result.empty?
-      return nil
-    end
-
-    if result.is_integer?
-      return result.to_i
-    end
-
-    if result.is_float?
-      return result.to_f
-    end
-
-    return result
+    return nil if result.empty?
+    return result.to_i if result.is_integer?
+    return result.to_f if result.is_float?
+    
+    result
   end
 
   class ::String
     def is_float?
-      !!Float(self) rescue false
+      true if Float(self) rescue false
     end
 
     def is_integer?
       self.to_i.to_s == self
     end
+
+    def shell_escape
+      Shellwords.escape(self)
+    end
+
+    def shell_escape!
+      replace(shell_escape)
+    end
+
   end
 
   class ::Float
-    def javascript_argument
-      return self.to_s
-    end
+    alias_method :javascript_argument, :to_s
   end
 
   class ::Integer
-    def javascript_argument
-      return self.to_s
-    end
+    alias_method :javascript_argument, :to_s
   end
 
 end

data/lib/webconsole/lib/view.rb

@@ -13,14 +13,7 @@ module WebConsole
     end
 
     def view_id
-      if !@view_id
-        if ENV.has_key?(SPLIT_ID_KEY)
-          @view_id = ENV[SPLIT_ID_KEY]
-        else
-          @view_id = split_id
-        end
-      end
-      return @view_id
+      @view_id ||= ENV.has_key?(SPLIT_ID_KEY) ? ENV[SPLIT_ID_KEY] : split_id
     end
 
     private
@@ -28,9 +21,7 @@ module WebConsole
     # Web
 
     def arguments_with_target(arguments)
-      arguments = super(arguments)
-      arguments.push(view_id)
-      return arguments
+      super(arguments).push(view_id)
     end
 
   end

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

@@ -3,7 +3,7 @@ module WebConsole
 
     def do_javascript_function(function, arguments = nil)
       javascript = self.class.javascript_function(function, arguments)
-      return do_javascript(javascript)
+      do_javascript(javascript)
     end
 
     def self.javascript_function(function, arguments = nil)
@@ -23,15 +23,13 @@ module WebConsole
       end
 
       function << ');'
-
-      return function
     end
 
     private
 
     class ::String
       def javascript_argument
-        return "'#{self.javascript_escape}'"
+        "'#{self.javascript_escape}'"
       end
 
       def javascript_escape

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

@@ -11,38 +11,32 @@ module WebConsole
     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)
+      stylesheet_link_tag(uri.to_s)
     end
 
     def stylesheet_link_tag(url)
-      return "<link rel=\"stylesheet\" href=\"#{url}\" />"
+      "<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)
+      javascript_include_tag(uri.to_s)
     end
 
     def javascript_include_tag(url)
-      return "<script type=\"text/javascript\" src=\"#{url}\"></script>"
+      "<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
+      @title ||= ENV.has_key?(PLUGIN_NAME_KEY) ? ENV[PLUGIN_NAME_KEY] : nil      
     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
+      @shared_resources_url || ENV.has_key?(SHARED_RESOURCES_URL_KEY) ? ENV[SHARED_RESOURCES_URL_KEY] : WebConsole::shared_resources_url
     end
   end
 end

data/lib/webconsole/lib/window.rb

@@ -15,14 +15,7 @@ module WebConsole
     end
     
     def window_id
-      if !@window_id
-        if ENV.has_key?(WINDOW_ID_KEY)
-          @window_id = ENV[WINDOW_ID_KEY]
-        else
-          @window_id = WebConsole::create_window
-        end
-      end
-      return @window_id
+      @window_id ||= ENV.has_key?(WINDOW_ID_KEY) ? ENV[WINDOW_ID_KEY] : WebConsole::create_window
     end
     
     # Web
@@ -39,12 +32,12 @@ module WebConsole
         arguments.push(@base_url)
       end
 
-      return run_script(script, arguments)
+      run_script(script, arguments)
     end
 
     DOJAVASCRIPT_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "do_javascript.scpt")
     def do_javascript(javascript)
-      return run_script(DOJAVASCRIPT_SCRIPT, [javascript])
+      run_script(DOJAVASCRIPT_SCRIPT, [javascript])
     end
 
     READ_FROM_STANDARD_INPUT_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, "read_from_standard_input.scpt")
@@ -60,23 +53,22 @@ module WebConsole
     end
 
     def split_id
-      return WebConsole::split_id_in_window(window_id)
+      WebConsole::split_id_in_window(window_id)
     end
 
     def split_id_last
-      return WebConsole::split_id_in_window_last(window_id)
+      WebConsole::split_id_in_window_last(window_id)
     end
 
     private
 
     def run_script(script, arguments = [])
       arguments = arguments_with_target(arguments)
-      return WebConsole::run_applescript(script, arguments)
+      WebConsole::run_applescript(script, arguments)
     end
 
     def arguments_with_target(arguments)
       arguments.push(window_id)
-      return arguments
     end
 
   end

data/lib/webconsole/logger.rb

@@ -44,30 +44,16 @@ module WebConsole
     # Properties
 
     def window_id
-      if !@window_id
-        if ENV.has_key?(WINDOW_ID_KEY)
-          @window_id = ENV[WINDOW_ID_KEY]
-        else
-          @window_id = WebConsole::create_window
-        end
-      end
-      return @window_id
+      @window_id ||= ENV.has_key?(WINDOW_ID_KEY) ? ENV[WINDOW_ID_KEY] : WebConsole::create_window
     end
   
     def view_id
-      if !@view_id
-        # First see if there's an existing log plugin
-        @view_id = WebConsole::split_id_in_window(window_id, LOG_PLUGIN_NAME)
+      @view_id ||= WebConsole::split_id_in_window(window_id, LOG_PLUGIN_NAME)
+      return @view_id unless @view_id.nil?
 
-        # If not, run one
-        if !@view_id
-          @view_id = WebConsole::split_id_in_window_last(window_id)
-          WebConsole::run_plugin_in_split(LOG_PLUGIN_NAME, window_id, @view_id)
-        end
-
-      end
-
-      return @view_id
+      @view_id = WebConsole::split_id_in_window_last(window_id)
+      WebConsole::run_plugin_in_split(LOG_PLUGIN_NAME, window_id, @view_id)
+      @view_id  
     end
 
     private

data/lib/webconsole/logger/test/lib/test_view_helper.rb

@@ -9,19 +9,19 @@ class TestViewHelper
     end
 
     def log_message_at_index(index)
-      return @view.do_javascript_function('innerTextOfBodyChildAtIndex', [index])
+      @view.do_javascript_function('innerTextOfBodyChildAtIndex', [index])
     end
 
     def number_of_log_messages
-      return @view.do_javascript(TEST_MESSAGE_COUNT_JAVASCRIPT)
+      @view.do_javascript(TEST_MESSAGE_COUNT_JAVASCRIPT)
     end
 
     def last_log_message
-      return @view.do_javascript(TEST_MESSAGE_JAVASCRIPT)
+      @view.do_javascript(TEST_MESSAGE_JAVASCRIPT)
     end
   
     def last_log_class
-      return @view.do_javascript(TEST_CLASS_JAVASCRIPT)
+      @view.do_javascript(TEST_CLASS_JAVASCRIPT)
     end
 
 end

data/lib/webconsole/repl.rb

@@ -8,6 +8,7 @@ module WebConsole::REPL
 
   class Wrapper
     require 'pty'
+
     def initialize(command)
 
       PTY.spawn(command) do |output, input, pid|
@@ -18,6 +19,7 @@ module WebConsole::REPL
         end
         @input = input
       end
+
     end
 
     def parse_input(input)
@@ -32,27 +34,16 @@ module WebConsole::REPL
     private
 
     def input_controller
-      if !@input_controller
-        @input_controller = InputController.new
-        @input_controller.view = view
-      end
-      return @input_controller
+      @input_controller ||= InputController.new(view)
     end
     
     def output_controller
-      if !@output_controller
-        @output_controller = OutputController.new
-        @output_controller.view = view
-      end
-      return @output_controller
+      @output_controller ||= OutputController.new(view)
     end
     
     def view
-      if !@view
-        @view = View.new
-      end
-      return @view
+      @view ||= View.new
     end
 
   end
-end
+end

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

@@ -2,7 +2,8 @@ module WebConsole::REPL
   class InputController < WebConsole::Controller
 
     attr_accessor :view
-    def initialize
+    def initialize(view)
+      @view = view
     end
 
     def parse_input(input)

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

@@ -2,7 +2,8 @@ module WebConsole::REPL
   class OutputController < WebConsole::Controller
 
     attr_accessor :view
-    def initialize
+    def initialize(view)
+      @view = view
     end
 
     def parse_output(output)

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

@@ -23,7 +23,7 @@ module WebConsole::REPL
     # Helpers to allow easy loading of REPL resource even from another base URL
 
     def repl_header_tags
-      return %Q[
+      %Q[
     #{repl_stylesheet_link_tag}
     #{repl_handlebars_template_tags}
     #{shared_javascript_include_tag("handlebars")}
@@ -33,7 +33,7 @@ module WebConsole::REPL
     end
 
     def repl_handlebars_template_tags
-      return %Q[
+      %Q[
     <script id="output-template" type="text/x-handlebars-template">
   		<pre class="output"><code>{{code}}</code></pre>
   	</script>
@@ -45,23 +45,23 @@ module WebConsole::REPL
     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)
+      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)
+      javascript_include_tag(url)
     end
 
     require 'open-uri'
     def repl_url_for_path(path)
       uri = URI::encode(path)
-      return "file://" + uri
+      "file://" + uri
     end
 
     def repl_base_resource_path
-      path = File.expand_path(File.join(File.dirname(__FILE__), "../"))
+      File.expand_path(File.join(File.dirname(__FILE__), "../"))
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webconsole
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Roben Kleene
@@ -34,8 +34,6 @@ files:
 - lib/applescript/split_id_in_window_last.scpt
 - lib/applescript/toggle_log.scpt
 - lib/applescript/window_id_for_plugin.scpt
-- lib/webconsole.rb
-- lib/webconsole/dependencies.rb
 - lib/webconsole/dependencies/css/style.css
 - lib/webconsole/dependencies/js/wcdependencies.js
 - lib/webconsole/dependencies/lib/controller.rb
@@ -43,29 +41,31 @@ files:
 - 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.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/logger.rb
-- lib/webconsole/logger/test/Rakefile
 - lib/webconsole/logger/test/js/test_view_helper.js
 - lib/webconsole/logger/test/lib/test_constants.rb
 - lib/webconsole/logger/test/lib/test_view_helper.rb
+- lib/webconsole/logger/test/Rakefile
 - lib/webconsole/logger/test/run_tests.sh
 - lib/webconsole/logger/test/tc_logger.rb
-- lib/webconsole/repl.rb
+- lib/webconsole/logger.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: {}
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Web Console helper gem