pixelflut 1.0.4 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7b03c15db9310c8b374b0aef1fb328bbf01c82da1d69b657f133081af8d475
-  data.tar.gz: bcf596c6c8b92c7645e29c67e409b31ff3cd452798228db177214401a3494877
+  metadata.gz: 4e6890a9d13b0f4b2149dd49c8add1decaaa6876a62c1f9200d4c1b2d6f36ced
+  data.tar.gz: 7364299d22932c514afea765f5cb13a3c4d85d8b6c649330d1761ce6733126d3
 SHA512:
-  metadata.gz: ba17e1b0ad958f79d284e9156c5f28969c7bca19444f8e59c7c4064fafd130bf3765acdc828a449ab0026fc36e4f04006bb8dcfc9c569bc81ce9db993f14ba44
-  data.tar.gz: 95ec9eaa9f0772a71f4de9fa0b2382f83cf11cd34a0985da5d6334454e53db3ee1ad2a8232e9d74450f21cf32c0dfa01b4cc81df1a439a1483d4d4f0768d6e95
+  metadata.gz: be62c10bdbbb3f5e316e48143da7b5d9a2c3be7bebab0a33d8728df5d6459f254e69a83f99e93d18068f31835ca8bc25adf5356ba345c46dabb926faf08b367c
+  data.tar.gz: 4210b816ff0cb3ed146c95e4301fc242d399b3d3065dbd9c9e1ebb829b9ab50ef683f95188ba5f7e6db927916eaace45061753b77ca19d7165d1001a366adb2d

data/bin/pxf

@@ -1,41 +1,33 @@
-#!/usr/bin/env ruby --jit
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 $stdout.sync = $stderr.sync = true
-$name = Process.setproctitle(File.basename(Process.argv0))
-
-if ARGV.index('-h') || ARGV.index('--help')
-  puts <<~HELP
-    Usage: #{$name} [options] <png_image>
-
-    Options:
-          --host <address>       target host address (default 127.0.0.1)
-      -p, --port <port>          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
-          --encode-text          encode pixel in text format (default)
-          --encode-bin           encode pixel in binary format
-          --use-processes        use seperate processes (default)
-          --use-threads          use threads instead of processes
-      -h, --help                 print this help
-      -v, --version              print version information
-  HELP
-  exit
-end
+def me = Process.setproctitle(File.basename(Process.argv0))
+
+puts(<<~HELP) || exit if ARGV.index('-h') || ARGV.index('--help')
+  Usage: #{me} [options] <png_image>
+
+  Options:
+        --host <address>       target host address (default 127.0.0.1)
+    -p, --port <port>          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
+        --encode-text          encode pixel in text format (default)
+        --encode-bin           encode pixel in binary format
+        --use-processes        use seperate processes (default)
+        --use-threads          use threads instead of processes
+    -h, --help                 print this help
+    -v, --version              print version information
+HELP
 
 if ARGV.index('-v') || ARGV.index('--version')
   require_relative('../lib/pixelflut/version')
-  puts("#{$name} - Pixelflut v#{Pixelflut::VERSION}")
-  exit
-end
-
-def die!(msg, code: 1)
-  $stderr.puts("#{$name}: #{msg}")
-  exit(code)
+  puts("#{me} - Pixelflut v#{Pixelflut::VERSION}") || exit
 end
 
-die!("argument missing - try `#{$name} --help`") if ARGV.empty?
+def die!(msg, code: 1) = $stderr.puts("#{me}: #{msg}") || exit(code)
+die!("argument missing - try `#{me} --help`") if ARGV.empty?
 
 require_relative('../lib/pixelflut')
 
@@ -52,7 +44,7 @@ module Configuration
 
     def invalid(value, name)
       die!("value for #{name} missing") if value.nil?
-      die!("invalid value for #{name} - '#{value}'")
+      die!("invalid value for #{name} - #{value.inspect}")
     end
 
     def as_str(value, name)
@@ -95,7 +87,7 @@ module Configuration
 end
 
 def use_threads(address, data)
-  puts("#{$name}: start #{data.size} threads for #{data.sum(&:size)} bytes")
+  puts("#{me}: start #{data.size} threads for #{data.sum(&:size)} bytes")
   Thread.report_on_exception = false
   data.map! { Thread.start { Pixelflut::Sender.send(address, it) } }
   GC.start
@@ -103,13 +95,13 @@ def use_threads(address, data)
 end
 
 def use_processes(address, data)
-  puts("#{$name}: start #{data.size} processes for #{data.sum(&:size)} bytes")
+  puts("#{me}: start #{data.size} processes for #{data.sum(&:size)} bytes")
   data.size.times do |i|
     next unless fork
     data = data[i]
     GC.start
