arr-pm 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTNjMjFhNWE2MmQ0MDhhOWZlNjBhZDYwNzI3MzI5NTM4MTMyZTJlYQ==
-  data.tar.gz: !binary |-
-    NDllNDRiN2NhODY3ZmRhNDYxNTk5MmU4OTA4Y2FmZTA3NDhkYWZkOQ==
+SHA1:
+  metadata.gz: 60fcb2287ddbb0f718255da5beb0033d9459be16
+  data.tar.gz: 1586517c23d99e2c5dead4a45128cfd49c9ff87c
 SHA512:
-  metadata.gz: !binary |-
-    ZTAwZWViMjNkZWI4MmJmMjFhNjI2MGNiYmIyZmFjNjhkNGI4ZmQwMjU1NDY5
-    YWY4YjY5MmE2MGNmMTNkYWI0MDRiMTdmZTg0ODE4YmM5MzU3YWY0M2JjYmNl
-    NGM0ZGUzYWIwZmIzODE4ODI4MzVjMzY1NDhhYTJiNjI2NjcyN2U=
-  data.tar.gz: !binary |-
-    MWNkZWU2ODFlMmMxNzEzOTYzYzllMTIwN2Y3YjBmYTc0ZjE2M2I1YjljYWFk
-    NjFhM2VkZmVhYjNmYzIxNzE1YTZjNzFkZjExMmMzMDRjYjA2MzA2MDc3MjI3
-    N2VmYWU0YjBhZTlhM2FkZGUxMGYzMmFhMWIwZmM0MWNiMmI1NjE=
+  metadata.gz: e44130d06daa88d4b84b0c800fb54dd8ca8cb4f0b75185c98e450e6b241d30fe666e4a491c6a8113c837d162b95783dcd805c293b1af5fc0d99b2e74ad86eb30
+  data.tar.gz: 1c7b02c83d66bcc5964faeeab66b3cc179acda31225039ba60ef0e05311ab9824887830e2ee568ef7946e18d594b274e11141fde2b92eb4a3418c3b85123abd0

data/.rubocop.yml

@@ -0,0 +1,73 @@
+# Let's not argue over this...
+StringLiterals:
+  Enabled: false
+
+# I can't find a reason for raise vs fail.
+SignalException:
+  Enabled: false
+
+# I can't find a reason to prefer 'map' when 'collect' is what I mean.
+# I'm collecting things from a list. Maybe someone can help me understand the
+# semantics here.
+CollectionMethods:
+  Enabled: false
+
+# Why do you even *SEE* trailing whitespace? Because your editor was
+# misconfigured to highlight trailing whitespace, right? Maybe turn that off?
+# ;)
+TrailingWhitespace:
+  Enabled: false
+
+# Line length is another weird problem that somehow in the past 40 years of
+# computing we don't seem to have solved. It's a display problem :(
+LineLength:
+  Max: 9000
+
+# %w() vs [ "x", "y", ... ]
+# The complaint is on lib/pleaserun/detector.rb's map of OS=>Runner,
+# i'll ignore it.
+WordArray:
+  MinSize: 5
+
+# A 20-line method isn't too bad.
+MethodLength:
+  Max: 20
+
+# Hash rockets (=>) forever. Why? Not all of my hash keys are static symbols.
+HashSyntax:
+  EnforcedStyle: hash_rockets
+
+# I prefer explicit return. It makes it clear in the code that the
+# code author intended to return a value from a method.
+RedundantReturn:
+  Enabled: false
+
+# My view on a readable case statement seems to disagree with 
+# what rubocop wants and it doesn't let me configure it other than
+# enable/disable.
+CaseIndentation:
+  Enabled: false
+
+# module This::Module::Definition is good.
+Style/ClassAndModuleChildren:
+  Enabled: true
+  EnforcedStyle: compact
+
+# "in interpolation #{use.some("double quotes is ok")}"
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+# Long-block `if !something ... end` are more readable to me than `unless something ... end`
+Style/NegatedIf:
+  Enabled: false
+
+Style/NumericLiterals:
+  MinDigits: 6
+
+# This kind of style "useless use of %x" assumes code is write-once.
+Style/UnneededPercentX:
+  Enabled: false
+
+Style/FileName:
+  Enabled: false

data/Gemfile

@@ -1 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
+
+gemspec

data/Makefile

