pixelflut 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 289cd742f8feabae71182b94738bf9b21246bf1f3afae4a4b2bc1c5b1be87d4c
-  data.tar.gz: 2ba98d609131de67a2be99f55681087b45eeaf4deb6bf488b393894c1b31c6c9
+  metadata.gz: d060b7c6e1888c61141aa6f24fae4e2255f4335d8e63ff8dcf1a8710f6d749a4
+  data.tar.gz: 81cb2846a78285887dab175ab3cb45bc9dcb4d9b0cf7d01add3d607431d537c5
 SHA512:
-  metadata.gz: 9a8b53a0309a0c52a8898bab91f9c1ba95bb1622f733fee1236914b036dabae5ad2b375a55b6bb5c5cb3d1d9ba33f9d200cde650d014232e193f598ce8d3de8f
-  data.tar.gz: ba1480300f12b1fae6dba2fcec945537b519dd04fabffd345288a5b3c2c1f1c8e5ae6d9115314663772feeaa6d74c8b8198c8d905f6c8c8e0fab51c27a8594e2
+  metadata.gz: d30c42ab6b714404eff2f5dfb3c861c96010266086a497ba2684acb7e6c8ca2b3d79999e41fc10b44fb89a62c1375ed0b68b6da74afa79dfe40cc775c0031d47
+  data.tar.gz: 58ab45066aeff1c2b1162ff225ba24498a966a7a75caae0219f849695c1cf7d1b997ddbfba605ed118ffea2c9a72a222e666525b2936a618c6563b083b8f4208

data/.gitignore

@@ -1,4 +1,3 @@
-_local/
 tmp/
 pkg/
 gems.locked

data/README.md

