maglev-webtools 0.2.1 → 1.0

data/lib/web_tools/support/error_log.rb

@@ -0,0 +1,33 @@
+# A singleton to hold on to the debuggable processes
+
+module WebTools
+  module Support
+    module ErrorLog
+      extend self
+      extend Enumerable
+
+      Entry = Struct.new :exception, :thread
+
+      def add(hash)
+        list << Entry.new(hash[:exception], hash[:thread])
+        list.last
+      end
+
+      def delete(entry)
+        list.delete entry
+      end
+
+      def list
+        defined?(@@list) ? @@list : @@list = []
+      end
+
+      def to_a
+        list
+      end
+
+      def each(&block)
+        list.each(&block)
+      end
+    end
+  end
+end

data/lib/web_tools/support/ruby.rb

@@ -1,132 +1,71 @@
-require 'maglev/method_source'
 module WebTools
-  # Provide information about the Ruby environment
-  module Ruby
-    # Traverse the Ruby namespace hierarchy and execute block for all classes
-    # and modules.  Returns an IdentitySet of all classes and modules found.
-    # Skips autoloads (i.e., does not trigger them and does not yield them to
-    # the block).
-    #
-    # @param [Module] klass The Class or Module object to start traversal.
-    #         Default is Object.
-    #
-    # @param [IdentitySet] rg The recursion guard used to prevent infinite
-    #         loops; also used as return value.
-    #
-    # @return [IdentitySet] An IdentitySet of all the Classes and Modules
-    #         registered in the Ruby namespace
-    #
-    def each_module(klass=Object, rg=IdentitySet.new, &block)
-      raise 'Must be class or module' unless Module === klass
-      unless rg.include?(klass)
-        rg.add klass
-        yield klass
-        klass.constants.each do |c|
-          unless klass.autoload?(c)
-            obj = klass.const_get c
-            each_module(obj, rg, &block) if Module === obj
-          end
-        end
-      end
-      rg
-    end
-    module_function :each_module
-
-    # Returns a sorted list of class and module names in the Ruby Namespace
-    #
-    # @return [Array] sorted list of class and module names found in the Ruby
-    #         namespace hierarchy.
-    def class_and_module_names
-      names = []
-      each_module { |klass|  names << klass.name }
-      names.sort
-    end
-    module_function :class_and_module_names
-
-    # A simple message from Ruby Land.
-    def say_something
-      "Hello from MagLev, My name is '#{self.name}'"
-    end
-    module_function :say_something
+  module Support
+    # Provide information about the Ruby environment
+    module Ruby
+      MODULE_MOD_FNS = Module.instance_methods(false)
 
-    # Return an object named in the Ruby namespace.
-    #
-    # @param [String] name The name of the object. E.g., "Object",
-    #         "Errno::EACCES", "Foo::Bar::Baz".
-    #
-    # @return [Object] the named object.
-    #
-    # @raise [NameError] if the name can't be found
-    def find_in_namespace(name)
-      name.split('::').inject(Object) do |parent, name|
-        obj = parent.const_get name
+      def module_info_for(name)
+        mod = find_in_namespace name
+        { :constants        => mod.constants.sort,
+          :class_methods    => module_fns_for(mod),
+          :instance_methods => mod.instance_methods(false).sort }
       end
-    end
-    module_function :find_in_namespace
+      module_function :module_info_for
 
-    MODULE_MOD_FNS = Module.instance_methods(false)
-
-    def module_info_for(name)
-      mod = find_in_namespace name
-      { :constants        => mod.constants.sort,
-        :class_methods    => module_fns_for(mod),
-        :instance_methods => mod.instance_methods(false).sort }
-    end
-    module_function :module_info_for
+      def module_fns_for(mod)
+        res = []
+        begin
+          sclass = mod.__singleton_class
+          res = sclass.instance_methods(false) - MODULE_MOD_FNS
+        rescue => e
+          # nothing
+        end
+        res
+      end
+      module_function :module_fns_for
 
-    def module_fns_for(mod)
-      res = []
-      begin
-        sclass = mod.__singleton_class
-        res = sclass.instance_methods(false) - MODULE_MOD_FNS
-      rescue => e
-        # nothing
+      # Get the source code for the named class and method
+      #
+      # The success of this method depends on being called from a Ruby stack,
+      # not a Smalltalk stack.
+      #
+      # @param [String] The name of the class
+      # @param [String] The method name
+      # @param [Boolean] if true, then look for a class method, otherwise look
+      #         for an instance method.
+      def source_for(class_name, method_name, instance_method=true)
+        klass = find_in_namespace(class_name)
+        gsnmeth = klass.gs_method_for(method_name, instance_method)
+        src = gsnmeth.__source_string
+        file,line = gsnmeth.__source_location
+        file.nil? ? "#{src}\n# No file information available." : "#{src}\n##{file}:#{line}"
       end