@@ -3,25 +3,6 @@ VERSION=$(shell awk -F\" '/spec.version/ { print $$2 }' $(GEMSPEC))
 NAME=$(shell awk -F\" '/spec.name/ { print $$2 }' $(GEMSPEC))
 GEM=$(NAME)-$(VERSION).gem
 
-.PHONY: test
-test:
-	sh notify-failure.sh ruby test/all.rb
-
-.PHONY: testloop
-testloop:
-	while true; do \
-		$(MAKE) test; \
-		$(MAKE) wait-for-changes; \
-	done
-
-.PHONY: serve-coverage
-serve-coverage:
-	cd coverage; python -mSimpleHTTPServer
-
-.PHONY: wait-for-changes
-wait-for-changes:
-	-inotifywait --exclude '\.swp' -e modify $$(find $(DIRS) -name '*.rb'; find $(DIRS) -type d)
-
 .PHONY: package
 package: | $(GEM)
 

data/arr-pm.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |spec|
   files = %x{git ls-files}.split("\n")
 
   spec.name = "arr-pm"
-  spec.version = "0.0.9"
+  spec.version = "0.0.10"
   spec.summary = "RPM reader and writer library"
   spec.description = "This library allows to you to read and write rpm " \
     "packages. Written in pure ruby because librpm is not available " \
@@ -16,6 +16,8 @@ Gem::Specification.new do |spec|
 
   spec.authors = ["Jordan Sissel"]
   spec.email = ["jls@semicomplete.com"]
+
+  spec.add_development_dependency "flores", ">0"
   #spec.homepage = "..."
 end
 

data/cpio.rb

@@ -0,0 +1,202 @@
+class BoundedIO
+  attr_reader :length
+  attr_reader :remaining
+
+  def initialize(io, length, &eof_callback)
+    @io = io
+    @length = length
+    @remaining = length
+
+    @eof_callback = eof_callback
+    @eof = false
+  end
+
+  def read(size=nil)
+    return nil if eof?
+    size = @remaining if size.nil?
+    data = @io.read(size)
+    @remaining -= data.bytesize
+    eof?
+    data
+  end
+
+  def sysread(size)
+    raise EOFError, "end of file reached" if eof?
+    read(size)
+  end
+
+  def eof?
+    return false if @remaining > 0
+    return @eof if @eof
+
+    @eof_callback.call
+    @eof = true
+  end
+end
+
+module CPIO
+  FIELDS = [
+    :magic, :ino, :mode, :uid, :gid, :nlink, :mtime, :filesize, :devmajor,
+    :devminor, :rdevmajor, :rdevminor, :namesize, :check
+  ]
+end
+
+class CPIO::ASCIIReader
+  FIELD_SIZES = {
+    :magic => 6,
+    :ino => 8,
+    :mode => 8,
+    :uid => 8,
+    :gid => 8,
+    :nlink => 8,
+    :mtime => 8,
+    :filesize => 8,
+    :devmajor => 8,
+    :devminor => 8,
+    :rdevmajor => 8,
+    :rdevminor => 8,
+    :namesize => 8,
+    :check => 8
+  }
+  HEADER_LENGTH = FIELD_SIZES.reduce(0) { |m, (_, v)| m + v }
+  HEADER_PACK = FIELD_SIZES.collect { |_, v| "A#{v}" }.join
+
+  FIELD_ORDER = [
+    :magic, :ino, :mode, :uid, :gid, :nlink, :mtime, :filesize, :devmajor,
+    :devminor, :rdevmajor, :rdevminor, :namesize, :check
+  ]
+
+  def initialize(io)
+    @io = io
+  end
+
+  private
+
+  def io
+    @io
+  end
+
+  def each(&block)
+    while true
+      entry = read
+      break if entry.nil?
+      # The CPIO format has the end-of-stream marker as a file called "TRAILER!!!"
+      break if entry.name == "TRAILER!!!"
+      block.call(entry, entry.file)
+      verify_correct_read(entry) unless entry.directory?
+    end
+  end
+
+  def verify_correct_read(entry)
+    # Read and throw away the whole file if not read at all.
+    entry.file.tap do |file|
+      if file.nil? ||  file.remaining == 0
+        # All OK! :)
+      elsif file.remaining == file.length
+        file.read(16384) while !file.eof?
+      else 
+        # The file was only partially read? This should be an error by the
+        # user.
+        consumed = file.length - file.remaining
+        raise BadState, "Only #{consumed} bytes were read of the #{file.length} byte file: #{entry.name}"
+      end
+    end
+  end
+
+  def read
+    entry = CPIOEntry.new
+    header = io.read(HEADER_LENGTH)
+    return nil if header.nil?
+    FIELD_ORDER.zip(header.unpack(HEADER_PACK)).each do |field, value|
+      entry.send("#{field}=", value.to_i(16))
+    end
+
+    entry.validate
+    entry.mtime = Time.at(entry.mtime)
+    read_name(entry, @io)
+    read_file(entry, @io)
+    entry
+  end
+
+  def read_name(entry, io)
+    entry.name = io.read(entry.namesize - 1) # - 1 for null terminator
+    nul = io.read(1)
+    raise ArgumentError, "Corrupt CPIO or bug? Name null terminator was not null: #{nul.inspect}" if nul != "\0"
+    padding_data = io.read(padding_name(entry))
+    # Padding should be all null bytes
+    if padding_data != ("\0" * padding_data.bytesize)
+      raise ArgumentError, "Corrupt CPIO or bug? Name null padding was #{padding_name(entry)} bytes: #{padding_data.inspect}"
+    end
+  end
+
+  def read_file(entry, io)
+    if entry.directory?
+      entry.file = nil
+      #read_file_padding(entry, io)
+      nil
+    else
+      entry.file = BoundedIO.new(io, entry.filesize) do
+        read_file_padding(entry, io)
+      end
+    end
+  end
+
+  def read_file_padding(entry, io)
+    padding_data = io.read(padding_file(entry))
+    if padding_data != ("\0" * padding_data.bytesize)
+      raise ArgumentError, "Corrupt CPIO or bug? File null padding was #{padding_file(entry)} bytes: #{padding_data.inspect}"
+    end
+  end
+
+  def padding_name(entry)
+    # name padding is padding up to a multiple of 4 after header+namesize
+    -(HEADER_LENGTH + entry.namesize) % 4
+  end
+
+  def padding_file(entry)
+    (-(HEADER_LENGTH + entry.filesize + 2) % 4)
+  end
+  public(:each)
+end
+
+class CPIOEntry
+  CPIO::FIELDS.each do |field|
+    attr_accessor field
+  end
+
+  attr_accessor :name
+  attr_accessor :file
+
+  DIRECTORY_FLAG = 0040000
+
+  def validate
+    raise "Invalid magic #{magic.inspect}" if magic != 0x070701
+    raise "Invalid ino #{ino.inspect}" if ino < 0
+    raise "Invalid mode #{mode.inspect}" if mode < 0
+    raise "Invalid uid #{uid.inspect}" if uid < 0
+    raise "Invalid gid #{gid.inspect}" if gid < 0
+    raise "Invalid nlink #{nlink.inspect}" if nlink < 0
+    raise "Invalid mtime #{mtime.inspect}" if mtime < 0
+    raise "Invalid filesize #{filesize.inspect}" if filesize < 0
+    raise "Invalid devmajor #{devmajor.inspect}" if devmajor < 0
+    raise "Invalid devminor #{devminor.inspect}" if devminor < 0
+    raise "Invalid rdevmajor #{rdevmajor.inspect}" if rdevmajor < 0
+    raise "Invalid rdevminor #{rdevminor.inspect}" if rdevminor < 0
+    raise "Invalid namesize #{namesize.inspect}" if namesize < 0
+    raise "Invalid check #{check.inspect}" if check < 0
+  end # def validate
+
+  def read(*args)
+    return nil if directory?
+    file.read(*args)
+  end
+
+  def directory?
+    mode & DIRECTORY_FLAG > 0
+  end
+end
+
+CPIO::ASCIIReader.new(STDIN).each do |entry, file|
+  puts entry.name
+  file.read unless entry.directory?
+end

data/lib/arr-pm/file.rb

@@ -177,6 +177,8 @@ class RPM::File
   def config_files
     # this stuff seems to be in the 'enum rpmfileAttrs_e' from rpm/rpmfi.h
     results = []
+    # short-circuit if there's no :fileflags tag
+    return results unless tags.include?(:fileflags)
     tags[:fileflags].each_with_index do |flag, i|
       # The :fileflags (and other :file... tags) are an array, in order of
       # files in the rpm payload, we want a list of paths of config files.

metadata

@@ -1,27 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: arr-pm
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
   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: flores
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 description: This library allows to you to read and write rpm packages. Written in
@@ -32,14 +46,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .batcave/manifest
-- .gitignore
+- ".batcave/manifest"
+- ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE
 - Makefile
 - README.md
 - arr-pm.gemspec
-- header-verify.rb
+- cpio.rb
 - lib/arr-pm.rb
 - lib/arr-pm/conflicts.rb
 - lib/arr-pm/file.rb
@@ -48,8 +63,6 @@ files:
 - lib/arr-pm/file/tag.rb
 - lib/arr-pm/namespace.rb
 - lib/arr-pm/requires.rb
-- notify-failure.sh
-- printrpm.rb
 homepage: 
 licenses:
 - Apache 2
@@ -61,19 +74,18 @@ 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.1.11
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: RPM reader and writer library
 test_files: []
-has_rdoc: 

data/header-verify.rb

@@ -1,71 +0,0 @@
-HEADER_MAGIC = "\x8e\xad\xe8\x01\x00\x00\x00\x00"
-TAG_ENTRY_SIZE = 16 # tag id, type, offset, count == 16 bytes
-
-def read_header(io)
-  # RPM 'header' section looks like:
-  #
-  # MAGIC (8 bytes) index_count (4 bytes), data_length (4 bytes )
-  #
-  # * index_count is the number of 'tags' in this header.
-  # * data_length is a blob containing all the values for the tags
-  #
-  # Header has a header of 'magic' + index_count (4 bytes) + data_length (4 bytes)
-  #p "start of header" => io.pos
-  data = io.read(16).unpack("a8NN")
-
-  # TODO(sissel): @index_count is really a count, rename?
-  @magic, @index_count, @data_length = data
-  if @magic != HEADER_MAGIC
-    puts "Magic value in header was wrong. Expected #{HEADER_MAGIC.inspect}, but got #{@magic.inspect}"
-    exit 1
-  end
-  
-  @index_size = @index_count * TAG_ENTRY_SIZE
-  tag_data = io.read(@index_size)
-  data = io.read(@data_length)
-  #p "end of header" => io.pos
-
-  (0 ... @index_count).each do |i|
-    offset = i * TAG_ENTRY_SIZE
-    entry_data = tag_data[i * TAG_ENTRY_SIZE, TAG_ENTRY_SIZE]
-    tag, tag_type, offset, count  = entry_data.unpack("NNNN")
-    if block_given?
-      yield :tag => tag, :type => tag_type, :offset => offset, :count => count
-    end
-    #entry << data
-  end # each index
-  return 16 + @index_size + @data_length
-end
-
-if ARGV.length != 1
-  puts "Usage: #{$0} blah.rpm"
-  exit 1
-end
-
-rpm = File.new(ARGV[0])
-
-# Read the 'lead' - it's mostly an ignored part of the rpm file.
-lead = rpm.read(96)
-magic, major, minor, type, archnum, name, osnum, signature_type, reserved = lead.unpack("A4CCnnA66nnA16")
-
-puts "RPM file version #{major}.#{minor} (#{signature_type == 5 ? "signed" : "unsigned"})"
-
-if signature_type == 5
-  # Read a header for the rpm signature. This has the same format as a normal
-  # rpm header
-  puts "Checking signature"
-  length = read_header(rpm) do |tag|
-    # print each tag in this header
-    p tag
-  end
-
-  # signature headers are padded up to an 8-byte boundar, details here:
-  # http://rpm.org/gitweb?p=rpm.git;a=blob;f=lib/signature.c;h=63e59c00f255a538e48cbc8b0cf3b9bd4a4dbd56;hb=HEAD#l204
-  # Throw away the pad.
-  rpm.read((length % 8))
-end
-
-# Read the rpm header
-puts "Checking header"
-read_header(rpm)
-p rpm.read(4)

data/notify-failure.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-"$@"
-status=$?
-
-if [ ! -z "$TMUX" ] ; then
-  if [ "$status" -ne 0 ] ; then
-    tmux display-message "Tests Fail"
-  else
-    tmux display-message "Tests OK"
-  fi
-fi
-
-exit $status
-

data/printrpm.rb

@@ -1,22 +0,0 @@
-$: << "lib"
-
-require "rpm/file"
-
-rpm = RPM::File.new(ARGV[0])
-
-#p rpm.lead
-rpm.signature.tags.each do |tag|
-  #p :tag => [tag.tag, tag.type, tag.count, tag.value]
-end
-
-rpm.header.tags.each do |tag|
-  #next unless tag.tag.to_s =~ /(payload|sig)/
-#  p :tag => [tag.tag, tag.type, tag.count, tag.value]
-end
-
-require "awesome_print"
-ap rpm.requires
-
-#payload = rpm.payload
-#fd = File.new("/tmp/rpm.payload", "w")
-#fd.write(rpm.payload.read)