pixo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a2ed5c3cd2e91b160038f832a3b282710879b21
-  data.tar.gz: 533ea89508d8054cda89981d09dc7a012ba428d4
+  metadata.gz: 8aa1f77b18b26d4780cb42129a19d2d287001a9a
+  data.tar.gz: 7029163344d64ce5696b5f6aca011662c2f1b665
 SHA512:
-  metadata.gz: 6b3bce155d3ac4418236f4cfc8ee774371bab059cf21f8b8c5a253587b3b2d9eef0a50cb7211ba2a1752cc7fbf892e42bbf94700b65ddc41221bcf19609513c7
-  data.tar.gz: 43e9f3a7dd771a5c7b47b94382adfd30f3acaaf6f143f8730e1b3c31508dc200e47e9bf487d6d5034c67d62fe7289c4abed9534a14bbd22e99e8878d2fdea1cd
+  metadata.gz: '0925db69c959cf66caac3972316390f9539f54d81db691dd3079d27a354cfc79223726be2715c0e90f4b737cd2284581c2530a5aa5e7912511cd021977eb4360'
+  data.tar.gz: 5e109416c55cf554aa8c9125402a6bef21fd86f51d8ca22e679b3620bd892e0aaf2f385ab3cab2528ba8431a2a1495941b5146fe4d53c4c72654eebddd2cf57c

data/Gemfile.lock

@@ -1,14 +1,30 @@
 PATH
   remote: .
   specs:
-    pixo (0.2.0)
+    pixo (0.2.1)
+      concurrent-ruby
 
 GEM
   remote: https://rubygems.org/
   specs:
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
     rake (10.5.0)
     rake-compiler (1.0.4)
       rake
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
 
 PLATFORMS
   ruby
@@ -18,6 +34,7 @@ DEPENDENCIES
   pixo!
   rake (~> 10.0)
   rake-compiler (~> 1.0)
+  rspec (>= 3.0)
 
 BUNDLED WITH
    1.15.4

data/exe/pixo

@@ -1,5 +1,13 @@
 #!/usr/bin/env ruby
 
 require 'pixo'
+require 'pixo/application'
 
-Pixo::Application.new.run
+
+service_thread = Thread.new do
+  sleep 0.1
+  Pixo::Ipc::Service.new(STDIN, STDOUT).run
+  Pixo::Application.instance.shutdown
+end
+
+Pixo::Application.instance.run

data/lib/pixo/application.rb

@@ -0,0 +1,61 @@
+require 'benchmark'
+require 'base64'
+
+require File.expand_path('../../libpixgem', __FILE__)
+
+module Pixo
+  class Application < Pixo::Native::Application
+    attr_accessor :running
+
+    def self.instance
+      @instance ||= Pixo::Application.new
+    end
+
+    def run
+      while(running)
+        self.running = tick(active_pattern) && running
+      end
+      close
+    end
+
+    def shutdown
+      self.running = false
+    end
+
+
+    def patterns
+      unless @patterns
+        @patterns = Hash.new
+        patterns_dir = File.join(File.dirname(__FILE__), "..", "..", 'ext', 'pixo', 'patterns')
+        Dir.entries(patterns_dir).each do | pattern_file|
+          next unless pattern_file.end_with?('.glsl')
+          @patterns[pattern_file] = Pixo::Native::Pattern.new(File.read(File.join(patterns_dir, pattern_file)))
+        end
+      end
+      @patterns
+    end
+
+    def active_pattern
+      @active_pattern ||= random_pattern
+    end
+
+    def random_pattern
+      patterns[patterns.keys.sample]
+    end
+
+    def active_pattern=(pattern)
+      pattern.reset_start
+      @active_pattern = pattern
+    end
+  
+  private
+
+    def initialize()
+      super
+      self.running = true
+
+      add_fadecandy(Pixo::Native::FadeCandy.new('localhost', 8))
+    end
+  end
+end
+

data/lib/pixo/ipc/service.rb

@@ -0,0 +1,108 @@
+require 'concurrent'
+require 'securerandom'
+require 'base64'
+require 'thread'
+
+module Pixo::Ipc
+  class Service
+
+    def initialize(reader_pipe, writer_pipe)
+      @reader_pipe = reader_pipe
+      @writer_pipe = writer_pipe
+      @running = true
+      @live_requests = Concurrent::Hash.new
+
+      @pipe_mutex = Mutex.new
+    end
+
+    def run
+      while @running && (line = @reader_pipe.readline)
+        message = Marshal.load(Base64.strict_decode64(line.strip))
+        if message.is_a?(Pixo::Ipc::RequestMessage)
+          resp = Pixo::Ipc::ResponseMessage.new(message.data.call, message.rid)
+
+          bytes_to_write = Base64.strict_encode64(Marshal.dump(resp))
+          @pipe_mutex.synchronize do
+            @writer_pipe.write(bytes_to_write)
+            @writer_pipe.write($/)
+            @writer_pipe.flush
+          end
+        elsif message.is_a?(Pixo::Ipc::ResponseMessage)
+          @live_requests[message.rid]
+          request = @live_requests[message.rid]
+          request.send_result(message.data) if request
+        end
+      end
+    rescue EOFError
+    rescue IOError
+    end
+
+    def shutdown
+      @running = false
+      @reader_pipe.close
+      @writer_pipe.close
+    end 
+
+    def request(message, timeout: nil)
+      request = Pixo::Ipc::Request.new(message)
+      @live_requests[request.message.rid] = request
+
+      @writer_pipe.write(Base64.strict_encode64(Marshal.dump(request.message)))
+      @writer_pipe.write($/)
+      @writer_pipe.flush
+
+      unless request.latch.wait(timeout)
+        raise Timeout::Error.new("%s: request timed out after %.3f seconds." % [request.rid, timeout] )
+      end
+      
+      return request.response
+    ensure
+      @live_requests.delete request.message.rid
+    end
+
+    def live_request_count
+      @live_requests.count
+    end
+  end
+
+  class Request
+    attr_accessor :message
+
+    attr_reader   :response
+    attr_reader   :latch
+
+    def initialize(data)
+      @message = Pixo::Ipc::RequestMessage.new(data)
+
+      @latch = Concurrent::CountDownLatch.new(1)
+    end
+
+    def send_result(result)
+      @response = result
+      @latch.count_down
+    end
+  end
+
+  class Message
+    attr_accessor :data
+    attr_reader   :rid
+
+    def initialize(data)
+      @data = data
+    end
+  end
+
+  class RequestMessage < Message
+    def initialize(data)
+      super(data)
+      @rid  = "rid_#{SecureRandom.hex(10)}"
+    end
+  end
+
+  class ResponseMessage < Message
+    def initialize(data, rid)
+      @data = data
+      @rid = rid
+    end
+  end
+end

