pixo 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0f34bd6751d6cba5bfa084708d71eed1dee942e
-  data.tar.gz: bee2d3a708af823d48cd2a303216a76930528601
+  metadata.gz: ab47761e84f228f514a4e7118207a388cd813463
+  data.tar.gz: bd2121709d447827d27cf2a1616a65f9eaa7ad35
 SHA512:
-  metadata.gz: c841a49f9d6652dadb2552fbb16d8a81bf989d2c0ce6248bdb6f2898d1d1acb7f74d48a6dc46768c9e2aa8d786f8ff9919c6ee0efedeedb04f2963e6f386e506
-  data.tar.gz: ea5edabe67c2144514cd2e430995829b3180af646a5a83dcb648f87209accb55e700c61892a8175356102977bd4e366ab65074c8abebf0c831c7d58460163131
+  metadata.gz: 29ca3f9f59fe05884d3701dcc0b2ed5b977325ffe6ff8586a51994a7f4511eb9762da2d89a307f5191757fae546d4b30b820757e9c27c2129f04018fd0abc955
+  data.tar.gz: b3db77d49b09d3834c6fe6dd9cba31e87c8a55fc291b79cad665d7a8a0f404a60db491f9f71d995e960d2318d819de4b383d73490e967fe9e08af30d2e99d89a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pixo (0.3.2)
+    pixo (0.4.0)
       concurrent-ruby
 
 GEM
@@ -16,6 +16,8 @@ GEM
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
       rspec-mocks (~> 3.6.0)
+    rspec-collection_matchers (1.1.3)
+      rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.6.0)
       rspec-support (~> 3.6.0)
     rspec-expectations (3.6.0)
@@ -35,6 +37,7 @@ DEPENDENCIES
   rake (~> 10.0)
   rake-compiler (~> 1.0)
   rspec (>= 3.0)
+  rspec-collection_matchers (>= 1.1.3)
 
 BUNDLED WITH
    1.15.4

data/lib/pixo/application.rb

@@ -6,39 +6,37 @@ require File.expand_path('../../libpixgem', __FILE__)
 module Pixo
   class Application < Pixo::Native::Application
     attr_accessor :running, :leds_on
+    attr_reader  :patterns
 
     def initialize()
       super
-      self.running = false
-      self.brightness = 1.0
-      self.leds_on    = true
       @procs = Array.new
 
       @procs_lock = Mutex.new
-    
-      @service = Pixo::Ipc::Service.new(STDIN, STDOUT, user_data: self)
-
-      @service_thread = Thread.new do
-        while(!self.running)
-          sleep 0.1
-        end
-        @service.run
-        self.shutdown
-      end
+      @started_latch = Concurrent::CountDownLatch.new(1)
+      @service = Pixo::Rpc::ApplicationService.new(STDIN, STDOUT, self, @started_latch)
+
+      @patterns = Concurrent::Hash.new
+
+      @active_pattern = BlankPattern.new
+      self.running = false
+      self.brightness = 1.0
+      self.leds_on    = true
     end
 
     def run
-      self.running = tick(active_pattern, brightness)
-      
+      self.running = tick(@active_pattern, brightness)
+      @started_latch.count_down
       while(running)
         @procs_lock.synchronize {
           @procs.each {|proc| proc.call(self) }
           @procs.clear
         }
 
-        self.running = tick(active_pattern, brightness) && running
+        self.running = tick(@active_pattern, brightness) && running
       end
     ensure
+      @service.shutdown
       close
     end
 
@@ -46,6 +44,14 @@ module Pixo
       self.running = false
     end
 