-      res
-    end
-    module_function :module_fns_for
+      module_function :source_for
 
-    # Get the source code for the named class and method
-    #
-    # The success of this method depends on being called from a Ruby stack,
-    # not a Smalltalk stack.
-    #
-    # @param [String] The name of the class
-    # @param [String] The method name
-    # @param [Boolean] if true, then look for a class method, otherwise look
-    #         for an instance method.
-    def source_for(class_name, method_name, instance_method=true)
-      klass = find_in_namespace(class_name)
-      gsnmeth = klass.gs_method_for(method_name, instance_method)
-      src = gsnmeth.__source_string
-      file,line = gsnmeth.__source_location
-      file.nil? ? "#{src}\n# No file information available." : "#{src}\n##{file}:#{line}"
-    end
-    module_function :source_for
+      # Return a display string suitable for rendering a constant.
+      # Currently, it just returns the results of #inspect on the object.
+      #
+      # TODO
+      #   1. If the const value is a proc, then return "Proc: " + the source code.
+      #
+      # @param [String,Symbol] class_name The name of the class to query.
+      # @param [String,Symbol] const_name The name of the constant.
+      # @return [String] A description of the constant.
+      #
+      def const_info_for(class_name, const_name)
+        klass = find_in_namespace class_name
+        const = klass.const_get const_name
+        const.inspect
+      end
+      module_function :const_info_for
 
-    # Return a display string suitable for rendering a constant.
-    # Currently, it just returns the results of #inspect on the object.
-    #
-    # TODO
-    #   1. If the const value is a proc, then return "Proc: " + the source code.
-    #
-    # @param [String,Symbol] class_name The name of the class to query.
-    # @param [String,Symbol] const_name The name of the constant.
-    # @return [String] A description of the constant.
-    #
-    def const_info_for(class_name, const_name)
-      klass = find_in_namespace class_name
-      const = klass.const_get const_name
-      const.inspect
+      # def logit(msg)
+      #   File.open("/tmp/log", "a+") do |f|
+      #     f.puts msg
+      #     f.flush
+      #   end
+      # end
+      # module_function :logit
     end
-    module_function :const_info_for
-
-    # def logit(msg)
-    #   File.open("/tmp/log", "a+") do |f|
-    #     f.puts msg
-    #     f.flush
-    #   end
-    # end
-    # module_function :logit
   end
 end

data/lib/web_tools/support/service_helper.rb

@@ -1,22 +1,50 @@
 require 'json/pure' unless defined? JSON
+require 'rack/contrib/jsonp'
 
 module WebTools::Support::ServiceHelper
   def self.included(base)
-    base.set :show_exceptions, true
+    base.set :show_exceptions, false
     base.set :raise_errors, false
+    base.set :method_override, true
+    base.set :logging, true
+    base.use Rack::JSONP
 
     base.error do
       excep = request.env['sinatra.error']
-      { '_stack' => excep.backtrace.join("<br>") }.to_json
+      puts
+      p excep.message
+      puts excep.backtrace
+      json('_stack' => excep.backtrace.join("<br>"),
+           '_error' => excep.message)
     end
-  end
 
-  # Returns a JSON string that contains the data under the "data" key.
-  # Adds other keys (_time, _stack) if appropriate.
-  def prepare_data(data)
-    raise "Expecting Hash" unless Hash === data
-    data['_time'] = ((Time.now - @ts) * 1_000).to_i
-    data['_stack'] = @stack
-    data.to_json
+    base.before do
+      @ts = Time.now
+    end
+
+    base.helpers do
+      def non_meta_name(str)
+        if str =~ /^#<Class:.*>$/
+          str["#<Class:".length..-2]
+        else
+          str
+        end
+      end
+
+      def json(obj)
+        content_type :json
+        obj.to_hash.tap do |o|
+          o["_time"] = ((Time.now - @ts) * 1000).to_i
+        end.to_json
+      end
+
+      def reflect(obj)
+        system.reflect(obj)
+      end
+
+      def system
+        @reflection ||= MirrorAPI::Reflection.new
+      end
+    end
   end
 end

data/lib/web_tools/support/smalltalk_extensions.rb

@@ -8,6 +8,8 @@ class Maglev::System
     #
     class_primitive_nobridge 'current_session_ids', 'currentSessions'
 
+    class_primitive_nobridge 'max_session_id', 'maxSessionId'
+
     # Return the cache process slot number (a SmallInteger) for the given
     # session ID.  The session must be connected to the same shared page
     # cache as the session invoking this method.
@@ -52,6 +54,16 @@ class Maglev::System
     #  must have the SessionAccess privilege.
     #
     class_primitive_nobridge 'description_of_session', 'descriptionOfSession:'
