rsense-server 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 904b8cb503bf9dd407287fe436c26c1ec36ad522
-  data.tar.gz: f49cef158d22c3e34e836a9901b1d7b3242d7804
+  metadata.gz: a93ed224e1c6d3c0e2801f7ddeac43131e643575
+  data.tar.gz: 6dfc2697283bb4ebdb58526798cecc0485fb772f
 SHA512:
-  metadata.gz: 36abbff6e807c73dd598e6f7b54e5fbb26cb7fdd216e578394d40f4eb0cd83197d461da352a611a3ac8061e532719639da23381af6f93a92b2edf8e67d919777
-  data.tar.gz: c1c76e00e84238d6729082f44eb0ba0ab0696f8739fdf1985df9554031d733a311e567793bfe9ae18538cbda14d1527af8b58a97d6d64aa4aac2139dc5efc3a0
+  metadata.gz: 7ee3a53cc591ae8fdedd0cfdc7777ed40b4dfe084015f09243bba47bda9de55d8db893cb77c69ae8d496630ab039d41f6e029eefe5f6013f870e89902e932f5b
+  data.tar.gz: 5b54aaf75b9dfde8c8f87f41a9f88a951aedbb7c575c219dd92a714b83b6d43f67a4a3d51c1d587b014d722780f4d7cbacf8b71a56165d1e271b79df3c1683f3

data/bin/_rsense.rb

@@ -19,6 +19,10 @@ OptionParser.new do |opts|
   opts.on("-p", "--port PORT", "Port") do |port|
     options[:port] = port
   end
+
+  opts.on("-d", "--debug", "Debug") do |debug|
+    options[:debug] = true
+  end
 end.parse!
 
 def config(options)
@@ -49,11 +53,20 @@ end
 PORT = port(options)
 
 class ProjectManager
-  attr_accessor :roptions, :rcommand, :rproject
+  attr_accessor :roptions, :rcommand, :rproject, :debug
+
+  def debug?
+    @debug
+  end
 end
 
 def projman_set_up(projman, options)
   options[:path] ||= "."
+  if options[:debug]
+    projman.debug = true
+  else
+    projman.debug = false
+  end
   path = Pathname.new(options[:path]).expand_path
   Rsense::Server::Command::Preload.load(projman, path)
 end
@@ -72,7 +85,7 @@ class RsenseApp < Sinatra::Base
   set :port, PORT
 
   def setup(jsondata)
-    if PROJMAN.roptions && PROJMAN.roptions.project_path.to_s =~ /#{jsondata["project"]}/ && PROJMAN.rcommand && PROJMAN.roptions.file.to_s =~ /#{jsondata["file"]}/
+    if project_check?(jsondata)
       PROJMAN.roptions = Rsense::Server::Options.new(jsondata)
       PROJMAN.rcommand.options = PROJMAN.roptions
     else
@@ -81,13 +94,21 @@ class RsenseApp < Sinatra::Base
     end
   end
 
+  def project_check?(jsondata)
+    PROJMAN.roptions && PROJMAN.roptions.project_path.to_s =~ /#{jsondata["project"]}/ && PROJMAN.rcommand && PROJMAN.roptions.file && PROJMAN.roptions.file.to_s =~ /#{jsondata["file"]}/
+  end
+
   def code_completion
     if PROJMAN.roptions.code
       candidates = PROJMAN.rcommand.code_completion(PROJMAN.roptions.file, PROJMAN.roptions.location, PROJMAN.roptions.code)
     else
       candidates = PROJMAN.rcommand.code_completion(PROJMAN.roptions.file, PROJMAN.roptions.location)
     end
