unix_utils 0.0.9 → 0.0.10

data/{History.txt → CHANGELOG}

@@ -1,28 +1,39 @@
-== 0.0.9 / 2012-04-12
+0.0.10 / 2012-14-23
+
+* Breaking changes
+
+  * Added UnixUtils.du_sk, which always returns bytes; removed UnixUtils.du, which returned block counts, which I doubt you wanted.
+
+* Enhancements
+
+  * If you call a method with _s at the end, you get a string back. For example: UnixUtils.head_s
+  * UnixUtils.tmp_path no longer junks up tmp paths with lots of "unix_utils_RANDOMSTRING"
+
+0.0.9 / 2012-04-12
 
 * Bug fixes
 
   * Correct implementation of :read_from
 
-== 0.0.8 / 2012-04-12
+0.0.8 / 2012-04-12
 
 * Bug fixes
 
   * Let perl handle its own input files (ARGF)... my implementation using IO.select was not working.
 
-== 0.0.7 / 2012-04-11
+0.0.7 / 2012-04-11
 
 * Bug fixes
 
   * Make sure UnixUtils.tmp_path doesn't create too-long filenames
 
-== 0.0.6 / 2012-04-11
+0.0.6 / 2012-04-11
 
 * Enhancements
 
   * iconv command silently discards invalid characters
 
-== 0.0.5 / 2012-03-21
+0.0.5 / 2012-03-21
 
 * Enhancements
 
@@ -32,13 +43,13 @@
 
   * Thanks to @leomao10, make sed work more reliably on large files by using its input-file argument rather than piping in data
 
-== 0.0.4 / 2012-03-19
+0.0.4 / 2012-03-19
 
 * Bug fixes
 
   * NoMethodError when trying to print $stderr - thanks @leomao10 !
 
-== 0.0.3 / 2012-03-19
+0.0.3 / 2012-03-19
 
 * Enhancements
 
@@ -49,12 +60,12 @@
 
   * Correctly use pipes (I hope) - imitate POSIX::Spawn::Child's use of IO.select
 
-== 0.0.2 / 2012-02-16
+0.0.2 / 2012-02-16
 
 * Bug fixes
 
   * Fix use of splat internally so that it actually runs in MRI 1.8.7 and JRuby
 
-== 0.0.1 / 2012-02-16 (yanked!)
+0.0.1 / 2012-02-16 (yanked!)
 
 * Birthday!

data/README.markdown

@@ -4,11 +4,16 @@ Like FileUtils, but provides zip, unzip, bzip2, bunzip2, tar, untar, sed, du, md
 
 Works in MRI 1.8.7+, MRI 1.9.2+, and JRuby 1.6.7+
 
-## Where it's used
+## Real-world usage
 
