zsteg 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b87b97cb6004ff973d7eff77003c11e001a4400b923e7bc57217dc9f2d6677
-  data.tar.gz: 8502cb142f3f7690d82055adb9e80ef0ce10e9d66afa800be2a941057fb1e848
+  metadata.gz: b50a98cd405613a299041cc60c497f4f9a73a099e3112f44b27dee3fddf4831d
+  data.tar.gz: 8c58dd150ce32f42cc381a67592eded9c9c38e7dc0c4026642ec4773081f4bea
 SHA512:
-  metadata.gz: 03ed0d039e9df2e142493c08b6601a1b8f997bfe4f0880896e6dbf5d5892e9eef4e00744d03e8b1d06839544aac105cef108dc6e65c5189bdd50bf5e110e8ade
-  data.tar.gz: 895a2f06eb22d9fbe4bb83c1a6914efcca5d5911309774be4edbf7e627cfed5053a357725402e0897ee2e07e37b8d7178a5c84e8ac4aab3f7a1849df8aef537a
+  metadata.gz: 726aa00d6e7cc127072b7dbebe5418d668bc7d62dd119267ab05341b96d63ca71ce23cb2e2cb189e5b59cb8cbd48c09700d736b0d581b32b1feeb30a9ac3b390
+  data.tar.gz: 22811b2e9c2ffc3e4ce09aa67d3a65c7dd3636d84740b09664e80dca20d02456f5632214a7df8354affac0f9e8ffd7ccaeb466606608f3bd8e1222ca3dec34c9

data/Gemfile

@@ -1,7 +1,8 @@
 source "http://rubygems.org"
 
-gem 'zpng', ">= 0.4.3"
+gem "zpng", ">= 0.4.4"
 gem "iostruct"
+gem "prime"
 
 group :development do
   gem "rspec"

data/Gemfile.lock

@@ -30,7 +30,9 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    git (1.11.0)
+    forwardable (1.3.3)
+    git (1.13.1)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -56,24 +58,27 @@ GEM
     jwt (2.4.1)
     kamelcase (0.0.2)
       semver2 (~> 3)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
-    nokogiri (1.13.6)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    oauth2 (1.4.9)
+    oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
+    prime (0.1.2)
+      forwardable
+      singleton
     psych (4.0.4)
       stringio
     public_suffix (4.0.7)
