pixelflut 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8019d928da022280882ac14842f29fd955e91741aa33fc9bfa3ca4e9706dc96
-  data.tar.gz: 0adfa74f15e70a8052555991814b017f86892251ad5e0b4d55b9df74d4063533
+  metadata.gz: 72c6df29c81c54b5819636736f404a2179a60fdb9ba3d957fa3b466c54963aae
+  data.tar.gz: cdc9fbbbe2c5dffb605429e0a2ba27be38c1411f074e1c883462780723a99176
 SHA512:
-  metadata.gz: ca1a224e787fcb547cde5cb19fe8707cca753b80bfed6b7ed4ec7a762e079f44e3ce93360a416b5d1d973fafece3f0fa7538cc62ae90bb91164905542886aea2
-  data.tar.gz: cda338e7116fd4a777a068a53c25fab94f69c2173d2ce282498fd4cd395cefb254c9f88e61bd8a86c244e944337b62ae27f2c517c5c3beadfaae439b025b78cc
+  metadata.gz: 5fb329f94c5e744dc5b25aaabf85351f5bad4593ecc46331240a5a22ecdcae67ce8ac5e3b496440092953c27d1f789170cd394371a25d5145d1b8c08128f4f45
+  data.tar.gz: ac537008fa8257540dac638117e5925a83a5ab4176f35ba30e7e2ad418b890e79ffc29b12fee41d6a83d07de9bea6e64436044dfb37f609307eeaf23c8e1d925

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Mike Blumtritt
+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

data/README.md

@@ -2,6 +2,9 @@
 
 A Pixelflut client written in Ruby.
 
+- Gem: [rubygems.org](https://rubygems.org/gems/pixelflut)
+- Source: [codeberg.org](https://codeberg.org/mblumtritt/pixelflut)
+
 ## 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 Ruby version of a client.
@@ -36,5 +39,4 @@ Options:
   -t, --threads              use threads instead of processes
   -h, --help                 print this help
   -v, --version              print version information
-
 ```

data/bin/pxf

@@ -1,37 +1,32 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby --jit
 # 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)
-      -m, --mode <mode>          select pixel encoding (TEXT | BIN)
-      -t, --threads              use threads instead of processes
-      -x, --transpose-x <x>      transpose image <x> pixels
-      -y, --transpose-y <y>      transpose image <y> pixels
-      -h, --help                 print this help
-      -v, --version              print version information
-  HELP
-  exit
-end
+puts(<<~HELP) || exit if ARGV.index('-h') || ARGV.index('--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
 
 if ARGV.index('-v') || ARGV.index('--version')
   require_relative('../lib/pixelflut/version')
-  puts("#{$name} - Pixelflut v#{Pixelflut::VERSION}")
-  exit
+  puts("#{$name} - Pixelflut v#{Pixelflut::VERSION}") || exit
 end
 
-def die!(msg, code: 1)
-  $stderr.puts("#{$name}: #{msg}")
-  exit(code)
-end
+def die!(msg, code: 1) = $stderr.puts("#{$name}: #{msg}") || exit(code)
 
 die!("argument missing - try `#{$name} --help`") if ARGV.empty?
 
@@ -39,7 +34,7 @@ require_relative('../lib/pixelflut')
 
 module Configuration
   class << self
-    attr_reader :use_threads
+    attr_reader :scheduler
 
     def address
       require_relative('../lib/pixelflut/sender')
@@ -60,10 +55,6 @@ module Configuration
     def as_uint(value, name)
       (ret = value.to_i).positive? ? ret : invalid(value, name)
     end
-
-    def as_mode(value, name)
-      %w[text bin].include?(v = value.downcase) ? v : invalid(value, name)
-    end
   end
 
   until ARGV.empty?
@@ -75,16 +66,20 @@ module Configuration
     when '-c', '--connections'
       Pixelflut.count = as_uint(ARGV.shift, 'connections')
       die!("too many connections - #{Pixelflut.count}") if Pixelflut.count > 255
-    when '-m', '--mode', '--pixel'
-      Pixelflut.mode = as_mode(ARGV.shift, 'mode')
-    when '-t', '--use-threads'
-      @use_threads = true
+    when '--encode-text'
+      Pixelflut.encoding = 'text'
+    when '--encode-bin'
+      Pixelflut.encoding = 'bin'
+    when '--use-threads'
+      @scheduler = :threads
+    when '--use-processes'
+      @scheduler = :processes
     when '-x', '--transpose-x'
       Pixelflut.delta_x = ARGV.shift.to_i
     when '-y', '--transpose-y'
       Pixelflut.delta_y = ARGV.shift.to_i
     else
-      die!("invalid option - #{arg}") if Pixelflut.file_name
+      die!("invalid option - #{arg}") if arg[0] == '-' || Pixelflut.file_name
       Pixelflut.file_name = arg
     end
   end
@@ -92,6 +87,14 @@ module Configuration
   die!('<image> missing') unless Pixelflut.file_name
 end
 
+def use_threads(address, data)
+  puts("#{$name}: 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
+  data.each(&:join)
+end
+
 def use_processes(address, data)
   puts("#{$name}: start #{data.size} processes for #{data.sum(&:size)} bytes")
   data.size.times do |i|
@@ -99,22 +102,13 @@ def use_processes(address, data)
     data = data[i]
     GC.start
     $name = Process.setproctitle("#{$name}-#{'0' if i < 9}#{i + 1}")
-    Pixelflut::Sender.send(address, data) do |size|
-      puts("#{$name}: #{size} bytes")
-    end
+    Pixelflut::Sender.send(address, data) { puts("#{$name}: #{it} bytes") }
   end
-end
-
-def use_threads(address, data)
-  puts("#{$name}: start #{data.size} threads for #{data.sum(&:size)} bytes")
-  Thread.report_on_exception = false
-  data.map! { |slice| Thread.start { Pixelflut::Sender.send(address, slice) } }
   GC.start
-  data.each(&:join)
 end
 
 begin
-  if Configuration.use_threads
+  if Configuration.scheduler == :threads
     use_threads(Configuration.address, Pixelflut.data)
   else
     use_processes(Configuration.address, Pixelflut.data)

data/lib/pixelflut/version.rb

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

data/lib/pixelflut.rb

@@ -2,11 +2,11 @@
 
 module Pixelflut
   class << self
-    attr_accessor :file_name, :count, :mode, :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
 
@@ -44,11 +44,8 @@ module Pixelflut
     end
 
     def convert(width, height, blob)
-      if @mode == 'bin'
-        to_bin_format(width, height, blob)
-      else
-        to_text_format(width, height, blob)
-      end
+      return to_bin_format(width, height, blob) if @encoding == 'bin'
+      to_text_format(width, height, blob)
     end
 
     def to_text_format(width, height, blob)
@@ -90,10 +87,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?
-  @mode = 'text'
+  @encoding = 'text'
   @delta_x = @delta_y = 0
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
 - Mike Blumtritt
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -28,13 +27,12 @@ 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.
-email:
 executables:
 - pxf
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE
+- README.md
 files:
 - LICENSE
 - README.md
@@ -48,7 +46,6 @@ metadata:
   source_code_uri: https://github.com/mblumtritt/pixelflut
   bug_tracker_uri: https://github.com/mblumtritt/pixelflut/issues
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -56,15 +53,14 @@ 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.5.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A fast Pixelflut client written in Ruby.
 test_files: []