-    $name = Process.setproctitle("#{$name}-#{'0' if i < 9}#{i + 1}")
-    Pixelflut::Sender.send(address, data) { puts("#{$name}: #{it} bytes") }
+    me = Process.setproctitle("#{me}-#{'0' if i < 9}#{i + 1}")
+    Pixelflut::Sender.send(address, data) { puts("#{me}: #{it} bytes") }
   end
   GC.start
 end

data/bin/pxf-info

@@ -0,0 +1,32 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = '--help' ]
+then
+  echo "Usage: ${0##*/} [-p|--port PORT] ADDRESS
+
+Requests screen size of Pixelflut server at ADDRESS.
+"
+  exit 0
+fi
+
+PORT="1234"
+ADDRESS=""
+
+while [ $# -gt 0 ]
+do
+  key="$1"
+  case $key in
+  -p|--port)
+    PORT="$2"
+    shift; shift
+    ;;
+  *)
+    ADDRESS="$key"
+    shift
+    ;;
+  esac
+done
+
+printf "SIZE\nQUIT\n" | nc "$ADDRESS" "$PORT"

data/lib/pixelflut/version.rb

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

data/lib/pixelflut.rb

@@ -2,11 +2,11 @@
 
 module Pixelflut
   class << self
-    attr_accessor :file_name, :count, :encoding, :delta_x, :delta_y
+    attr_accessor :file_name, :encoding, :delta_x, :delta_y
+    attr_writer :count
 
-    def data
-      sliced(convert(*load).shuffle!, @count).map!(&:join)
-    end
+    def data = sliced(convert(*load).shuffle!, count).map!(&:join)
+    def count = (@count ||= find_suggested_thread_count)
 
     private
 
@@ -55,13 +55,7 @@ module Pixelflut
         width.times do |x|
           next if (a = blob.getbyte(pos += 4)) == 0
           ret << format(
-            (
-              if a == 255
-                "PX %d %d %02x%02x%02x\n"
-              else
-                "PX %d %d %02x%02x%02x%02x\n"
-              end
-            ),
+            "PX %d %d %02x%02x%02x#{'%02x' if a != 255}\n",
             x + @delta_x,
             y + @delta_y,
             blob.getbyte(pos - 3),
@@ -87,10 +81,19 @@ module Pixelflut
       end
       ret
     end
+
+    def find_suggested_thread_count
+      count = ENV['TC'].to_i
+      return count if count > 0
+      begin
+        require('etc') unless defined?(Etc)
+        Etc.nprocessors
+      rescue LoadError
+        4
+      end
+    end
   end
 
-  @count = ENV['TC'].to_i
-  @count = 4 unless @count.positive?
   @encoding = 'text'
   @delta_x = @delta_y = 0
 end

data/pixelflut.gemspec

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative 'lib/pixelflut/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'pixelflut'
+  spec.version = Pixelflut::VERSION
+  spec.summary = 'A fast Pixelflut client written in Ruby.'
+  spec.description = <<~DESCRIPTION.tr("\n", '')
+    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.licenses = %w[MIT Ruby]
+  spec.homepage = 'https://codeberg.org/mblumtritt/pixelflut'
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues"
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
+  spec.required_ruby_version = '> 3.0'
+
+  spec.add_dependency 'chunky_png'
+
+  spec.executables = %w[pxf pxf-info]
+  spec.files = Dir['lib/**/*.rb'] + %w[pixelflut.gemspec]
+  spec.extra_rdoc_files = %w[README.md]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -23,44 +23,46 @@ dependencies:
     - - ">="
       - !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
-  implements a fast Ruby client version.
+description: Based on the idea of a simple server protocol to collaborate on a sharedcanvas
+  named [Pixelflut](https://cccgoe.de/wiki/Pixelflut) this gemimplements a fast Ruby
+  client version.
 executables:
 - pxf
+- pxf-info
 extensions: []
 extra_rdoc_files:
-- LICENSE
 - README.md
 files:
-- LICENSE
 - README.md
 - bin/pxf
+- bin/pxf-info
 - lib/pixelflut.rb
 - lib/pixelflut/sender.rb
 - lib/pixelflut/version.rb
-homepage: https://github.com/mblumtritt/pixelflut
-licenses: []
+- pixelflut.gemspec
+homepage: https://codeberg.org/mblumtritt/pixelflut
+licenses:
+- MIT
+- Ruby
 metadata:
-  source_code_uri: https://github.com/mblumtritt/pixelflut
-  bug_tracker_uri: https://github.com/mblumtritt/pixelflut/issues
+  source_code_uri: https://codeberg.org/mblumtritt/pixelflut
+  bug_tracker_uri: https://codeberg.org/mblumtritt/pixelflut/issues
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: 2.7.2
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.11
 specification_version: 4
 summary: A fast Pixelflut client written in Ruby.
 test_files: []

data/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-2025 Mike Blumtritt
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.