-    PROJMAN.rcommand.errors.each { |e| puts e }
+
+    if PROJMAN.debug?
+      PROJMAN.rcommand.errors.each { |e| puts e }
+    end
+
     completions = candidates.map do |c|
       {
         name: c.completion,

data/bin/_rsense_commandline.rb

@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'json'
+require 'net/http'
+
+module Rsense
+  class Request
+    SOCKET_PATH = 'http://localhost'
+    DEFAULT_PORT = 47367
+
+    def self.req(jsondata)
+      request = Net::HTTP::Post.new uri
+      request.body = jsondata
+
+      Net::HTTP.start(uri.host, uri.port) do |http|
+        http.request request
+      end
+    end
+
+    def self.uri
+      uri = URI(SOCKET_PATH)
+      uri.port = DEFAULT_PORT
+      uri
+    end
+  end
+
+  class Main
+    def self.run(jsondata)
+      req_body = request(jsondata).body
+      completions_hash = JSON.parse(req_body)
+      self.stringify(completions_hash)
+    end
+
+    def self.stringify(completions_hash)
+      compls = completions_hash["completions"].map do |c|
+        "#{c["name"]} #{c["qualified_name"]} #{c["base_name"]} #{c["kind"]}"
+      end
+      compls.join("\n")
+    end
+
+    def self.request(jsondata)
+      Rsense::Request.req(jsondata)
+    end
+  end
+end
+
+options = { command: "code_completion" }
+OptionParser.new do |opts|
+  opts.banner = "Usage: rsense start [options]"
+
+  opts.on("--project PROJECT", "project path") do |project|
+    options[:project] = project
+  end
+
+  opts.on("--filepath FILEPATH", "Filepath") do |filepath|
+    options[:file] = filepath
+  end
+
+  opts.on("--text TEXT", "Text") do |text|
+    options[:code] = text
+  end
+
+  opts.on("--location LOCATION", "Location") do |location|
+    loc = location.split(':')
+    row = loc.first
+    col = loc.last
+    options[:location] = { row: (row.to_i + 1), column: (col.to_i + 1) }
+  end
+end.parse!
+
+begin
+
+  jsondata = JSON.generate(options)
+
+  compls = Rsense::Main.run(jsondata)
+  puts compls
+
+rescue Exception => e
+  puts "ERROR: #{e}"
+end

data/lib/rsense/server/command/graph.rb

@@ -0,0 +1,89 @@
+require "pry"
+require_relative "./runtime_helper"
+
+module Rsense
+  module Server
+    module Command
+
+    end
+  end
+end
+
+class Rsense::Server::Command::Vertex < Java::org.cx4a.rsense.typing.vertex::Vertex
+
+  def addType(type)
+    unless type
+      return false
+    end
+    super
+  end
+end
+
+class Rsense::Server::Command::Graph < Java::org.cx4a.rsense.typing::Graph
+  RuntimeHelper = Rsense::Server::Command::RuntimeHelper
+  attr_accessor :context
+
+  def initialize
+    super
+    @context = self.runtime.getContext
+  end
+
+  def visitDefnNode(node)
+    name = node.getName()
+    if name.match(/new/)
+      return Java::org.cx4a.rsense.typing.vertex::Vertex::EMPTY
+    end
+    super
+  end
+
+  def visitDefsNode(node)
+    name = node.getName()
+    if name.match(/new/)
+      return Java::org.cx4a.rsense.typing.vertex::Vertex::EMPTY
+    end
+    super
+  end
+
+  def visitColon2Node(node)
+    target = RuntimeHelper.getNamespace(self, node)
+    super
+  end
+
+  def visitClassNode(node)
+    cpath = node.getCPath()
+    name = cpath.getName()
+    RuntimeHelper.getNamespace(self, cpath)
+    super
+  end
+
+  def visitFCallNode(node)
+    if node.name.match(/filter!/)
+      if node.getArgs && node.getArgs.getNodeType == Java::org.jrubyparser.ast::NodeType::BLOCKPASSNODE
+        block_pass = node.getArgs()
+        argVertices = RuntimeHelper.setupCallArgs(self, block_pass.getArgs())
+        block = RuntimeHelper.setupCallBlock(self, block_pass)
+      else
+        argVertices = RuntimeHelper.setupCallArgs(self, node.getArgs())
+        block = RuntimeHelper.setupCallBlock(self, node.getIter())
+      end
+      vertex = Java::org.cx4a.rsense.typing.vertex::CallVertex.new(node, createFreeSingleTypeVertex(context.getFrameSelf()), argVertices, block)
+      vertex.setPrivateVisibility(true)
+      return RuntimeHelper.call(self, vertex)
+    end
+    super
+  end
+
+  def createFreeSingleTypeVertex(type)
+    vertex = createFreeVertex()
+    vertex.addType(type)
+    return vertex
+  end
+
+  def createFreeVertex(typeSet=nil)
+    if typeSet
+      return Rsense::Server::Command::Vertex.new(nil, typeSet)
+    else
+      return Rsense::Server::Command::Vertex.new
+    end
+  end
+end

data/lib/rsense/server/command/preload.rb

@@ -1,26 +1,51 @@
 module Rsense
   module Server
     module Command
-      module Preload
-
-        def stub_data(path)
-          filepath = path.join("/lib/code.rb")
-          {
-            "command"=>"code_completion",
-            "project" => path.to_s,
-            "file" =>  filepath.to_s,
-            "code" => "def check(testarg)\n  testarg\nend\ncheck('hello')",
-            "location" => { "row" => 2, "column" => 10 }
-          }
+      class Preload
+        SourceCode = Struct.new(:name, :full_name, :path,  :files, :source)
+
+        def self.stub_data(path)
+          { "project" => path.to_s }
         end
-        module_function :stub_data
 
-        def load(project_manager, path)
+        def self.load(project_manager, path)
           PROJMAN.roptions = Rsense::Server::Options.new(stub_data(path))
           PROJMAN.rcommand = Rsense::Server::Command::Command.new(PROJMAN.roptions)
         end
 
-        module_function :load
+        def self.dependency_code(dependencies)
+          paths = dependencies.map { |d| gen_source(d) }.compact!
+          lib_dirs(paths)
+          code(paths)
+          paths.each { |l| concat_files(l) }
+        end
+
+        def self.gen_source(d)
+          SourceCode.new(d.name, d.full_name, d.path.first) if d.path.first
+        end
+
+        def self.code(libs)
+          libs.each do |l|
+            l.files = Dir.glob(Pathname.new(l.path).join("**/*.rb"))
+          end
+        end
+
+        def self.concat_files(paths)
+          code = paths.files.map { |f| Pathname.new(f).read }
+          paths.source = code.join("\n")
+        end
+
+        def self.lib_dirs(paths)
+          paths.each { |p|
+            p.path = find_lib(p)
+          }
+        end
+
+        def self.find_lib(path)
+          p = Pathname.new(path.path).expand_path
+          return p.dirname if p.file?
+          return p
+        end
 
       end
     end

data/lib/rsense/server/command/runtime_helper.rb

@@ -0,0 +1,30 @@
+java_import Java::org.cx4a.rsense.typing.vertex::MultipleAsgnVertex
+
+module Rsense
+  module Server
+    module Command
+
+    end
+  end
+end
+
+class Rsense::Server::Command::RuntimeHelper < Java::org.cx4a.rsense.typing.runtime::RuntimeHelper
+
+  def self.getNamespace(graph, node)
+    if node.class.to_s.match(/Colon2ConstNode/)
+      left = graph.createVertex((node).getLeftNode())
+      object = left.singleType()
+      if object && object.java_object.java_kind_of?(Java::org.cx4a.rsense.ruby::RubyModule)
+        return object
+      else
+        return nil
+      end
+    else
+      super
+    end
+  end
+
+  def self.get_namespace(graph, node)
+    self.getNamespace(graph, node)
+  end
+end

data/lib/rsense/server/command.rb

@@ -7,6 +7,7 @@ require_relative "./command/type_inference_method"
 require_relative "./command/native_attr_method"
 require_relative "./command/alias_native_method"
 require_relative "./command/rsense_method"
+require_relative "./command/preload"
 
 module Rsense
   module Server
@@ -95,7 +96,7 @@ class Rsense::Server::Command::Command
     return LoadResult.alreadyLoaded() if project.loaded?(file)
     return LoadResult.alreadyLoaded() if project.loaded?(feature)
     return if file.extname =~ /(\.so|\.dylib|\.dll|\.java|\.class|\.jar|\.c$|\.h$|\.m$|\.js|\.html|\.css)/
-    project.loaded << feature
+
     project.loaded << file
 
     oldmain = @context.main
@@ -105,6 +106,7 @@ class Rsense::Server::Command::Command
     else
       @context.main = false
     end
+    return if file.directory?
 
     source = file.read
     return unless check_shebang(source)
@@ -112,11 +114,24 @@ class Rsense::Server::Command::Command
     begin
       @ast = @parser.parse_string(source, file.to_s)
       project.graph.load(@ast)
-      result = LoadResult.new
-      result.setAST(@ast)
-      result
+
     rescue Java::OrgJrubyparserLexer::SyntaxException => e
       @errors << e
+    rescue Java::JavaUtil::ConcurrentModificationException => e
+      @errors << e
+    end
+  end
+
+  def load_gem(project, source)
+    begin
+      @ast = @parser.parse_string(source.source, source.name)
+      project.graph.load(@ast)
+    rescue Java::OrgJrubyparserLexer::SyntaxException => e
+      @errors << e
+    rescue Java::JavaLang::NullPointerException => e
+      @errors << e
+    rescue Java::JavaUtil::ConcurrentModificationException => e
+        @errors << e
     end
   end
 
@@ -232,8 +247,8 @@ class Rsense::Server::Command::Command
       source = code.inject_inference_marker(location)
       @ast = @parser.parse_string(source, file.to_s)
       @project.graph.load(@ast)
-      result = Java::org.cx4a.rsense::CodeCompletionResult.new
-      result.setAST(@ast)
+      # result = Java::org.cx4a.rsense::CodeCompletionResult.new
+      # result.setAST(@ast)
     rescue Java::OrgJrubyparserLexer::SyntaxException => e
       @errors << e
     end
@@ -304,14 +319,26 @@ class Rsense::Server::Command::Command
     prepare_project()
   end
 
+  def set_features_loaded(deps)
+    deps.each do |d|
+      @project.loaded << d.name
+    end
+  end
+
   def prepare_project()
     if @options.name
-      name = @roptions.name
+      name = @options.name
     else
       name = "(sandbox)"
     end
     file = @options.project_path
     @project = Rsense::Server::Project.new(name, file)
+    prepare(project)
+    set_features_loaded(@project.dependencies)
+    codes = Rsense::Server::Command::Preload.dependency_code(@project.dependencies)
+    codes.each do |c|
+      load_gem(@project, c)
+    end
   end
 
 end

data/lib/rsense/server/config.rb

@@ -71,6 +71,4 @@ class Rsense::Server::Config
       options(conf)
     end
   end
-
-
 end

data/lib/rsense/server/load_path.rb

@@ -22,9 +22,10 @@ module Rsense
           start_dir = Dir.pwd
           Dir.chdir(@gemfile.dirname)
           lockfile = Bundler::LockfileParser.new(Bundler.read_file(@gemfile))
-          gem_info(lockfile)
+          @deps = gem_info(lockfile)
           Dir.chdir(start_dir)
         end
+        @deps
       end
 
       def gem_info(lfile)

data/lib/rsense/server/project.rb

@@ -1,3 +1,7 @@
+require_relative "./command/graph"
+require_relative "./command/runtime_helper"
+require "rsense-core"
+
 module Rsense
   module Server
     class Project
@@ -6,7 +10,8 @@ module Rsense
       def initialize(name, path)
         @name = name
         @path = path
-        @graph = Rsense::Typing::Graph.new
+        #@graph = Java::org.cx4a.rsense.typing::Graph.new
+        @graph = Rsense::Server::Command::Graph.new
         @runtime = @graph.getRuntime()
         @stubs = Dir.glob(Rsense::BUILTIN.join("**/*.rb"))
         @load_path = Rsense::Server::LoadPath.paths

data/lib/rsense/server/version.rb

@@ -1,5 +1,5 @@
 module Rsense
   module Server
-    VERSION = "0.5.10"
+    VERSION = "0.5.11"
   end
 end

data/rsense-server.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib", "vendor/gems/puma-2.8.2-java/lib/"]
 
-  spec.add_dependency "rsense-core", "~> 0.6.2"
+  spec.add_dependency "rsense-core", "~> 0.6.6"
   spec.add_dependency "spoon", "~> 0.0.4"
   spec.add_dependency "jruby-jars", "~> 1.7.4"
   spec.add_dependency "jruby-parser", "~> 0.5.4"

data/spec/integration_spec.rb

@@ -22,7 +22,7 @@ describe "completions" do
     it "returns completions" do
       @script = TestMockscript.new
       compls = @script.code_complete
-      compls.size.must_equal(58)
+      compls.size.must_equal(66)
     end
 
 end

data/spec/rsense/server/command_spec.rb

@@ -3,15 +3,13 @@ require "json"
 require_relative "../../spec_helper.rb"
 
 describe Rsense::Server::Command::Command do
-
-  before do
-    @json_path = Pathname.new("spec/fixtures/sample.json")
-    @json = JSON.parse(@json_path.read)
-    @options = Rsense::Server::Options.new(@json)
-  end
+  json_path = Pathname.new("spec/fixtures/sample.json")
+  json = JSON.parse(json_path.read)
+  OPTIONS = Rsense::Server::Options.new(json)
+  COMMAND = Rsense::Server::Command::Command.new(OPTIONS)
 
   it "can be initialized" do
-    Rsense::Server::Command::Command.new(@options)
+    Rsense::Server::Command::Command.new(OPTIONS)
   end
 
   describe "finding dependencies" do
@@ -32,47 +30,46 @@ describe Rsense::Server::Command::Command do
         "/i/smell/the/blood/of/an/englishman"
       ]
       @stubs = Dir.glob(Rsense::BUILTIN.join("**/*.rb"))