-* [Brighter Planet CM1 Impact Estimate web service](http://impact.brighterplanet.com)
-* [Brighter Planet Reference Data web service](http://data.brighterplanet.com)
-* Extracted from [`remote_table`](https://github.com/seamusabshere/remote_table)
+<p><a href="http://brighterplanet.com"><img src="https://s3.amazonaws.com/static.brighterplanet.com/assets/logos/flush-left/inline/green/rasterized/brighter_planet-160-transparent.png" alt="Brighter Planet logo"/></a></p>
+
+We use `unix_utils` for [data science at Brighter Planet](http://brighterplanet.com/research) and in production at
+
+* [Brighter Planet's impact estimate web service](http://impact.brighterplanet.com)
+* [Brighter Planet's reference data web service](http://data.brighterplanet.com)
+
+Originally extracted from [`remote_table`](https://github.com/seamusabshere/remote_table)
 
 ## Philosophy
 

data/lib/unix_utils.rb

@@ -3,7 +3,7 @@ require 'tmpdir'
 require 'uri'
 require 'stringio'
 require 'posix/spawn'
-
+require 'securerandom'
 require "unix_utils/version"
 
 module UnixUtils
@@ -70,9 +70,9 @@ module UnixUtils
     end
   end
 
-  def self.du(srcdir)
+  def self.du_sk(srcdir)
     srcdir = ::File.expand_path srcdir
-    argv = ['du', srcdir]
+    argv = ['du', '-sk', srcdir]
     stdout = spawn argv
     stdout.strip.split(/\s+/).first.to_i
   end
@@ -245,10 +245,9 @@ module UnixUtils
   def self.tmp_path(ancestor, extname = nil) # :nodoc:
     ancestor = ancestor.to_s
     extname ||= ::File.extname ancestor
-    basename = ::File.basename ancestor.sub(/^unix_utils-[0-9]+-/, '')
+    basename = ::File.basename ancestor.gsub(/unix_utils_[a-f0-9]{8,}_/, '')
     basename.gsub! /\W+/, '_'
-    ::Kernel.srand
-    ::File.join ::Dir.tmpdir, "unix_utils-#{::Kernel.rand(1e11)}-#{basename[0..(231-extname.length)]}#{extname}"
+    ::File.join ::Dir.tmpdir, "unix_utils_#{::SecureRandom.hex(4)}_#{basename[0..(234-extname.length)]}#{extname}"
   end
 
   def self.spawn(argv, options = {}) # :nodoc:
@@ -324,4 +323,18 @@ module UnixUtils
   ensure
     [stdin, stdout, stderr, input, output, error].each { |io| io.close if io and not io.closed? }
   end
+
+  def self.method_missing(method_id, *args)
+    base_method_id = method_id.to_s.chomp('_s')
+    if respond_to?(base_method_id)
+      begin
+        outfile = send(*([base_method_id]+args))
+        ::File.read outfile
+      ensure
+        ::FileUtils.rm_f outfile
+      end
+    else
+      super
+    end
+  end
 end

data/lib/unix_utils/version.rb

@@ -1,3 +1,3 @@
 module UnixUtils
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/test/helper.rb

@@ -7,8 +7,6 @@ require 'minitest/reporters'
 MiniTest::Unit.runner = MiniTest::SuiteRunner.new
 MiniTest::Unit.runner.reporters << MiniTest::Reporters::SpecReporter.new
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'unix_utils'
 
 require 'stringio'
@@ -25,7 +23,7 @@ module TestHelper
     when :file
       checksum = UnixUtils.shasum infile_or_srcdir, 256
     when :directory
-      size = UnixUtils.du infile_or_srcdir
+      size = UnixUtils.du_sk infile_or_srcdir
     end
     destdir = UnixUtils.send(*([method_id] + args))
     safe_delete destdir
@@ -34,7 +32,7 @@ module TestHelper
     when :file
       UnixUtils.shasum(infile_or_srcdir, 256).must_equal checksum
     when :directory
-      UnixUtils.du(infile_or_srcdir).must_equal size
+      UnixUtils.du_sk(infile_or_srcdir).must_equal size
     end
   end
 

data/test/test_unix_utils.rb

@@ -55,9 +55,9 @@ describe UnixUtils do
     end
   end
 
-  describe :du do
+  describe :du_sk do
     it "calculates the size of a directory in bytes" do
-      UnixUtils.du('directory').must_equal 16
+      UnixUtils.du_sk('directory').must_equal 8
     end
   end
 
@@ -342,6 +342,10 @@ describe UnixUtils do
       File.read(outfile).must_equal @a2z[2..-1].join("\n")
       safe_delete outfile
     end
+    it 'has a related tail_s method' do
+      str = UnixUtils.tail_s(@infile, 3)
+      str.must_equal @a2z.last(3).join("\n")
+    end
   end
 
   describe :head do
@@ -360,6 +364,10 @@ describe UnixUtils do
       File.read(outfile).must_equal(@a2z.first(3).join("\n") + "\n")
       safe_delete outfile
     end
+    it 'has a related head_s method' do
+      str = UnixUtils.head_s(@infile, 3)
+      str.must_equal(@a2z.first(3).join("\n") + "\n")
+    end
   end
 
   describe :cut do
@@ -413,11 +421,23 @@ describe UnixUtils do
       File.extname(UnixUtils.tmp_path("dirname1/dirname2/basename.extname", '.foobar')).must_equal '.foobar'
     end
     it "doesn't create excessively long filenames" do
-      100.times { File.basename(UnixUtils.tmp_path("a"*5000)).length.must_be :<, 256 }
+      100.times { File.basename(UnixUtils.tmp_path("a"*5000)).length.must_equal(255) }
     end
     it "doesn't include directory part of ancestor" do
       UnixUtils.tmp_path("dirname1/dirname2/basename.extname").wont_include 'dirname1'
     end
+    it "includes unix_utils part only once" do
+      one = UnixUtils.tmp_path('basename.extname')
+      File.basename(one).start_with?('unix_utils').must_equal true
+      one.scan(/unix_utils/).length.must_equal 1
+      again = UnixUtils.tmp_path(one)
+      File.basename(again).start_with?('unix_utils').must_equal true
+      again.scan(/unix_utils/).length.must_equal 1
+      and_again = UnixUtils.tmp_path(again)
+      File.basename(and_again).start_with?('unix_utils').must_equal true
+      and_again.scan(/unix_utils/).length.must_equal 1
+      and_again.must_include('basename_extname')
+    end
   end
 
   # not really for public consumption

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unix_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -37,8 +37,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG
 - Gemfile
-- History.txt
 - README.markdown
 - Rakefile
 - lib/unix_utils.rb