@@ -4,7 +4,7 @@ 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 of a client.
+Based on the idea of a simple server protocol to collaborate on a shared canvas named [Pixelflut](https://cccgoe.de/wiki/Pixelflut) this gem implements a Ruby version of a client.
 
 This gem is an open experiment. You are welcome to fork or create pull requests to find the fastest solution!
 
@@ -24,16 +24,16 @@ You'll find some help on the command line:
 
 ```bash
 $ pxf
-Usage: pxf [options] IMAGE
+Usage: pxf [OPTIONS] IMAGE
 
 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
-
-  -h, --help                       print this help
-  -v, --version                    print version information
+    --host ADDRESS        target host address
+-p, --port PORT           target port (default 1234)
+-c, --connections CONN    count of connections (default 4)
+-b, --bytes BYTES         send junks of BYTES size
+-x, --transpose-x X       transpose image X pixels
+-y, --transpose-y Y       transpose image Y pixels
+-s, --scale SCALE         scale image by SCALE factor
+-m, --pixel MODE          select pixel coding (RGBX | RGBA | RGB)
+-h, --help                print this help
 ```

data/bin/pxf

@@ -1,92 +1,67 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-Process.setproctitle($name = 'pxf')
-$stderr.sync = $stdout.sync = true
-
-require 'optparse'
-require_relative '../lib/pixelflut'
+require 'mini-cli'
+include MiniCli
 
-def err(msg, code = 1)
-  $stderr.puts("#{$name}: #{msg}")
-  exit(code)
+help <<~end, 'IMAGE'
+      --host ADDRESS        target host address
+  -p, --port PORT           target port (default 1234)
+  -c, --connections CONN    count of connections (default 4)
+  -b, --bytes BYTES         send junks of BYTES size
+  -x, --transpose-x X       transpose image X pixels
+  -y, --transpose-y Y       transpose image Y pixels
+  -s, --scale SCALE         scale image by SCALE factor
+  -m, --pixel MODE          select pixel coding (RGBX | RGBA | RGB)
+  -h, --help                print this help
 end
 
-OPTS =
-  Struct
-  .new(:host, :port, :count, :x, :y, :mode, :scale, :image)
-  .new('127.0.0.1', 1234, 4, 0, 0, :rgbx)
+Process.setproctitle(name)
+$stderr.sync = $stdout.sync = true
 
-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.on(
-      '-m', '--pixel MODE',
-      {'RGBX' => :rgbx, 'RGBA' => :rgba, 'RGB' => :rgb},
-      'select pixel coding (RGBX | RGBA | RGB)'
-    ){ |v| OPTS.mode = 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}"))
+parse_argv do |args|
+  Struct.new(:host, :port, :count, :bytes, :x, :y, :mode, :scale, :source) do
+    def to_h
+      { source: source, x: x, y: y, scale: scale, mode: mode }
     end
-  end.parse!(args)
-  OPTS.image = args.first or err('image name expected')
-  OPTS
-rescue OptionParser::ParseError => e
-  err(e)
+  end.new(
+    args['ADDRESS'] || '127.0.0.1',
+    (args['PORT'] || 1234).to_i,
+    (args['CONN'] || 4).to_i,
+    args['BYTES'].to_i,
+    args['X'].to_i,
+    args['Y'].to_i,
+    { 'RGBA' => :rgba, 'RGB' => :rgb }[args['MODE']] || :rgbx,
+    args.key?('SCALE') ? args['SCALE'].to_f : nil,
+    args['IMAGE']
+  )
 end
 
-begin
-  parse(ARGV)
-  address = Pixelflut::Sender.address(OPTS.host, OPTS.port)
-  data = Pixelflut.sliced(
-    source: OPTS.image,
-    count: OPTS.count,
-    x: OPTS.x,
-    y: OPTS.y,
-    scale: OPTS.scale,
-    mode: OPTS.mode
-  )
+main do |opts|
+  require_relative '../lib/pixelflut'
+  address = Pixelflut::Sender.address(opts.host, opts.port)
+  data = create_data(opts)
+  print("spawn #{data.size}")
   data.size.times do |i|
     next unless fork
-    Process.setproctitle($name = format('pxf-%02d', i + 1))
+    Process.setproctitle(name(format("#{name}-%02d", i + 1)))
     data = data[i].join
-    puts("#{$name}: run - #{data.bytesize} bytes")
-    Pixelflut::Sender.send(address, data)
+    GC.start
+    GC.disable
+    Pixelflut::Sender.send(address, data) { print('.') }
   end
 rescue SocketError => e
-  err(e, 3)
+  error(3, e)
 rescue LoadError => e
-  err(e, 4)
+  error(4, e)
 rescue Errno::ECONNREFUSED
-  err('unable to connect', 2)
+  error(2, 'unable to connect')
 rescue Errno::EPIPE
-  err('connection lost', 2)
-rescue Interrupt
-  err('interrupted', 130)
+  error(2, 'connection lost')
+end
+
+def create_data(opts)
+  data = Pixelflut.convert(**opts.to_h)
+  return Pixelflut.slices(data, count: opts.count) if opts.bytes.zero?
+  Pixelflut.packages(data, bytes: opts.bytes)
 end

data/gems.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-source('https://rubygems.org'){ gemspec }
+source('https://rubygems.org') { gemspec }

data/lib/pixelflut.rb

@@ -1,19 +1,57 @@
 # frozen_string_literal: true
 
 require_relative 'pixelflut/image'
-require_relative 'pixelflut/convert'
 require_relative 'pixelflut/sender'
 
 module Pixelflut
-  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
+  class << self
+    def convert(source:, x: 0, y: 0, scale: nil, mode: :rgbx)
+      _convert(as_image(source, scale), x, y, &as_cvt(mode))
+    end
+
+    def slices(lines, count: 4)
+      Array.new(count) { [] }.tap do |ret|
+        lines.each_with_index { |line, idx| ret[idx % count] << line }
+      end
+    end
+
+    def packages(lines, bytes:)
+      ret = [current = []]
+      size = 0
+      lines.each do |line|
+        next current << line if (size += line.bytesize) < bytes
+        ret << (current = [line])
+        size = line.bytesize
+      end
+      ret
+    end
+
+    private
+
+    def _convert(image, dx, dy)
+      image.each_pixel.to_a.map! do |x, y, px|
+        "PX #{x + dx} #{y + dy} #{yield(px)}\n"
+      end.shuffle!
+    end
+
+    def as_image(source, scale)
+      Image.new(source).tap { |image| image.scale(scale) if scale }
+    end
 
-  def self.sliced(source:, count: 4, x: 0, y: 0, scale: nil, mode: :rgbx)
-    image = Image.new(source)
-    image.scale(scale) if scale
-    Convert.random_slices(image, x, y, mode, count)
+    def as_cvt(mode)
+      case mode
+      when :rgb
+        lambda { |px| px.to_color(Magick::AllCompliance, false, 8, true)[1, 6] }
+      when :rgba
+        lambda { |px| px.to_color(Magick::AllCompliance, true, 8, true)[1, 8] }
+      else
+        lambda do |px|
+          px.to_color(Magick::AllCompliance, false, 8, true)[
+            1,
+            px.alpha >= 65_535 ? 6 : 8
+          ]
+        end
+      end
+    end
   end
 end

data/lib/pixelflut/image.rb

@@ -26,7 +26,7 @@ module Pixelflut
 
     def each_pixel
       return to_enum(__method__) unless block_given?
-      @image.each_pixel{ |px, x, y| 0 != px.alpha and yield(x, y, px) }
+      @image.each_pixel { |px, x, y| 0 != px.alpha and yield(x, y, px) }
     end
   end
 end

data/lib/pixelflut/sender.rb

@@ -2,27 +2,28 @@ require 'socket'
 
 module Pixelflut
   module Sender
-    module_function
-
-    def address(host, port)
+    def self.address(host, port)
       Addrinfo.tcp(host, port)
     end
 
-    def send(address, data)
+    def self.send(address, data)
       socket = create_socket(address)
-      loop{ socket.write(data) }
+      yield(socket) if block_given?
+      loop { socket.write(data) }
     end
 
-    def create_socket(address)
-      socket = Socket.new(address.ipv6? ? :INET6 : :INET, :STREAM)
-      # socket.sync = true
-      # socket.setsockopt(:TCP, :NODELAY, 1)
-      socket.setsockopt(:SOCKET, :KEEPALIVE, 0)
-      socket.do_not_reverse_lookup = true
-      socket.connect(
-        Socket.pack_sockaddr_in(address.ip_port, address.ip_address)
-      )
-      socket
+    def self.create_socket(address)
+      Socket
+        .new(address.ipv6? ? :INET6 : :INET, :STREAM)
+        .tap do |socket|
+          socket.sync = false
+          socket.setsockopt(:TCP, :NODELAY, 0)
+          socket.setsockopt(:SOCKET, :KEEPALIVE, 0)
+          socket.do_not_reverse_lookup = true
+          socket.connect(
+            Socket.pack_sockaddr_in(address.ip_port, address.ip_address)
+          )
+        end
     end
   end
 end

data/lib/pixelflut/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pixelflut
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.2.0'
 end

data/pixelflut.gemspec

@@ -2,38 +2,33 @@
 
 require_relative 'lib/pixelflut/version'
 
-GemSpec = Gem::Specification.new do |spec|
+Gem::Specification.new do |spec|
   spec.name = 'pixelflut'
   spec.version = Pixelflut::VERSION
+  spec.author = 'Mike Blumtritt'
+
+  spec.required_ruby_version = '>= 2.7.2'
+
   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 fast Ruby client version.
+    Based on the idea of a simple server protocol to collaborate on a shared
+    canvas named [Pixelflut](https://cccgoe.de/wiki/Pixelflut) this gem
+    implements a fast Ruby client version.
   DESCRIPTION
-  spec.author = 'Mike Blumtritt'
-  spec.email = 'mike.blumtritt@pm.me'
   spec.homepage = 'https://github.com/mblumtritt/pixelflut'
-  spec.metadata = {
-    'source_code_uri' => 'https://github.com/mblumtritt/pixelflut',
-    'bug_tracker_uri' => 'https://github.com/mblumtritt/pixelflut/issues'
-  }
-  spec.rubyforge_project = spec.name
+
+  spec.metadata['source_code_uri'] = 'https://github.com/mblumtritt/pixelflut'
+  spec.metadata['bug_tracker_uri'] =
+    'https://github.com/mblumtritt/pixelflut/issues'
 
   spec.add_runtime_dependency 'rmagick'
+  spec.add_runtime_dependency 'mini-cli'
   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')
-  spec.required_ruby_version = '>= 2.5.0'
-
-  spec.require_paths = %w[lib]
   spec.bindir = 'bin'
   spec.executables = %w[pxf pxf-info]
 
-  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.files = Dir.chdir(__dir__) { `git ls-files -z`.split(0.chr) }
   spec.extra_rdoc_files = %w[README.md]
 end

data/rakefile.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 
-task :default do
-  exec 'rake --tasks'
-end
+$stdout.sync = $stderr.sync = true
+
+task(:default) { exec 'rake --tasks' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Blumtritt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2021-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini-cli
+  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
@@ -53,9 +67,10 @@ dependencies:
       - !ruby/object:Gem::Version
         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 fast Ruby client version.
-email: mike.blumtritt@pm.me
+  Based on the idea of a simple server protocol to collaborate on a shared
+  canvas named [Pixelflut](https://cccgoe.de/wiki/Pixelflut) this gem
+  implements a fast Ruby client version.
+email:
 executables:
 - pxf
 - pxf-info
@@ -69,7 +84,6 @@ files:
 - bin/pxf-info
 - gems.rb
 - lib/pixelflut.rb
-- lib/pixelflut/convert.rb
 - lib/pixelflut/image.rb
 - lib/pixelflut/sender.rb
 - lib/pixelflut/version.rb
@@ -80,7 +94,7 @@ licenses: []
 metadata:
   source_code_uri: https://github.com/mblumtritt/pixelflut
   bug_tracker_uri: https://github.com/mblumtritt/pixelflut/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,15 +102,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.9
+signing_key:
 specification_version: 4
 summary: A fast Pixelflut client written in Ruby.
 test_files: []

data/lib/pixelflut/convert.rb

@@ -1,31 +0,0 @@
-require 'rmagick'
-
-module Pixelflut
-  module Convert
-    def self.random_slices(image, dx, dy, mode, count)
-      mode = MODE.fetch(mode) if Symbol === mode
-      ret, idx = Array.new(count){ [] }, 0
-      image.each_pixel.to_a.shuffle!.each do |x, y, px|
-        ret[idx % count] << "PX #{x + dx} #{y + dy} #{mode.call(px)}\n"
-        idx += 1
-      end
-      ret
-    end
-
-    MODE = {
-      rgb: lambda do |pixel|
-        pixel.to_color(Magick::AllCompliance, false, 8, true)[1, 6]
-      end,
-      rgba: lambda do |pixel|
-        pixel.to_color(Magick::AllCompliance, true, 8, true)[1, 8]
-      end,
-      rgbx: lambda do |pixel|
-        if pixel.alpha >= 65535
-          pixel.to_color(Magick::AllCompliance, false, 8, true)[1, 6]
-        else
-          pixel.to_color(Magick::AllCompliance, true, 8, true)[1, 8]
-        end
-      end
-    }.freeze
-  end
-end