-    racc (1.6.0)
-    rack (2.2.3.1)
+    racc (1.6.2)
+    rack (3.0.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rchardet (1.8.0)
@@ -94,9 +99,10 @@ GEM
     rspec-support (3.11.0)
     ruby2_keywords (0.0.5)
     semver2 (3.4.2)
+    singleton (0.1.1)
     stringio (3.0.2)
     thread_safe (0.3.6)
-    zpng (0.4.3)
+    zpng (0.4.4)
       rainbow (~> 3.1.1)
 
 PLATFORMS
@@ -105,8 +111,9 @@ PLATFORMS
 DEPENDENCIES
   iostruct
   juwelier
+  prime
   rspec
-  zpng (>= 0.4.3)
+  zpng (>= 0.4.4)
 
 BUNDLED WITH
    2.3.12

data/Rakefile

@@ -24,7 +24,7 @@ Juwelier::Tasks.new do |gem|
   #gem.executables = %w'zsteg'
   gem.files.include "lib/**/*.rb"
   gem.files.include "bin/*"
-  gem.files.exclude "samples/*"
+  gem.files.exclude "samples/**/*"
   # dependencies defined in Gemfile
 end
 Juwelier::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.12

data/lib/zsteg/cli/cli.rb

@@ -201,7 +201,7 @@ module ZSteg
           h[:bit_order] = :lsb
         when 'msb'
           h[:bit_order] = :msb
-        when /^(\d)b$/, /^b(\d)$/
+        when /^(\d)b$/, /^b(\d+)$/
           h[:bits] = parse_bits($1)
         when /\A[rgba]+\Z/
           h[:channels] = [x]

data/spec/spec_helper.rb

@@ -48,7 +48,7 @@ def cli *args
       ensure
         $stdout = orig_stdout
       end
-      out.strip
+      out
     end
 end
 

data/spec/zlib_spec.rb

@@ -16,7 +16,7 @@ sample("ndh2k12_sp113.bmp") do |fname|
       subject{ cli(fname, "--extract b1,rgb,lsb,yx,zlib") }
 
       it { should include "%PDF-1.4" }
-      it { subject.size.should == 202383 }
+      it { subject.size.should == 202386 }
     end
   end
 end

data/zsteg.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: zsteg 0.2.10 ruby lib
+# stub: zsteg 0.2.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "zsteg".freeze
-  s.version = "0.2.10"
+  s.version = "0.2.12"
 
   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 = "2022-06-30"
+  s.date = "2023-02-14"
   s.email = "zed.0xff@gmail.com".freeze
   s.executables = ["zsteg".freeze, "zsteg-mask".freeze, "zsteg-reflow".freeze]
   s.extra_rdoc_files = [
@@ -47,36 +47,6 @@ Gem::Specification.new do |s|
     "lib/zsteg/file_cmd.rb",
     "lib/zsteg/masker.rb",
     "lib/zsteg/result.rb",
-    "pngsteg.gemspec",
-    "samples/hackquest/crypt.bmp",
-    "samples/hackquest/square.bmp",
-    "samples/newbiecontest/alph1-surprise.bmp.7z",
-    "samples/wbstego/wbsteg_blowfish_pass_1.bmp",
-    "samples/wbstego/wbsteg_cast128_pass_1.bmp",
-    "samples/wbstego/wbsteg_enc_pass_pass.bmp",
-    "samples/wbstego/wbsteg_enc_pass_pass_even.bmp",
-    "samples/wbstego/wbsteg_mix_pass_1.bmp",
-    "samples/wbstego/wbsteg_mix_pass_1_even.bmp",
-    "samples/wbstego/wbsteg_mix_pass_foobar.bmp",
-    "samples/wbstego/wbsteg_mix_pass_pass.bmp",
-    "samples/wbstego/wbsteg_mixenc_pass_pass_even.bmp",
-    "samples/wbstego/wbsteg_noenc.bmp",
-    "samples/wbstego/wbsteg_noenc.png",
-    "samples/wbstego/wbsteg_noenc_.bmp",
-    "samples/wbstego/wbsteg_noenc_17.bmp",
-    "samples/wbstego/wbsteg_noenc__.bmp",
-    "samples/wbstego/wbsteg_noenc_even.bmp",
-    "samples/wbstego/wbsteg_noenc_even2.bmp",
-    "samples/wbstego/wbsteg_noenc_even_17.bmp",
-    "samples/wbstego/wbsteg_noenc_even_17_.bmp",
-    "samples/wbstego/wbsteg_noenc_ext_ABC.bmp",
-    "samples/wbstego/wbsteg_rijndael_pass_1.bmp",
-    "samples/wbstego/wbsteg_rijndael_pass_pass.bmp",
-    "samples/wbstego/wbsteg_rijndael_pass_pass_even.bmp",
-    "samples/wbstego/wbsteg_twofish_pass_1.bmp",
-    "samples/wechall/5ZMGcCLxpcpsru03.g00000010.png",
-    "samples/wechall/5ZMGcCLxpcpsru03.png",
-    "samples/wechall/stegano1.bmp",
     "spec/bin_spec.rb",
     "spec/camouflage_spec.rb",
     "spec/cats_spec.rb",
@@ -103,7 +73,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/zed-0xff/zsteg".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.1.6".freeze
+  s.rubygems_version = "3.3.7".freeze
   s.summary = "Detect stegano-hidden data in PNG & BMP files.".freeze
 
   if s.respond_to? :specification_version then
@@ -111,13 +81,15 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<zpng>.freeze, [">= 0.4.3"])
+    s.add_runtime_dependency(%q<zpng>.freeze, [">= 0.4.4"])
     s.add_runtime_dependency(%q<iostruct>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<prime>.freeze, [">= 0"])
     s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<zpng>.freeze, [">= 0.4.3"])
