rsense-server 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a7e403afc05e2f67e50e7d33c8d526a7a61159
-  data.tar.gz: 8f0a7e59751031424ffb131f92502da089aa79da
+  metadata.gz: f8baee56e544b5d2b5226f349d5f4056d3b07a2f
+  data.tar.gz: 246f872f84091d4ef65706bc71616a1f00106c5f
 SHA512:
-  metadata.gz: edff3e46860b8f24bc07895f106a34535299b10c366409bc7b89e51ef57fffe0f462233f4dae6d4e923e5677eff0b79a19684fcfcd58f2297e552a3f3ca561ad
-  data.tar.gz: 4017afb091033435c0a1f915af0fc2249310bcc009155fc67efe1ed07e00d5f2d4ccb98b75f65a5bb194d88fe63f795631231701afc4c93d9ed61bd9269af37b
+  metadata.gz: 1fcecf455fcb3e7e5ceba461046d4d304fe148473167195b529cedf8948a4e0aef29c496d8314f1e8ec534b02cd5c1729b2b348856412991b8ba4d6d730ffecb
+  data.tar.gz: 80b8afdbb2fc95f328c6cb68f97d0e8bd0c4b9230ca213663c858b4b881024c5292180afa9cd9ba87438ade0cbda6befc528f546747811a1986b993e952835ee

data/bin/_rsense.rb

@@ -1,6 +1,9 @@
+#!/usr/bin/env ruby
+
 require "rsense/server"
 require "rsense/server/config"
 require "optparse"
+require "awesome_print"
 
 SOCKET_PATH = '127.0.0.1:'
 DEFAULT_PORT = 47367
@@ -62,9 +65,8 @@ class RsenseApp < Sinatra::Base
   set :port, PORT
 
   def setup(jsondata)
-    if PROJMAN.roptions && PROJMAN.roptions.project_path.to_s =~ /#{jsondata["project"]}/
-      changed = check_options(jsondata)
-      return if changed && changed.empty?
+    if PROJMAN.roptions && PROJMAN.roptions.project_path.to_s =~ /#{jsondata["project"]}/ && PROJMAN.rcommand && PROJMAN.roptions.file.to_s =~ /#{jsondata["file"]}/
+      PROJMAN.roptions = Rsense::Server::Options.new(jsondata)
       PROJMAN.rcommand.options = PROJMAN.roptions
     else
       PROJMAN.roptions = Rsense::Server::Options.new(jsondata)
@@ -72,20 +74,6 @@ class RsenseApp < Sinatra::Base
     end
   end
 
-  def check_options(data)
-    changed = []
-    data.each do |k, v|
-      if PROJMAN.roptions.respond_to? k.to_sym
-        keyval = PROJMAN.roptions.send k.to_sym
-        unless keyval.to_s =~ /#{v}/
-          PROJMAN.roptions.__send__("#{k}=", v)
-          changed << k
-        end
-      end
-    end
-    changed
-  end
-
   def code_completion
     if PROJMAN.roptions.code
       candidates = PROJMAN.rcommand.code_completion(PROJMAN.roptions.file, PROJMAN.roptions.location, PROJMAN.roptions.code)
@@ -108,6 +96,8 @@ class RsenseApp < Sinatra::Base
     Thread.new do
       if PROJMAN.rcommand.placeholders.first
         proj, feat = PROJMAN.rcommand.placeholders.shift
+        puts "Add deps: "
+        puts feat
         PROJMAN.rcommand.rrequire(proj, feat, true, 0)
       end
     end

data/lib/rsense/server/command.rb

@@ -1,6 +1,6 @@
 require "pathname"
-require "pry"
 require "rsense-core"
+require "pry"
 require_relative "./listeners/find_definition_event_listener"
 require_relative "./listeners/where_event_listener"
 require_relative "./command/special_meth"
@@ -68,7 +68,10 @@ class Rsense::Server::Command::Command
         if feature
           files = Dir.glob(Pathname.new(args.first.node.position.file).dirname.join("#{feature}*"))
           files.each do |f|
-            rload(project, f, "UTF-8", false)
+            pth = Pathname.new(f).expand_path
+            if pth.file?
+              rload(project, f, "UTF-8", false)
+            end
           end
         end
       end
@@ -89,9 +92,13 @@ class Rsense::Server::Command::Command
 
   def rload(project, file, encoding, prep)
     file = Pathname.new(file)
+    feature = file.basename.to_s.sub(file.extname, "")
     return LoadResult.alreadyLoaded() if project.loaded?(file)
