pixelflut 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d060b7c6e1888c61141aa6f24fae4e2255f4335d8e63ff8dcf1a8710f6d749a4
-  data.tar.gz: 81cb2846a78285887dab175ab3cb45bc9dcb4d9b0cf7d01add3d607431d537c5
+  metadata.gz: accec3b9c3471899c3d8f9b9ff5b1e2f8f60506aa674acc9ff5e76dd8411ad15
+  data.tar.gz: ef229296c199b0e12dcd6f2f7a3c48a265c7d6dae9757b1518e299f117dfa01f
 SHA512:
-  metadata.gz: d30c42ab6b714404eff2f5dfb3c861c96010266086a497ba2684acb7e6c8ca2b3d79999e41fc10b44fb89a62c1375ed0b68b6da74afa79dfe40cc775c0031d47
-  data.tar.gz: 58ab45066aeff1c2b1162ff225ba24498a966a7a75caae0219f849695c1cf7d1b997ddbfba605ed118ffea2c9a72a222e666525b2936a618c6563b083b8f4208
+  metadata.gz: 8634a2c74929588c18e9c1c7b391f0557811fcf342c7d1297511ab78ae1318fff00c49a4e398c99c6c7b576cfeafd9589543297ce5d1bca7a862a77434d9fac2
+  data.tar.gz: f7dbf586cf87531e11eca5938c3807cbd1a92d7881c21bde15d29b9f3b1301069b4c47de9cec7ae87a3b59049aded33169109f07a70d80f4d503e3a55c73b820

data/bin/pxf

@@ -1,67 +1,152 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'mini-cli'
-include MiniCli
-
-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
+$stdout.sync = $stderr.sync = true
+Process.setproctitle($name = 'pxf')
+
+if ARGV.index('-h') || ARGV.index('--help')
+  puts <<~HELP
+    Usage: #{$name} <image> [options]
+
+    Options:
+          --host <address>       target host address
+      -p, --port <port>          target port (default 1234)
+      -c, --connections <count>  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 factor
+      -m, --pixel <mode>         select pixel coding (RGBX | RGBA | RGB)
+      -h, --help                 print this help
+  HELP
+  exit
 end
 
-Process.setproctitle(name)
-$stderr.sync = $stdout.sync = true
+def error(msg, code: 1)
+  $stderr.puts("#{$name}-error: #{msg}")
+  exit(code)
+end
+
+error('Argument missing') if ARGV.empty?
+
+Configuration =
+  Class
+    .new do
+      attr_reader :image
+      attr_reader :num_connections, :bytes
+      attr_reader :trans_x, :trans_y, :scale, :mode
+
+      def initialize
+        @address = '127.0.0.1'
+        @port = 1234
+        @num_connections = 4
+        @bytes = 0
+        @trans_x = 0
+        @trans_y = 0
+        @mode = :rgbx
+      end
+
+      def parse!(argv)
+        argv = Array.new(argv)
+        until argv.empty?
+          case arg = argv.shift
+          when '--host'
+            @address = as_str(argv.shift, 'host')
+          when '-p', '--port'
+            @port = as_uint(argv.shift, 'port')
+          when '-c', '--connections'
+            @num_connections = as_uint(argv.shift, 'connections')
+          when '-b', '--bytes'
+            @bytes = as_uint(argv.shift, 'bytes')
+          when '-x', '--transpose-x'
+            @trans_x = argv.shift.to_i
+          when '-y', '--transpose-y'
+            @trans_y = argv.shift.to_i
+          when '-s', '--scale'
+            @scale = as_float(argv.shift, 'scale')
+          when '-m', '--pixel'
+            @mode = as_mode(argv.shift, 'mode')
+          else
+            raise(ArgumentError, "Invalid option - #{arg}") if @image
+            @image = arg
+          end
+        end
+      end
+
+      def address
+        Pixelflut::Sender.address(@address, @port)
+      end
+
+      def options
+        { source: @image, x: @trans_x, y: @trans_y, scale: @scale, mode: @mode }
+      end
+
+      private
 
-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 }
+      def invalid(value, name)
+        raise(ArgumentError, "Value for #{name} missing") if value.nil?
+        raise(ArgumentError, "Invalid value for #{name} - '#{value}'")
+      end
+
+      def as_uint(value, name)
+        ret = value.to_i
+        ret.positive? ? ret : invalid(value, name)
+      end
+
+      def as_str(value, name)
+        value.nil? || value.empty? ? invalid(value, name) : value
+      end
+
+      def as_float(value, name)
+        ret = value.to_f
+        ret.positive? ? ret : invalid(value, name)
+      end
+
+      def as_mode(value, name)
+        case value.downcase
+        when 'rgbx'
+          :rgbx
+        when 'rgba'
+          :rgba
+        when 'rgb'
+          :rgb
+        else
+          invalid(value, name)
+        end
+      end
     end