+    def add_pattern(name, code)
+      self.patterns[name] = Pixo::Native::Pattern.new(code)
+    end
+
+    def add_fadecandy(hostname, count)
+      super(Pixo::Native::FadeCandy.new(hostname, count))
+    end
+
     def post(proc)
       @procs_lock.synchronize {
         @procs << proc
@@ -53,32 +59,21 @@ module Pixo
     end
 
     def key_callback(key, scancode, action, mods)
-      @service.request(Pixo::Renderer::OnKey.new(key, scancode, action, mods), async: true)
+      @service.request(Pixo::Rpc::OnKey.new(key, scancode, action, mods), async: true)
     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
+    def pattern=(name)
+      pat = patterns[name]
+      if (pat)
+        pat.reset_start
+        @active_pattern = pat
       end
-      @patterns
-    end
-
-    def active_pattern
-      @active_pattern ||= random_pattern
-    end
 
-    def random_pattern
-      patterns[patterns.keys.sample]
+      pattern
     end
 
-    def active_pattern=(pattern)
-      pattern.reset_start
-      @active_pattern = pattern
+    def pattern
+      patterns.key(@active_pattern)
     end
 
     def brightness=(val)
@@ -96,10 +91,18 @@ module Pixo
 
     private
 
+    class BlankPattern < Pixo::Native::Pattern
+      def initialize
+        super(<<-EOF)
+#version 330 core
+out vec4 color_out;
 
-
+void main( void ) {
+  color_out = vec4( 0.0, 0.0, 0.0, 1.0 );
+}
+           EOF
+      end
+    end
   end
-
-
 end
 

data/lib/pixo/renderer.rb

@@ -1,148 +1,51 @@
 module Pixo
-  class Renderer
-    attr_reader :service, :service_thread
-
-    class OnKey
-      def initialize(key, scancode, action, mods)
-        @key = key
-        @scancode = scancode
-        @action = action
-        @mods = mods
-      end
-
-      def call(service)
-        service.on_key(@key, @scancode, @action, @mods)
-        self
-      end
-    end
-
-    class Service < Pixo::Ipc::Service
-      attr_reader :renderer
-
-      def initialize(renderer)
-        @renderer = renderer
-        i, o, t = Open3.popen2('bundle exec pixo')
-        super(o, i)
-        @service_thread = Thread.new { self.run }
-      end
-
-
-      def on_key(key, scancode, action, mods)
-        renderer.on_key(key, scancode, action, mods)
-      end
-
-    end
+  class Renderer < Pixo::Rpc::Service
+    attr_reader :service_thread
 
     def initialize
-      @service = Pixo::Renderer::Service.new(self)
+      i, o, t = Open3.popen2('bundle exec pixo')
+      super(o, i)
+      @service_thread = Thread.new { self.run }
     end
 
     def on_key(key, scancode, action, mods)
 
     end
 
-    def pattern_names
-      service.request(Pixo::Renderer::GetPatternNames.new)
+    def list_patterns
+      request(Pixo::Rpc::ListPatterns.new)
     end
 
-    def active_pattern
-      service.request(Pixo::Renderer::GetPatternName.new)
+    def pattern
+      request(Pixo::Rpc::GetPattern.new)
     end
 
-    def active_pattern=(name)
-      service.request(Pixo::Renderer::SetPattern.new(name), async: true)
+    def pattern=(name)
+      request(Pixo::Rpc::SetPattern.new(name))
     end
 
     def brightness=(brightness)
-      service.request(Pixo::Renderer::SetBrightness.new(brightness))
+      request(Pixo::Rpc::SetBrightness.new(brightness))
     end
 
     def brightness
-      service.request(Pixo::Renderer::GetBrightness.new())
+      request(Pixo::Rpc::GetBrightness.new())
     end
 
     def leds_on=(leds_on)
-      service.request(Pixo::Renderer::SetLedsOn.new(leds_on))
+      request(Pixo::Rpc::SetLedsOn.new(leds_on))
     end
 
     def leds_on
-      service.request(Pixo::Renderer::GetLedsOn.new())
-    end
-
-    def add_fadecandy(hostname, count)
-      service.request(Pixo::Renderer::AddFadecandy.new(hostname, count), async: true)
+      request(Pixo::Rpc::GetLedsOn.new())
     end
 
-    private
-
-    class AddFadecandy
-      def initialize(hostname, count)
-        @hostname = hostname
-        @count = count
-      end
-
-      def call(service)
-        service.user_data.post Proc.new { |app| app.add_fadecandy(Pixo::Native::FadeCandy.new(@hostname, @count)) }
-        self
-      end
+    def add_pattern(name, code)
+      request(Pixo::Rpc::AddPattern.new(name, code))
     end
 
-    class GetPatternName
-      def call(service)
-        service.user_data.patterns.key(service.user_data.active_pattern)
-      end
-    end
-    
-    class GetPatternNames
-      def call(service)
-        service.user_data.patterns.keys
-      end
-    end
-
-    class SetPattern
-      def initialize(pattern_name = nil)
-        @pattern_name = pattern_name    
-      end
-
-      def call(service)
-        pattern = service.user_data.patterns[@pattern_name]
-        service.user_data.active_pattern = pattern
-        @pattern_name
-      end
-    end
-
-    class GetBrightness
-      def call(service)
-        service.user_data.brightness
-      end
-    end
-
-    class SetBrightness
-      def initialize(brightness)
-        @brightness = brightness    
-      end
-
-      def call(service)
-        service.user_data.brightness = @brightness
-      end
-    end
-
-
-    class GetLedsOn
-      def call(service)
-        service.user_data.leds_on
-      end
-    end
-
-    class SetLedsOn
-      def initialize(leds_on)
-        @leds_on = leds_on    
-      end
-
-      def call(service)
-        service.user_data.leds_on = @leds_on
-      end
+    def add_fadecandy(hostname, count)
+      request(Pixo::Rpc::AddFadecandy.new(hostname, count))
     end
-
   end
 end

data/lib/pixo/rpc/application_service.rb

@@ -0,0 +1,23 @@
+module Pixo::Rpc
+  class ApplicationService < Pixo::Rpc::Service
+    attr_reader :application
+
+    def initialize(reader_pipe, writer_pipe, app, latch)
+      super(reader_pipe, writer_pipe)
+      @application = app
+
+      @latch = latch
+      @service_thread = Thread.new { self.thread_run }
+    end
+
+    def thread_run
+      @latch.wait(10)
+      run
+    rescue
+      STDERR.puts $!.inspect
+    ensure
+      application.shutdown
+    end
+
+  end
+end

data/lib/pixo/rpc/request_types.rb

@@ -0,0 +1,114 @@
+module Pixo::Rpc
+  
+  class OnKey
+    def initialize(key, scancode, action, mods)
+      @key = key
+      @scancode = scancode
+      @action = action
+      @mods = mods
+    end
+
+    def call(service)
+      service.on_key(@key, @scancode, @action, @mods)
+      self
+    end
+  end
+
+  class AddPattern
+    def initialize(name, code)
+      @name = name
+      @code = code
+    end
+
+    def call(service)
+      result = nil
+      latch = Concurrent::CountDownLatch.new(1)
+
+      service.application.post( Proc.new do |app|
+              app.add_pattern(@name, @code)
+              result = @name
+              latch.count_down
+            end)
+      latch.wait
+
+      result
+    end
+  end
+
+  class AddFadecandy
+    def initialize(hostname, count)
+      @hostname = hostname
+      @count = count
+    end
+
+    def call(service)
+      result = nil
+      latch = Concurrent::CountDownLatch.new(1)
+
+      service.application.post( Proc.new do |app|
+              app.add_fadecandy(@hostname, @count)
+              result = @hostname
+              latch.count_down
+            end)
+      latch.wait
+
+      result
+    end
+  end
+
+
+  class ListPatterns
+    def call(service)
+      service.application.patterns.keys
+    end
+  end
+
+  class GetPattern
+    def call(service)
+      service.application.pattern
+    end
+  end
+
+  class SetPattern
+    def initialize(pattern_name = nil)
+      @pattern_name = pattern_name    
+    end
+
+    def call(service)
+      service.application.pattern = @pattern_name
+    end
+  end
+
+  class GetBrightness
+    def call(service)
+      service.application.brightness
+    end
+  end
+
+  class SetBrightness
+    def initialize(brightness)
+      @brightness = brightness    
+    end
+
+    def call(service)
+      service.application.brightness = @brightness
+    end
+  end
+
+
+  class GetLedsOn
+    def call(service)
+      service.application.leds_on
+    end
+  end
+
+  class SetLedsOn
+    def initialize(leds_on)
+      @leds_on = leds_on    
+    end
+
+    def call(service)
+      service.application.leds_on = @leds_on
+    end
+  end
+end

data/lib/pixo/{ipc → rpc}/service.rb

@@ -3,11 +3,9 @@ require 'securerandom'
 require 'base64'
 require 'thread'
 
-module Pixo::Ipc
+module Pixo::Rpc
   class Service
-    attr_reader :user_data
-
-    def initialize(reader_pipe, writer_pipe, user_data: nil)
+    def initialize(reader_pipe, writer_pipe)
       @reader_pipe = reader_pipe
       @writer_pipe = writer_pipe
 
@@ -15,15 +13,13 @@ module Pixo::Ipc
       @live_requests = Concurrent::Hash.new
 
       @pipe_mutex = Mutex.new
-
-      @user_data = user_data
     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(self), message.rid)