data/lib/pixo/version.rb

@@ -1,3 +1,3 @@
 module Pixo
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/pixo.rb

@@ -1,82 +1,51 @@
 require "pixo/version"
+require "pixo/ipc/service"
 require "open3"
-require 'benchmark'
-require 'base64'
-
-require File.expand_path('../libpixgem', __FILE__)
 
 module Pixo
-  class FrameStatus
-    attr_accessor :render_ms
-    def initialize(render_ms)
-      self.render_ms = render_ms
+  class GetPatternName
+    def call
+      Pixo::Application.instance.patterns.key(Pixo::Application.instance.active_pattern)
     end
   end
-
-  class Renderer
-
-    def run(&block)
-      Open3.popen3('bundle exec pixo') do |i, o, e, t|
-        while line = o.readline
-
-          block.call(Marshal.load(Base64.strict_decode64(line.strip)))
-        end
-      end
+  
+  class GetPatternNames
+    def call
+      Pixo::Application.instance.patterns.keys
     end
   end
 
-  class Application < Pixo::Native::Application
-    attr_accessor :running
-
-    def initialize()
-      super
-      self.running = true
-
-      add_fadecandy(Pixo::Native::FadeCandy.new('localhost', 8))
+  class SetPattern
+    def initialize(pattern_name)
+      @pattern_name = pattern_name    
     end
-    
-    def run
-      while(running)
-        render_ms = Benchmark.realtime do
-          running = tick(active_pattern) && running 
-        end
-
-        stats = Pixo::FrameStatus.new(render_ms)
-        STDOUT.write(Base64.strict_encode64(Marshal.dump(stats)))
-        STDOUT.write($/)
-        STDOUT.flush
 
-        if (active_pattern.elapsed > 1)
-          self.active_pattern = random_pattern
-        end
-      end
-      close
+    def call
+      pattern = Pixo::Application.instance.patterns[@pattern_name]
+      Pixo::Application.instance.active_pattern = pattern if pattern
+      @pattern_name
     end
+  end
 
+  class Renderer
+    attr_reader :service, :service_thread
 
-    def patterns
-      unless @patterns
-        @patterns = Hash.new
-        patterns_dir = File.join(File.dirname(__FILE__), "..", 'ext', 'pixo', 'patterns')
-        Dir.entries(patterns_dir).each do | pattern_file|
-          next unless pattern_file.end_with?('.glsl')
-          @patterns[pattern_file] = Pixo::Native::Pattern.new(File.read(File.join(patterns_dir, pattern_file)))
-        end
-      end
-      @patterns
+    def initialize()
+      i, o, t = Open3.popen2('bundle exec pixo') 
+      @service = Pixo::Ipc::Service.new(o, i)
+      @service_thread = Thread.new { self.service.run }
     end
 
-    def active_pattern
-      @active_pattern ||= random_pattern
+    def pattern_names
+      service.request(Pixo::GetPatternNames.new)
     end
 
-    def random_pattern
-      patterns[patterns.keys.sample]
+    def active_pattern
+      service.request(Pixo::GetPatternName.new)
     end
 
-    def active_pattern=(pattern)
-      pattern.reset_start
-      @active_pattern = pattern
+    def set_pattern(name)
+      service.request(Pixo::SetPattern.new(name))
     end
   end
 end

data/pixo.gemspec

@@ -25,8 +25,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "concurrent-ruby"
+
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rake-compiler", "~> 1.0"
+  spec.add_development_dependency "rspec", ">= 3.0"
 
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pixo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Constantine
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-23 00:00:00.000000000 Z
+date: 2017-09-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Write a longer description or delete this line.
 email:
 - cconstan@gmail.com
@@ -1511,6 +1539,8 @@ files:
 - ext/pixo/src/main.cpp
 - ext/pixo/src/opengl.h
 - lib/pixo.rb
+- lib/pixo/application.rb
+- lib/pixo/ipc/service.rb
 - lib/pixo/version.rb
 - pixo.gemspec
 homepage: https://github.com/cconstantine