epitools 0.5.12 → 0.5.13

data/VERSION

@@ -1 +1 @@
-0.5.12
+0.5.13

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "epitools"
-  s.version = "0.5.12"
+  s.version = "0.5.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = "2012-11-07"
+  s.date = "2012-11-13"
   s.description = "Miscellaneous utility libraries to make my life easier."
   s.email = "chris@ill-logic.com"
   s.extra_rdoc_files = [

data/lib/epitools/core_ext/numbers.rb

@@ -99,6 +99,29 @@ class Numeric
     Math.log(self, n)
   end
 
+
+  BYTE_SIZE_TABLE = {
+    # power    # units
+    0          => "",
+    1          => "KB",
+    2          => "MB",
+    3          => "GB",
+    4          => "TB",
+    5          => "PB",
+    6          => "EB",
+    7          => "ZB",
+    8          => "YB",
+  }
+
+  def human_bytes(decimals=0)
+    power = self.log(1024).floor
+    base  = 1024.0 ** power
+    units = BYTE_SIZE_TABLE[power]
+    "#{(self / base).round(decimals)}#{units}"
+  end
+
+  alias_method :human_size, :human_bytes
+
 end
 
 

data/lib/epitools/core_ext/object.rb

@@ -44,55 +44,6 @@ class Object
     end
   end
   
-  #
-  # Turns block-accepting iterator methods (eg: each) into methods that return an
-  # Enumerator when they're called called without a block.
-  #
-  # It can transform many methods at once (eg: `enumerable :each, :all_people`).
-  #
-  # Example:
-  #
-  #   def lots_of_stuff
-  #     @stuff.each { |thing| yield thing }
-  #   end
-  #
-  #   enumerable :lots_of_stuff
-  #
-  # Now you can use it like an Enumerator: object.lots_of_stuff.with_index.sort.zip(99..1000)
-  #
-  def self.enumerable *meths
-    meths.each do |meth|
-      alias_method "#{meth}_without_enumerator", meth
-      class_eval %{
-        def #{meth}(*args, &block)
-          return Enum.new(self, #{meth.inspect}, *args, &block) unless block_given?
-          #{meth}_without_enumerator(*args, &block)
-        end
-      }
-    end
-  end
-  alias_class_method :enumerator, :enumerable
-
-  #
-  # Instead of:
-  #   if cookie_jar.include? cookie
-  # Now you can do:
-  #   if cookie.in? cookie_jar
-  #
-  def in?(enum)
-    enum.include? self
-  end
-
-  #
-  # Instead of:
-  #   @person ? @person.name : nil
-  # Now you can do:
-  #   @person.try(:name)
-  #
-  def try(method, *args, &block)
-    send(method, *args, &block) if respond_to? method
-  end
-
   #
   # Serialize this object to a binary String, using Marshal.dump.
   #

data/lib/epitools/minimal.rb

@@ -100,6 +100,55 @@ class Object
     metaclass.send(:alias_method, dest, src)
   end
 
+  #
+  # Turns block-accepting iterator methods (eg: each) into methods that return an
+  # Enumerator when they're called called without a block.
+  #
+  # It can transform many methods at once (eg: `enumerable :each, :all_people`).
+  #
+  # Example:
+  #
+  #   def lots_of_stuff
+  #     @stuff.each { |thing| yield thing }
+  #   end
+  #
+  #   enumerable :lots_of_stuff
+  #
+  # Now you can use it like an Enumerator: object.lots_of_stuff.with_index.sort.zip(99..1000)
+  #
+  def self.enumerable *meths
+    meths.each do |meth|
+      alias_method "#{meth}_without_enumerator", meth
+      class_eval %{
+        def #{meth}(*args, &block)
+          return Enum.new(self, #{meth.inspect}, *args, &block) unless block_given?
+          #{meth}_without_enumerator(*args, &block)
+        end
+      }
+    end
+  end
+  alias_class_method :enumerator, :enumerable
+
+  #
+  # Instead of:
+  #   if cookie_jar.include? cookie
+  # Now you can do:
+  #   if cookie.in? cookie_jar
+  #
+  def in?(enum)
+    enum.include? self
+  end
+
+  #
+  # Instead of:
+  #   @person ? @person.name : nil
+  # Now you can do:
+  #   @person.try(:name)
+  #
+  def try(method, *args, &block)
+    send(method, *args, &block) if respond_to? method
+  end
+
 end
 
 #

data/lib/epitools/term.rb

@@ -1,11 +1,24 @@
 #require 'epitools'
 
+require 'epitools/minimal'
+require 'epitools/core_ext/string'
+require 'io/console'
+
 #
 # Example usage:
 #   puts Term::Table[ (1..100).to_a ].horizontally #=> prints all the numbers, ordered across rows
 #   puts Term::Table[ (1..100).to_a ].vertically #=> prints all the numbers, ordered across columns
 #   puts Term::Table[ [[1,2], [3,4]] ] #=> prints the table that was supplied
 #
+#   Term::Table.new do |t|
+#     t.row [...]
+#     t.rows[5] = [...]
+#     t.rows << [...]
+#     t.col []
+#   end.to_s
+#
+#   table.compact.to_s #=> minimize the table's columns
+#
 module Term
 
   extend self
@@ -16,10 +29,7 @@ module Term
   # Return the [width,height] of the terminal.
   #
   def size
-    Curses.init_screen
-    result = [Curses.cols, Curses.lines]
-    Curses.close_screen
-    result
+    STDIN.winsize.reverse
   end
 
   def width;  size[0]; end
@@ -52,7 +62,7 @@ module Term
     #   eg: Table.new(elements, :sort=>:vertical).to_s
     #
 
-    attr_accessor :border, :columns, :padding, :strip_color, :indent
+    attr_accessor :border, :columns, :padding, :strip_color, :indent, :width, :height
 
     def self.[](data)
       self.new(data)
@@ -72,13 +82,16 @@ module Term
       @border   = options[:border]
       @columns  = options[:columns]
       @padding  = options[:padding] || 1
+
+      # Update the terminal size
+      @width, @height = Term.size
     end
 
     def num_columns
       return @columns if @columns
-      width, height = Term.size
-      width -= indent
-      (width-2) / (@max_size + @padding)
+      w = @width
+      w -= indent
+      (w-2) / (@max_size + @padding)
     end
 
     def num_rows

data/lib/epitools/wm.rb

@@ -363,16 +363,16 @@ module WM
       temp   = Tempfile.new("xse")
       events = keys_to_events(keys)
 
-      p events
-      p eventstring = events.map { |e| e + "\n" }.join("")
+      # p events
+      eventstring = events.map { |e| e + "\n" }.join("")
 
       temp.write eventstring 
       temp.flush
       temp.seek 0
-      p [:temp, temp.read]
+      # p [:temp, temp.read]
 
       cmd = "xse", "-window", window_id, "-file", temp.path
-      p [:cmd, cmd]
+      # p [:cmd, cmd]
       unless system(*cmd)
         raise "Error: couldn't send key commands to 'xse'. (Is xsendevents installed?)"
       end

data/spec/core_ext_spec.rb

@@ -165,6 +165,13 @@ describe Numeric do
     (2**(4212.log(2))).round.should == 4212.0
   end
 
+  it "human_sizes" do
+    1024.human_size.should == "1KB"
+    23984.human_size.should == "23KB"
+    12983128.human_size.should == "12MB"
+    32583128.human_size(2).should == "31.07MB"
+  end
+
 end
 
 describe String do

data/spec/term_spec.rb

@@ -16,6 +16,8 @@ describe Term do
     #puts table.by_columns :border=>true
     #puts "rows"
     #puts table.by_rows 
+    puts table.by_rows
+
     table.by_columns.should_not be_nil
     table.by_rows.should_not be_nil
 
@@ -23,6 +25,7 @@ describe Term do
     
     table.by_columns.should_not be_nil
     table.by_rows.should_not be_nil
+
   end
   
   it "tables nothing" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec