pixelflut 0.0.13 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46bc6d8430a0a37a766f925558d1279fbf69457f859f9f6286c2fb4a3f3a9e81
-  data.tar.gz: f634ffe53ec48385c8c9b42f032f3fa0e56d91155cf075a05b2b9c15794d8dbb
+  metadata.gz: b29b8ce88df1c1d08de27f9c87fae728d58d25759cbfc88c2f0c62865492f054
+  data.tar.gz: 55311c23772975543c15e74741a5bbb452e4a48eb0e4af4d351d28e9ed5cbfa3
 SHA512:
-  metadata.gz: 53bb74856603e0d46563b707726cdb8d5d96f5192ebd641c00ebba463e45ba5165536f4b95ea60d28e0468f8735acb32d3439802541791faf9a2dcbe13b94dab
-  data.tar.gz: 2f26150a3d40045e6030018cbcbf807dcbb1f415f193f156d1c45d8c4eea5e5c6d56e5205d764b701b6d644346d0892042f5fb1cdd9ce0d9cd6ee5ba4fbad099
+  metadata.gz: c078c2eb4b3dfe4c4faf5d0c3b9bc652c90d3b602c0166b89bcc5f6ccfe8c01e02e9ade0098d5b951f82beab9ef165a8e0bb9363542ebf93264f73d45985ef7e
+  data.tar.gz: 244d2e819a90182daf2883c49a73454e0367dc098a3ed3f50748846efec8605e14f34dff346f347f7df453d977de9e5b1bc1b9bf2eefbaf4bd36a24aea52d094

data/README.md

@@ -1,14 +1,12 @@
 # Pixelflut
 
-A Pixelflut server & client tool collection written in Ruby.
+A Pixelflut client written in Ruby.
 
 ## 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.
+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 of a client.
 
-This gem is an open experiment to write a fast server and canvas in Ruby. You are welcome to fork or create pull requests to find the fastest solution!
-
-The gem includes some tools to develop Pixelflut clients and pre-processors.
+This gem is an open experiment. You are welcome to fork or create pull requests to find the fastest solution!
 
 ### Installation
 
@@ -26,76 +24,16 @@ You'll find some help on the command line:
 
 ```bash
 $ pxf
-usage: pxf command [options]
-
-valid commands:
-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.
-```
+Usage: pxf [options] IMAGE
 
-### Start a Sserver
+Options:
+      --host ADDRESS               target host address
+  -p, --port NUMBER                target port (default 1234)
+  -c, --connections COUNT          count of connections (default 4)
+  -x, --transpose-x X              transpose image X pixels
+  -y, --transpose-y Y              transpose image Y pixels
+  -s, --scale FACTOR               scale image by FACTOR
 
-Starting the server on default port `1234` and open a drawing screen is quite simple:
-
-```bash
-$ pxf server
-```
-
-With these options you can configure the server:
-
-```
--b, --bind ADDR          bind to given address
--p, --port PORT          select port(default: 1234)
--k, --keep-alive         set maximum keep-alive time
--r, --read_buffer SIZE   set read buffer size (default: 1024)
--w, --width WIDTH        set canvas width (default: 800)
--h, --height HEIGHT      set canvas height (default: 600)
--f, --[no-]fullscreen    run in fullscreen mode
+  -h, --help                       print this help
+  -v, --version                    print version information
 ```
-
-### Convert an Image
-
-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 send directly to a server (sample assumes the server runs on localhost port 1234):
-
-```bash
-$ pxf convert image.png | pxf send
-```
-
-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
--y, --transpose-y Y   transpose image Y pixels
--w, --width WIDTH     resize the image to given WIDTH
--h, --height HEIGHT   resize the image to given HEIGHT
-```
-
-It maybe faster to pre-process your images and send them later:
-
-```bash
-$ 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/bin/pxf

@@ -1,33 +1,84 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-def bin_root
-  File.realdirpath('../', __FILE__).freeze
-end
+Process.setproctitle($name = 'pxf')
+$stderr.sync = $stdout.sync = true
+
+require 'optparse'
+require_relative '../lib/pixelflut'
 
-def find_commands
-  Hash[Dir.glob(File.join(bin_root, 'pxf-*')).map!{ |cmd| [File.basename(cmd)[4..-1], cmd] }]
+def err(msg, code = 1)
+  $stderr.puts("#{$name}: #{msg}")
+  exit(code)
 end
 
