zsteg 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9c404bfeb56a154e348ab6b9317d39f2ed111909
-  data.tar.gz: 4757c7c83b8cc4b7ed7ce818df237846784c9e72
+SHA256:
+  metadata.gz: 6c3df1cb23705566ae711f5916b200de58607e377ad469516e23ef5e7c593c3a
+  data.tar.gz: ee5175fbaccc64e440c8ae3f520624485c42a0ac7fe2228f8cb1bed66cc4d7fd
 SHA512:
-  metadata.gz: 5bedebed7ee62ad32d4eebdcd881ede8ac8750d85c39107138ce5ddd3532947afd7114876017191c274ae34398243f9cacaf9b949d3304d5f326ae029cd4b6d1
-  data.tar.gz: 90f91286daabad120e67ba8f1eb15c531c8f17fbc1e85e79fda39841d8ef265fac7ac5067acc23521ac016ef139bc829474427afcdb1957b266b64e6a8cc544a
+  metadata.gz: bf7fabe958651053060be974ce6cbb79f15a9f09f6837e817a2329bbf2e0db063b0087e842f558e0b3888648d56d5a0f5b5c14f34ce43db2f7afecc2c338ef4b
+  data.tar.gz: 1e19798636051be8b90683e4e4efdfa758f82a0122a9573196b221026684f0620e4f354561480eb82e6756638d03ea694adf48f3f152dfa3e869ef34b20a741d

data/Gemfile

@@ -1,10 +1,10 @@
 source "http://rubygems.org"
 
-gem 'zpng', ">= 0.2.5"
+gem 'zpng', ">= 0.3.0"
 gem "iostruct"
 
 group :development do
-  gem "rspec",   ">= 2.8.0"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.8.4"
+  gem "rspec",   "~> 3.9.0"
+  gem "bundler", "~> 2.1.4"
+  gem "jeweler", "~> 2.3.9"
 end

data/Gemfile.lock

@@ -1,66 +1,81 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
-    builder (3.2.2)
-    diff-lcs (1.1.3)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.21)
+    addressable (2.4.0)
+    builder (3.2.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.5.0)
+    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.0.0)
+    highline (2.0.3)
     iostruct (0.0.1)
-    jeweler (1.8.8)
+    jeweler (2.3.9)
       builder
-      bundler (~> 1.0)
+      bundler
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-    json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    multi_json (1.8.4)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.3)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      semver2
+    jwt (2.2.1)
+    mime-types (2.99.3)
+    mini_portile2 (2.4.0)
+    multi_json (1.14.1)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.7)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.2)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
+      rack (>= 1.2, < 3)
+    psych (3.1.0)
+    rack (2.1.1)
     rainbow (2.0.0)
