pixelflut 0.0.10 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53fa839b0f1e655d481296ff80e16c50bcb14cb8b65002508a6cbdb6cf602d18
-  data.tar.gz: dc278f90adf043c2acfa484ea1beaadb04c12dd70e18e7ed2daa88db69ea1f28
+  metadata.gz: 46bc6d8430a0a37a766f925558d1279fbf69457f859f9f6286c2fb4a3f3a9e81
+  data.tar.gz: f634ffe53ec48385c8c9b42f032f3fa0e56d91155cf075a05b2b9c15794d8dbb
 SHA512:
-  metadata.gz: 1bbf4d13ed7bc852d20000103456680ececcfc4286225b0fb7be74afce25ad89dff6fdcb5e89120737c599645591400c5761e4c0172e632c742599975ee5a5da
-  data.tar.gz: 53368ac74848597f441952344f40e30744517da98db162405d7837f461d15096a66a37e0291763672d60119a8fe1d8266ee91c2ca7764bd7a2eef71620b3ec95
+  metadata.gz: 53bb74856603e0d46563b707726cdb8d5d96f5192ebd641c00ebba463e45ba5165536f4b95ea60d28e0468f8735acb32d3439802541791faf9a2dcbe13b94dab
+  data.tar.gz: 2f26150a3d40045e6030018cbcbf807dcbb1f415f193f156d1c45d8c4eea5e5c6d56e5205d764b701b6d644346d0892042f5fb1cdd9ce0d9cd6ee5ba4fbad099

data/README.md

@@ -1,6 +1,6 @@
 # Pixelflut
 
-A Pixelflut server written in Ruby.
+A Pixelflut server & client tool collection written in Ruby.
 
 ## Description
 

data/TODO.md

@@ -8,3 +8,4 @@
 - [x] add a pre-processor for images
 - [ ] mention the Gosu gem in the README
 - [ ] add `pxf info` command to get some server information
+- [ ] clarify that `pxf convert` require RMagick

data/bin/pxf-info

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+def options(cfg)
+  require 'optparse'
+  OptionParser.new do |opts|
+    opts.summary_indent = '  '
+    opts.banner = 'usage: pxf info [options]'
+    opts.separator(nil)
+    opts.separator('valid options:')
+    opts.on('-h', '--host HOST', String, 'target host name (default localhost)'){ |v| cfg[:host] = v }
+    opts.on('-p', '--port PORT', Integer, 'target port (default 1234)'){ |v| cfg[:port] = v }
+  end
+end
+
+def help(short)
+  puts(options(nil), nil) unless short
+  puts('Get info about a Pixelflut server.')
+  exit
+end
+
+def err(msg, code = 1)
+  $stderr.puts("pxf: #{msg}")
+  exit(code)
+end
+
+def create_options
+  {port: 1234}.tap{ |cfg| options(cfg).parse! }
+rescue OptionParser::ParseError => e
+  err(e)
+end
+
+help(false) if '--help' == ARGV[0]
+help(true) if '--short-help' == ARGV[0]
+options = create_options
+require File.realdirpath('../../lib/pixelflut/client/socket.rb', __FILE__)
+begin
+  socket = Pixelflut::Client::Socket.new(Addrinfo.tcp(options[:host], options[:port]))
+
+
+  err("unable to connect - #{options[:host]}:options[:port])", 2) unless socket.connect? || socket.wait_writable(5)
+  err("server busy - #{options[:host]}:options[:port])", 3) unless socket.write_with_timout("SIZE\n", 5)
+  line = socket.readline_with_timeout(5)
+  socket.close
+  err("server does not respond - #{options[:host]}:options[:port])", 4) unless line
+  mark, width, height = line.split(' ', 3)
+  width = width.to_i
+  height = height.to_i
+  err("no Pixelflut server - #{options[:host]}:options[:port])", 5) if mark != 'SIZE' || width <= 0 || height <= 0
+  puts "canvas size: #{width}x#{height}"
+rescue SocketError, SystemCallError => e
+  err(e.message, 2)
+rescue Interrupt
+  exit
+end

data/lib/pixelflut.rb

@@ -1,8 +1,8 @@
 module Pixelflut
-  LibDir = File.realdirpath('../pixelflut', __FILE__).freeze
-  autoload :App, File.join(LibDir, 'app.rb')
-  autoload :Server, File.join(LibDir, 'server.rb')
-  autoload :Canvas, File.join(LibDir, 'canvas.rb')
-  autoload :Converter, File.join(LibDir, 'converter.rb')
-  autoload :VERSION, File.join(LibDir, 'version.rb')
+  LIB_DIR = File.realdirpath('../pixelflut', __FILE__).freeze
+  autoload :App, File.join(LIB_DIR, 'app.rb')
+  autoload :Server, File.join(LIB_DIR, 'server.rb')
+  autoload :Canvas, File.join(LIB_DIR, 'canvas.rb')
+  autoload :Converter, File.join(LIB_DIR, 'converter.rb')
+  autoload :VERSION, File.join(LIB_DIR, 'version.rb')
 end

