pixelflut 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d060b7c6e1888c61141aa6f24fae4e2255f4335d8e63ff8dcf1a8710f6d749a4
-  data.tar.gz: 81cb2846a78285887dab175ab3cb45bc9dcb4d9b0cf7d01add3d607431d537c5
+  metadata.gz: a4b1d4d4f5be08766e694539cf82507427f901f71ae1ec4c5568cec7344d1345
+  data.tar.gz: 65d9ebde1aa48a5989c28340d3da137b8d99d3952a85fbfb904ad7af64420df8
 SHA512:
-  metadata.gz: d30c42ab6b714404eff2f5dfb3c861c96010266086a497ba2684acb7e6c8ca2b3d79999e41fc10b44fb89a62c1375ed0b68b6da74afa79dfe40cc775c0031d47
-  data.tar.gz: 58ab45066aeff1c2b1162ff225ba24498a966a7a75caae0219f849695c1cf7d1b997ddbfba605ed118ffea2c9a72a222e666525b2936a618c6563b083b8f4208
+  metadata.gz: 377feb36cdde2221e3d6c7739acc9773d771d15cf319e93e379c6f86248189c286af91a25e13acda88fc40e030b956761ffa205215e4bb37ddd9ee64e805e748
+  data.tar.gz: 910cd772cedf70ddd4cb01445821ccf360f54d96a3c4076b9845886a0e5e1a232a0b153e640b574e6540c490c77691bd515a6b42bb74ade60f0970e2e201c9f9

data/bin/pxf

@@ -1,9 +1,6 @@
 #!/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)
@@ -16,31 +13,8 @@ help <<~end, 'IMAGE'
   -h, --help                print this help
 end
 
-Process.setproctitle(name)
-$stderr.sync = $stdout.sync = true
-
-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.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
-
 main do |opts|
-  require_relative '../lib/pixelflut'
-  address = Pixelflut::Sender.address(opts.host, opts.port)
-  data = create_data(opts)
+  data = create_junks(opts)
   print("spawn #{data.size}")
   data.size.times do |i|
     next unless fork
@@ -48,7 +22,7 @@ main do |opts|
     data = data[i].join
     GC.start
     GC.disable
-    Pixelflut::Sender.send(address, data) { print('.') }
+    Pixelflut::Sender.send(opts.address, data) { print('.') }
   end
 rescue SocketError => e
   error(3, e)
@@ -60,8 +34,36 @@ 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)
+def create_junks(opts)
+  lines = Pixelflut.convert(**opts.to_h)
+  return Pixelflut.slices(lines, count: opts.count) if opts.bytes.zero?
+  Pixelflut.junks(lines, bytes: opts.bytes)
 end
+
+before do
+  $stderr.sync = $stdout.sync = true
+  Process.setproctitle(name)
+  require_relative('../lib/pixelflut')
+end
+
+parse_argv do |args|
+  Struct.new(:address, :count, :bytes, :x, :y, :mode, :scale, :source) do
+    def to_h
+      { source: source, x: x, y: y, scale: scale, mode: mode }
+    end
+  end.new(
+    Pixelflut::Sender.address(
+      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 { require('mini-cli') and include(MiniCli) }

data/lib/pixelflut.rb

@@ -15,9 +15,8 @@ module Pixelflut
       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])
@@ -25,6 +24,7 @@ module Pixelflut
       end
       ret
     end
+    alias packages junks # backward compatibility
 
     private
 

data/lib/pixelflut/version.rb

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

data/pixelflut.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
     'https://github.com/mblumtritt/pixelflut/issues'
 
   spec.add_runtime_dependency 'rmagick'
-  spec.add_runtime_dependency 'mini-cli'
+  spec.add_runtime_dependency 'mini-cli', '>= 0.4.0'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement