quartz 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 966959af5eccc12fdaeebb8f89c9b1d0b0745ee4
-  data.tar.gz: 5bd071aa23710e57e982417cf3f88bd6027ff581
+  metadata.gz: a9b32688049786025781cf7243a2cab933d83d0d
+  data.tar.gz: ca72a56ea8e7098daf9a05560353e0982c3c67b4
 SHA512:
-  metadata.gz: c685ac6dfa5a3f425f6af8b46700cbf72abb2ba9b4e3dd832cbbb68ac92e633c498142d7d75e89cbcff085d3d073207aad3f13e898fa6ab3cd698d6efed5fb5e
-  data.tar.gz: f24332c3ca02f128a26d4b21890223a3ccc6a032eb5813c3286f04bd58fe4a109f5c92b90f8084254da91685d4902b252ee4ae98bddcde76175cab3a8bdb6de0
+  metadata.gz: 979ad4c2465c424464c0f40ac89f0671959ec27f6d91cbfe45099b409fa9d95ae45a325d5a3a230c69066d203a29f5d0281e85747f639539c1b74846dceec52d
+  data.tar.gz: 86fad9d659b2912ba1bab12afe798f7eb44477062737a770e69db3865ad5351428da0bbf1c00edb2f09b71dac4d5bf772a45747991c607ca9a0cad05af2b2e28

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/go/quartz/quartz.go

@@ -102,8 +102,10 @@ func (q *Quartz) Call(args *CallArgs, response *interface{}) error {
 	unmarshallerValue.Call([]reflect.Value{methodArgsValue, argStructPointer})
 
 	// Call the method
-	// TODO: check for errors
-	method.Func.Call([]reflect.Value{structValue, argStruct, responseValuePointer})
+	err := method.Func.Call([]reflect.Value{structValue, argStruct, responseValuePointer})
+	if !err[0].IsNil() {
+		return err[0].Interface().(error)
+	}
 
 	// Set this method's response value
 	rpcResponse := reflect.Indirect(responseValuePointer)

data/lib/quartz/go_process.rb

@@ -92,14 +92,20 @@ class Quartz::GoProcess
   end
 
   def cleanup
-    Process.kill('SIGTERM', pid)
-    Process.wait(pid)
-    File.delete(@temp_file_path) if @temp_file_path
-    self.class.processes.delete(self)
+    unless @killed_go_process
+      Process.kill('SIGTERM', pid)
+      Process.wait(pid)
+      @killed_go_process = true
+    end
+
+    if @temp_file_path && File.exists?(@temp_file_path)
+      File.delete(@temp_file_path)
+    end
   end
 
   def self.cleanup
-    processes.each { |p| p.cleanup }
+    @processes.each(&:cleanup)
+    @processes = []
   end
 
 end

data/lib/quartz/go_struct.rb

@@ -33,7 +33,7 @@ class Quartz::GoStruct
     response = @process.call(@struct_name, method_name, args)
 
     if response['error']
-      raise "Error calling #{method_name}: #{response['error']}"
+      raise Quartz::ResponseError.new(response['error'])
     end
 
     response['result']

data/lib/quartz.rb

@@ -2,9 +2,16 @@ require 'json'
 require 'socket'
 
 module Quartz
-
+  class ResponseError < StandardError; end
 end
 
 require 'quartz/go_process'
 require 'quartz/go_struct'
 require 'quartz/client'
+
+# Check if go is installed
+go_exists = ENV['PATH'].split(File::PATH_SEPARATOR).any? do |directory|
+  File.exist?(File.join(directory, 'go'))
+end
+
+raise 'Go not installed' unless go_exists

data/quartz.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: quartz 0.2.1 ruby lib
+# stub: quartz 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "quartz"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["David Huie"]
-  s.date = "2014-06-17"
+  s.date = "2014-06-23"
   s.description = "A gem for calling Go code from Ruby"
   s.email = "dahuie@gmail.com"
   s.extra_rdoc_files = [
@@ -42,8 +43,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/DavidHuie/quartz"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.2.2"
   s.summary = "A gem for calling Go code from Ruby"
 
   if s.respond_to? :specification_version then

data/spec/go_process_spec.rb

@@ -9,7 +9,7 @@ describe Quartz::GoProcess do
     context 'with a go file' do
 
       it 'pulls metadata' do
-        process.get_metadata.should eq({"adder"=>{"NameToMethodMetadata"=>{"Add"=>{"ArgumentToType"=>{"A"=>"int", "B"=>"int"}}}}})
+        process.get_metadata.should eq("adder" => {"NameToMethodMetadata"=>{"Add"=>{"ArgumentToType"=>{"A"=>"int", "B"=>"int"}}, "AddError"=>{"ArgumentToType"=>{"A"=>"int", "B"=>"int"}}}})
       end
 
     end
@@ -51,7 +51,7 @@ describe Quartz::GoProcess do
       it "it kills child processes" do
         File.exists?(process.temp_file_path).should be_true
         process.cleanup
-        File.exists?(process.temp_file_path).should be_false
+        $?.exited?.should be_true
       end
 
     end

data/spec/go_struct_spec.rb

@@ -8,7 +8,9 @@ describe Quartz::GoStruct do
 
     let(:struct) do
       Quartz::GoStruct.new("adder",
-                           {"NameToMethodMetadata"=>{"Add"=>{"ArgumentToType"=>{"A"=>"int", "B"=>"int"}}}}, process)
+                           {"NameToMethodMetadata"=>{"Add"=>{"ArgumentToType"=>{"A"=>"int", "B"=>"int"}},
+                               "AddError"=>{"ArgumentToType"=>{"A"=>"int", "B"=>"int"}}
+                               }}, process)
     end
 
     it 'is able to call a struct' do
@@ -16,6 +18,12 @@ describe Quartz::GoStruct do
       response.should eq({'X' => 6})
     end
 
+    it 'raises an exception when an error is returned' do
+      expect do
+        struct.call('AddError', { 'A' => 5, 'B' => 6 })
+      end.to raise_error(Quartz::ResponseError)
+    end
+
   end
 
 end

data/spec/test.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"errors"
+
 	"github.com/DavidHuie/quartz/go/quartz"
 )
 
@@ -20,6 +22,10 @@ func (t *Test) Add(args Args, response *Response) error {
 	return nil
 }
 
+func (t *Test) AddError(args Args, response *Response) error {
+	return errors.New("Adding error")
+}
+
 func main() {
 	a := &Test{}
 	quartz.RegisterName("adder", a)

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: quartz
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - David Huie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2
 description: A gem for calling Go code from Ruby
@@ -60,8 +60,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .rspec
-- .travis.yml
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -91,17 +91,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A gem for calling Go code from Ruby