zsteg 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c3df1cb23705566ae711f5916b200de58607e377ad469516e23ef5e7c593c3a
-  data.tar.gz: ee5175fbaccc64e440c8ae3f520624485c42a0ac7fe2228f8cb1bed66cc4d7fd
+  metadata.gz: cb1bb907e034ed5fc54f9febcf4cdd78f6de91af843adf94ffd03d0a8be3aac1
+  data.tar.gz: b5cf9a4fd08d72129954628dca764be23528402ad82e608f5f36f96825b1437d
 SHA512:
-  metadata.gz: bf7fabe958651053060be974ce6cbb79f15a9f09f6837e817a2329bbf2e0db063b0087e842f558e0b3888648d56d5a0f5b5c14f34ce43db2f7afecc2c338ef4b
-  data.tar.gz: 1e19798636051be8b90683e4e4efdfa758f82a0122a9573196b221026684f0620e4f354561480eb82e6756638d03ea694adf48f3f152dfa3e869ef34b20a741d
+  metadata.gz: 0f0532dd0e6e6bdce7dbdb9a769738f6964ce0033344f659b4447fe0af03ee7e128e89cfe1ab967edc6c4d65a2b836a4b3951320187444036a4260fee2bb79ff
+  data.tar.gz: 69908330b837fbbc32a3f358c478756a7341361cfce99a62922c00a0a29c6c0941396ae5785977e9d4249df1b6506ff2ae17e93ef1cbe862ae61e8e5f40715fb

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/zsteg-mask

@@ -0,0 +1,8 @@
+#!/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

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

data/lib/zsteg/cli/cli.rb

@@ -209,6 +209,8 @@ module ZSteg
           h[:order] = x
         when 'prime'
           h[:prime] = true
+        when 'zlib'
+          h[:zlib] = true
         else
           raise "uknown param #{x.inspect}"
         end
@@ -227,6 +229,8 @@ module ZSteg
         # zlib stream may contain extradata
         @img.imagedata
         @img.extradata[$1.to_i]
+      when /imagedata/
+        @img.imagedata
       else
         h = decode_param_string name
         h[:limit] = @options[:limit] if @options[:limit] != Checker::DEFAULT_LIMIT
@@ -242,7 +246,15 @@ module ZSteg
     end
 
     def extract name
-      print _extract_data(name)
+      data = _extract_data(name)
+      if name['zlib']
+        if r = Checker::Zlib.check_data(data)
+          data = r.data
+        else
+          raise "cannot decompress with zlib"
+        end
+      end
+      print data
     end
 
   end

data/spec/zlib_spec.rb

@@ -1,6 +1,22 @@
 require 'spec_helper'
 
-describe "samples/ndh2k12_sp113.bmp" do
-  subject{ cli(sample("ndh2k12_sp113.bmp"), "-o", "all") }
-  it { should include("%PDF-1.4") }
+sample("ndh2k12_sp113.bmp") do |fname|
+  describe fname do
+    subject{ cli(fname, "-o", "all") }
+    it { should include("%PDF-1.4") }
+
+    describe "--extract" do
+      subject{ cli(fname, "--extract b1,rgb,lsb,yx") }
+
+      it { should_not include "%PDF-1.4" }
+      it { subject.size.should == 546750 }
+    end
+
+    describe "--extract zlib" do
+      subject{ cli(fname, "--extract b1,rgb,lsb,yx,zlib") }
+
+      it { should include "%PDF-1.4" }
+      it { subject.size.should == 202383 }
+    end
+  end
 end

data/zsteg.gemspec

@@ -2,11 +2,11 @@
 # 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
+# stub: zsteg 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "zsteg".freeze
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zsteg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin

data/bin/zsteg-mask

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

data/bin/zsteg-reflow

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