unix_utils 0.0.10 → 0.0.11

data/CHANGELOG

@@ -1,4 +1,10 @@
-0.0.10 / 2012-14-23
+0.0.11 / 2012-05-07
+
+* Bug fixes
+
+  * Fix handling of local files by UnixUtils.curl
+
+0.0.10 / 2012-04-23
 
 * Breaking changes
 

data/README.markdown

@@ -21,11 +21,11 @@ Use a subprocess to perform a big task and then get out of memory.
 
 <table>
   <tr>
-    <td rowspan="2"><img src="https://raw.github.com/seamusabshere/unix_utils/master/unix-philosophy-cover.png" alt="cover of the Unix Philosophy book" /></td>
-    <td><img src="https://raw.github.com/seamusabshere/unix_utils/master/unix-philosophy-quote-pg1.png" alt="Tenet 2: Make Each Program Do One Thing Well. The best programs, like Cousteau's lake fly, does but one task in its life and does it well. The program is loaded into memory, accomplishes its function, and then gets out ot the way to allow" /></td>
+    <td rowspan="2"><img src="https://github.com/seamusabshere/unix_utils/raw/master/unix-philosophy-cover.png" alt="cover of the Unix Philosophy book" /></td>
+    <td><img src="https://github.com/seamusabshere/unix_utils/raw/master/unix-philosophy-quote-pg1.png" alt="Tenet 2: Make Each Program Do One Thing Well. The best programs, like Cousteau's lake fly, does but one task in its life and does it well. The program is loaded into memory, accomplishes its function, and then gets out ot the way to allow" /></td>
   </tr>
   <tr>
-    <td><img src="https://raw.github.com/seamusabshere/unix_utils/master/unix-philosophy-quote-pg2.png" alt="the next single-minded program to begin. This sounds simple, yet it may surprise you how many software developers have difficulty sticking to this singular goal." /></td>
+    <td><img src="https://github.com/seamusabshere/unix_utils/raw/master/unix-philosophy-quote-pg2.png" alt="the next single-minded program to begin. This sounds simple, yet it may surprise you how many software developers have difficulty sticking to this singular goal." /></td>
   </tr>
 </table>
 

data/lib/unix_utils.rb

@@ -12,9 +12,10 @@ module UnixUtils
 
   def self.curl(url, form_data = nil)
     outfile = tmp_path url
-    if url.start_with?('/') or url.start_with?('file://')
+    if url.start_with?('file://') or url.start_with?('/') or url.count('/') == 0
       # deal with local files
-      ::FileUtils.cp url.delete('file://'), path
+      infile = ::File.expand_path url.sub('file://', '')
+      ::FileUtils.cp infile, outfile
       return outfile
     end
     uri = ::URI.parse url
@@ -176,7 +177,12 @@ module UnixUtils
 
   def self.unix2dos(infile)
     infile = ::File.expand_path infile
-    if available?('gawk') or available?('awk')
+    if available?('unix2dos')
+      outfile = tmp_path infile
+      argv = ['unix2dos', '--force', '--newfile', infile, outfile ]
+      spawn argv
+      outfile
+    elsif available?('gawk') or available?('awk')
       awk infile, '{ sub(/\r/, ""); printf("%s\r\n", $0) }'
     else
       perl infile, 's/\r\n|\n|\r/\r\n/g'
@@ -185,7 +191,12 @@ module UnixUtils
 
   def self.dos2unix(infile)
     infile = ::File.expand_path infile
-    if available?('gawk') or available?('awk')
+    if available?('dos2unix')
+      outfile = tmp_path infile
+      argv = ['dos2unix', '--force', '--newfile', infile, outfile ]
+      spawn argv
+      outfile
+    elsif available?('gawk') or available?('awk')
       awk infile, '{ sub(/\r/, ""); printf("%s\n", $0) }'
     else
       perl infile, 's/\r\n|\n|\r/\n/g'

data/lib/unix_utils/version.rb

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

data/test/test_unix_utils.rb

@@ -32,6 +32,12 @@ describe UnixUtils do
       File.read(outfile).must_match %r{sustain}i
       safe_delete outfile
     end
+
+    it "deals safely with local files" do
+      UnixUtils.curl_s('utf8.txt').must_include 'Hola, ¿cómo estás?'
+      UnixUtils.curl_s(File.expand_path('utf8.txt')).must_include 'Hola, ¿cómo estás?'
+      UnixUtils.curl_s("file://#{File.expand_path('utf8.txt')}").must_include 'Hola, ¿cómo estás?'
+    end
   end
 
   describe :shasum do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unix_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn