pixelflut 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62efcd05717e96f42f60e21cbc7a569277fed6bb2e56d24d57d3fe11ff37cb1b
-  data.tar.gz: 7c8fd4eb2542668dd25abd6b5cccc12818c790cf111f1b2a8e38bbda44527f4d
+  metadata.gz: 53fa839b0f1e655d481296ff80e16c50bcb14cb8b65002508a6cbdb6cf602d18
+  data.tar.gz: dc278f90adf043c2acfa484ea1beaadb04c12dd70e18e7ed2daa88db69ea1f28
 SHA512:
-  metadata.gz: 94241373ff17f9e0cbbc1b1b2e51f55db1da4beb032c18f4985590e6c50a1ba1bd9313fc7858caa9be76f84593b8fc7374337226afc72641a1c40f767b7fa66a
-  data.tar.gz: 00f6b49748585411187665ef9c2c3a519ca77641c7a3c7aa281b65f37a0c5b8fea7e53df82b49b58cc88401b72698f551b6752915c9d7177c9de5d2b1be9f3f3
+  metadata.gz: 1bbf4d13ed7bc852d20000103456680ececcfc4286225b0fb7be74afce25ad89dff6fdcb5e89120737c599645591400c5761e4c0172e632c742599975ee5a5da
+  data.tar.gz: 53368ac74848597f441952344f40e30744517da98db162405d7837f461d15096a66a37e0291763672d60119a8fe1d8266ee91c2ca7764bd7a2eef71620b3ec95

data/README.md

@@ -29,14 +29,15 @@ $ pxf
 usage: pxf command [options]
 
 valid commands:
-convert    Convert given IMAGE file to Pixelflut format.
+convert    Convert given IMAGE file to Pixelflut ASCII format.
 generate   Execute given generator FILEs.
 help       Print help for given COMMAND.
+send       Send given Pixelflut ASCII file to a server.
 server     Start Pixelflut server.
 version    Print version information.
 ```
 
-### Start a server
+### Start a Sserver
 
 Starting the server on default port `1234` and open a drawing screen is quite simple:
 
@@ -56,21 +57,21 @@ With these options you can configure the server:
 -f, --[no-]fullscreen    run in fullscreen mode
 ```
 
-### Convert an image
+### Convert an Image
 
-There is a conversion command which can be used to convert a given image to the Pixelflut text format:
+There is a conversion command which can be used to convert a given image to the Pixelflut ASCII text format:
 
 ```bash
 $ pxf convert image.png
 ```
 
-The result can directly send to a running server (sample assumes the server runs on localhost port 1234):
+The result can send directly to a server (sample assumes the server runs on localhost port 1234):
 
 ```bash
-$ pxf convert image.png | netcat localhost 1234
+$ pxf convert image.png | pxf send
 ```
 
-The converter can help you to resize and positioning the image and the servers canvas. These options are avail:
+The converter can help you to resize and positioning the image at the servers canvas. These options are avail:
 
 ```
 -x, --transpose-x X   transpose image X pixels
@@ -79,9 +80,22 @@ The converter can help you to resize and positioning the image and the servers c
 -h, --height HEIGHT   resize the image to given HEIGHT
 ```
 
-It maybe faster to pre-process your image(s) and send later:
+It maybe faster to pre-process your images and send them later:
 
 ```bash
-$ pxf convert -x 50 -y 100 --width 640 image.png > image.px
-$ cat image.px | netcat localhost 1234
+$ pxf convert -x 50 -y 100 --width 100 image1.png > image1.px
+$ pxf convert -x 150 --width 2100 image2.png > image2.px
+$ pxf send -h pixel_host image1.px image2.px
 ```
+
+### Send Pixelflut ASCII Text
+
+The `pxf send` command can be used to send given Pixelflut ASCII text files to a server. It uses several connections at the same time to fasten the transmission.
+
+Next sample will send the Pixelflut ASCII text file named `pixels.px` to the server on port 1234 at address `pixelhost` using 12 connections:
+
+```bash
+$ pxf send -h pixelhost -p 1234 -c 12 pixels.px
+```
+
+If no file is given the STDIN will be read and send afterwards to the server.

data/TODO.md

@@ -7,3 +7,4 @@
 - [ ] extend `pxf generate`
 - [x] add a pre-processor for images
 - [ ] mention the Gosu gem in the README
+- [ ] add `pxf info` command to get some server information

data/bin/pxf-convert

@@ -8,8 +8,8 @@ def options(cfg)
     opts.banner = 'usage: pxf convert [options] IMAGE'
     opts.separator(nil)
     opts.separator('valid options:')