-    rake (10.1.1)
-    rdoc (4.1.1)
-      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.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    zpng (0.2.5)
-      rainbow
+    rake (13.0.1)
+    rdoc (6.2.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    semver2 (3.4.2)
+    thread_safe (0.3.6)
+    zpng (0.3.0)
+      rainbow (~> 2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
+  bundler (~> 2.1.4)
   iostruct
-  jeweler (~> 1.8.4)
-  rspec (>= 2.8.0)
-  zpng (>= 0.2.5)
+  jeweler (~> 2.3.9)
+  rspec (~> 3.9.0)
+  zpng (>= 0.3.0)
+
+BUNDLED WITH
+   2.1.4

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/zsteg-mask

@@ -0,0 +1 @@
+bin/zsteg

data/bin/zsteg-reflow

@@ -0,0 +1 @@
+bin/zsteg

data/lib/zsteg/checker/scanline_checker.rb

@@ -1,3 +1,4 @@
+#coding: binary
 module ZSteg
   class Checker
     module ScanlineChecker

data/lib/zsteg/checker/wbstego.rb

@@ -1,3 +1,4 @@
+#coding: binary
 module ZSteg
   class Checker
     module WBStego

data/lib/zsteg/cli/cli.rb

@@ -124,7 +124,11 @@ module ZSteg
           @options[:verbose] -= 1
         end
         opts.on "-C", "--[no-]color", "Force (or disable) color output (default: auto)" do |x|
-          Sickill::Rainbow.enabled = x
+          if defined?(Rainbow) && Rainbow.respond_to?(:enabled=)
+            Rainbow.enabled = x
+          else
+            Sickill::Rainbow.enabled = x
+          end
         end
         opts.separator "\nPARAMS SHORTCUT\n"+
           "\tzsteg fname.png 2b,b,lsb,xy  ==>  --bits 2 --channel b --lsb --order xy"

data/lib/zsteg/cli/mask.rb

@@ -77,7 +77,11 @@ module ZSteg
           @options[:verbose] -= 1
         end
         opts.on "-C", "--[no-]color", "Force (or disable) color output (default: auto)" do |x|
-          Sickill::Rainbow.enabled = x
+          if defined?(Rainbow) && Rainbow.respond_to?(:enabled=)
+            Rainbow.enabled = x
+          else
+            Sickill::Rainbow.enabled = x
+          end
         end
       end
 

data/lib/zsteg/cli/reflow.rb

@@ -1,3 +1,4 @@
+#coding: binary
 require 'optparse'
 require 'stringio'
 require 'set'
@@ -68,7 +69,11 @@ module ZSteg
           @options[:verbose] -= 1
         end
         opts.on "-C", "--[no-]color", "Force (or disable) color output (default: auto)" do |x|
-          Sickill::Rainbow.enabled = x
+          if defined?(Rainbow) && Rainbow.respond_to?(:enabled=)
+            Rainbow.enabled = x
+          else
+            Sickill::Rainbow.enabled = x
+          end
         end
       end
 

data/lib/zsteg/extractor/byte_extractor.rb

@@ -1,3 +1,4 @@
+#coding: binary
 module ZSteg
   class Extractor
     # ByteExtractor extracts bits from each scanline bytes

data/lib/zsteg/extractor/color_extractor.rb

@@ -1,3 +1,4 @@
+#coding: binary
 module ZSteg
   class Extractor
     # ColorExtractor extracts bits from each pixel's color

data/lib/zsteg/result.rb

@@ -1,3 +1,4 @@
+#coding: binary
 module ZSteg
   module Result
 

data/spec/cats_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe "cats.png" do
   subject{ cli(sample("cats.png")) }
 
-  its(:size){ should < 4_000 }
+  it "size should be < 4k" do
+    subject.size.should < 4_000
+  end
 
   it "should get 2nd cat" do
     should include("Second cat is Marussia")

data/spec/newbiecontest_spec.rb

@@ -5,7 +5,8 @@ sample("newbiecontest/alph1-surprise.bmp") do |fname|
   describe fname do
     subject{ cli(fname) }
 
-    it { should include "PE32 executable for MS Windows" }
+    it { should include "PE32 executable" }
+    it { should include "MS Windows" }
     it { should include "is program canno" }
 
     describe "--extract" do

data/spec/polictf2012_spec.rb

@@ -7,37 +7,51 @@ sample('polictf2012_f200.bmp') do |fname|
     end
 
     describe "hidden BMP #1" do
-      subject(:data){ cli(fname, "--extract", "4b,lsb,bY") }
-      its(:size){ should == 416816 }
+      before(:all) do
+        @data = cli(fname, "--extract", "4b,lsb,bY")
+      end
+
+      it "should be 416816 bytes" do
+        @data.size.should == 416816
+      end
 
       it "should have BMP header" do
-        data[0,2].should == "BM"
+        @data[0,2].should == "BM"
       end
 
       it "should have 7zip after BMP" do
-        data.index("7z").should == 2005
+        @data.index("7z").should == 2005
       end
 
       describe "deeper" do
-        let(:tname){  File.join("tmp", File.basename(fname) + ".bmp") }
-        before(:all){ File.open(tname, "wb"){ |f| f<<data } }
+        before(:all) do
+          @tname = File.join("tmp", File.basename(fname) + ".bmp")
+          File.open(@tname, "wb"){ |f| f<<@data }
+        end
 
         it "should detect 7z & BMP" do
-          out = cli(tname)
+          out = cli(@tname)
           out.should include('7-zip archive')
           out.should include('PC bitmap, Windows 3.x format, 100 x 55 x 24')
         end
 
         describe "hidden BMP #2" do
-          subject(:data2){ cli(tname, "--extract", "2b,lsb,bY") }
-          its(:size){ should == 103875 }
+          before(:all) do
+            @data2 = cli(@tname, "--extract", "2b,lsb,bY")
+          end
+
+          it "should be 103875 bytes" do
+            @data2.size.should == 103875
+          end
 
           describe "deeper" do
-            let(:tname2){ File.join("tmp", File.basename(tname) + ".bmp") }
-            before(:all){ File.open(tname2, "wb"){ |f| f<<data2 } }
+            before(:all) do
+              @tname2 = File.join("tmp", File.basename(@tname) + ".bmp")
+              File.open(@tname2, "wb"){ |f| f<<@data2 }
+            end
 
             it "should detect text" do
-              out = cli(tname2)
+              out = cli(@tname2)
               out.should include('sticazziantanieancoraunavoltacomesefossestato')
             end
           end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+#coding: binary
 $:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 require 'zsteg'
 
@@ -19,7 +20,7 @@ def sample fname
 end
 
 def cli *args
-  @@cli_cache ||= {}
+  @cli_cache ||= {}
   args.map! do |arg|
     if arg.is_a?(String) && arg[' ']
       # split strings with spaces into arrays
@@ -29,7 +30,7 @@ def cli *args
     end
   end
   args.flatten!
-  @@cli_cache[args.inspect] ||=
+  @cli_cache[args.inspect] ||=
     begin
       klass =
         if args.first.is_a?(Symbol)
@@ -52,6 +53,7 @@ def cli *args
 end
 
 RSpec.configure do |config|
+  config.expect_with(:rspec) { |c| c.syntax = :should }
   config.before :suite do
     Dir[File.join(SAMPLES_DIR, "**", "*.7z")].each do |fname|
       next if File.exist?(fname.sub(/\.7z$/,''))

data/zsteg.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: zsteg 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "zsteg"
-  s.version = "0.1.2"
+  s.name = "zsteg".freeze
+  s.version = "0.2.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2014-03-01"
-  s.email = "zed.0xff@gmail.com"
-  s.executables = ["zsteg", "zsteg-mask", "zsteg-reflow"]
+  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 = "2020-01-14"
+  s.email = "zed.0xff@gmail.com".freeze
+  s.executables = ["zsteg".freeze, "zsteg-mask".freeze, "zsteg-reflow".freeze]
   s.extra_rdoc_files = [
     "README.md",
     "README.md.tpl",
@@ -99,34 +101,33 @@ Gem::Specification.new do |s|
     "writers/zlib_append.rb",
     "zsteg.gemspec"
   ]
-  s.homepage = "http://github.com/zed-0xff/zsteg"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
-  s.summary = "Detect stegano-hidden data in PNG & BMP files."
+  s.homepage = "http://github.com/zed-0xff/zsteg".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.7.6".freeze
+  s.summary = "Detect stegano-hidden data in PNG & BMP files.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<zpng>, [">= 0.2.5"])
-      s.add_runtime_dependency(%q<iostruct>, [">= 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_runtime_dependency(%q<zpng>.freeze, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<iostruct>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.9.0"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 2.1.4"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
     else
-      s.add_dependency(%q<zpng>, [">= 0.2.5"])
-      s.add_dependency(%q<iostruct>, [">= 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<zpng>.freeze, [">= 0.3.0"])
+      s.add_dependency(%q<iostruct>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.9.0"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 2.1.4"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
     end
   else
-    s.add_dependency(%q<zpng>, [">= 0.2.5"])
-    s.add_dependency(%q<iostruct>, [">= 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<zpng>.freeze, [">= 0.3.0"])
+    s.add_dependency(%q<iostruct>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.9.0"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 2.1.4"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
   end
 end
 

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: zsteg
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zpng
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: iostruct
   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
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.3.9
 description: 
 email: zed.0xff@gmail.com
 executables:
@@ -182,17 +182,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Detect stegano-hidden data in PNG & BMP files.

data/bin/zsteg-mask

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-base = File.expand_path('../lib', File.dirname(__FILE__))
-$:.unshift(base)
-
-require File.join(base, 'zsteg')
-
-ZSteg::CLI.run

data/bin/zsteg-reflow

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-base = File.expand_path('../lib', File.dirname(__FILE__))
-$:.unshift(base)
-
-require File.join(base, 'zsteg')
-
-ZSteg::CLI.run