data/lib/pixelflut/app.rb

@@ -42,7 +42,7 @@ module Pixelflut
 
     def update
       # self.caption = @image.changes
-      @draw_image = nil unless 0 == @image.changes
+      @draw_image = nil unless @image.changes.zero?
     end
 
     def draw
@@ -65,7 +65,7 @@ module Pixelflut
     end
 
     def needs_redraw?
-      nil == @draw_image
+      @draw_image.nil?
     end
 
     def needs_cursor?

data/lib/pixelflut/canvas/base.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'color'
-
 module Pixelflut
   module Canvas
     class Base
@@ -13,7 +11,7 @@ module Pixelflut
 
       def clear!
         @offset_x = @offset_y = 0
-        @color = Color::Black
+        @color = 'ffffffff'
       end
 
       def translate(x, y)

data/lib/pixelflut/client.rb

@@ -29,7 +29,7 @@ module Pixelflut
     end
 
     def create_sockets(address, slices)
-      slices.map{ |data| Socket.new(address, data) }
+      slices.map{ |data| NonblockSocket.new(address, data) }
     end
   end
 end

data/lib/pixelflut/client/socket.rb

@@ -5,15 +5,56 @@ require 'socket'
 module Pixelflut
   class Client
     class Socket < ::Socket
+      def initialize(address)
+        super(address.ipv6? ? :INET6 : :INET, :STREAM)
+        @addr = ::Socket.pack_sockaddr_in(address.ip_port, address.ip_address)
+        configure
+      end
+
+      def write_with_timout(data, timeout)
+        return true if write_nonblock(data, exception: false) == data.bytesize
+        return false unless wait_writable(timeout)
+        write_nonblock(data, exception: false) == data.bytesize
+      end
+
+      def readline_with_timeout(timeout)
+        deadline = Time.now + timeout
+        ret = ''
+        loop do
+          got = read_nonblock(16, exception: false)
+          if got == :wait_readable
+            remaining_time = deadline - Time.now
+            return nil if remaining_time <= 0 || wait_readable(remaining_time).nil?
+            next
+          end
+          idx = got.index("\n")
+          next ret += got unless idx
+          return ret + got[0, idx]
+        end
+      end
+
+      def connect?
+        :wait_writable != connect_nonblock(@addr, exception: false)
+      end
+
+      private
+
+      def configure
+        self.sync = true
+        setsockopt(:TCP, :NODELAY, 1)
+        setsockopt(:SOCKET, :KEEPALIVE, 0)
+        self.do_not_reverse_lookup = true
+      end
+    end
+
+    class NonblockSocket < Socket
       attr_reader :state
 
       def initialize(address, data)
-        super(address.ipv6? ? :INET6 : :INET, :STREAM)
-        configure
-        @addr = ::Socket.pack_sockaddr_in(address.ip_port, address.ip_address)
+        super(address)
+        @state = :not_connected
         @data = data
         @size = data.bytesize
-        @state = :not_connected
       end
 
       def call
@@ -33,27 +74,20 @@ module Pixelflut
       private
 
       def do_connect
-        @state = :wait_writable === connect_nonblock(@addr, exception: false) ? :wait_connect : :write
+        @state = connect? ? :write : :wait_connect
       end
 
       def do_wait_for_connect
-        @state = :write unless wait_writable(0.1).nil?
+        @state = :not_connected unless wait_writable(0.1).nil?
       end
 
       def do_write
         written = write_nonblock(@data, exception: false)
-        return if Symbol === written
+        return written if Symbol === written
         @size -= written
         return @state = :write_finished if @size <= 0
         @data = @data.byteslice(written, @data.bytesize - written)
       end
-
-      def configure
-        self.sync = true
-        setsockopt(:TCP, :NODELAY, 1)
-        setsockopt(:SOCKET, :KEEPALIVE, 0)
-        self.do_not_reverse_lookup = true
-      end
     end
   end
 end

data/lib/pixelflut/converter.rb

@@ -22,14 +22,21 @@ module Pixelflut
       def each_pixel
         return to_enum(__method__) unless block_given?
         @images.each do |image|
-          image.each_pixel do |color, x, y|
-            yield(x, y, color.to_color(Magick::AllCompliance, true, 8, true)[1, 8]) unless 0xffff == color.opacity
-          end
+          image.each_pixel{ |color, x, y| yield(x, y, color) }
         end
       end
 
+      def each_rgba_pixel
+        return to_enum(__method__) unless block_given?
+        each_pixel{ |x, y, color| yield(x, y, as_rgba(color)) unless 0xffff == color.opacity }
+      end
+
       def draw(canvas)
