discreet_proxy 1.0.0 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 6d604d587652c9e262e170bd071de1228856038a645e316ccf395d6542437bcc
+  data.tar.gz: 3b80ad22e6c84ce89c881247dcd412df4ca9d7c2d23e51959b50fe3fb50e1d82
+SHA512:
+  metadata.gz: b7fdb9c9232138db58ea42e4ba487eeb4f049090f958364e3c67587e2addd9ede917a08d0457bed2208c100793c0d6aa2bce4a14851dc68d9c843406f97c4503
+  data.tar.gz: bc37f8eced2f798ccaed0d922fe48487ab9772df462ffcafc23a04d0a295891d4135c24c53f4e7f8499178dbd6f755ab4d2e9f9636d5ffce18d4034e072293b2

data/Gemfile

@@ -1,10 +1,5 @@
-source "http://rubygems.org"
+# frozen_string_literal: true
 
-gem "chunky_png"
+source "http://rubygems.org"
 
-group :development do
-  gem "rake"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "cli_test"
-end
+gemspec

data/README.rdoc

@@ -2,15 +2,18 @@
 
 Writes and reads Flame/Smoke proxy files (.p) using ChunkyPNG.
 
-To read every .p file on your Flame system and write it out as a PNG preview to the /tmp
+== Installation
 
-  Dir.glob("/usr/discreet/project/**/*.p").each do | icon_path |
-    proxy = DiscreetProxy.from_file(icon_path)
-    dest_path = "/tmp/" + File.basename(icon_path) + ".png"
-    proxy.save_png(dest_path)
-  end
-  
-Also you can use the builtin `flame_proxy_icon` binary to convert to and from the format.
+Run these two commands in your terminal:
+
+  $sudo gem install discreet_proxy
+  $flame_proxy_icon --help
+
+If the first one does not work - make sure you have Ruby installed.
+
+== Usage from the command line
+
+The builtin `flame_proxy_icon` binary is used to convert to and from the `.p` format.
 
   $flame_proxy_icon --from-png my_icon.png
   
@@ -20,6 +23,20 @@ will create "my_icon.p", and the reverse
 
 will create a SuperSetup.batch.png file that you can massage in, say, Photoshop.
 
+== Usage from Ruby
+
+To read every .p file on your Flame system and write it out as a PNG preview to the /tmp
+
+  require "rubygems"
+  require "discreet_proxy"
+  Dir.glob("/usr/discreet/project/**/*.p").each do | icon_path |
+    proxy = DiscreetProxy.from_file(icon_path)
+    dest_path = "/tmp/" + File.basename(icon_path) + ".png"
+    proxy.save_png(dest_path)
+  end
+
+From there on the possibilities are endless.
+  
 == Contributing to discreet_proxy
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
@@ -32,6 +49,6 @@ will create a SuperSetup.batch.png file that you can massage in, say, Photoshop.
 
 == Copyright
 
-Copyright (c) 2011 Julik Tarkhanov. See LICENSE.txt for
+Copyright (c) 2011 and on Julik Tarkhanov. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -1,28 +1,15 @@
+# frozen_string_literal: true
+
 # encoding: utf-8