-  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']
-  )
+    .new
+
+def create_junks
+  lines = Pixelflut.convert(**Configuration.options)
+  if Configuration.bytes.zero?
+    return Pixelflut.slices(lines, count: Configuration.num_connections)
+  end
+  Pixelflut.junks(lines, bytes: Configuration.bytes)
 end
 
-main do |opts|
-  require_relative '../lib/pixelflut'
-  address = Pixelflut::Sender.address(opts.host, opts.port)
-  data = create_data(opts)
+begin
+  Configuration.parse!(ARGV)
+  require_relative('../lib/pixelflut')
+  data = create_junks
+  error("Too many subprocesses - #{data.size}") if data.size > 256
   print("spawn #{data.size}")
   data.size.times do |i|
     next unless fork
-    Process.setproctitle(name(format("#{name}-%02d", i + 1)))
+    Process.setproctitle($name = format("#{$name}-%02d", i + 1))
     data = data[i].join
     GC.start
     GC.disable
-    Pixelflut::Sender.send(address, data) { print('.') }
+    Pixelflut::Sender.send(Configuration.address, data) { print('.') }
   end
-rescue SocketError => e
-  error(3, e)
+rescue ArgumentError => e
+  error(e)
 rescue LoadError => e
-  error(4, e)
+  error(e, code: 4)
 rescue Errno::ECONNREFUSED
-  error(2, 'unable to connect')
+  error('unable to connect', code: 2)
 rescue Errno::EPIPE
-  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)
+  error('connection lost', code: 2)
+rescue SocketError => e
+  error(e, code: 3)
 end

data/lib/pixelflut/image.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'rmagick'
 
 module Pixelflut
   class Image
     def initialize(file_name)
-      @image = Magick::ImageList.new(file_name)[0]
+      @image = Magick::ImageList.new(file_name).first
     rescue Magick::ImageMagickError => e
       raise(LoadError, e.message, cause: e)
     end

data/lib/pixelflut/sender.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'socket'
 
 module Pixelflut
@@ -16,7 +18,7 @@ module Pixelflut
       Socket
         .new(address.ipv6? ? :INET6 : :INET, :STREAM)
         .tap do |socket|
-          socket.sync = false
+          socket.sync = true
           socket.setsockopt(:TCP, :NODELAY, 0)
           socket.setsockopt(:SOCKET, :KEEPALIVE, 0)
           socket.do_not_reverse_lookup = true

data/lib/pixelflut/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pixelflut
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

data/lib/pixelflut.rb

@@ -10,14 +10,15 @@ module Pixelflut
     end
 
     def slices(lines, count: 4)
-      Array.new(count) { [] }.tap do |ret|
-        lines.each_with_index { |line, idx| ret[idx % count] << line }
-      end
+      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
+    def junks(lines, bytes:)
+      size, ret = 0, [current = []]
       lines.each do |line|
         next current << line if (size += line.bytesize) < bytes
         ret << (current = [line])
@@ -29,9 +30,11 @@ module Pixelflut
     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!
+      image
+        .each_pixel
+        .to_a
+        .map! { |x, y, px| "PX #{x + dx} #{y + dy} #{yield(px)}\n" }
+        .shuffle!
     end
 
     def as_image(source, scale)
@@ -41,9 +44,9 @@ module Pixelflut
     def as_cvt(mode)
       case mode
       when :rgb
-        lambda { |px| px.to_color(Magick::AllCompliance, false, 8, true)[1, 6] }
+        ->(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] }
+        ->(px) { px.to_color(Magick::AllCompliance, true, 8, true)[1, 8] }
       else
         lambda do |px|
           px.to_color(Magick::AllCompliance, false, 8, true)[

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -24,48 +24,6 @@ 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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |
   Based on the idea of a simple server protocol to collaborate on a shared
   canvas named [Pixelflut](https://cccgoe.de/wiki/Pixelflut) this gem
@@ -78,17 +36,13 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".gitignore"
 - README.md
 - bin/pxf
 - bin/pxf-info
-- gems.rb
 - lib/pixelflut.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:
@@ -109,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A fast Pixelflut client written in Ruby.

data/.gitignore

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

data/gems.rb

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

data/pixelflut.gemspec

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/pixelflut/version'
-
-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 [Pixelflut](https://cccgoe.de/wiki/Pixelflut) this gem
-    implements a fast Ruby client version.
-  DESCRIPTION
-  spec.homepage = 'https://github.com/mblumtritt/pixelflut'
-
-  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.bindir = 'bin'
-  spec.executables = %w[pxf pxf-info]
-
-  spec.files = Dir.chdir(__dir__) { `git ls-files -z`.split(0.chr) }
-  spec.extra_rdoc_files = %w[README.md]
-end

data/rakefile.rb

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