-def err(msg)
-  $stderr.puts("pxf: #{msg}")
-  exit 1
+OPTS = Struct
+  .new(:host, :port, :count, :x, :y, :scale, :image)
+  .new('127.0.0.1', 1234, 4, 0, 0)
+
+def parse(args)
+  OptionParser.new do |parser|
+    parser.summary_indent = '  '
+    parser.banner = 'Usage: pxf [options] IMAGE'
+    parser.separator(nil)
+    parser.separator('Options:')
+    parser.on(
+      '--host ADDRESS', 'target host address'
+    ){ |v| OPTS.host = v }
+    parser.on(
+      '-p', '--port NUMBER', Integer, 'target port (default 1234)'
+    ){ |v| OPTS.port = v }
+    parser.on(
+      '-c', '--connections COUNT', Integer, 'count of connections (default 4)'
+    ){ |v| OPTS.count = v }
+    parser.on(
+      '-x', '--transpose-x X', Integer, 'transpose image X pixels'
+    ){ |v| OPTS.x = v }
+    parser.on(
+      '-y', '--transpose-y Y', Integer, 'transpose image Y pixels'
+    ){ |v| OPTS.y = v }
+    parser.on(
+      '-s', '--scale FACTOR', OptionParser::DecimalNumeric, 'scale image by FACTOR'
+    ){ |v| OPTS.scale = v }
+    parser.separator(nil)
+    parser.on('-h', '--help', 'print this help') do
+      exit(!puts(parser))
+    end
+    parser.on('-v', '--version', 'print version information') do
+      require_relative '../lib/pixelflut/version'
+      exit(!puts("pxf-#{Pixelflut::VERSION}"))
+    end
+  end.parse!(args)
+  OPTS.image = args.first or err('image name expected')
+  OPTS
+rescue OptionParser::ParseError => e
+  err(e)
 end
 