-require 'rubygems'
-require 'bundler'
-require 'jeweler'
-require './lib/discreet_proxy'
 
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.version = DiscreetProxy::VERSION
-  gem.name = "discreet_proxy"
-  gem.homepage = "http://github.com/julik/discreet_proxy"
-  gem.license = "MIT"
-  gem.summary = %Q{Parses and creates Flame/Smoke .p proxy icon files}
-  gem.email = "me@julik.nl"
-  gem.authors = ["Julik Tarkhanov"]
-  gem.executables = ["flame_proxy_icon"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rake/testtask"
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib"
+  t.test_files = FileList["test/test_*.rb"]
 end
 
-task :default => :test
+task default: [:test]

data/bin/flame_proxy_icon

@@ -6,7 +6,7 @@ require "optparse"
 $from_png = false
 $error = true
 OptionParser.new do | op |
-  op.banner = "Usage: flame_proxy_icon --png convert_from_this_png.png"
+  op.banner = "Usage: flame_proxy_icon --from-png convert_from_this_png.png"
   op.on("--from-png", "Generate a .p proxy from a PNG file") { $from_png = true; $error = false}
   op.on("--from-icon", "Generate a .png file from a proxy .p file") { $from_png = false; $error = false}
 end.parse!
@@ -18,7 +18,7 @@ ARGV.each do | filename_to_convert |
     proxy = DiscreetProxy.from_png(png)
     proxy.save(destination_filename)
   else
-    destination_filename = filename_to_convert.gsub(/\.p$/, '.png')
+    destination_filename = filename_to_convert + "ng" # .png
     proxy = DiscreetProxy.from_file(filename_to_convert)
     proxy.save_png(destination_filename)
   end
@@ -27,4 +27,4 @@ end
 if $error
   $stderr.puts "You need to provide the path to the file being converted. Also use the --help option."
   exit(1)
-end
+end

data/discreet_proxy.gemspec

@@ -1,83 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
+require_relative "lib/discreet_proxy"
 
 Gem::Specification.new do |s|
   s.name = "discreet_proxy"
-  s.version = "1.0.0"
+  s.version = DiscreetProxy::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2011-12-13"
   s.email = "me@julik.nl"
   s.executables = ["flame_proxy_icon"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "bin/flame_proxy_icon",
-    "discreet_proxy.gemspec",
-    "lib/discreet_proxy.rb",
-    "test/converted_png_proxies/Kanaty.stabilizer.p.p.png",
-    "test/converted_png_proxies/Medianize.stabilizer.p.p.png",
-    "test/converted_png_proxies/Ripples.glsl.p.p.png",
-    "test/converted_png_proxies/Tezt_flame_5_trackers.stabilizer.p.p.png",
-    "test/converted_png_proxies/doberman.batch.p.p.png",
-    "test/converted_png_proxies/e292_v02.batch.p.p.png",
-    "test/converted_png_proxies/e292_v02shadow.batch.p.p.png",
-    "test/converted_png_proxies/spontaan.stabilizer.p.p.png",
-    "test/converted_png_proxies/spontaan2.stabilizer.p.p.png",
-    "test/converted_png_proxies/t2.batch.p.p.png",
-    "test/helper.rb",
-    "test/test_cli.rb",
-    "test/test_discreet_proxy.rb",
-    "test/test_proxies/Kanaty.stabilizer.p",
-    "test/test_proxies/Medianize.stabilizer.p",
-    "test/test_proxies/Ripples.glsl.p",
-    "test/test_proxies/Tezt_flame_5_trackers.stabilizer.p",
-    "test/test_proxies/doberman.batch.p",
-    "test/test_proxies/e292_v02.batch.p",
-    "test/test_proxies/e292_v02shadow.batch.p",
-    "test/test_proxies/spontaan.stabilizer.p",
-    "test/test_proxies/spontaan2.stabilizer.p",
-    "test/test_proxies/t2.batch.p",
-    "test/test_proxy_out/Kanaty.stabilizer.p"
-  ]
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f == ".gitignore" }
   s.homepage = "http://github.com/julik/discreet_proxy"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
   s.summary = "Parses and creates Flame/Smoke .p proxy icon files"
+  s.specification_version = 4
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_runtime_dependency "chunky_png"#, "~>1.2"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<chunky_png>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<cli_test>, [">= 0"])
-    else
-      s.add_dependency(%q<chunky_png>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<cli_test>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<chunky_png>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<cli_test>, [">= 0"])
-  end
+  s.add_development_dependency "rake"
+  s.add_development_dependency "cli_test"
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "ostruct"
+  s.add_development_dependency "magic_frozen_string_literal"
 end
 

data/lib/discreet_proxy.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "chunky_png"
 
 # The whole module for making and reading Flame proxy icon files
 module DiscreetProxy
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
   
   # Parse a .p file and return a Proxy
   def self.from_file(path)
@@ -96,15 +98,13 @@ module DiscreetProxy
     def to_dotp
       # Pack the header
       buf = StringIO.new(0xFF.chr * 40)
-      byteswap_version = [PROXY_VERSION].pack("e").reverse
       header = [MAGIC, VERSION_BSWAP, width, height, PROXY_DEPTH].pack("na6nnn")
       buf.write(header)
       buf.seek(40)
       
-      # Now... all the reverses come in reverse
-      (0...@rows.length).each do | row_offset |
-        row_idx = (@rows.length - 1) - row_offset
-        @rows[row_idx].each do | pix |
+      # Write out all the rows starting with the last one
+      @rows.reverse.each do | row |
+        row.each do | pix |
           rgb = unpack_rgb(pix).pack("CCC")
           buf.write(rgb) 
         end
@@ -159,10 +159,11 @@ module DiscreetProxy
     
     private
     
-    # Rows start at 8-byte aligned boundaries. BUT due to the
-    # fact that this is a BDSM Silicon Graphics format the start of the row is END of the image.
+    # Rows are padded so the byte count is a multiple of 4 (32-bit alignment).
+    # BUT due to the fact that this is a BDSM Silicon Graphics format the start of
+    # the row is END of the image.
     def row_pad
-      @row_pad ||= ((@width * 3) % 8)
+      @row_pad ||= (-@width * 3) % 4
     end
     
     def pack_rgb(r,g,b)

data/test/helper.rb

@@ -1,13 +1,10 @@
-require 'rubygems'
+# frozen_string_literal: true
+
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
+Bundler.setup
+
+require "minitest"
+require "minitest/autorun"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_cli.rb

