zpng 0.2.3 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: d2b6418f5582a71d006e8b8181884884eef0d2287bded6771b6dda3abf1da3cc
+  data.tar.gz: dc6e8aa63943cbc3f505d0b8635a61c9f0c4da1fb9abd2dc655f1c3869ef7ada
+SHA512:
+  metadata.gz: 3a9063b7a4864fb7f172c17124a3aa24653a86768ba6c2c69d1daf7b3b14d646bacc199f8705dd2ca1238ad8e3397a93b86c03c11dbcd9ca525396327564c39e
+  data.tar.gz: 335c9e814b351dc42fc46ff7dbaf1ab808f16155722a9cfc0832242778d9b47efcd4c106393105e9ccd005f665d584c75032d47508435bff68013e8e3570c676

data/Gemfile

@@ -7,8 +7,9 @@ gem 'rainbow'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec",   ">= 2.8.0"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.8.4"
+  gem "rspec",   "~> 3.9.0"
+  gem "rspec-its", "~> 1.3.0"
+  gem "bundler", "~> 2.2.3"
+  gem "jeweler", "~> 2.3.9"
   gem "what_methods"
 end

data/Gemfile.lock

@@ -1,34 +1,87 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    addressable (2.4.0)
+    builder (3.2.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.4.4)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (4.1.0)
+    highline (2.0.3)
+    jeweler (2.3.9)
+      builder
+      bundler
       git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-    json (1.7.5)
