smith 0.6.3.1 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 647de83af2459d5c1d36106d946a285d0036a40e
-  data.tar.gz: 23e2377ae34c9dac6260f6d5eae59649d3b32544
+  metadata.gz: b15b0f5502947a211eac261f595a91abae778941
+  data.tar.gz: ee098f6e8ce36b909cfd0c521b7208f73ca89798
 SHA512:
-  metadata.gz: 8190b27278ba8689cfddac882408ec75343237a1b2f8e95fa1c97fb67ad93bc06b1c590f67a761b419e802495a8aa53ac0c6110744fa713df3895946588e7bb7
-  data.tar.gz: b36c38be47ed043cfdeab3b0f63ada70f7aea6ec886ed8815d215b1188f2ca522398abe2656b61fd2953932b91c48b66eca5e3d145beac51991118c726a77a02
+  metadata.gz: d9000646169a24af31b427389e24d03f8bdaee492bf3ccc3f9dd12e975335711d1e0c468d99c78c0f83ac119bad5f3848fb24f36ef1268cfabbb7768d96c6414
+  data.tar.gz: ec817e13da4fc3cdf8e56f1ef252f45c794882c7e69c1fb9eef19b6f24ffe394084b793b13c553c5bdcf3086ab6de7ba8856b1080dc92702c9b11f8095923e0d

data/lib/smith/acl_compiler.rb

@@ -1,21 +1,13 @@
 # -*- encoding: utf-8 -*-
-require 'ffi'
 require "tempfile"
 require 'ruby_parser'
+
 require 'smith/messaging/acl_type_cache'
 
 module Smith
   class ACLCompiler
 
     include Logger
-    extend FFI::Library
-
-    def self.find_so
-      $:.map{|p| Pathname.new(p).join("ruby_generator.so")}.detect{|so| so.exist? }
-    end
-
-    ffi_lib(find_so)
-    attach_function(:_rprotoc_extern, [:int, :pointer], :int32)
 
     def initialize
       @acl_type_cache = AclTypeCache.instance
@@ -28,13 +20,13 @@ module Smith
       Smith.acl_path.each do |path|
         $LOAD_PATH << path
 
-        acls_files = path_glob(path)
+        acl_files = path_glob(path)
         out_of_date_acls = path_glob(path).select { |p| should_compile?(p) }
         if out_of_date_acls.size > 0
-          compile_on_path(path, acls_files, out_of_date_acls)
+          compile_on_path(path, acl_files, out_of_date_acls)
         end
 
-        acls_files.each do |acl_file|
+        acl_files.each do |acl_file|
           acl_class_path = acl_compiled_path(acl_file)
           load_acl(acl_class_path)
           add_to_type_cache(acl_class_path)
@@ -49,36 +41,25 @@ module Smith
 
       unless acls.empty?
         Dir.chdir(path) do
-          begin
-            GC.disable
-
-            args = ["rprotoc", "--ruby_out", Smith.acl_cache_path, "--proto_path", path].map {|a| ::FFI::MemoryPointer.from_string(a.to_s.dup) }
-
-            ffi_acls = acls.map do |acl|
-              FFI::MemoryPointer.from_string(acl.to_s.dup)
-            end
-            ffi_acls << nil
-
-            args += ffi_acls
-            argv = FFI::MemoryPointer.new(:pointer, args.size)
-
-            args.each_with_index { |p, index| argv[index].put_pointer(0, p) }
-
-            errors = capture_stderr do
-              self._rprotoc_extern(args.compact.size, argv)
-            end.split("\n")
-
-            errors.each do |error|
-              logger.fatal { "Cannot compile ACLs: #{error}" }
-              raise RuntimeError, error
-            end
-          ensure
-            GC.enable
+          cmd = %Q{sh -c 'protoc --ruby_out=#{Smith.acl_cache_path} -I #{path} #{out_of_date_acls.map(&:to_s).join(' ')} 2>&1'}
+          protoc = IO.popen(cmd)
+          output = protoc.read
+          protoc.close
+
+          if $?.exitstatus != 0
+            error = parse_protoc_error(output)
+            logger.fatal { "Cannot compile ACLs: #{error[:file]}" }
+            raise RuntimeError, output
           end
         end
       end
     end
 
+    def parse_protoc_error(s)
+      e = s.split(/:/)
+      {:file => e[0], :line => e[1], :pos => e[2], :error => e[3,-1]}
+    end
+
     # Returns true if the .proto file is newer that the .pb.rb file
     def should_compile?(file)
       cached_file = Smith.acl_cache_path.join(file.basename).sub_ext(".pb.rb")

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.6.3.1"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.6.3.1
+  version: 0.6.4
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -84,16 +84,16 @@ dependencies:
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.7
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.7
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -274,9 +274,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: smith
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Multi-agent framework
 test_files: []
-has_rdoc: false