pixelflut 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7b03c15db9310c8b374b0aef1fb328bbf01c82da1d69b657f133081af8d475
-  data.tar.gz: bcf596c6c8b92c7645e29c67e409b31ff3cd452798228db177214401a3494877
+  metadata.gz: 72c6df29c81c54b5819636736f404a2179a60fdb9ba3d957fa3b466c54963aae
+  data.tar.gz: cdc9fbbbe2c5dffb605429e0a2ba27be38c1411f074e1c883462780723a99176
 SHA512:
-  metadata.gz: ba17e1b0ad958f79d284e9156c5f28969c7bca19444f8e59c7c4064fafd130bf3765acdc828a449ab0026fc36e4f04006bb8dcfc9c569bc81ce9db993f14ba44
-  data.tar.gz: 95ec9eaa9f0772a71f4de9fa0b2382f83cf11cd34a0985da5d6334454e53db3ee1ad2a8232e9d74450f21cf32c0dfa01b4cc81df1a439a1483d4d4f0768d6e95
+  metadata.gz: 5fb329f94c5e744dc5b25aaabf85351f5bad4593ecc46331240a5a22ecdcae67ce8ac5e3b496440092953c27d1f789170cd394371a25d5145d1b8c08128f4f45
+  data.tar.gz: ac537008fa8257540dac638117e5925a83a5ab4176f35ba30e7e2ad418b890e79ffc29b12fee41d6a83d07de9bea6e64436044dfb37f609307eeaf23c8e1d925

data/bin/pxf

@@ -4,36 +4,29 @@
 $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
+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?
 

data/lib/pixelflut/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pixelflut
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 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
 
@@ -87,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?
   @encoding = 'text'
   @delta_x = @delta_y = 0
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -53,7 +53,7 @@ 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:
   - - ">="