+        if message.is_a?(Pixo::Rpc::RequestMessage)
+          resp = Pixo::Rpc::ResponseMessage.new(message.data.call(self), message.rid)
 
           bytes_to_write = Base64.strict_encode64(Marshal.dump(resp))
           @pipe_mutex.synchronize do
@@ -31,7 +27,7 @@ module Pixo::Ipc
             @writer_pipe.write($/)
             @writer_pipe.flush
           end
-        elsif message.is_a?(Pixo::Ipc::ResponseMessage)
+        elsif message.is_a?(Pixo::Rpc::ResponseMessage)
           @live_requests[message.rid]
           request = @live_requests[message.rid]
           request.send_result(message.data) if request
@@ -48,7 +44,7 @@ module Pixo::Ipc
     end 
 
     def request(message, timeout: 10, async: false)
-      request = Pixo::Ipc::Request.new(message)
+      request = Pixo::Rpc::Request.new(message)
       @live_requests[request.message.rid] = request unless async
 
       bytes_to_write = Base64.strict_encode64(Marshal.dump(request.message))
@@ -81,7 +77,7 @@ module Pixo::Ipc
     attr_reader   :latch
 
     def initialize(data)
-      @message = Pixo::Ipc::RequestMessage.new(data)
+      @message = Pixo::Rpc::RequestMessage.new(data)
 
       @latch = Concurrent::CountDownLatch.new(1)
     end