@@ -1,7 +1,9 @@
-require File.expand_path(File.dirname(__FILE__)) + '/helper'
+# frozen_string_literal: true
+
+require_relative "helper"
 require "cli_test"
 
-class CliTest < Test::Unit::TestCase
+class CliTest < Minitest::Test
   TEMP_DIR = File.expand_path(File.dirname(__FILE__) + "/tmp")
   BIN_P = File.expand_path(File.dirname(__FILE__) + "/../bin/flame_proxy_icon")
   
@@ -19,14 +21,14 @@ class CliTest < Test::Unit::TestCase
   end
   
   def test_cli_with_no_args_produces_usage
-    status, o, e = cli('')
+    status, _o, e = cli('')
     assert_equal 1, status
-    assert_match /Also use the --help option/, e
+    assert_match( /Also use the --help option/, e)
   end
   
   def test_cli_from_png
     FileUtils.cp(File.dirname(__FILE__) + "/converted_png_proxies/Kanaty.stabilizer.p.p.png", TEMP_DIR)
-    status, o, e = cli("--from-png #{TEMP_DIR}/Kanaty.stabilizer.p.p.png")
+    status, _o, e = cli("--from-png #{TEMP_DIR}/Kanaty.stabilizer.p.p.png")
     assert status.zero?, e
     assert File.exist?(TEMP_DIR + "/Kanaty.stabilizer.p.p.p")
   end
@@ -34,7 +36,7 @@ class CliTest < Test::Unit::TestCase
   def test_cli_from_p
     FileUtils.cp(File.dirname(__FILE__) + "/test_proxies/Kanaty.stabilizer.p", TEMP_DIR)
     
-    status, o, e = cli("--from-icon #{TEMP_DIR}/Kanaty.stabilizer.p")
+    status, _o, e = cli("--from-icon #{TEMP_DIR}/Kanaty.stabilizer.p")
     assert status.zero?, e
     assert File.exist?(TEMP_DIR + "/Kanaty.stabilizer.png")
   end

data/test/test_discreet_proxy.rb

@@ -1,6 +1,8 @@
-require 'helper'
+# frozen_string_literal: true
 
-class TestDiscreetProxy < Test::Unit::TestCase
+require_relative "helper"
+
+class TestDiscreetProxy < Minitest::Test
   def test_reading
     f = DiscreetProxy.from_file(File.dirname(__FILE__) + "/test_proxies/e292_v02.batch.p")
     assert_equal 126, f.width, "Width should be correct"
@@ -18,7 +20,6 @@ class TestDiscreetProxy < Test::Unit::TestCase
   def test_to_dotp
     Dir.glob(File.dirname(__FILE__) + "/test_proxies/*.p").each do | f |
       proxy = DiscreetProxy.from_file(f)
-      repl = '/tmp/%s.p' % File.basename(f)
       message = "Roundtripping #{File.basename(f)}"
       
       pixdata = proxy.to_dotp # Package up

metadata

@@ -1,72 +1,98 @@
 --- !ruby/object:Gem::Specification
 name: discreet_proxy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Julik Tarkhanov
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2026-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
-  requirement: &10672110 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10672110
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10671820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cli_test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10671820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &10671440 !ruby/object:Gem::Requirement
-    none: false
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10671440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &10671100 !ruby/object:Gem::Requirement
-    none: false
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10671100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: cli_test
-  requirement: &10670720 !ruby/object:Gem::Requirement
-    none: false
+  name: magic_frozen_string_literal
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10670720
-description: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email: me@julik.nl
 executables:
 - flame_proxy_icon
@@ -75,7 +101,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -83,6 +109,7 @@ files:
 - bin/flame_proxy_icon
 - discreet_proxy.gemspec
 - lib/discreet_proxy.rb
+- test/converted_png_proxies/AB_Halation.glsl.p.p.png
 - test/converted_png_proxies/Kanaty.stabilizer.p.p.png
 - test/converted_png_proxies/Medianize.stabilizer.p.p.png
 - test/converted_png_proxies/Ripples.glsl.p.p.png
@@ -96,6 +123,7 @@ files:
 - test/helper.rb
 - test/test_cli.rb
 - test/test_discreet_proxy.rb
+- test/test_proxies/AB_Halation.glsl.p
 - test/test_proxies/Kanaty.stabilizer.p
 - test/test_proxies/Medianize.stabilizer.p
 - test/test_proxies/Ripples.glsl.p
@@ -110,26 +138,22 @@ files:
 homepage: http://github.com/julik/discreet_proxy
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.11
-signing_key: 
-specification_version: 3
+rubygems_version: 3.6.2
+specification_version: 4
 summary: Parses and creates Flame/Smoke .p proxy icon files
 test_files: []