rsense 0.5.16 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a0ddf473e545145bfbc7b6c9204df0a6f42282
-  data.tar.gz: d82314714f1d8a104d893e6f04cbecab8970f270
+  metadata.gz: f698810651ef1e3870d8ca2ae09a19630162243a
+  data.tar.gz: e297e3d65b240e5087741e57d5a7989c344a36e0
 SHA512:
-  metadata.gz: d7859292ba32e3e8995730a4487fa895f7214815c46c82a55b309d7a312e4db897bf14883dc22f0ee23d9d35ce084e08a4513ccef37d22b33521ee59a94d1804
-  data.tar.gz: 6415f13dbbd3b30c81aace309c57e94dd96a457c403eef90905113ef8385281c10721c0e50eebd65e8361d29341df3fd7b4d6d108baf29339d9f091aed4be7e0
+  metadata.gz: 0acba04264905a7871c4182c79f7c730a21d50a49c36d62ae9090bbd42aaa682ea65eb86ad46b23ed27f9bfa4b3eca36842e502a557c9c25fdbc2d948d9b2c56
+  data.tar.gz: e53a30024ec22724564e19667fd913053a0a740afa5c42988e53535bf89763ef1979352b334ff0a68d8eec1b211ea426c99f7a66577452afdc71f8a14fad9d3e

data/README.md

@@ -12,15 +12,7 @@ RSense is currently under heavy development and ready for testing.  Currently we
 
 
 ## Installation
-RSense is installed via RubyGems. It works well installed via Bundler as that gives it access to your application's LOAD_PATH very easily, and ensures it's installed into the same Ruby as your other dependencies if you happen to be using a version management tool like `rbenv`.  Otherwise, be sure to install it with the proper version of Ruby (whichever ruby you are using for your project).
-
-Add this line to your application's Gemfile:
-
-    gem 'rsense'
-
-And then execute:
-
-    $ bundle
+RSense is installed via RubyGems. Be sure to install it with the proper version of Ruby (whichever ruby you are using for your project).
 
 Or install it yourself as:
 

data/bin/_rsense_commandline.rb

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'json'
+require "faraday"
+require "uri"
+require "timeout"
+
+module Rsense
+  class Request
+    SOCKET_PATH = 'localhost'
+    DEFAULT_PORT = 47367
+
+    def self.req(jsondata)
+      conn = Faraday.new(uri)
+
+      conn.post do |req|
+        req.headers["Content-Type"] = 'application.json'
+        req.body = jsondata
+      end
+    end
+
+    def self.uri
+      uri = URI::HTTP.build({host: SOCKET_PATH, port: DEFAULT_PORT})
+    end
+  end
+
+  class Main
+    def self.run(jsondata)
+      begin
+        Timeout::timeout(1) do
+          res_body = request(jsondata).body
+          completions_hash = JSON.parse(res_body)
+          self.stringify(completions_hash)
+        end
+      rescue Timeout::Error => e
+        [""]
+      end
+    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/client/runner.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'rubygems'
 require 'spoon'
 
@@ -8,11 +9,13 @@ module Rsense
 
       APPNAME = 'rsense'
       WORK_PATH = Dir.pwd
-      PID_PATH  = '/tmp/exec.pid'
-      OUT_PATH = '/tmp/rsense.log'
+      # TODO: Make this configurable w/out ENV variables
+      PID_PATH  = ENV['RSENSE_PID'] || '/tmp'
+      OUT_PATH = ENV['RSENSE_LOG'] || '/tmp'
       EXEC = "/usr/bin/env"
 
       def initialize(args={})
+        ensure_paths_exist(PID_PATH, OUT_PATH)
         @args = args
       end
 
@@ -22,11 +25,11 @@ module Rsense
 
       def create_pid(pid)
         begin
-          open(PID_PATH, 'w') do |f|
+          open(pid_path, 'w') do |f|
             f.puts pid
           end
         rescue => e
-          STDERR.puts "Error: Unable to open #{PID_PATH} for writing:\n\t" +
+          STDERR.puts "Error: Unable to open #{pid_path} for writing:\n\t" +
               "(#{e.class}) #{e.message}"
           exit!
         end
@@ -35,12 +38,12 @@ module Rsense
       def get_pid
         pid = false
         begin
-          open(PID_PATH, 'r') do |f|
+          open(pid_path, 'r') do |f|
             pid = f.readline
             pid = pid.to_s.gsub(/[^0-9]/,'')
           end
         rescue => e
-          STDERR.puts "Error: Unable to open #{PID_PATH} for reading:\n\t" +
+          STDERR.puts "Error: Unable to open #{pid_path} for reading:\n\t" +
               "(#{e.class}) #{e.message}"
           exit
         end
