rmtools 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c14d10479b262ef50e03d2ee4e3643677ac7174
-  data.tar.gz: 17e0c478440bccc1e6a43e3bc4c6f107291de7b2
+  metadata.gz: 9334478c59f448c6ac5a6693e6a91975533614e2
+  data.tar.gz: c1377abc4ccb7bfb4ae55b636ecbae31906a4ab5
 SHA512:
-  metadata.gz: e43360436dfa4fc935983ee0f87a1bc8376b27bbab765720b9ae498efa3ce4a6333a6534619298228731894fdf8156b08dcc921c9e30ddc14514bf1438026e7c
-  data.tar.gz: a47880d138ccb5db7da325a1abf2db283ad6479bdf74593829c112c3fa87fa837a5fafd3c0e5052603d195075773f1d7f096d3dbd8ff1b802c8f6909b640f249
+  metadata.gz: 79964bcde63bb715714903d516507f60411510cb35de71fc83e441e7bb205f6b443ddfee9139f90a4f4447c95c5c9d7bb87eaf298ab2d2e1116755a57a16c437
+  data.tar.gz: aec618b40383d704a4ed558127bb77f52c950416769900ed56138c850ef916dd705fb8f45bc92939a6314d3ae642f10545a02d81c274752d09473865d1f4d507

data/.gitignore

@@ -19,4 +19,5 @@ Manifest.txt
 Makefile
 *.out
 *.o
-*.so
+*.so
+.directory

data/README.md

@@ -27,14 +27,26 @@ It's still randomly documented since it's just my working tool.
 
 ### CHANGES
 
-##### Version 2.2.5
+##### Version 2.3.4
 
+* Ruby 2+ behaviour:
+  * Disabled C-extension
+  * Used String#encode instead of Iconv#iconv
+  
 * String
-  * Added #fix_encoding! It differentiates only utf-8 and ansi-1251, though.
+  * Updated #digit_date to parse full english month names
+
+##### Version 2.2.6
+
+* String
+  * Added #utf? and #find_compatible_encoding. Currently, latter one differentiates only utf-8 and ansi-1251.
 
 * Range
   * #include? never raises an exception
 
+* Array/Set
+  * Added #is_subset_of?
+
 ##### Version 2.2.4
 
 * Hash

data/lib/rmtools/core/class.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'rmtools/core/object'
+
 class Class
   
   def method_proxy *vars

data/lib/rmtools/dev/watching.rb

@@ -117,7 +117,7 @@ module RMTools
       cmd = "scp #{fullpath.inspect} #{[@host, fpath].join(':').inspect} 2>&1"
       print "`#{cmd}`: " if @debug
       if res = RMTools::tick_while {`#{cmd}`}.b
-        puts "[ #{Painter.rb('Error')} ]: #{res}"
+        puts "[ #{Painter.r_b('Error')} ]: #{res}"
       else
         print "[ #{Painter.g('OK')} ]"
       end

data/lib/rmtools/enumerable/array.rb

@@ -222,9 +222,11 @@ class Array
     foldl(:+, &b) || identity 
   end
   
-  # fastering activesupport's method
-  def group_by(&b) 
-    arrange(:group, &b) 
+  if RUBY_VERSION < '2'
+    # fastering activesupport's method
+    def group_by(&b) 
+      arrange(:group, &b) 
+    end
   end
   
 end

data/lib/rmtools/enumerable/hash.rb

@@ -73,5 +73,9 @@ end
   def truth_map
     map_values {|v| !!v}
   end
+  
+  def key_value
+    to_a.first
+  end
 
 end

data/lib/rmtools/enumerable/set_ops.rb

@@ -14,7 +14,8 @@ module RMTools
         alias :coallition :+
         alias :subtraction :-
         alias :intersection :&
-        protected :union, :coallition, :subtraction, :intersection
+        # :& won't work this way if :intersection will be protected
+        protected :union, :coallition, :subtraction
         
         def |(ary) 
           return ary.uniq if empty?
@@ -55,12 +56,17 @@ module RMTools
           [self - common, ary - common]
         end
         