-    opts.on('-x', '--transpose-x X', Integer, 'transpose image X pixels'){ |v| cfg[:x_offset] = v }
-    opts.on('-y', '--transpose-y Y', Integer, 'transpose image Y pixels'){ |v| cfg[:y_offset] = v }
+    opts.on('-x', '--transpose-x X', Integer, 'transpose image X pixels'){ |v| cfg[:offset_x] = v }
+    opts.on('-y', '--transpose-y Y', Integer, 'transpose image Y pixels'){ |v| cfg[:offset_y] = v }
     opts.on('-w', '--width WIDTH', Integer, 'resize the image to given WIDTH'){ |v| cfg[:width] = v }
     opts.on('-h', '--height HEIGHT', Integer, 'resize the image to given HEIGHT'){ |v| cfg[:height] = v }
   end
@@ -27,25 +27,26 @@ def err(msg, code = 1)
 end
 
 def create_options
-  cfg = {}
-  options(cfg).parse!
-  cfg
+  {}.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]
-err('too few arguments') if ARGV.empty?
 options = create_options
+err('too few arguments') if ARGV.empty?
 require File.realdirpath('../../lib/pixelflut/converter.rb', __FILE__)
+err('unable to load library - RMagick') unless Pixelflut::Converter::AVAIL
+require File.realdirpath('../../lib/pixelflut/canvas/streamed.rb', __FILE__)
 begin
+  canvas = Pixelflut::Canvas::Streamed.new($stdout)
+  canvas.offset_x = options[:offset_x] if options[:offset_x]
+  canvas.offset_y = options[:offset_y] if options[:offset_y]
   ARGV.each do |file_name|
     cvt = Pixelflut::Converter.new(file_name)
-    cvt.x_offset = options[:x_offset] if options[:x_offset]
-    cvt.y_offset = options[:y_offset] if options[:y_offset]
     cvt.resize_to(options[:width], options[:height]) if options[:width]
-    cvt.each_line{ |line| puts(line) }
+    cvt.draw(canvas)
   end
 rescue Pixelflut::Converter::Error => e
   err(e.message, 2)

data/bin/pxf-help

@@ -4,6 +4,7 @@
 def help(short)
   puts('usage: pxf help COMMAND', nil) unless short
   puts('Print help for given COMMAND.')
+  exit
 end
 
 def err(msg)
@@ -11,17 +12,12 @@ def err(msg)
   exit(1)
 end
 
-case ARGV[0]
-when '--help'
-  help(false)
-when '--short-help'
-  help(true)
-else
-  root = File.realdirpath('../', __FILE__).freeze
-  exec(File.join(root, 'pxf')) if ARGV.empty?
-  ARGV.each do |cmd|
-    fname = File.join(root, 'pxf-' + cmd)
-    err("no such command - #{cmd}") unless File.executable?(fname)
-    system(fname, '--help')
-  end
+help(false) if ARGV[0] == '--help'
+help(true) if ARGV[0] == '--short-help'
+root = File.realdirpath('../', __FILE__).freeze
+exec(File.join(root, 'pxf')) if ARGV.empty?
+ARGV.each do |cmd|
+  fname = File.join(root, 'pxf-' + cmd)
+  err("no such command - #{cmd}") unless File.executable?(fname)
+  system(fname, '--help')
 end

data/bin/pxf-send

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+def options(cfg)
+  require 'optparse'
+  OptionParser.new do |opts|
+    opts.summary_indent = '  '
+    opts.banner = 'usage: pxf send [options] FILE'
+    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 }
+    opts.on('-c', '--connections COUNT', Integer, 'count of connections (default 8)'){ |v| cfg[:count] = v }
+  end
+end
+
+def help(short)
+  puts(options(nil), nil) unless short
+  puts('Send given Pixelflut ASCII file to a server.')
+  exit
+end
+
+def err(msg, code = 1)
+  $stderr.puts("pxf: #{msg}")
+  exit(code)
+end
+
+def create_options
+  {port: 1234, count: 8}.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.rb', __FILE__)
+begin
+  Pixelflut::Client.new(options[:host], options[:port], ARGF.readlines, options[:count]).run
+rescue SystemCallError => e
+  err(e.message, 2)
+rescue Interrupt
+  exit
+end

data/lib/pixelflut.rb

@@ -3,5 +3,6 @@ module Pixelflut
   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')
 end

data/lib/pixelflut/canvas/buffered.rb

@@ -10,13 +10,11 @@ module Pixelflut
       end
 
       def each(&block)
-        return to_enum(__method__) unless block
-        @lines.each(&block)
-        yield "QUIT\n"
+        block ? @lines.each(&block) : to_enum(__method__)
       end
 
       def to_s
-        @lines.join + "QUIT\n"
+        @lines.join
       end
 
       private