-        each_pixel{ |x, y, rgba| canvas[x, y] = rgba }
+        each_rgba_pixel{ |x, y, rgba| canvas[x, y] = rgba }
+      end
+
+      def as_rgba(color)
+        color.to_color(Magick::AllCompliance, true, 8, true)[1, 8]
       end
 
       private

data/lib/pixelflut/server/connection.rb

@@ -38,7 +38,7 @@ module Pixelflut
         str = @socket.recv_nonblock(read_size, exception: false)
         now = Time.now.to_f
         return (now - @last_tm > @config.keep_alive_time ? close(:timeout) : nil) if Symbol === str
-        return close(:closed_by_peer) if 0 == str.size
+        return close(:closed_by_peer) if str.size.zero?
         @buffer += str
         @last_tm = now
       rescue Errno::ECONNRESET

data/lib/pixelflut/version.rb

@@ -1,3 +1,3 @@
 module Pixelflut
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.0.13'.freeze
 end

data/pixelflut.gemspec

@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
-require File.expand_path('../lib/pixelflut/version', __FILE__)
+require_relative 'lib/pixelflut/version'
 
 GemSpec = Gem::Specification.new do |spec|
   spec.name = 'pixelflut'
   spec.version = Pixelflut::VERSION
-  spec.summary = 'A Pixelflut server written in Ruby.'
-  spec.description = <<~EOS
+  spec.summary = 'A Pixelflut server & client tool collection written in Ruby.'
+  spec.description = <<~DESCRIPTION
     Based on the idea of a simple server protocol to collaborate on a shared canvas named
     [Pixel Flut](https://cccgoe.de/wiki/Pixelflut) this gem implements a Ruby version.
-  EOS
+  DESCRIPTION
   spec.author = 'Mike Blumtritt'
   spec.email = 'mike.blumtritt@invision.de'
   spec.homepage = 'https://github.com/mblumtritt/pixelflut'
-  spec.metadata = {'issue_tracker' => 'https://github.com/mblumtritt/pixelflut/issues'}
+  spec.metadata = {
+    'issue_tracker' => 'https://github.com/mblumtritt/pixelflut/issues'
+  }
   spec.rubyforge_project = spec.name
 
   spec.add_runtime_dependency 'gosu', '>= 0.13.2'
@@ -26,12 +28,14 @@ GemSpec = Gem::Specification.new do |spec|
 
   spec.require_paths = %w[lib]
   spec.bindir = 'bin'
-  spec.executables = Dir.glob(File.expand_path('../bin/*', __FILE__)).map!{ |fn| File.basename(fn) }
+  spec.executables =
+    Dir
+    .glob(File.expand_path('../bin/*', __FILE__))
+    .map!{ |fn| File.basename(fn) }
 
   all_files = %x(git ls-files -z).split(0.chr)
   spec.test_files = all_files.grep(%r{^(spec|test)/})
   spec.files = all_files - spec.test_files
 
-  spec.has_rdoc = false
   spec.extra_rdoc_files = %w[README.md]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.13
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -64,6 +64,7 @@ executables:
 - pxf-help
 - pxf-send
 - pxf-version
+- pxf-info
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -75,6 +76,7 @@ files:
 - bin/pxf-convert
 - bin/pxf-generate
 - bin/pxf-help
+- bin/pxf-info
 - bin/pxf-send
 - bin/pxf-server
 - bin/pxf-version
@@ -84,7 +86,6 @@ files:
 - lib/pixelflut/canvas.rb
 - lib/pixelflut/canvas/base.rb
 - lib/pixelflut/canvas/buffered.rb
-- lib/pixelflut/canvas/color.rb
 - lib/pixelflut/canvas/streamed.rb
 - lib/pixelflut/client.rb
 - lib/pixelflut/client/socket.rb
@@ -115,9 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: pixelflut
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: A Pixelflut server written in Ruby.
+summary: A Pixelflut server & client tool collection written in Ruby.
 test_files: []

data/lib/pixelflut/canvas/color.rb

@@ -1,32 +0,0 @@
-module Pixelflut
-  module Canvas
-    class Base
-      module Color
-        class << self
-          def from_rgb(r, g, b)
-            from_rgba(r, g, b, 0xff)
-          end
-
-          def from_rgba(r, g, b, a)
-            as_hex(r) + as_hex(g) + as_hex(b) + as_hex(a)
-          end
-
-          private
-
-          def as_hex(int)
-            ret = int.to_s(16)
-            ret = '0' + ret if 1 == ret.size
-            ret
-          end
-        end
-
-        Black = from_rgba(0, 0, 0, 0xff)
-        White = from_rgba(0xff, 0xff, 0xff, 0xff)
-        Red = from_rgba(0xff, 0, 0, 0xff)
-        Green = from_rgba(0, 0xff, 0, 0xff)
-        Blue = from_rgba(0, 0, 0xff, 0xff)
-        Yellow = from_rgba(0xff, 0xff, 0, 0xff)
-      end
-    end
-  end
-end