-        alias diff ^
+        alias :diff :^
         
         def intersects?(ary)
           (self & ary).any?
         end
         alias :x? :intersects?
+        
+        def =~(ary)
+          (self - ary).empty?
+        end
+        alias :is_subset_of? :=~
       }
       super
     end

data/lib/rmtools/lang/ansi.rb

@@ -19,7 +19,7 @@ module RMTools
       ANSI_ENCODING = ANSI_LETTERS_UC[0].encoding
     end
   
-    ENCODINGS_PATTERNS["WINDOWS-1251"] = /[#{ANSI_LETTERS_UC.concat(ANSI_YOYE).join}]/
+    ENCODINGS_PATTERNS["WINDOWS-1251"] = /[#{ANSI_LETTERS_UC.join}]/
   end
 
   if RUBY_VERSION < '2'
@@ -40,60 +40,60 @@ class String
   
   if RUBY_VERSION < '2'
     
-    def utf(from_encoding='WINDOWS-1251//IGNORE')
-      (ICONVS['UTF-8<'+from_encoding] ||= Iconv.new('UTF-8//IGNORE', from_encoding)).iconv(self)
+    def utf(from_encoding=encoding.name.upcase)
+      from_encoding += "//IGNORE"
+      (ICONVS["UTF-8<#{from_encoding}"] ||= Iconv.new('UTF-8//IGNORE', from_encoding)).iconv(self)
     end
     
-    def ansi(from_encoding='UTF-8//IGNORE')
-      (ICONVS['WINDOWS-1251<'+from_encoding] ||= Iconv.new('WINDOWS-1251//IGNORE', from_encoding)).iconv(self)
+    def ansi(from_encoding=encoding.name.upcase)
+      from_encoding += "//IGNORE"
+      (ICONVS["WINDOWS-1251<#{from_encoding}"] ||= Iconv.new('WINDOWS-1251//IGNORE', from_encoding)).iconv(self)
     end
     
-    def utf!(from_encoding='WINDOWS-1251//IGNORE')
+    def utf!(from_encoding=encoding.name.upcase)
       replace utf from_encoding
     end
     
-    def ansi!(from_encoding='UTF-8//IGNORE')
+    def ansi!(from_encoding=encoding.name.upcase)
       replace ansi from_encoding
     end
     
   else
     
-    def utf(from_encoding='WINDOWS-1251')
+    def utf(from_encoding="UTF-16")
       encode(from_encoding, :invalid => :replace, :undef => :replace, :replace => "").encode("UTF-8", :invalid => :replace, :undef => :replace, :replace => "")
     end
     
-    def ansi(from_encoding='UTF-8')
+    def ansi(from_encoding="UTF-16")
       encode(from_encoding, :invalid => :replace, :undef => :replace, :replace => "").encode("WINDOWS-1251", :invalid => :replace, :undef => :replace, :replace => "")
     end
     
-    def utf!(from_encoding='WINDOWS-1251')
+    def utf!(from_encoding="UTF-16")
       replace utf from_encoding
     end
     
-    def ansi!(from_encoding='UTF-8')
+    def ansi!(from_encoding="UTF-16")
       replace ansi from_encoding
     end
     
   end
   
   
-  def valid_encoding?
+  def utf?
     begin
-      self =~ /./
-    rescue ArgumentError
+      encoding == Encoding::UTF_8 and self =~ /./u
+    rescue Encoding::CompatibilityError
       false
-    else
-      true
     end
   end
   
-  def fix_encoding!
+  def find_compatible_encoding
     # UTF-8 by default
-    return nil if valid_encoding?
+    return nil if utf?
     for enc, pattern in ENCODINGS_PATTERNS
       force_encoding(enc)
-      if valid_encoding? and self =~ pattern
-        return encoding.name.upcase
+      if self =~ pattern
+        return enc
       end
     end
     false

data/lib/rmtools/version.rb

@@ -1,3 +1,3 @@
 module RMTools
-  VERSION = '2.3.3'
+  VERSION = '2.3.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmtools
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Sergey Baev