pru 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819c391f98a1c8d622a34b5e95e7eb6d1770da78
-  data.tar.gz: 65e0fa9c0f8a8651d903b01ecb35a87173fa6115
+  metadata.gz: d7ab83319d415eed24a2650913be76d27c0652a1
+  data.tar.gz: 69d39153bc5388450fb4125e6d66513740e81273
 SHA512:
-  metadata.gz: 283aea062a69167b5f611bd68d936c4ba174a21fea05a5103e72096f4cd5726d075a18175ba9b260aa4afa0c759f5a7cab64c7e08b67dd87abf797f46ac2ff80
-  data.tar.gz: eb42663ead626b3108ec357a8d0fe26f49acd22b0cc07f0994f3cb47ce72b14c9db4cbe23fa6ece2a81ca0e7c0126dfc8643101a2ab57c37c2f73b53b1a5d97f
+  metadata.gz: f21fbb6b7a9925e65176555fe73b732f9708c32dbc202d83555542b710f14ef92bbc6543edb1f0d0b1f21fc38b4f2dbea05c1189a85353e3a49fc0bd74b70d00
+  data.tar.gz: 8c10b8fdd4a47e024c603729b6d5b6b260f0402c4c71e1e0c7fa2f0182c68ca50f4adfee06f389d4bdcfc4b3da2f9d937897b00bf67831ec83bc0b581c528133

data/bin/pru

@@ -1,39 +1,36 @@
 #!/usr/bin/env ruby
 require 'optparse'
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+# enable local usage from cloned repo
+root = File.expand_path("../..", __FILE__)
+$LOAD_PATH << "#{root}/lib" if File.exist?("#{root}/Gemfile")
+
 require 'pru'
 
 usage = nil
 options = {}
 
 OptionParser.new do |opts|
-  opts.banner = <<BANNER
-Pipeable Ruby
+  opts.banner = <<-BANNER.gsub(/^    /, "")
+    Pipeable Ruby
 
-Use ruby in your pipes, forget about grep / sed / awk / wc ...
+    Use ruby in your pipes, forget about grep / sed / awk / wc ...
 
-Map works on each line as String
-Reduce works on all lines as Array (optional or via -r)
+    Map works on each line as String
+    Reduce works on all lines as Array (optional or via -r)
 
-Usage:
-    something | pru 'map'
-    something | pru 'map' 'reduce'
-    something | pru '' 'reduce'
-    something | pru --reduce 'reduce'
+    Usage:
+        something | pru 'map'
+        something | pru 'map' 'reduce'
+        something | pru '' 'reduce'
+        something | pru --reduce 'reduce'
 
-Options:
-BANNER
+    Options:
+  BANNER
   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.on('--require LIB', 'Require LIB (also comma-separated)') { |lib| lib.split(',').each{|l| require l } }
   opts.on('-i', '--inplace-edit FILE', 'Edit FILE inplace') { |file| options[:file] = file }
   opts.separator ''
   opts.on("-h", "--help","Show this.") { puts opts; exit }
@@ -41,7 +38,7 @@ BANNER
   usage = opts
 end.parse!
 
-if ARGV.empty? and options.empty? # no arguments -> show usage
+if ARGV.empty? && options.empty? # no arguments -> show usage
   puts usage
   exit
 end
@@ -50,28 +47,31 @@ abort "Too many arguments, see --help" if ARGV.size > 2
 
 map, reduce = ARGV
 reduce ||= options[:reduce]
-map = 'true' if not map or map.empty?
+map = 'true' if !map || map.empty?
 
 if options[:file]
   output_lines = []
   input = File.read(options[:file])
   newline = input[/\r\n|\r|\n/]
+  trailing_newline = (input =~ /#{newline}\Z/)
 else
   input = $stdin
 end
 
-collector = lambda{|line|
+collector = lambda do |line|
   output_lines ? output_lines << line : puts(line)
-}
+end
 
 if reduce
   results = []
-  Pru.map(input, map){|out| results << out }
+  Pru.map(input, map) { |out| results << out }
   collector.call Pru.reduce(results, reduce)
 else
-  Pru.map(input, map){|out| collector.call out }
+  Pru.map(input, map) { |out| collector.call out }
 end
 
 if options[:file]
-  File.open(options[:file], 'w'){|f| f.write output_lines.join(newline) }
+  content = output_lines.join(newline)
+  content << newline if trailing_newline
+  File.write options[:file], content
 end

data/lib/pru.rb

@@ -1,5 +1,4 @@
 require 'pru/core_ext/array'
-require 'pru/core_ext/symbol'
 
 module Pru
   class << self

data/lib/pru/core_ext/array.rb

@@ -22,10 +22,4 @@ class Array
   def counted
     grouped.sort_by{|d, f| -1 * f.size }.map{|d, f| "#{d} : #{f.size}" }
   end unless method_defined?(:counted)
-
-  def group_by
-    hash = {}
-    each { |x| hash[yield(x)] = x }
-    hash
-  end unless method_defined?(:group_by)
 end

data/lib/pru/version.rb

@@ -1,3 +1,3 @@
 module Pru
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pru
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -20,7 +20,6 @@ files:
 - bin/pru
 - lib/pru.rb
 - lib/pru/core_ext/array.rb
-- lib/pru/core_ext/symbol.rb
 - lib/pru/version.rb
 homepage: https://github.com/grosser/pru
 licenses:
@@ -34,7 +33,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -42,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pipeable Ruby - forget about grep / sed / awk / wc ... use pure, readable

data/lib/pru/core_ext/symbol.rb

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