archive-ar 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b8964d1e8fd25109ee84f91077e13c0f53ac20c
-  data.tar.gz: df0475465b5f32e07c048219febe4aac0c853bbe
+  metadata.gz: b4ab04343b793ea9fa4b2854f52c36fe85cd16ca
+  data.tar.gz: bd6fbfb6bfc8b808c996cde44f082fbe51863bcb
 SHA512:
-  metadata.gz: d80d25fd483e80d10d206b1f27cda4ef31e8b2b9b2e8c64b1d0fc209c76ae256eea20c3696d3351ee0ab27af354aff0c78609819ab4122981ac5f537c34dcc76
-  data.tar.gz: c20d3d7785c83f452a91acbccc89bf024eefa3bf0a6023b9a0f07c1e6db50759dd1078018a7b81c4c40172a988b0f6db42159d37fe44110fe82af2cf014f6052
+  metadata.gz: b811768447f57e58020a1cb8b26193d04c6324351295210d81fb7e89ca6db0deb3e34c2e03bcedbcac54ebe9c160bf2435b96dc4a29e555b8be2fb169e1f3648
+  data.tar.gz: 8a82fffa32cce8e4386d7d33888731309642cbe4b453b1e8f6d20ad18eb0feb65425769b8da6925447ecb82ec68390e92b91c092e3d02d5928b0f45596554b9a

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/bin/ar.rb

@@ -0,0 +1,101 @@
+#!/usr/bin/env ruby
+require 'archive/ar'
+require 'optparse'
+
+######## HACK ALERT #################
+# TODO: Make this a gem or something
+#####################################
+def short_mode(value)
+  str = "---"
+  str[0] = "r" if value & 4 == 4
+  str[1] = "w" if value & 2 == 2
+  str[2] = "x" if value & 1 == 1
+  str
+end
+
+def mode(value)
+  r = ""
+  everyone = short_mode(value)
+  value = value >> 3
+  group = short_mode(value)
+  value = value >> 3
+  owner = short_mode(value)
+  "#{owner}#{group}#{everyone}"
+end
+#####################################
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: archive-ar [options]"
+
+  opts.on("-t", "display contents of archive") do |v|
+    options[:t] = v
+  end
+
+  opts.on("-x", "extract file(s) from the archive") do |v|
+    options[:x] = v
+  end
+
+  opts.on("-p", "print file(s) found in the archive") do |v|
+    options[:p] = v
+  end
+
+  opts.on("-v", "be verbose") do |v|
+    options[:verbose] = v
+  end
+
+  opts.on("-r", "replace existing or insert new file(s) into the archive") do |v|
+    options[:r] = v
+  end
+end.parse!
+
+if options[:r]
+  raise "two different operation options specified" if options[:t]
+  raise "two different operation options specified" if options[:x]
+  raise "two different operation options specified" if options[:p]
+
+elsif options[:p]
+  raise "illegal option combination for -p" if options[:t]
+  raise "illegal option combination for -p" if options[:x]
+
+  Archive::Ar.traverse(ARGV[0]) do |header, data|
+    if options[:verbose]
+      puts
+      puts "<#{header[:name]}>"
+      puts
+    end
+    puts data
+  end
+elsif options[:t]
+  raise "illegal option combination for -t" if options[:x]
+
+  Archive::Ar.traverse(ARGV[0]) do |header, data|
+    if options[:verbose]
+      print mode(header[:mode])
+      print " "
+      og = "#{header[:owner]}/#{header[:group]}"
+      print "%10s" % og
+      print " "
+      print "%12s" % header[:size]
+      print " "
+      print header[:modified].strftime("%b %e %R %Y")
+      print " "
+      print header[:name]
+      puts
+    else
+      puts header[:name]
+    end
+  end
+elsif options[:x]
+  if options[:verbose]
+    Archive::Ar.traverse(ARGV[0]) do |header, data|
+      puts "x - #{header[:name]}"
+      Archive::Ar::Format.extract_file(Dir.pwd, header, data)
+    end
+  else
+    Archive::Ar.extract(ARGV[0], Dir.pwd)
+  end
+end
+
+#p options
+#p ARGV