data/lib/pixelflut/client.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative 'client/socket'
+
+module Pixelflut
+  class Client
+    def initialize(host, port, data, socket_count)
+      @sockets = create_sockets(Addrinfo.tcp(host, port), sliced(data, socket_count))
+    end
+
+    def run
+      loop{ break if call }
+    end
+
+    def call
+      @sockets.size == @sockets.count do |socket|
+        socket.call
+        socket.state == :closed
+      end
+    end
+
+    private
+
+    def sliced(data, count)
+      data = data.split("\n") if data.is_a?(String)
+      data = data.each_slice(data.size / count).to_a
+      data[-2] += data.pop unless (data.size % count).zero?
+      data.map!(&:join)
+    end
+
+    def create_sockets(address, slices)
+      slices.map{ |data| Socket.new(address, data) }
+    end
+  end
+end

data/lib/pixelflut/client/socket.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'socket'
+
+module Pixelflut
+  class Client
+    class Socket < ::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)
+        @data = data
+        @size = data.bytesize
+        @state = :not_connected
+      end
+
+      def call
+        case @state
+        when :not_connected
+          do_connect
+        when :wait_connect
+          do_wait_for_connect
+        when :write
+          do_write
+        else
+          close
+          @state = :closed
+        end
+      end
+
+      private
+
+      def do_connect
+        @state = :wait_writable === connect_nonblock(@addr, exception: false) ? :wait_connect : :write
+      end
+
+      def do_wait_for_connect
+        @state = :write unless wait_writable(0.1).nil?
+      end
+
+      def do_write
+        written = write_nonblock(@data, exception: false)
+        return 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

@@ -3,50 +3,44 @@
 module Pixelflut
   class Converter
     Error = Class.new(RuntimeError)
+  end
 
-    attr_accessor :x_offset, :y_offset
+  begin
+    require 'rmagick'
 
-    def initialize(file_name)
-      load_rmagick
-      @images = load_image(file_name)
-      @x_offset = @y_offset = 0
-    end
+    class Converter
+      AVAIL = true
 
-    def resize_to(width, height = nil)
-      @images.each{ |image| image.resize_to_fit!(width, height) }
-    end
+      def initialize(file_name)
+        @images = load_images(file_name)
+      end
 
-    def each_pixel
-      return to_enum(__method__) unless block_given?
-      @images.each do |image|
-        image.each_pixel do |color, x, y|
-          yield(
-            x + @x_offset,
-            y + @y_offset,
-            color.to_color(Magick::AllCompliance, true, 8, true)[1, 8]
-          ) unless 0xffff == color.opacity
-        end
+      def resize_to(width, height = nil)
+        @images.each{ |image| image.resize_to_fit!(width, height) }
       end
-    end
 
-    def each_line
-      return to_enum(__method__) unless block_given?
-      each_pixel{ |x, y, rgba| yield "PX #{x} #{y} #{rgba}" }
-    end
+      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
+        end
+      end
 
-    private
+      def draw(canvas)
+        each_pixel{ |x, y, rgba| canvas[x, y] = rgba }
+      end
 
-    def load_image(file_name)
-      Magick::ImageList.new(file_name)
-    rescue Magick::ImageMagickError => e
-      raise(Error, e.message)
-    end
+      private
 
-    def load_rmagick
-      require 'rmagick'
-    rescue LoadError
-      raise(Error, 'unable to load gem - "RMagick" not installed')
+      def load_images(file_name)
+        Magick::ImageList.new(file_name)
+      rescue Magick::ImageMagickError => e
+        raise(Error, e.message)
+      end
     end
-
+  rescue LoadError
+    Converter::AVAIL = false
   end
 end

data/lib/pixelflut/server/connection.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'socket'
+
 module Pixelflut
   class Server
     class Connection

data/lib/pixelflut/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -62,6 +62,7 @@ executables:
 - pxf-server
 - pxf-convert
 - pxf-help
+- pxf-send
 - pxf-version
 extensions: []
 extra_rdoc_files:
@@ -74,6 +75,7 @@ files:
 - bin/pxf-convert
 - bin/pxf-generate
 - bin/pxf-help
+- bin/pxf-send
 - bin/pxf-server
 - bin/pxf-version
 - gems.rb
@@ -84,6 +86,8 @@ files:
 - lib/pixelflut/canvas/buffered.rb
 - lib/pixelflut/canvas/color.rb
 - lib/pixelflut/canvas/streamed.rb
+- lib/pixelflut/client.rb
+- lib/pixelflut/client/socket.rb
 - lib/pixelflut/converter.rb
 - lib/pixelflut/server.rb
 - lib/pixelflut/server/configuration.rb