rmtools 1.2.2d → 1.2.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'lib/rmtools/install'
 compile_manifest
 
-RMTOOLS_VERSION = '1.2.2d'
+RMTOOLS_VERSION = '1.2.3'
 begin
     require 'hoe'
     config = Hoe.spec 'rmtools' do

data/lib/rmtools/console/printing.rb

@@ -54,4 +54,5 @@ module RMTools
     print %W{|\b /\b -\b \\\b +\b X\b}.rand
   end
     
+  module_function :tick!
 end

data/lib/rmtools/dev/code_reader.rb

@@ -475,9 +475,9 @@ module RMTools
         lines = path.sharp_split(/\n/)
       end
       if RUBY_VERSION > '1.9'
-        ss = StringScanner lines.join.force_encoding('UTF-8')
+        ss = StringScanner.new lines.join.force_encoding('UTF-8')
       else
-        ss = StringScanner lines.join
+        ss = StringScanner.new lines.join
       end
       
       @curls_count = 0

data/lib/rmtools/dev/present.rb

@@ -26,7 +26,7 @@ class Array
     opts = {:max_cols => Inf, :padding => 0}.merge opts
     return inspect unless cols = ENV['COLUMNS']
     cols = cols.to_i
-    cell_size = map {|e| e.inspect.size}.max + opts[:padding]*2
+    cell_size = map {|e| e.inspect.csize}.max + opts[:padding]*2
     if n = [(1..cols/2).max {|i| i*(cell_size+1) < cols}, opts[:max_cols]].min
       table = div(n)
       border = '+'+('-'*cell_size+'+')*n
@@ -36,7 +36,7 @@ class Array
         border : 
         '+'+('-'*cell_size+'+')*table.last.size + '-'*((cell_size+1)*(n-table.last.size)-1) + '+'
       table.map {|rows| 
-        str = '|'+rows.map {|cell| cell.inspect.center(cell_size)}*'|'+'|'
+        str = '|'+rows.map {|cell| cell.inspect.ccenter(cell_size)}*'|'+'|'
         str << ' '*((cell_size+1)*(n-rows.size)-1)+'|' if rows.size < n
         border + str + ("\n" if need_lb)
       }.join + last_border

data/lib/rmtools/dev/trace_format.rb

@@ -29,13 +29,13 @@ module RMTools
     while i < a.size
       m2 = a[i+1] && a[i+1].parse(:caller)
       m2.line -= 1 if m2 and m2.file =~ /\.haml$/
-      if m.path =~ IgnoreFiles
-        nil
+      if !m or m.path =~ IgnoreFiles
+          nil
       elsif m and m.func and m2 and [m.path, m.line] == [m2.path, m2.line]
-        calls << " -> `#{m.func}'"
+          calls << " -> `#{m.func}'"
       elsif m and m.line != 0 and line = RMTools.highlighted_line(m.path, m.line)
-        bt << "#{a[i]}#{calls.join}\n#{line}"
-        calls = []
+          bt << "#{a[i]}#{calls.join}\n#{line}"
+          calls = []
       else bt << a[i]
       end
       i += 1

data/lib/rmtools/enumerable/array.rb

@@ -93,6 +93,10 @@ class Array
     !find {|e| yield(e)}
   end
   
+  def find_by(key, value)
+    find {|e| e.__send__(key) == value}
+  end
+  
   # concatenation  
   # analogue to String#>>
   def >>(ary)

data/lib/rmtools/enumerable/array_iterators.rb

@@ -18,13 +18,15 @@ unless defined? RMTools::Iterators
     
     def method_missing(method, *args, &block)
       if match = (meth = method.to_s).match(RMTools::Iterators)
-        iterator, meth = match[1], match[2].to_sym
+        iterator, meth = match[1].to_sym, match[2].to_sym
         begin
           iterator = :every? if iterator == :every
           iterator = :no? if iterator == :no
-          return iterator == :sum ?
-            __send__(iterator, args.shift) {|i| i.__send__ meth, *args, &block}: 
-            __send__(iterator) {|i| i.__send__ meth, *args, &block}
+          return case iterator
+            when :sum;     sum(args.shift) {|i| i.__send__ meth, *args, &block}
+            when :find_by; find_by(meth, *args)
+            else __send__(iterator) {|i| i.__send__ meth, *args, &block}
+            end
         rescue NoMethodError => e
           e.message << " (`#{method}' interpreted as decorator-function `#{meth}')"
           raise e