-def general_help
-  puts('usage: pxf command [options]', nil, 'valid commands:')
-  map = find_commands.transform_values!{ |cmd| %x(#{cmd} --short-help) }
-  cmds = map.keys.sort!
-  len = cmds.max_by(&:size).size + 3
-  cmds.each do |cmd|
-    print cmd.ljust(len)
-    puts(map[cmd])
+begin
+  parse(ARGV)
+  addr = Pixelflut::Sender.address(OPTS.host, OPTS.port)
+  slices = Pixelflut.as_slices(
+    source: OPTS.image,
+    count: OPTS.count,
+    x: OPTS.x,
+    y: OPTS.y,
+    scale: OPTS.scale
+  )
+  slices.size.times do |i|
+    next unless fork
+    Process.setproctitle($name = format('pxf-%02d', i + 1))
+    sender = Pixelflut::Sender.new(addr, slices[i].join)
+    slices.clear
+    puts "#{$name}: run"
+    sender.run
   end
-  exit
+rescue SocketError => e
+  err(e, 3)
+rescue LoadError => e
+  err(e, 4)
+rescue Errno::EPIPE
+  err('connection lost', 2)
+rescue Interrupt
+  err('interrupted', 130)
 end
-
-general_help if ARGV.empty? || ARGV[0] == '--help' || ARGV[0] == '-h'
-cmd = ARGV.shift
-fname = File.join(bin_root, 'pxf-' + cmd)
-err("no such command - #{cmd}") unless File.executable?(fname)
-exec(fname, *ARGV)

data/lib/pixelflut.rb

@@ -1,8 +1,19 @@
+# frozen_string_literal: true
+
+require_relative 'pixelflut/image'
+require_relative 'pixelflut/convert'
+require_relative 'pixelflut/sender'
+
 module Pixelflut
-  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')
+  def self.converted(source, x = 0, y = 0, scale = nil)
+    image = Image.new(source)
+    image.scale(scale) if scale
+    Convert.each_line(image, x, y)
+  end
+
+  def self.as_slices(source:, count: 4, x: 0, y: 0, scale: nil)
+    image = Image.new(source)
+    image.scale(scale) if scale
+    Convert.as_slices(image, x, y, count)
+  end
 end

data/lib/pixelflut/convert.rb

@@ -0,0 +1,28 @@
+module Pixelflut
+  module Convert
+    def self.each_line0(image)
+      return to_enum(__method__, image) unless block_given?
+      image.each_pixel do |x, y, px|
+        px = px.to_color(Magick::AllCompliance, true, 8, true)[
+          1, 255 == px.alpha ? 6 : 8
+        ]
+        yield("PX #{x} #{y} #{px}\n")
+      end
+    end
+
+    def self.each_line(image, dx, dy)
+      return to_enum(__method__, image, dx, dy) unless block_given?
+      image.each_pixel do |x, y, px|
+        px = px.to_color(Magick::AllCompliance, true, 8, true)[
+          1, 255 == px.alpha ? 6 : 8
+        ]
+        yield("PX #{x + dx} #{y + dy} #{px}\n")
+      end
+    end
+
+    def self.as_slices(image, dx, dy, count)
+      ret = each_line(image, dx, dy).to_a.shuffle!
+      ret.each_slice(ret.size / count).to_a
+    end
+  end
+end

data/lib/pixelflut/image.rb

@@ -0,0 +1,32 @@
+require 'rmagick'
+
+module Pixelflut
+  class Image
+    def initialize(file_name)
+      @image = Magick::ImageList.new(file_name)[0]
+    rescue Magick::ImageMagickError => e
+      raise(LoadError, e.message, cause: e)
+    end
+
+    def width
+      @image.columns
+    end
+
+    def height
+      @image.rows
+    end
+
+    def resize_to(width, height = nil)
+      @image.resize_to_fit!(width, height)
+    end
+
+    def scale(factor)
+      @image.scale!(factor)
+    end
+
+    def each_pixel
+      return to_enum(__method__) unless block_given?
+      @image.each_pixel{ |px, x, y| 0 != px.alpha and yield(x, y, px) }
+    end
+  end
+end

data/lib/pixelflut/sender.rb

@@ -0,0 +1,53 @@
+require 'socket'
+
+module Pixelflut
+  class Sender
+    def self.address(host, port)
+      Addrinfo.tcp(host, port)
+    end
+
+    def initialize(address, data)
+      @data = data.freeze
+      @addr = Socket.pack_sockaddr_in(address.ip_port, address.ip_address)
+      @socket = configure(Socket.new(address.ipv6? ? :INET6 : :INET, :STREAM))
+    end
+
+    def run
+      connect
+      send(@socket, @data)
+      @socket.close
+    end
+
+    private
+
+    def send(socket, data)
+      curr = String.new(data)
+      loop do
+        written = socket.write(curr)
+        curr =
+          if (size = curr.bytesize - written) > 0
+            curr.byteslice(written, size)
+          else
+            String.new(data)
+          end
+      end
+    end
+
+    def connect
+      loop do
+        (
+          :wait_writable == @socket.connect_nonblock(@addr, exception: false)
+        ) and break
+      end
+      loop{ @socket.wait_writable(10) and break }
+    end
+
+    def configure(socket)
+      socket.sync = true
+      socket.setsockopt(:TCP, :NODELAY, 1)
+      socket.setsockopt(:SOCKET, :KEEPALIVE, 0)
+      socket.do_not_reverse_lookup = true
+      socket
+    end
+  end
+end

data/lib/pixelflut/version.rb

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

data/pixelflut.gemspec

@@ -5,22 +5,23 @@ require_relative 'lib/pixelflut/version'
 GemSpec = Gem::Specification.new do |spec|
   spec.name = 'pixelflut'
   spec.version = Pixelflut::VERSION
-  spec.summary = 'A Pixelflut server & client tool collection written in Ruby.'
+  spec.summary = 'A fast Pixelflut client 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.
+    [Pixel Flut](https://cccgoe.de/wiki/Pixelflut) this gem implements a fast Ruby client version.
   DESCRIPTION
   spec.author = 'Mike Blumtritt'
-  spec.email = 'mike.blumtritt@invision.de'
+  spec.email = 'mike.blumtritt@pm.me'
   spec.homepage = 'https://github.com/mblumtritt/pixelflut'
   spec.metadata = {
-    'issue_tracker' => 'https://github.com/mblumtritt/pixelflut/issues'
+    'source_code_uri' => 'https://github.com/mblumtritt/pixelflut',
+    'bug_tracker_uri' => 'https://github.com/mblumtritt/pixelflut/issues'
   }
   spec.rubyforge_project = spec.name
 
-  spec.add_runtime_dependency 'gosu', '>= 0.13.2'
-  spec.add_development_dependency 'bundler', '>= 1.16.0'
-  spec.add_development_dependency 'rake', '>= 12.3.0'
+  spec.add_runtime_dependency 'rmagick'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
 
   spec.platform = Gem::Platform::RUBY
   spec.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')

metadata

@@ -1,106 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.2
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-26 00:00:00.000000000 Z
+date: 2019-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gosu
+  name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '0'
 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.
-email: mike.blumtritt@invision.de
+  [Pixel Flut](https://cccgoe.de/wiki/Pixelflut) this gem implements a fast Ruby client version.
+email: mike.blumtritt@pm.me
 executables:
 - pxf
-- pxf-generate
-- pxf-server
-- pxf-convert
-- pxf-help
-- pxf-send
-- pxf-version
-- pxf-info
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
 - README.md
-- TODO.md
 - bin/pxf
-- bin/pxf-convert
-- bin/pxf-generate
-- bin/pxf-help
-- bin/pxf-info
-- bin/pxf-send
-- bin/pxf-server
-- bin/pxf-version
 - gems.rb
 - lib/pixelflut.rb
-- lib/pixelflut/app.rb
-- lib/pixelflut/canvas.rb
-- lib/pixelflut/canvas/base.rb
-- lib/pixelflut/canvas/buffered.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
-- lib/pixelflut/server/connection.rb
-- lib/pixelflut/text_image.rb
+- lib/pixelflut/convert.rb
+- lib/pixelflut/image.rb
+- lib/pixelflut/sender.rb
 - lib/pixelflut/version.rb
 - pixelflut.gemspec
 - rakefile.rb
 homepage: https://github.com/mblumtritt/pixelflut
 licenses: []
 metadata:
-  issue_tracker: https://github.com/mblumtritt/pixelflut/issues
+  source_code_uri: https://github.com/mblumtritt/pixelflut
+  bug_tracker_uri: https://github.com/mblumtritt/pixelflut/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -116,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: A Pixelflut server & client tool collection written in Ruby.
+summary: A fast Pixelflut client written in Ruby.
 test_files: []