+    s.add_dependency(%q<zpng>.freeze, [">= 0.4.4"])
     s.add_dependency(%q<iostruct>.freeze, [">= 0"])
+    s.add_dependency(%q<prime>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<juwelier>.freeze, [">= 0"])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zsteg
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zpng
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: iostruct
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: prime
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -105,36 +119,6 @@ files:
 - lib/zsteg/file_cmd.rb
 - lib/zsteg/masker.rb
 - lib/zsteg/result.rb
-- pngsteg.gemspec
-- samples/hackquest/crypt.bmp
-- samples/hackquest/square.bmp
-- samples/newbiecontest/alph1-surprise.bmp.7z
-- samples/wbstego/wbsteg_blowfish_pass_1.bmp
-- samples/wbstego/wbsteg_cast128_pass_1.bmp
-- samples/wbstego/wbsteg_enc_pass_pass.bmp
-- samples/wbstego/wbsteg_enc_pass_pass_even.bmp
-- samples/wbstego/wbsteg_mix_pass_1.bmp
-- samples/wbstego/wbsteg_mix_pass_1_even.bmp
-- samples/wbstego/wbsteg_mix_pass_foobar.bmp
-- samples/wbstego/wbsteg_mix_pass_pass.bmp
-- samples/wbstego/wbsteg_mixenc_pass_pass_even.bmp
-- samples/wbstego/wbsteg_noenc.bmp
-- samples/wbstego/wbsteg_noenc.png
-- samples/wbstego/wbsteg_noenc_.bmp
-- samples/wbstego/wbsteg_noenc_17.bmp
-- samples/wbstego/wbsteg_noenc__.bmp
-- samples/wbstego/wbsteg_noenc_even.bmp
-- samples/wbstego/wbsteg_noenc_even2.bmp
-- samples/wbstego/wbsteg_noenc_even_17.bmp
-- samples/wbstego/wbsteg_noenc_even_17_.bmp
-- samples/wbstego/wbsteg_noenc_ext_ABC.bmp
-- samples/wbstego/wbsteg_rijndael_pass_1.bmp
-- samples/wbstego/wbsteg_rijndael_pass_pass.bmp
-- samples/wbstego/wbsteg_rijndael_pass_pass_even.bmp
-- samples/wbstego/wbsteg_twofish_pass_1.bmp
-- samples/wechall/5ZMGcCLxpcpsru03.g00000010.png
-- samples/wechall/5ZMGcCLxpcpsru03.png
-- samples/wechall/stegano1.bmp
 - spec/bin_spec.rb
 - spec/camouflage_spec.rb
 - spec/cats_spec.rb
@@ -177,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Detect stegano-hidden data in PNG & BMP files.

data/pngsteg.gemspec

@@ -1,65 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "pngsteg"
-  s.version = "0.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2013-01-06"
-  s.email = "zed.0xff@gmail.com"
-  s.executables = ["pngsteg"]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "Rakefile",
-    "VERSION",
-    "bin/pngsteg",
-    "lib/pngsteg.rb",
-    "lib/pngsteg/checker.rb",
-    "lib/pngsteg/cli.rb",
-    "lib/pngsteg/extractor.rb",
-    "samples/flower.png",
-    "samples/flower_rgb1.png",
-    "samples/flower_rgb2.png",
-    "samples/flower_rgb3.png",
-    "samples/flower_rgb4.png",
-    "samples/flower_rgb5.png",
-    "samples/flower_rgb6.png",
-    "spec/samples_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/zed-0xff/pngsteg"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Detect stegano-hidden data in PNG files"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<zpng>, [">= 0.2.1"])
-      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<awesome_print>, [">= 0"])
-    else
-      s.add_dependency(%q<zpng>, [">= 0.2.1"])
-      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<awesome_print>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<zpng>, [">= 0.2.1"])
-    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<awesome_print>, [">= 0"])
-  end
-end
-