pru 0.1.4 → 0.1.5

data/Readme.md

@@ -15,8 +15,18 @@ pru supports mapping and reducing.<br/><br/>
 Map works on each line as String<br/>
 Reduce works on all lines as Array<br/>
 
-    something | pru 'map' ['reduce']
-    something | pru -r 'reduce'
+    something | pru 'map'
+    something | pru 'map' 'reduce'
+    something | pru '' 'reduce'
+    something | pru --reduce 'reduce'
+
+    -r, --reduce CODE                reduce via CODE
+
+    -I, --libdir DIR                 Add DIR to load path
+        --require LIB                Require LIB (also comma-separated)
+
+    -h, --help                       Show this.
+    -v, --version                    Show Version
 
 ### Examples
 
@@ -42,7 +52,7 @@ Reduce works on all lines as Array<br/>
 
     # wc --- count lines
     ls -al | wc -l
-    ls -al | pru -r 'size'
+    ls -al | pru --reuduce 'size'
 
     # sed -- replace a 5 with five
     ls -al | sed 's/5/five/'
@@ -65,6 +75,7 @@ Authors
 ### [Contributors](http://github.com/grosser/pru/contributors)
  - [John Hobbs](http://github.com/jmhobbs)
  - [Vasiliy Ermolovich](http://github.com/nashby)
+ - [Jens Wille](http://blackwinter.de)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/pru

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'rubygems'
 require 'optparse'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
@@ -16,26 +15,37 @@ Map works on each line as String
 Reduce works on all lines as Array (optional or via -r)
 
 Usage:
-    something | pru 'map' ['reduce']
-    something | pru -r 'reduce'
+    something | pru 'map'
+    something | pru 'map' 'reduce'
+    something | pru '' 'reduce'
+    something | pru --reduce 'reduce'
 
 Options:
 BANNER
-  opts.on("-r", "--reduce S","reduce via") {|s| options[:reduce] = s }
+  opts.on("-r", "--reduce CODE","reduce via CODE") {|code| options[:reduce] = code }
+  opts.separator ''
+  opts.on('-I', '--libdir DIR', 'Add DIR to load path') { |dir| $LOAD_PATH << dir }
+  opts.on('--require LIB', 'Require LIB (also comma-separated)') { |lib|
+    begin
+      require 'rubygems'
+    rescue LoadError
+    end
+    lib.split(',').each{|l| require l }
+  }
+  opts.separator ''
   opts.on("-h", "--help","Show this.") { puts opts; exit }
   opts.on('-v', '--version','Show Version'){ puts Pru::VERSION; exit}
 end.parse!
 
+abort "Too many arguments, see --help" if ARGV.size > 2
 map, reduce = ARGV
 reduce ||= options[:reduce]
-map = nil if map and map.empty?
+map = 'true' if not map or map.empty?
 
-if map and not reduce
-  Pru.map($stdin, map){|x| puts x }
-elsif map and reduce
+if reduce
   results = []
   Pru.map($stdin, map){|x| results << x }
   puts Pru.reduce(results, reduce)
-elsif reduce
-  puts Pru.reduce($stdin.read.split("\n"), reduce)
+else
+  Pru.map($stdin, map){|x| puts x }
 end

data/lib/pru/{core_ext.rb → core_ext/array.rb}

@@ -1,5 +1,5 @@
-# http://madeofcode.com/posts/74-ruby-core-extension-array-sum
 class Array
+  # http://madeofcode.com/posts/74-ruby-core-extension-array-sum
   def sum(method = nil, &block)
     if block_given?
       raise ArgumentError, "You cannot pass a block and a method!" if method
@@ -9,13 +9,19 @@ class Array
     else
       inject(0) { |sum, i| sum + i }
     end
-  end
-  
+  end unless method_defined?(:sum)
+
   def mean(method = nil, &block)
     sum(method, &block) / size.to_f
-  end
+  end unless method_defined?(:mean)
 
   def grouped
-    group_by{|x|x}
-  end
+    group_by { |x| x }
+  end unless method_defined?(:grouped)
+
+  def group_by
+    hash = {}
+    each { |x| hash[yield(x)] = x }
+    hash
+  end unless method_defined?(:group_by)
 end

data/lib/pru/core_ext/symbol.rb

@@ -0,0 +1,5 @@
+class Symbol
+  def to_proc
+    proc { |obj, *args| obj.send(self, *args) }
+  end unless method_defined?(:to_proc)
+end

data/lib/pru.rb

@@ -1,6 +1,7 @@
-require 'pru/core_ext'
+require 'pru/core_ext/array'
+require 'pru/core_ext/symbol'
 
-class Pru
+module Pru
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
 
   def self.map(io, code)
@@ -13,13 +14,13 @@ class Pru
     i = 0
     io.each_line do |line|
       i += 1
-      result = line[0..-2]._pru(i)
-      if result == true
-        yield line
-      elsif result.is_a?(Regexp)
-        yield line if line =~ result
-      elsif result
-        yield result
+      line.chomp!
+      result = line._pru(i) or next
+
+      case result
+      when true then yield line
+      when Regexp then yield line if line =~ result
+      else yield result
       end
     end
   end

data/pru.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pru}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-04-21}
+  s.date = %q{2011-04-22}
   s.default_executable = %q{pru}
   s.email = %q{michael@grosser.it}
   s.executables = ["pru"]
@@ -21,8 +21,10 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/pru",
     "lib/pru.rb",
-    "lib/pru/core_ext.rb",
+    "lib/pru/core_ext/array.rb",
+    "lib/pru/core_ext/symbol.rb",
     "pru.gemspec",
+    "spec/a_test.rb",
     "spec/pru_spec.rb",
     "spec/spec_helper.rb",
     "spec/test.txt"
@@ -32,6 +34,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Pipeable Ruby - forget about grep / sed / awk / wc ... use pure, readable Ruby!}
   s.test_files = [
+    "spec/a_test.rb",
     "spec/pru_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/a_test.rb

@@ -0,0 +1,2 @@
+class ATest
+end

data/spec/pru_spec.rb

@@ -30,7 +30,7 @@ describe Pru do
       `echo spec/test.txt | ./bin/pru 'File.read(self)'`.should == File.read('spec/test.txt')
     end
 
-    it "can open preserves whitespaces" do
+    it "preserves whitespaces" do
       `echo ' ab\tcd ' | ./bin/pru 'self'`.should == " ab\tcd \n"
     end
 
@@ -68,4 +68,20 @@ describe Pru do
       `cat spec/test.txt | ./bin/pru '' 'size'`.should == "5\n"
     end
   end
+
+  describe '-I / --libdir' do
+    it "adds a folder to the load-path" do
+      `echo 1 | ./bin/pru -I spec --reduce 'require "a_test"; ATest.to_s'`.should == "ATest\n"
+    end
+  end
+
+  describe '--require' do
+    it "requires these libs" do
+      `echo 1 | ./bin/pru --require rake --reduce 'Rake.to_s'`.should == "Rake\n"
+    end
+
+    it "requires these libs comma-separated" do
+      `echo 1 | ./bin/pru --require jeweler,rake --reduce 'Rake.to_s + Jeweler.to_s'`.should == "RakeJeweler\n"
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pru
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 +02:00
+date: 2011-04-22 00:00:00 +02:00
 default_executable: pru
 dependencies: []
 
@@ -35,8 +35,10 @@ files:
 - VERSION
 - bin/pru
 - lib/pru.rb
-- lib/pru/core_ext.rb
+- lib/pru/core_ext/array.rb
+- lib/pru/core_ext/symbol.rb
 - pru.gemspec
+- spec/a_test.rb
 - spec/pru_spec.rb
 - spec/spec_helper.rb
 - spec/test.txt
@@ -75,5 +77,6 @@ signing_key:
 specification_version: 3
 summary: Pipeable Ruby - forget about grep / sed / awk / wc ... use pure, readable Ruby!
 test_files: 
+- spec/a_test.rb
 - spec/pru_spec.rb
 - spec/spec_helper.rb