archive-zip 0.4.0 → 0.5.0

data/NEWS

@@ -6,7 +6,18 @@ detailed information is available in the rest of the documentation.
 <b>NOTE:</b> Date stamps in the following entries are in YYYY/MM/DD format.
 
 
-== v0.4.0 (2011/??/??)
+== v0.5.0 (2012/03/01)
+
+=== Fixes
+
+* Avoid timezone discrepancies in encryption tests.
+* Moved the DOSTime class to the Archive namespace (Chris Schneider).
+
+=== Notes
+
+* Broke backward compatibility of the DOSTime class.
+
+== v0.4.0 (2011/08/29)
 
 === Features
 

data/Rakefile

@@ -75,6 +75,8 @@ PKG_FILES = FileList.new('**/*', '**/.[^.][^.]*') do |files|
   files.exclude('**/.*.sw?')
   # Exclude Git administrative files and directories.
   files.exclude(%r{(^|[/\\])\.git(ignore|modules)?([/\\]|$)})
+  # Exclude Rubunius compiled Ruby files.
+  files.exclude('**/*.rbc')
 
   # Exclude the top level pkg, doc, and examples directories and their contents.
   files.exclude(%r{^(pkg|doc|examples)([/\\]|$)})

data/lib/archive/support/time.rb

@@ -14,7 +14,7 @@ class Time
     dos_year = 0   if dos_year < 0
     dos_year = 119 if dos_year > 119
 