@@ -49,8 +52,8 @@ module Rsense
       end
 
       def remove_pidfile
-       begin
-         File.unlink(PID_PATH)
+        begin
+          File.unlink(pid_path)
         rescue => e
           STDERR.puts "ERROR: Unable to unlink #{path}:\n\t" +
             "(#{e.class}) #{e.message}"
@@ -108,13 +111,27 @@ module Rsense
         Dir::chdir(WORK_PATH)
         file_actions = Spoon::FileActions.new
         file_actions.close(1)
-        file_actions.open(1, OUT_PATH, File::WRONLY | File::TRUNC | File::CREAT, 0600)
+        file_actions.open(1, out_path, File::WRONLY | File::TRUNC | File::CREAT, 0600)
         file_actions.close(2)
-        file_actions.open(2, OUT_PATH, File::WRONLY | File::TRUNC | File::CREAT, 0600)
+        file_actions.open(2, out_path, File::WRONLY | File::TRUNC | File::CREAT, 0600)
         spawn_attr =  Spoon::SpawnAttributes.new
         pid = Spoon.posix_spawn EXEC, file_actions, spawn_attr, @args
         create_pid(pid)
       end
+
+      def pid_path
+        File.join(PID_PATH, "rsense.pid")
+      end
+
+      def out_path
+        File.join(OUT_PATH, "rsense.log")
+      end
+
+      def ensure_paths_exist(*paths)
+        paths.each do |path|
+          FileUtils.mkdir_p(path) unless File.directory?(path)
+        end
+      end
     end
   end
 end

data/lib/rsense/version.rb

@@ -1,3 +1,3 @@
 module Rsense
-  VERSION = "0.5.16"
+  VERSION = "0.5.18"
 end

data/rsense.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rsense-core", "~> 0.6.6"
-  spec.add_dependency "rsense-server", "~> 0.5.17"
+  spec.add_dependency "rsense-server", "~> 0.5.18"
   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/rsense/client/daemon_spec.rb

@@ -74,7 +74,7 @@ describe Rsense::Client::Daemon do
 
     it "should initialize a runner" do
       daemon = Rsense::Client::Daemon.new(["foo", "bar"])
-      daemon.runner.class::PID_PATH.must_match(/tmp\/exec\.pid/)
+      daemon.runner.class::PID_PATH.must_match(Rsense::Client::Runner::PID_PATH)
     end
 
     it "should delegate start method to runner" do

data/spec/rsense/client/runner_spec.rb

@@ -0,0 +1,33 @@
+require_relative "../../spec_helper"
+require 'fileutils'
+
+describe Rsense::Client::Runner do
+  before do
+    @runner = Rsense::Client::Runner.new
+  end
+
+  describe "#ensure_paths_exists" do
+    let(:filepath) { "/tmp/rsense-test" }
+
+    before(:each) do
+      FileUtils.rm_r(filepath) if File.directory?(filepath)
+    end
+
+    after(:each) do
+      FileUtils.rm_r(filepath) if File.directory?(filepath)
+    end
+
+    it "creates directories when they don't exists" do
+      File.directory?(filepath).must_equal(false)
+      @runner.ensure_paths_exist(filepath)
+      File.directory?(filepath).must_equal(true)
+    end
+
+    it "doesn't do anything when directories exists" do
+      FileUtils.mkdir_p(filepath)
+      File.directory?(filepath).must_equal(true)
+      @runner.ensure_paths_exist(filepath)
+      File.directory?(filepath).must_equal(true)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsense
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.18
 platform: ruby
 authors:
 - Eric West
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsense-core
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.17
+        version: 0.5.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.17
+        version: 0.5.18
 - !ruby/object:Gem::Dependency
   name: spoon
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,7 @@ email:
 - esw9999@gmail.com
 - tomo@cx4a.org
 executables:
+- _rsense_commandline.rb
 - rsense
 extensions: []
 extra_rdoc_files: []
@@ -229,6 +230,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/_rsense_commandline.rb
 - bin/rsense
 - lib/rsense.rb
 - lib/rsense/client.rb
@@ -239,6 +241,7 @@ files:
 - spec/fixtures/find_def_sample.json
 - spec/fixtures/sample.json
 - spec/rsense/client/daemon_spec.rb
+- spec/rsense/client/runner_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -268,4 +271,5 @@ test_files:
 - spec/fixtures/find_def_sample.json
 - spec/fixtures/sample.json
 - spec/rsense/client/daemon_spec.rb
+- spec/rsense/client/runner_spec.rb
 - spec/spec_helper.rb