-      @project = Project.new(@loadpath, @gempath, @stubs)
-      @command = Rsense::Server::Command::Command.new(@options)
+      @project = Project.new("(test-sandbox)", "spec/fixtures/test_gem/", @stubs)
     end
 
     it "finds the dependency" do
-      matches = @command.dependency_matches(@dependencies, "foo")
+      matches = COMMAND.dependency_matches(@dependencies, "foo")
       matches.first.to_s.must_match(/baz/)
     end
 
     it "does not find a dependency which is not there" do
-      @command.dependency_matches(@dependencies, "scoby").must_be_empty
+      COMMAND.dependency_matches(@dependencies, "scoby").must_be_empty
     end
 
     it "finds the path in the load_path" do
-      @command.load_path_matches(@project, "def_sample").size.must_equal(1)
+      @project.load_path = @loadpath
+      COMMAND.load_path_matches(@project, "def_sample").size.must_equal(1)
     end
 
     it "gathers the lib directory paths from the dependencies" do
       deps = [
         Dependency.new("foo", "foo.1.2", ["/foo/lib/foo.rb"]),
-        Dependency.new("scooby", "scooby.1.2", ["/scooby/lib/scooby.rb"])
       ]
-      paths = @command.dependency_paths(deps)
-      paths.size.must_equal(2)
-      paths.first.to_s.must_match(/\/foo\/lib$/)
+      paths = COMMAND.dependency_paths(deps)
+
+      paths.to_s.must_match(/\/foo\/lib/)
     end
 
     it "finds a deeply nested path" do
       dep_paths = [Pathname.new("spec/fixtures/deeply"), Pathname.new("foo/bar/baz")]