data/ext/integration.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+AR_COMMAND = 'ar'
+ARCHIVE_AR_COMMAND = 'bundle exec ../bin/ar.rb'
+
+def run_test(cmd)
+  puts "Testing `ar #{cmd}`"
+  out_ar = `#{AR_COMMAND} #{cmd} 2>&1`
+  out_archive_ar = `#{ARCHIVE_AR_COMMAND} #{cmd} 2>&1`
+
+  if out_ar != out_archive_ar
+    puts " Error #{cmd}"
+    puts " Expected:"
+    out_ar.split("\n").each {|l| puts "  | #{l}"}
+    puts " Got:"
+    out_archive_ar.split("\n").each {|l| puts "  | #{l}"}
+    false
+  else
+    true
+  end
+end
+
+#run_test("-r test.ar myfile")
+run_test("-t test.ar")
+run_test("-tv test.ar")
+run_test("-p test.ar")
+run_test("-pv test.ar")
+run_test("-x test.ar")
+run_test("-xv test.ar")
+run_test("-r test.ar myfile")

data/ext/myfile

@@ -0,0 +1,35 @@
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah

data/ext/test.ar

@@ -0,0 +1,38 @@
+!<arch>
+myfile          1399173274  501   20    100644  875       `
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+blahblahblahblahblahblah
+

data/lib/archive/ar/format.rb

@@ -8,6 +8,28 @@ module Archive
           end
         end
 
+        def build_header(file)
+          header = {
+            :name => File.basename(file),
+            :modified => File.mtime(file).to_i,
+            :owner => File.stat(file).uid,
+            :group => File.stat(file).gid,
+            :mode => File.stat(file).mode,
+            :size => File.size(file),
+            :magic => "`\n"
+          }
+
+          data = ""
+          data += "%-16s" % header[:name]
+          data += "%-12s" % header[:modified]
+          data += "%-6s" % header[:owner]
+          data += "%-6s" % header[:group]
+          data += "%-8s" % header[:mode].to_s(8)
+          data += "%-10s" % header[:size]
+          data += "%2s" % header[:magic]
+          data
+        end
+
         def parse_header(data)
           h = data.unpack("A16 Z12 a6 a6 A8 Z10 Z2")
           {
@@ -44,6 +66,8 @@ module Archive
 
           File.chmod(header[:mode], file)
           #FileUtils.chown(header[:owner], header[:group], file)
+
+          true
         end
       end
     end

data/lib/archive/ar/version.rb

@@ -1,5 +1,5 @@
 module Archive
   module Ar
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/archive/ar/writer.rb

@@ -5,7 +5,24 @@ module Archive
         @filenames = filenames
       end
 
-      def write(dest_file, options)
+      def build_ar_entry(file)
+        header = Archive::Ar::Format.build_header(file)
+        data = File.read(file)
+        [header, data].join
+      end
+
+      def build_ar
+        @filenames.collect do |f|
+          build_ar_entry(f)
+        end
+      end
+
+      def write(dest_file, options = {})
+        File.open(dest_file, 'w') do |f|
+          data = build_ar.join("")
+          f.write(Archive::Ar::MAGIC)
+          f.write(data)
+        end
       end
     end
   end

data/spec/fixtures/archive.ar

@@ -0,0 +1,2 @@
+!<arch>
+file/           1399574923  1001  1001  100664  0         `

data/spec/fixtures/file

@@ -0,0 +1 @@
+test

data/spec/lib/archive/ar/format_spec.rb

@@ -20,22 +20,63 @@ describe Archive::Ar::Format do
     end
   end
 
+  describe "build_header" do
+    let(:file) { "spec/fixtures/file" }
+    let(:timestamp) { "%-12s" % File.mtime(file).to_i }
+    let(:owner) { "%-6s" % File.stat(file).uid }
+    let(:group) { "%-6s" % File.stat(file).gid }
+    let(:subject) { Archive::Ar::Format.build_header(file) }
+
+    it { should == "file            #{timestamp}#{owner}#{group}100664  5         `\n" }
+  end
+
   describe "read_header" do
     let(:read_header) { Archive::Ar::Format.read_header(io) }
-    let(:io) { StringIO.new("Filename        1399095295  1234  5678  100644  95        `\n") }
+    let(:io) { StringIO.new(payload) }
     subject { read_header }
 
-    it {
-      subject.should == {
-        :name=>"Filename",
-        :modified=>Time.parse("2014-05-02 22:34:55 -0700"),
-        :owner=>1234,
-        :group=>5678,
-        :mode=>"100644".to_i(8),
-        :start=>60,
-        :size=>95,
-        :magic=>"`\n"
+    context "normal" do
+      let(:payload) { "#1/8            1399095295  1234  5678  100644  95        `\nFilename" }
+
+      it {
+        subject.should == {
+          :name=>"Filename",
+          :modified=>Time.parse("2014-05-02 22:34:55 -0700"),
+          :owner=>1234,
+          :group=>5678,
+          :mode=>"100644".to_i(8),
+          :start=>68,
+          :size=>95,
+          :magic=>"`\n"
+        }
+      }
+    end
+
+    context "long filename" do
+      let(:payload) { "Filename        1399095295  1234  5678  100644  95        `\n" }
+
+      it {
+        subject.should == {
+          :name=>"Filename",
+          :modified=>Time.parse("2014-05-02 22:34:55 -0700"),
+          :owner=>1234,
+          :group=>5678,
+          :mode=>"100644".to_i(8),
+          :start=>60,
+          :size=>95,
+          :magic=>"`\n"
+        }
       }
-    }
+    end
+  end
+
+  describe "extract_file" do
+    let(:dest_dir) { "tmp/" }
+    let(:header) { { :name => "file", :mode => 0100644 } }
+    let(:data) { "test" }
+    let(:options) { {} }
+    subject { Archive::Ar::Format.extract_file(dest_dir, header, data, options) }
+
+    it { should == true }
   end
 end

data/spec/lib/archive/ar/reader_spec.rb

@@ -1,13 +1,42 @@
 require 'spec_helper'
 
 describe Archive::Ar::Reader do
-  let(:source) { File.open("spec/fixtures/test.ar") }
-  let(:reader) { Archive::Ar::Reader.new(source, {}) }
+  let(:options) { {} }
+  let(:source) { io }
+  let(:io) { File.open("spec/fixtures/archive.ar") }
+  let(:reader) { Archive::Ar::Reader.new(source, options) }
 
-  describe "parse" do
-    let(:source) { io }
+  describe "extract" do
+    let(:dest_dir) { "tmp/" }
     let(:options) { {} }
-    let(:reader) { Archive::Ar::Reader.new(source, options) }
+    subject { reader.extract(dest_dir, options) }
+
+    it { should == ["file"] }
+  end
+
+  describe "each" do
+    context "using IO" do
+      let(:io) { File.open("spec/fixtures/archive.ar") }
+
+      it "yields anything once" do
+        expect {|b|
+          reader.each(&b)
+        }.to yield_successive_args(anything)
+      end
+    end
+
+    context "using String" do
+      let(:io) { "spec/fixtures/archive.ar" }
+
+      it "yields anything once" do
+        expect {|b|
+          reader.each(&b)
+        }.to yield_successive_args(anything)
+      end
+    end
+  end
+
+  describe "parse" do
     subject { reader.parse(io) }
 
     context "empty" do

data/spec/lib/archive/ar/writer_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Archive::Ar::Writer do
+  let(:filenames) { [] }
+  let(:dest_file) { "tmp/test.ar" }
+  let(:writer) { Archive::Ar::Writer.new(filenames) }
+
+  describe "write" do
+    context "no files" do
+      it "works" do
+        writer.write(dest_file)
+      end
+    end
+
+    context "one file" do
+      let(:filenames) { ["spec/fixtures/file"] }
+      let(:dest_file) { "tmp/test-one.ar" }
+
+      it "works" do
+        writer.write(dest_file)
+      end
+    end
+  end
+end

data/spec/lib/archive/ar_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Archive::Ar do
+  let(:options) { {} }
+
+  describe "create" do
+    let(:dest_file) { "tmp/create.ar" }
+    let(:filenames) { ["spec/fixtures/file"] }
+    subject { Archive::Ar.create(dest_file, filenames, options) }
+
+    it { should == 65 }
+  end
+
+  describe "extract" do
+    let(:dest_dir) { "tmp/" }
+    subject { Archive::Ar.extract(source_file, dest_dir, options) }
+
+    context "archive.ar" do
+      let(:source_file) { "spec/fixtures/archive.ar" }
+
+      it { should == ["file"] }
+    end
+  end
+
+  describe "traverse" do
+    subject { Archive::Ar.traverse(source_file, options) }
+
+    context "archive.ar" do
+      let(:source_file) { "spec/fixtures/archive.ar" }
+
+      it "yields the file" do
+        expect {|b|
+          Archive::Ar.traverse(source_file, options, &b)
+        }.to yield_successive_args(anything)
+      end
+    end
+  end
+end

metadata

@@ -1,85 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: archive-ar
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Joshua B. Bussdieker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: 
 email:
 - jbussdieker@gmail.com
 executables:
-- archive-ar
+- ar.rb
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - archive-ar.gemspec
-- bin/archive-ar
+- bin/ar.rb
+- ext/integration.rb
+- ext/myfile
+- ext/test.ar
 - lib/archive/ar.rb
 - lib/archive/ar/format.rb
 - lib/archive/ar/reader.rb
 - lib/archive/ar/version.rb
 - lib/archive/ar/writer.rb
-- spec/fixtures/test-long.ar
-- spec/fixtures/test.ar
+- spec/fixtures/archive.ar
+- spec/fixtures/emptyfile
+- spec/fixtures/file
 - spec/lib/archive/ar/format_spec.rb
 - spec/lib/archive/ar/reader_spec.rb
+- spec/lib/archive/ar/writer_spec.rb
 - spec/lib/archive/ar_spec.rb
 - spec/spec_helper.rb
+- tmp/.gitkeep
 homepage: ''
 licenses:
 - MIT
@@ -90,24 +97,27 @@ 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.2.2
 signing_key: 
 specification_version: 4
 summary: Simple AR file functions
 test_files:
-- spec/fixtures/test-long.ar
-- spec/fixtures/test.ar
+- spec/fixtures/archive.ar
+- spec/fixtures/emptyfile
+- spec/fixtures/file
 - spec/lib/archive/ar/format_spec.rb
 - spec/lib/archive/ar/reader_spec.rb
+- spec/lib/archive/ar/writer_spec.rb
 - spec/lib/archive/ar_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/bin/archive-ar

@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-require 'archive/ar'
-require 'optparse'
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: archive-ar [options]"
-
-  opts.on("-t", "List the specified files in the order in which they appear in the archive, each on a
-             separate line.  If no files are specified, all files in the archive are listed.") do |v|
-    options[:t] = v
-  end
-
-  opts.on("-x", "Extract the specified archive members into the files named by the command line argu-
-             ments.  If no members are specified, all the members of the archive are extracted into
-             the current directory.
-
-             If the file does not exist, it is created; if it does exist, the owner and group will
-             be unchanged.  The file access and modification times are the time of the extraction
-             (but see the -o option).  The file permissions will be set to those of the file when
-             it was entered into the archive; this will fail if the user is not the owner of the
-             extracted file or the super-user.") do |v|
-    options[:x] = v
-  end
-
-  opts.on("-p", "Write the contents of the specified archive files to the standard output.  If no files
-             are specified, the contents of all the files in the archive are written in the order
-             they appear in the archive.") do |v|
-    options[:p] = v
-  end
-
-  opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-    options[:verbose] = v
-  end
-end.parse!
-
-if options[:p]
-  raise "illegal option combination for -p" if options[:t]
-  raise "illegal option combination for -p" if options[:x]
-
-  Archive::Ar.traverse(ARGV[0]) do |header, data|
-    if options[:verbose]
-      puts
-      puts "<#{header[:name]}>"
-      puts
-    end
-    puts data
-  end
-elsif options[:t]
-  raise "illegal option combination for -t" if options[:x]
-
-  Archive::Ar.traverse(ARGV[0]) do |header, data|
-    if options[:verbose]
-      print header[:mode].to_s(8)
-      print "\t"
-      print header[:owner]
-      print "/"
-      print header[:group]
-      print "\t"
-      print header[:size]
-      print "\t"
-      print header[:modified]
-      print "\t"
-      print header[:name]
-      puts
-    else
-      puts header[:name]
-    end
-  end
-elsif options[:x]
-  if options[:verbose]
-    Archive::Ar.traverse(ARGV[0]) do |header, data|
-      puts "x - #{header[:name]}"
-      Archive::Ar::Format.extract_file(Dir.pwd, header, data)
-    end
-  else
-    Archive::Ar.extract(ARGV[0], Dir.pwd)
-  end
-end
-
-#p options
-#p ARGV

data/spec/fixtures/test-long.ar

@@ -1,4 +0,0 @@
-!<arch>
-#1/32           1399147683  501   20    100644  43        `
-aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbtestin1234
-

data/spec/fixtures/test.ar

@@ -1,13 +0,0 @@
-!<arch>
-Pjjjjjj         1399095295  501   20    100755  95        `
-source 'https://rubygems.org'
-
-( Specify your gem's dependencies in archive-ar.gemspec
-gemspec
-
-Sjjjjjj         1399095295  502   20    100750  95        `
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in archive-ar.gemspec
-gemspec
-