data/lib/rmtools/fs/file.rb

@@ -55,7 +55,7 @@ class File
   def mv(df)
     dir = File.dirname df
     FileUtils.mkpath dir unless File.directory? dir
-    rename df
+    File.rename path, df
   end
   
   # Fixing windoze path problems

data/lib/rmtools/lang/cyrillic.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-RMTools::require 'lang/ansi'
+RMTools::require 'lang/helpers'
 
 class String
   include RMTools::Cyrillic
@@ -65,9 +65,29 @@ class String
         ANSI2UTF[UTF2ANSI[self].tr(*ANSI_YOYE)]:
         tr(*ANSI_YOYE)
     end
-    
+      
+    alias csize size    
+    alias cljust ljust    
+    alias cjust just    
+    alias ccenter center    
   else
     
+    def csize
+      UTF2ANSI[self].size
+    end
+    
+    def cljust(*args)
+      ANSI2UTF[UTF2ANSI[self].ljust(*args)]
+    end
+    
+    def cjust(*args)
+      ANSI2UTF[UTF2ANSI[self].just(*args)]
+    end
+    
+    def ccenter(*args)
+      ANSI2UTF[UTF2ANSI[self].center(*args)]
+    end
+    
     def cupcase(encode=1)
       encode ?
         ANSI2UTF[UTF2ANSI[self].tr("\270\340-\377", "\250\300-\337")]:

data/lib/rmtools/lang/helpers.rb

@@ -2,20 +2,23 @@
 RMTools::require 'lang/ansi'
 
 class String
-    # Actually, for short strings and 1251<->65001 it's much faster to use predefined ANSI2UTF and UTF2ANSI procs
-    def utf(from_encoding='WINDOWS-1251')
-      Iconv.new('UTF-8', from_encoding).iconv(self)
-    end
-    
-    def utf!(from_encoding='WINDOWS-1251')
-      replace utf from_encoding
-    end
-    
-    def ansi(from_encoding='UTF-8')
-      Iconv.new('WINDOWS-1251', from_encoding).iconv(self)
-    end
-    
-    def ansi!(from_encoding='UTF-8')
-      replace ansi from_encoding
-    end
+  ANSI2UTF = Iconv.new("UTF-8", "WINDOWS-1251").method :iconv
+  UTF2ANSI = Iconv.new("WINDOWS-1251", "UTF-8").method :iconv
+  
+  # Actually, for short strings and 1251<->65001 it's much faster to use predefined ANSI2UTF and UTF2ANSI procs
+  def utf(from_encoding='WINDOWS-1251')
+    Iconv.new('UTF-8', from_encoding).iconv(self)
+  end
+  
+  def utf!(from_encoding='WINDOWS-1251')
+    replace utf from_encoding
+  end
+  
+  def ansi(from_encoding='UTF-8')
+    Iconv.new('WINDOWS-1251', from_encoding).iconv(self)
+  end
+  
+  def ansi!(from_encoding='UTF-8')
+    replace ansi from_encoding
+  end
 end

data/lib/rmtools/text/string_scanner.rb

@@ -39,7 +39,7 @@ class StringScanner
         end
       else
         while res
-          if cb = cbs.find {|patern, fun| pattern and matched[pattern]}
+          if cb = cbs.find {|pattern, fun| pattern and matched[pattern]}
             # patterns should be as explicit as possible
             cb[1][self, $~] if cb[1]
             @last = pos

data/lib/rmtools/text/string_simple.rb

@@ -72,10 +72,12 @@ class String
   
   #    "b ц ~ \255 秀".bytes
   ### => ["62", "20", "d1", "86", "20", "7e", "20", "ad", "20", "e7", "a7", "80"]
-  def bytes
-    arr = []
-    each_byte {|b| arr << b.hex}
-    arr
-  end
+  #def bytes
+  #  arr = []
+  #  each_byte {|b| arr << b.hex}
+  #  arr
+  #end
+  #
+  # this method defined in Enumerable and returns Enumerable::Enumerator that should be converted to array of integers, not hex-strings
   
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rmtools
 version: !ruby/object:Gem::Version 
-  hash: 33
-  prerelease: 5
+  hash: 25
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 2
-  - d
-  version: 1.2.2d
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Shinku
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 +03:00
+date: 2012-02-02 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,14 +196,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rmtools