-      matches = @command.deep_check(@gempath, dep_paths, "thing")
+      matches = COMMAND.deep_check(@gempath, dep_paths, "thing")
       matches.first.must_match(/nested/)
       matches.size.must_equal(1)
     end
 
     it "finds the stubs" do
-      matches = @command.stub_matches(@project, "_builtin")
+      matches = COMMAND.stub_matches(@project, "_builtin")
       matches.size.must_equal(1)
     end
 
     it "finds the _builtin" do
-      @command.builtin_path(@project).to_s.must_match(/_builtin/)
+      COMMAND.builtin_path(@project).to_s.must_match(/_builtin/)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsense-server
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Eric West
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsense-core
@@ -17,12 +17,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.6
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.6
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -213,6 +213,7 @@ email:
 - tomo@cx4a.org
 executables:
 - _rsense.rb
+- _rsense_commandline.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -223,15 +224,18 @@ files:
 - README.md
 - Rakefile
 - bin/_rsense.rb
+- bin/_rsense_commandline.rb
 - config/puma.rb
 - lib/rsense/server.rb
 - lib/rsense/server/code.rb
 - lib/rsense/server/command.rb
 - lib/rsense/server/command/alias_native_method.rb
 - lib/rsense/server/command/completion_result.rb
+- lib/rsense/server/command/graph.rb
 - lib/rsense/server/command/native_attr_method.rb
 - lib/rsense/server/command/preload.rb
 - lib/rsense/server/command/rsense_method.rb
+- lib/rsense/server/command/runtime_helper.rb
 - lib/rsense/server/command/special_meth.rb
 - lib/rsense/server/command/type_inference_method.rb
 - lib/rsense/server/config.rb