-    rainbow (1.1.4)
-    rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+      semver2
+    jwt (2.2.2)
+    mime-types (2.99.3)
+    mini_portile2 (2.5.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (3.3.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    rchardet (1.8.0)
+    rdoc (6.3.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    semver2 (3.4.2)
+    thread_safe (0.3.6)
     what_methods (1.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
-  jeweler (~> 1.8.4)
+  bundler (~> 2.2.3)
+  jeweler (~> 2.3.9)
   rainbow
-  rspec (>= 2.8.0)
+  rspec (~> 3.9.0)
+  rspec-its (~> 1.3.0)
   what_methods
+
+BUNDLED WITH
+   2.2.3

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.2

data/lib/zpng/cli.rb

@@ -56,6 +56,10 @@ module ZPNG
         opts.on "-A", '--ascii', 'Try to convert image to ASCII (works best with monochrome images)' do
           @actions << :ascii
         end
+        opts.on '--ascii-string STRING', 'Use specific string to map pixels to ASCII characters' do |x|
+          @options[:ascii_string] = x
+          @actions << :ascii
+        end
         opts.on "-N", '--ansi', 'Try to display image as ANSI colored text' do
           @actions << :ansi
         end
@@ -216,7 +220,7 @@ module ZPNG
     def ascii
       @img.height.times do |y|
         @img.width.times do |x|
-          c = @img[x,y].to_ascii
+          c = @img[x,y].to_ascii *[@options[:ascii_string]].compact
           c *= 2 if @options[:wide]
           print c
         end

data/lib/zpng/string_ext.rb

@@ -1,4 +1,4 @@
-require 'rainbow'
+require 'rainbow/ext/string'
 
 class String
   [:black, :red, :green, :yellow, :blue, :magenta, :cyan, :white].each do |color|

data/lib/zpng/text_chunk.rb

@@ -2,13 +2,19 @@ module ZPNG
   class TextChunk < Chunk
     attr_accessor :keyword, :text
 
+    if RUBY_VERSION > "2.4"
+      INTEGER_CLASS = Integer
+    else
+      INTEGER_CLASS = Fixnum
+    end
+
     def inspect verbosity = 10
       vars = %w'keyword text language translated_keyword cmethod cflag'
       vars -= %w'text translated_keyword' if verbosity <=0
       super.sub(/ *>$/,'') + ", " +
         vars.map do |var|
           t = instance_variable_get("@#{var}")
-          unless t.is_a?(Fixnum)
+          unless t.is_a?(INTEGER_CLASS)
             t = t.to_s
             t = t[0..20] + "..." if t.size > 20
           end

data/spec/adam7_spec.rb

@@ -13,7 +13,8 @@ describe ZPNG::Adam7Decoder do
     }.each do |dims, slw|
       it "should be right for #{dims} image" do
         w,h = dims.split('x').map(&:to_i)
-        img = stub(:width => w, :height => h)
+        img = Object.new
+        allow(img).to receive_messages(:width => w, :height => h)
         adam7 = ZPNG::Adam7Decoder.new(img)
         slw.size.times.map{ |i| adam7.scanline_width(i) }.should == slw
       end
@@ -33,7 +34,8 @@ describe ZPNG::Adam7Decoder do
     }.each do |dims, n|
       it "should be right for #{dims} image" do
         w,h = dims.split('x').map(&:to_i)
-        img = stub(:width => w, :height => h)
+        img = Object.new
+        allow(img).to receive_messages(:width => w, :height => h)
         adam7 = ZPNG::Adam7Decoder.new(img)
         adam7.scanlines_count.should == n
       end
@@ -52,7 +54,8 @@ describe ZPNG::Adam7Decoder do
     }.each do |dims, pst|
       it "should be right for #{dims} image" do
         w,h = dims.split('x').map(&:to_i)
-        img = stub(:width => w, :height => h)
+        img = Object.new
+        allow(img).to receive_messages(:width => w, :height => h)
         adam7 = ZPNG::Adam7Decoder.new(img)
         adam7.instance_variable_get("@pass_starts").should == pst
       end

data/spec/create_image_spec.rb

@@ -33,7 +33,7 @@ describe Image do
 
   describe "new( :bpp => 16, :color => true )" do
     subject{ lambda{ _new_img(16,true) } }
-    it { should raise_exception }
+    it { should raise_exception(RuntimeError) }
   end
 
   describe "new( :bpp => 24, :color => false )" do

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
+require 'rspec/its'
 require 'zpng'
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -33,6 +34,7 @@ end
 PNGSuite.init( File.join(SAMPLES_DIR, "png_suite") )
 
 RSpec.configure do |config|
+  config.expect_with(:rspec) { |c| c.syntax = :should }
   config.before :suite do
   end
 end

data/spec/support/png_suite.rb

@@ -16,12 +16,13 @@ module PNGSuite
       end
       require 'open-uri'
       puts "[.] fetching PNG test-suite from #{PNG_SUITE_URL} .. "
-      data = open(PNG_SUITE_URL).read
+      data = URI.open(PNG_SUITE_URL).read
 
       fname = File.join(dir, "png_suite.tgz")
-      File.open(fname, "wb"){ |f| f<<data }
+      File.binwrite fname, data
       puts "[.] unpacking .. "
-      system "tar", "xzf", fname, "-C", dir
+      system "tar", "xf", fname, "-C", dir
+      raise "cannot unpack #{fname}" unless $?.success?
     end
 
     def each *prefixes

data/zpng.gemspec

@@ -2,16 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: zpng 0.3.2 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "zpng"
-  s.version = "0.2.3"
+  s.name = "zpng".freeze
+  s.version = "0.3.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2013-01-24"
-  s.email = "zed.0xff@gmail.com"
-  s.executables = ["zpng"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Andrey \"Zed\" Zaikin".freeze]
+  s.date = "2021-02-18"
+  s.email = "zed.0xff@gmail.com".freeze
+  s.executables = ["zpng".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md",
@@ -90,34 +92,29 @@ Gem::Specification.new do |s|
     "spec/support/png_suite.rb",
     "zpng.gemspec"
   ]
-  s.homepage = "http://github.com/zed-0xff/zpng"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "pure ruby PNG file manipulation & validation"
+  s.homepage = "http://github.com/zed-0xff/zpng".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.2.3".freeze
+  s.summary = "pure ruby PNG file manipulation & validation".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rainbow>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<what_methods>, [">= 0"])
-    else
-      s.add_dependency(%q<rainbow>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.8.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<what_methods>, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<rainbow>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.9.0"])
+    s.add_development_dependency(%q<rspec-its>.freeze, ["~> 1.3.0"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.2.3"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
+    s.add_development_dependency(%q<what_methods>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<rainbow>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.8.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<what_methods>, [">= 0"])
+    s.add_dependency(%q<rainbow>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.9.0"])
+    s.add_dependency(%q<rspec-its>.freeze, ["~> 1.3.0"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 2.2.3"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
+    s.add_dependency(%q<what_methods>.freeze, [">= 0"])
   end
 end
 

metadata

@@ -1,97 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: zpng
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.3.9
 - !ruby/object:Gem::Dependency
   name: what_methods
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: zed.0xff@gmail.com
 executables:
 - zpng
@@ -102,8 +105,8 @@ extra_rdoc_files:
 - README.md.tpl
 - TODO
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -175,29 +178,24 @@ files:
 homepage: http://github.com/zed-0xff/zpng
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 377147211466559287
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.2.3
+signing_key:
+specification_version: 4
 summary: pure ruby PNG file manipulation & validation
 test_files: []