-    DOSTime.new(
+    Archive::DOSTime.new(
       (dos_sec       ) |
       (min      <<  5) |
       (hour     << 11) |
@@ -27,61 +27,64 @@ end
 
 # A representation of the DOS time structure which can be converted into
 # instances of Time.
-class DOSTime
-  include Comparable
+module Archive
+  class DOSTime
+    include Comparable
 
-  # Creates a new instance of DOSTime.  _dos_time_ is a 4 byte String or
-  # unsigned number (Integer) representing an MS-DOS time structure where:
-  # Bits 0-4::   2 second increments (0-29)
-  # Bits 5-10::  minutes (0-59)
-  # Bits 11-15:: hours (0-24)
-  # Bits 16-20:: day (1-31)
-  # Bits 21-24:: month (1-12)
-  # Bits 25-31:: four digit year minus 1980 (0-119)
-  #
-  # If _dos_time_ is ommitted or +nil+, a new instance is created based on the
-  # current time.
-  def initialize(dos_time = nil)
-    case dos_time
-    when nil
-      @dos_time = Time.now.to_dos_time.dos_time
-    when Integer
-      @dos_time = dos_time
-    else
-      unless dos_time.length == 4 then
-        raise ArgumentError, 'length of DOS time structure is not 4'
+    # Creates a new instance of DOSTime.  _dos_time_ is a 4 byte String or
+    # unsigned number (Integer) representing an MS-DOS time structure where:
+    # Bits 0-4::   2 second increments (0-29)
+    # Bits 5-10::  minutes (0-59)
+    # Bits 11-15:: hours (0-24)
+    # Bits 16-20:: day (1-31)
+    # Bits 21-24:: month (1-12)
+    # Bits 25-31:: four digit year minus 1980 (0-119)
+    #
+    # If _dos_time_ is ommitted or +nil+, a new instance is created based on the
+    # current time.
+    def initialize(dos_time = nil)
+      case dos_time
+      when nil
+        @dos_time = Time.now.to_dos_time.dos_time
+      when Integer
+        @dos_time = dos_time
+      else
+        unless dos_time.length == 4 then
+          raise ArgumentError, 'length of DOS time structure is not 4'
+        end
+        @dos_time = dos_time.unpack('V')[0]
       end
-      @dos_time = dos_time.unpack('V')[0]
     end
-  end
-
-  # Returns -1 if _other_ is a time earlier than this one, 0 if _other_ is the
-  # same time, and 1 if _other_ is a later time.
-  def cmp(other)
-    @dos_time <=> other.dos_time
-  end
-  alias :<=> :cmp
 
-  # Returns the time value of this object as an integer representing the DOS
-  # time structure.
-  def to_i
-    @dos_time
-  end
+    # Returns -1 if _other_ is a time earlier than this one, 0 if _other_ is the
+    # same time, and 1 if _other_ is a later time.
+    def cmp(other)
+      to_i <=> other.to_i
+    end
+    alias :<=> :cmp
 
-  # Returns a Time instance which is equivalent to the time represented by this
-  # object.
-  def to_time
-    second = ((0b11111         & @dos_time)      ) * 2
-    minute = ((0b111111  << 5  & @dos_time) >>  5)
-    hour   = ((0b11111   << 11 & @dos_time) >> 11)
-    day    = ((0b11111   << 16 & @dos_time) >> 16)
-    month  = ((0b1111    << 21 & @dos_time) >> 21)
-    year   = ((0b1111111 << 25 & @dos_time) >> 25) + 1980
-    return Time.local(year, month, day, hour, minute, second)
-  end
+    # Returns the time value of this object as an integer representing the DOS
+    # time structure.
+    def to_i
+      @dos_time
+    end
 
-  protected
+    # Returns the 32 bit integer that backs this object packed into a String in
+    # little endian format.  This is suitable for use with #new.
+    def pack
+      [to_i].pack('V')
+    end
 
-  # Used by _cmp_ to read another time stored in another DOSTime instance.
-  attr_reader :dos_time # :nodoc:
+    # Returns a Time instance which is equivalent to the time represented by
+    # this object.
+    def to_time
+      second = ((0b11111         & @dos_time)      ) * 2
+      minute = ((0b111111  << 5  & @dos_time) >>  5)
+      hour   = ((0b11111   << 11 & @dos_time) >> 11)
+      day    = ((0b11111   << 16 & @dos_time) >> 16)
+      month  = ((0b1111    << 21 & @dos_time) >> 21)
+      year   = ((0b1111111 << 25 & @dos_time) >> 25) + 1980
+      return Time.local(year, month, day, hour, minute, second)
+    end
+  end
 end

data/lib/archive/zip/codec/traditional_encryption.rb

@@ -58,13 +58,9 @@ module Archive; class Zip; module Codec
         # flipped before processing.  The new CRC value must have its bits
         # flipped as well for storage and later use.  This applies to the
         # handling of @key0 and @key2.
-        #
-        # NOTE: XOR'ing with 0xffffffff is used instead of simple bit negation
-        # in case this is run on a platform with a native integer size of
-        # something other than 32 bits.
-        @key0 = Zlib.crc32(char, @key0 ^ 0xffffffff) ^ 0xffffffff
+        @key0 = ~Zlib.crc32(char, ~@key0)
         @key1 = ((@key1 + (@key0 & 0xff)) * 134775813 + 1) & 0xffffffff
-        @key2 = Zlib.crc32((@key1 >> 24).chr, @key2 ^ 0xffffffff) ^ 0xffffffff
+        @key2 = ~Zlib.crc32((@key1 >> 24).chr, ~@key2)
         nil
       end
 
@@ -157,14 +153,13 @@ module Archive; class Zip; module Codec
 
         # Create and encrypt a 12 byte header to protect the encrypted file data
         # from attack.  The first 10 bytes are random, and the last 2 bytes are
-        # the low order word of the last modified time of the entry in DOS
-        # format.
+        # the low order word in little endian byte order of the last modified
+        # time of the entry in DOS format.
         header = ''
         10.times do
           header << rand(256).chr
         end
-        time = mtime.to_dos_time.to_i
-        header << (time & 0xff).chr << ((time >> 8) & 0xff).chr
+        header << mtime.to_dos_time.pack[0, 2]
 
         # Take care to ensure that all bytes in the header are written.
         while header.size > 0 do

data/lib/archive/zip/version.rb

@@ -2,5 +2,5 @@
 
 module Archive; class Zip
   # The current version of this gem.
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end; end

data/spec/archive/zip/codec/traditional_encryption/fixtures/classes.rb

@@ -7,7 +7,7 @@ class TraditionalEncryptionSpecs
     end
 
     def mtime
-      Time.at(0)
+      Time.local(1979, 12, 31, 18, 0, 0)
     end
 
     def encrypted_data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archive-zip
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2012-03-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-like
-  requirement: &19530420 !ruby/object:Gem::Requirement
+  requirement: &12753840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *19530420
+  version_requirements: *12753840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19529560 !ruby/object:Gem::Requirement
+  requirement: &12752440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *19529560
+  version_requirements: *12752440
 - !ruby/object:Gem::Dependency
   name: mspec
-  requirement: &19528860 !ruby/object:Gem::Requirement
+  requirement: &12750780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.5.12
   type: :development
   prerelease: false
-  version_requirements: *19528860
+  version_requirements: *12750780
 description: ! 'Archive::Zip provides a simple Ruby-esque interface to creating, extracting,
   and
 
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: archive-zip
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple, extensible, pure Ruby ZIP archive support.