+
+    class_primitive_nobridge 'cache_statistics', 'cacheStatisticsAt:'
+    class_primitive_nobridge 'cache_statistics_description_for_type', 'cacheStatisticsDescriptionForType:'
+
+    begin
+      StatStatistic = __resolve_smalltalk_global(:StatStatistic)
+      class StatStatistic
+        class_primitive_nobridge 'cache_stat_descriptions', 'cacheStatDescriptions'
+      end
+    rescue Exception; end
 end
 
 # The stoneVersionReport returns a StringKeyValueDictionary.

data/lib/web_tools/tool.rb

@@ -0,0 +1,48 @@
+require 'web_tools'
+require 'sinatra/base'
+require 'web_tools/support/service_helper'
+require 'web_tools/support/error_log'
+
+module WebTools
+  class Tool < Sinatra::Base
+    include WebTools::Support::ServiceHelper
+
+    before do
+      params.each do |k,v|
+        params[k] = Rack::Utils.unescape(v)
+        params[k] = false if v == "false"
+        params[k] = nil if v == "null"
+        params.delete(k) if v == "null" || v.empty?
+      end
+    end
+
+    class << self
+      def inherited(subclass)
+        super
+        self.subclasses << subclass
+      end
+
+      def dont_show!
+        @dont_show = true
+      end
+
+      def dont_show?
+        !!@dont_show
+      end
+
+      def subclasses
+        @subclasses ||= []
+      end
+
+      def display_name
+        name.split("::").last
+      end
+
+      def file_name
+        display_name + ".html"
+      end
+
+      alias description name
+    end
+  end
+end

data/lib/web_tools/ui.rb

@@ -1,67 +1,28 @@
 require 'sinatra/base'
 require 'web_tools'
+require 'web_tools/support/service_helper'
 
 class WebTools::UI < Sinatra::Base
-  use WebTools::Browser
-  use WebTools::Debugger
-  use WebTools::Info
+  PUBLIC_FOLDER = File.expand_path("../../../public", __FILE__)
+  include WebTools::Support::ServiceHelper
 
-  before do
-    @location = env["SCRIPT_NAME"]
-    @javascripts = %w[
-                     https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js
-                     https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js
-                   ]
-    @stylesheets = %w[reset.css webtools.css]
+  helpers do
+    def static(file) File.read("#{PUBLIC_FOLDER}/#{file}.html") end
   end
 
   get '/' do
-    erb :index
+    static :index
   end
 
-  get '/browser' do
-    @javascripts += %w[webtools/browser.js CodeMirror/js/codemirror.js]
-    erb :browser
+  get '/tools' do
+    json "tools" => (WebTools::Tool.subclasses.reject(&:dont_show?).sort_by(&:name).map do |cls|
+      { "file" => cls.file_name,
+        "name" => cls.display_name,
+        "description" => cls.description }
+    end)
   end
 
-  get '/debugger' do
-    @javascripts += %w[
-      ace/ace.js
-      ace/mode-ruby.js
-      webtools/debugger.js]
-    erb :debugger
-  end
-
-  get '/info/version' do
-    @javascripts += %w[webtools/version.js]
-    @stylesheets = []
-    erb :version
-  end
-
-  get '/info/sessions' do
-    @javascripts += %w[webtools/sessions.js]
-    @stylesheets = []
-    erb :sessions
-  end
-
-  private
-
-  def erb(*args, &block)
-    @stylesheets = @stylesheets.map do |path|
-      unless path =~ /^((http)|\/)/
-        "#{@location}/stylesheets/#{path}"
-      else
-        path
-      end
-    end
-
-    @javascripts = @javascripts.map do |path|
-      unless path =~ /^((http)|\/)/
-        "#{@location}/javascript/#{path}"
-      else
-        path
-      end
-    end
-    super
+  get '/*' do
+    "#{params[:splat]} not implemented"
   end
 end

data/lib/web_tools/version_report.rb

@@ -0,0 +1,29 @@
+require 'sinatra/base'
+require 'web_tools'
+require 'web_tools/support/service_helper'
+
+class WebTools::VersionReport < WebTools::Tool
+
+  def self.description
+    'Information about the Stone and Gem processes and their host(s)'
+  end
+
+  get '/' do
+    json("stone" => stone_version_report,
+         "gem" => gem_version_report)
+  end
+
+  def stone_version_report
+    results = { }
+    rpt = Maglev::System.stone_version_report
+    rpt.keys.each { |k| results[k] = rpt.at(k) }
+    results
+  end
+
+  def gem_version_report
+    results = { }
+    rpt = Maglev::System.gem_version_report
+    rpt.keys.each { |k| results[k] = rpt.at(k) }
+    results
+  end
+end