pixelflut 0.0.10 → 0.2.0

data/rakefile.rb

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

metadata

@@ -1,106 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Blumtritt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2021-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gosu
+  name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        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: 1.16.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '0'
 description: |
-  Based on the idea of a simple server protocol to collaborate on a shared canvas named
-  [Pixel Flut](https://cccgoe.de/wiki/Pixelflut) this gem implements a Ruby version.
-email: mike.blumtritt@invision.de
+  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
-- pxf-generate
-- pxf-server
-- pxf-convert
-- pxf-help
-- pxf-send
-- pxf-version
+- pxf-info
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
 - README.md
-- TODO.md
 - bin/pxf
-- bin/pxf-convert
-- bin/pxf-generate
-- bin/pxf-help
-- bin/pxf-send
-- bin/pxf-server
-- bin/pxf-version
+- bin/pxf-info
 - gems.rb
 - lib/pixelflut.rb
-- lib/pixelflut/app.rb
-- lib/pixelflut/canvas.rb
-- lib/pixelflut/canvas/base.rb
-- lib/pixelflut/canvas/buffered.rb
-- lib/pixelflut/canvas/color.rb
-- lib/pixelflut/canvas/streamed.rb
-- lib/pixelflut/client.rb
-- lib/pixelflut/client/socket.rb
-- lib/pixelflut/converter.rb
-- lib/pixelflut/server.rb
-- lib/pixelflut/server/configuration.rb
-- lib/pixelflut/server/connection.rb
-- lib/pixelflut/text_image.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:
-  issue_tracker: https://github.com/mblumtritt/pixelflut/issues
-post_install_message: 
+  source_code_uri: https://github.com/mblumtritt/pixelflut
+  bug_tracker_uri: https://github.com/mblumtritt/pixelflut/issues
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,16 +102,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubyforge_project: pixelflut
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.2.9
+signing_key:
 specification_version: 4
-summary: A Pixelflut server written in Ruby.
+summary: A fast Pixelflut client written in Ruby.
 test_files: []

data/TODO.md

@@ -1,10 +0,0 @@
-# Pixelflut
-
-## Todo
-
-- [x] limit connections _per IP_
-- [x] allow 10 (pixel-)actions per client
-- [ ] extend `pxf generate`
-- [x] add a pre-processor for images
-- [ ] mention the Gosu gem in the README
-- [ ] add `pxf info` command to get some server information

data/bin/pxf-convert

@@ -1,55 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-def options(cfg)
-  require 'optparse'
-  OptionParser.new do |opts|
-    opts.summary_indent = '  '
-    opts.banner = 'usage: pxf convert [options] IMAGE'
-    opts.separator(nil)
-    opts.separator('valid options:')
-    opts.on('-x', '--transpose-x X', Integer, 'transpose image X pixels'){ |v| cfg[:offset_x] = v }
-    opts.on('-y', '--transpose-y Y', Integer, 'transpose image Y pixels'){ |v| cfg[:offset_y] = v }
-    opts.on('-w', '--width WIDTH', Integer, 'resize the image to given WIDTH'){ |v| cfg[:width] = v }
-    opts.on('-h', '--height HEIGHT', Integer, 'resize the image to given HEIGHT'){ |v| cfg[:height] = v }
-  end
-end
-
-def help(short)
-  puts(options(nil), nil) unless short
-  puts('Convert given IMAGE file to Pixelflut format.')
-  exit
-end
-
-def err(msg, code = 1)
-  $stderr.puts("pxf: #{msg}")
-  exit(code)
-end
-
-def create_options
-  {}.tap{ |cfg| options(cfg).parse! }
-rescue OptionParser::ParseError => e
-  err(e)
-end
-
-help(false) if '--help' == ARGV[0]
-help(true) if '--short-help' == ARGV[0]
-options = create_options
-err('too few arguments') if ARGV.empty?
-require File.realdirpath('../../lib/pixelflut/converter.rb', __FILE__)
-err('unable to load library - RMagick') unless Pixelflut::Converter::AVAIL
-require File.realdirpath('../../lib/pixelflut/canvas/streamed.rb', __FILE__)
-begin
-  canvas = Pixelflut::Canvas::Streamed.new($stdout)
-  canvas.offset_x = options[:offset_x] if options[:offset_x]
-  canvas.offset_y = options[:offset_y] if options[:offset_y]
-  ARGV.each do |file_name|
-    cvt = Pixelflut::Converter.new(file_name)
-    cvt.resize_to(options[:width], options[:height]) if options[:width]
-    cvt.draw(canvas)
-  end
-rescue Pixelflut::Converter::Error => e
-  err(e.message, 2)
-rescue Interrupt
-  exit
-end

data/bin/pxf-generate

@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-def help(short)
-  puts('usage: pxf generate FILE [FILE2, ...]', nil) unless short
-  puts('Execute given generator FILEs.')
-end
-
-def extract_options(args)
-  files, options = [], {}
-  while !args.empty?
-    arg = args.shift
-    next files << arg unless arg[0] == '-'
-    next options.merge!(Hash[arg[1..-1].chars.map!{ |c| [c.to_sym, true] }]) unless arg[1] == '-'
-    options[arg[2..-1].to_sym] = args.shift
-  end
-  args[0, 0] = files
-  options
-end
-
-case ARGV[0]
-when '--help'
-  help(false)
-when '--short-help'
-  help(true)
-else
-  $options = extract_options(ARGV)
-  require File.realdirpath('../../lib/pixelflut/canvas/streamed.rb', __FILE__)
-  begin
-    ARGV.each{ |file| Pixelflut::Canvas::Streamed.new.instance_eval(IO.read(file), file, 0) }
-    print "QUIT\n"
-  rescue Interrupt
-    exit
-  end
-end

data/bin/pxf-help

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-def help(short)
-  puts('usage: pxf help COMMAND', nil) unless short
-  puts('Print help for given COMMAND.')
-  exit
-end
-
-def err(msg)
-  $stderr.puts("pxf: #{msg}")
-  exit(1)
-end
-
-help(false) if ARGV[0] == '--help'
-help(true) if ARGV[0] == '--short-help'
-root = File.realdirpath('../', __FILE__).freeze
-exec(File.join(root, 'pxf')) if ARGV.empty?
-ARGV.each do |cmd|
-  fname = File.join(root, 'pxf-' + cmd)
-  err("no such command - #{cmd}") unless File.executable?(fname)
-  system(fname, '--help')
-end

data/bin/pxf-send

@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-def options(cfg)
-  require 'optparse'
-  OptionParser.new do |opts|
-    opts.summary_indent = '  '
-    opts.banner = 'usage: pxf send [options] FILE'
-    opts.separator(nil)
-    opts.separator('valid options:')
-    opts.on('-h', '--host HOST', String, 'target host name (default localhost)'){ |v| cfg[:host] = v }
-    opts.on('-p', '--port PORT', Integer, 'target port (default 1234)'){ |v| cfg[:port] = v }
-    opts.on('-c', '--connections COUNT', Integer, 'count of connections (default 8)'){ |v| cfg[:count] = v }
-  end
-end
-
-def help(short)
-  puts(options(nil), nil) unless short
-  puts('Send given Pixelflut ASCII file to a server.')
-  exit
-end
-
-def err(msg, code = 1)
-  $stderr.puts("pxf: #{msg}")
-  exit(code)
-end
-
-def create_options
-  {port: 1234, count: 8}.tap{ |cfg| options(cfg).parse! }
-rescue OptionParser::ParseError => e
-  err(e)
-end
-
-help(false) if '--help' == ARGV[0]
-help(true) if '--short-help' == ARGV[0]
-options = create_options
-require File.realdirpath('../../lib/pixelflut/client.rb', __FILE__)
-begin
-  Pixelflut::Client.new(options[:host], options[:port], ARGF.readlines, options[:count]).run
-rescue SystemCallError => e
-  err(e.message, 2)
-rescue Interrupt
-  exit
-end

data/bin/pxf-server

@@ -1,64 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-def options(cfg)
-  require 'optparse'
-  OptionParser.new do |opts|
-    opts.summary_indent = '  '
-    opts.banner = 'usage: pxf server [options]'
-    opts.separator(nil)
-    opts.separator('valid options:')
-    opts.on('-b', '--bind ADDR', String, 'bind address') do |v|
-      cfg.server.host = v
-    end
-    opts.on('-p', '--port PORT', Integer, 'bind port(default: 1234)') do |v|
-      cfg.server.port = v
-    end
-    opts.on('-k', '--keep-alive', Float, 'set maximum keep-alive time') do |v|
-      cfg.server.keep_alive_time = v
-    end
-    opts.on('-r', '--read_buffer SIZE', Integer, 'set read buffer size (default: 1024)') do |v|
-      cfg.server.read_buffer_size = v
-    end
-    opts.on('-l', '--peer-limit NUMBER', Integer, 'limit number of connections per peer (default: 8)') do |v|
-      cfg.server.peer_limit = v
-    end
-    opts.on('-c', '--command-limit NUMBER', Integer, 'limit of continious processed commands (default: 10)') do |v|
-      cfg.server.command_limit = v
-    end
-    opts.on('-w', '--width WIDTH', Integer, 'set canvas width (default: 800)') do |v|
-      cfg.width = v
-    end
-    opts.on('-h', '--height HEIGHT', Integer, 'set canvas height (default: 600)') do |v|
-      cfg.height = v
-    end
-    opts.on('-f', '--[no-]fullscreen', 'run in fullscreen mode') do |v|
-      cfg.fullscreen = v
-    end
-  end
-end
-
-def help(short)
-  puts(options(nil), nil) unless short
-  puts('Start Pixelflut server.')
-  exit
-end
-
-help(false) if ARGV[0] == '--help'
-help(true) if ARGV[0] == '--short-help'
-
-def create_configuration
-  cfg = Pixelflut::App::Configuration.default
-  options(cfg).parse!
-  cfg
-rescue OptionParser::ParseError => e
-  $stderr.puts("pxf: #{e}")
-  exit(1)
-end
-
-begin
-  require File.realdirpath('../../lib/pixelflut.rb', __FILE__)
-  Pixelflut::App.run(create_configuration)
-rescue Interrupt
-  exit
-end

data/bin/pxf-version

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-def help(short)
-  puts('usage: pxf version', nil) unless short
-  puts('Print version information.')
-end
-
-case ARGV[0]
-when '--help'
-  help(false)
-when '--short-help'
-  help(true)
-else
-  require File.realdirpath('../../lib/pixelflut/version.rb', __FILE__).freeze
-  puts("pxf #{Pixelflut::VERSION}")
-end

data/lib/pixelflut/app.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require 'gosu'
-require_relative 'server'
-require_relative 'text_image'
-
-module Pixelflut
-  class App < Gosu::Window
-    Configuration = Struct.new(:width, :height, :fullscreen, :server) do
-      def self.default
-        new(nil, nil, false, Server::Configuration.default)
-      end
-    end
-
-    def self.run(configuration = Configuration.default)
-      new(configuration).show
-    end
-
-    def initialize(configuration)
-      if configuration.fullscreen
-        super(configuration.width || Gosu.screen_width, configuration.height || Gosu.screen_height, fullscreen: true)
-      else
-        super(configuration.width || 800, configuration.height || 600)
-      end
-      Process.setproctitle('pxflut')
-      @image = TextImage.new(width, height)
-      @server = Server.new(@image, configuration.server)
-      log(self.caption = "Pixelflut@#{configuration.server.host}:#{configuration.server.port}")
-      log(configuration.server)
-      reset!
-    end
-
-    def show
-      @server.run
-      super
-    end
-
-    def reset!
-      @image.clear
-      log("clean image: #{@image.width}x#{@image.height}")
-    end
-
-    def update
-      # self.caption = @image.changes
-      @draw_image = nil unless 0 == @image.changes
-    end
-
-    def draw
-      (@draw_image ||= Gosu::Image.new(@image.changed, tileable: true, retro: true)).draw(0, 0, 0)
-    end
-
-    def log(*args)
-      print("[#{Time.now}] ")
-      puts(*args)
-    end
-
-    def button_down(id)
-      return close! if Gosu::Button::KbEscape == id
-      return reset! if Gosu::Button::KbSpace == id
-      return log("connections: #{@server.connection_count}") if Gosu::Button::KbC == id
-    end
-
-    def close
-      close!
-    end
-
-    def needs_redraw?
-      nil == @draw_image
-    end
-
-    def needs_cursor?
-      false
-    end
-  end
-end
-
-begin
-  Pixelflut::App.run
-rescue Interrupt
-  exit
-end if __FILE__ == $PROGRAM_NAME