data/lib/pixo/version.rb

@@ -1,3 +1,3 @@
 module Pixo
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/pixo.rb

@@ -1,8 +1,21 @@
 require "pixo/version"
-require "pixo/ipc/service"
+require "pixo/rpc/service"
+require "pixo/rpc/application_service"
+require "pixo/rpc/request_types"
 require "pixo/renderer"
 require "open3"
 
 module Pixo
 
+  def self.seed_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] = File.read(File.join(patterns_dir, pattern_file))
+      end
+    end
+    @patterns
+  end
 end

data/pixo.gemspec

@@ -31,5 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rake-compiler", "~> 1.0"
   spec.add_development_dependency "rspec", ">= 3.0"
+  spec.add_development_dependency "rspec-collection_matchers", ">= 1.1.3"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixo
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Constantine
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 description: Write a longer description or delete this line.
 email:
 - cconstan@gmail.com
@@ -1540,8 +1554,10 @@ files:
 - ext/pixo/src/opengl.h
 - lib/pixo.rb
 - lib/pixo/application.rb
-- lib/pixo/ipc/service.rb
 - lib/pixo/renderer.rb
+- lib/pixo/rpc/application_service.rb
+- lib/pixo/rpc/request_types.rb
+- lib/pixo/rpc/service.rb
 - lib/pixo/version.rb
 - pixo.gemspec
 homepage: https://github.com/cconstantine