-    return if file.extname =~ /(\.so|\.dylib|\.dll|\.java|\.class|\.c$|\.h$|\.m$|\.js|\.html|\.css)/
+    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
 
     if prep
@@ -100,8 +107,11 @@ class Rsense::Server::Command::Command
       @context.main = false
     end
 
+    source = file.read
+    return unless check_shebang(source)
+
     begin
-      @ast = @parser.parse_string(file.read, file.to_s)
+      @ast = @parser.parse_string(source, file.to_s)
       project.graph.load(@ast)
       result = LoadResult.new
       result.setAST(@ast)
@@ -111,15 +121,21 @@ class Rsense::Server::Command::Command
     end
   end
 
+  def check_shebang(source)
+    return true unless source.match(/^#!/)
+    source.match(/^(#!)(\/\w+)*\/ruby/)
+  end
+
   def rrequire(project, feature, background, loadPathLevel=0)
-    puts feature
+
     encoding = "UTF-8"
 
     lplevel = @context.loadPathLevel
     @context.loadPathLevel = loadPathLevel
-    if lplevel > 1 && background == false
+    if lplevel > 2 && background == false
       return @placeholders << [project, feature]
     end
+
     return LoadResult.alreadyLoaded() if project.loaded?(feature)
 
     if PROJMAN && PROJMAN.roptions && PROJMAN.roptions.project_path
@@ -158,12 +174,14 @@ class Rsense::Server::Command::Command
         rload(project, cp, encoding, false)
       end
     end
-    @context.loadPathLevel = lplevel
   end
 
   def load_builtin(project)
     builtin = builtin_path(project)
     rload(project, builtin, "UTF-8", false)
+    project.stubs.each do |p|
+      rload(project, Pathname.new(p), "UTF-8", false) unless p.match(/builtin/)
+    end
   end
 
   def builtin_path(project)
@@ -223,6 +241,7 @@ class Rsense::Server::Command::Command
 
     candidates = []
     @receivers = []
+
     @context.typeSet.each do |receiver|
       @receivers << receiver
       ruby_class = receiver.getMetaClass
@@ -265,7 +284,7 @@ class Rsense::Server::Command::Command
     @context.main = true
     @type_inference_method.context = @context
     @graph = project.graph
-    @native_attr_method.graph = graph
+    @native_attr_method.graph = @graph
     @graph.addSpecialMethod(Rsense::Server::Command::TYPE_INFERENCE_METHOD_NAME, @type_inference_method)
     @graph.addSpecialMethod("require", @require_method)
     @graph.addSpecialMethod("require_next", @require_next_method)

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

@@ -1,5 +1,4 @@
 require "jruby-parser"
-require "pry"
 
 module Rsense
   module Server
@@ -55,5 +54,3 @@ module Rsense
     end
   end
 end
-
-

data/lib/rsense/server/options.rb

@@ -32,7 +32,12 @@ module Rsense
       end
 
       def file=(path)
-        @file = Pathname.new(path).expand_path
+        file = Pathname.new(path.to_s).expand_path
+        if file.exist?
+          @file = file
+        else
+          @file = Pathname.new(".")
+        end
       end
 
       def here_doc_reader(reader)
@@ -86,4 +91,3 @@ module Rsense
     end
   end
 end
-

data/lib/rsense/server/version.rb

@@ -1,5 +1,5 @@
 module Rsense
   module Server
-    VERSION = "0.5.2"
+    VERSION = "0.5.4"
   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"
+  spec.add_dependency "rsense-core", "~> 0.5.8"
   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(51)
+      compls.size.must_equal(58)
     end
 
 end

data/spec/rsense/server/command_spec.rb

@@ -3,11 +3,6 @@ require "json"
 require_relative "../../spec_helper.rb"
 
 describe Rsense::Server::Command::Command do
-  class ProjectManager
-    attr_accessor :roptions, :rcommand, :rproject
-  end
-
-  PROJMAN = ProjectManager.new
 
   before do
     @json_path = Pathname.new("spec/fixtures/sample.json")

data/spec/spec_helper.rb

@@ -14,3 +14,9 @@ require_relative "../lib/rsense/server/path_info.rb"
 require_relative "../lib/rsense/server/command/special_meth.rb"
 require_relative "../lib/rsense/server/project.rb"
 require_relative "../lib/rsense/server/config.rb"
+
+class ProjectManager
+  attr_accessor :roptions, :rcommand, :rproject
+end
+
+PROJMAN = ProjectManager.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsense-server
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Eric West
@@ -9,20 +9,20 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsense-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.8
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.8
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency