rdoba 0.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 000e2b10a8728464889da9e1fb18cb1dc12593a6
-  data.tar.gz: 9e5d1e6da0d62943247e5158305f87b93016825a
-SHA512:
-  metadata.gz: e4b93ed652786a11219857fe012041695722bc23c9fa2560060e40e0e4b56af4b1eab8862b085eb0bca492b6807342f3b489cae1795d9908722b6f88bdc7b3fe
-  data.tar.gz: e04e6fddfd18f48c00b0335a6cdab61106e5428bbfa5e31ba54920be388f027a192d65c16b14c18d9d4880ef54da8c4cbef54470d1f36858a7a2126ef5ba4375
+--- 
+SHA1: 
+  metadata.gz: 42b106c41e5273c7b2d1594996b557121eb37663
+  data.tar.gz: 6eefdf94d3d1dbc3f1aaafa054a2ff2e46bf2bc9
+SHA512: 
+  metadata.gz: e9f284c473161858b14946754204530adae45f8f565716b03a192cb2a5c6ec0dbb319516effb2515e12766ae24a637491e06fae97cbb4824fb4a51327f9f5d30
+  data.tar.gz: 5167bd2b03969c63fd0412a11e76c649c41702a67f5143184ca79c6f545196ab57401688248c52d4a0446a8a264fefbd84796dfefc74eafa42d3988afd5f78e7

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 *.swp
 *~
 .rvmrc
+.coveralls.yml

data/README.md

@@ -1,10 +1,20 @@
 # Rdoba
+<!---
+![Web Component Logo](http://??.tinypic.com/??.png)
+-->
+[![Gem Version](https://badge.fury.io/rb/rdoba.png)](http://rubygems.org/gems/rdoba)
+[![Build Status](https://travis-ci.org/3aHyga/rdoba.png?branch=master)](https://travis-ci.org/3aHyga/rdoba)
+[![Coverage Status](https://coveralls.io/repos/3aHyga/rdoba/badge.png)](https://coveralls.io/r/3aHyga/rdoba)
+[![Code Climate](https://codeclimate.com/github/3aHyga/rdoba.png)](https://codeclimate.com/github/3aHyga/rdoba)
+[![Endorse Count](http://api.coderwall.com/3aHyga/endorsecount.png)](http://coderwall.com/3aHyga)
 
 Rdoba, сирѣчь руби-добавокъ, есть библиотека, расширитяющая основныя классы Ruby такія какъ: Объектъ(Object), Ядро(Kernel), Строка(String), Словарь(Hash), Наборъ(Array), Пущь(NilClass) и т.д. Включаетъ модули и такія функціи:
  * common       - нѣкоторыя простыя методы къ Объекту, Ядру, Пущю, Набору, Строкѣ и Словрю;
  * a            - чтеніе и запись значеній въ Наборъ и Словарь по индексу;
  * combinations - перечисленіе значеній Набора въ различномъ порядкѣ;
  * log	        - функціи сборки отладочныхъ свѣдѣній приложенія;
+ * gem		- нѣкоторыя методы бисера Rdoba, въ частности определенія оси и корневой папки бисера;
+ * mixin        - примѣси, которыя могутъ быть подмѣшаны въ основныя классы рубинки;
  * dup		- функціи удвоенія Словаря и Набораъ, включая ихъ вложенія;
  * hashorder	- перечисленіе значеній Словаря въ заданномъ порядкѣ;
  * numeric	- разширенный переводъ числа въ строку и строки въ число;
@@ -85,6 +95,53 @@ Rdoba, сирѣчь руби-добавокъ, есть библиотека, р
 
     A.new # » This is the Log
 
+
+### Методы бисера Rdoba
+#### Rdoba.os
+Методъ возвращаетъ видъ оси, на которой былъ запущенъ руби.
+
+    require 'rdoba'
+
+    Rdoba.os # » "linux"
+
+#### Rdoba.gemroot
+Методъ принимаетъ на входѣ параметръ имени бисера, и возвращаетъ корневую папку онаго бисера.
+
+    require 'rdoba'
+
+    Rdoba.gemroot 'rdoba' # » "/home/malo/git/rdoba"
+
+### Методы бисера Rdoba
+Модуль содержитъ примѣсныя методы, которыя могутъ быть подмѣшаны въ основныя классы рубинки.
+
+### Пусто ли? (Is it empty?)
+Проверяет пуста ли переменная.
+
+    require 'rdoba'
+    rdoba :mixin => [ :empty ]
+    nil.empty? # » true
+    false.empty? # » false
+    Object.new.empty? # » false
+
+### Пречинение Набора в Словарь (Array to Hash)
+Преобразуетъ Набор в Словарь по определённымъ правиламъ.
+
+    require 'rdoba'
+    rdoba :mixin => [ :to_h ]
+    [ 'aa', 0,
+      'bb', 1 ].to_h # » {"aa"=>nil, 0=>nil, "bb"=>nil, 1=>nil
+    [ [ 'aa', 0, ],
+      [ 'bb', 1 ] ].to_h # » {"aa"=>0, "bb"=>1}
+    [ [ 'aa', 0, 1, ],
+      [ 'bb', [ 1, 0 ] ] ].to_h # » {"aa"=>[0, 1], "bb"=>[1, 0]}
+    [ [ 'aa', 0, ],
+      [ 'aa', 1 ] ].to_h # » {"aa"=>[0, 1]}
+    [ [ 'aa', 0, ],
+      [ 'aa', 0 ] ].to_h # » {"aa"=>[0, 1]}
+    [ [ 'aa', 0, ],
+      [ 'aa', 0 ] ].to_h( :save_unique => true ) # » {"aa"=>[0]}
+
+
 ### Одвоеніе Словаря и Набора
 
 Позволяетъ выполнять какъ обычное, такъ и вложенное одвоеніе Словаря или Набора.
@@ -107,7 +164,7 @@ Rdoba, сирѣчь руби-добавокъ, есть библиотека, р
 
 ### Перечисленіе значеній Словаря въ заданномъ порядкѣ
 
-Позволядетъ перебрать всѣ ключи и значенія Словаря по опредѣлённому порядку. Порядок сей задаётся свойствомъ Словаря :order. Если въ заданном порядкѣ не всѣ ключи опредѣлены, то сначала перебираются заданныя ключ, а затѣмъ уже остальныя въ порядкѣ какъ они заданы въ Словарѣ. Перебирать можно ключи, пары или значенія по ключамъ. 4 метода суть перебора: each, each_pair, each_key, each_value. Удаляется порядокъ методом disorder.
+Позволяетъ перебрать всѣ ключи и значенія Словаря по опредѣлённому порядку. Порядок сей задаётся свойствомъ Словаря :order. Если въ заданном порядкѣ не всѣ ключи опредѣлены, то сначала перебираются заданныя ключ, а затѣмъ уже остальныя въ порядкѣ какъ они заданы въ Словарѣ. Перебирать можно ключи, пары или значенія по ключамъ. 4 метода суть перебора: each, each_pair, each_key, each_value. Удаляется порядокъ методом disorder.
 
     require 'rdoba/hashorder'
 

data/Rakefile

@@ -1,18 +1,37 @@
 #!/usr/bin/env rake
 
 desc "Prepare bundler"
-task :prebundle do
+task :bundleup do
   sh 'gem install bundler --version "~> 1.3.1" --no-ri --no-rdoc'
 end
 
+desc "Requires"
+task :req do
+   $: << File.expand_path( '../lib', __FILE__ )
+   require 'bundler/gem_helper'
+
+   Bundler::GemHelper.install_tasks
+end
+
 desc "Prepare bundle environment"
-task :pre do
+task :up do
   sh 'bundle install'
 end
 
+desc "Test with cucumber"
+task :test do
+  sh 'cucumber features/log.feature features/bcd.feature'
+end
+
+desc "Distilled clean"
+task :distclean do
+   sh 'git clean -fd'
+   sh 'cat .gitignore | while read mask; do rm -rf $(find -iname "$mask"); done'
+end
+
 desc "Generate gem"
 namespace :gem do
-  task :build do
+  task :build => [ :req ] do
     sh 'gem build rdoba.gemspec'
   end
 
@@ -21,7 +40,7 @@ namespace :gem do
     sh "gem install rdoba-#{Rdoba::VERSION}.gem"
   end
 
-  task :publish do
+  task :publish => [ :req ] do
     require File.expand_path( '../lib/rdoba/_version_', __FILE__ )
     sh "git tag v#{Rdoba::VERSION}"
     sh "git push"
@@ -34,5 +53,6 @@ namespace :gem do
 end
 
 task(:default).clear
-task :default => :pre
-task :all => [ :prebundle, :pre ]
+task :default => :test
+task :all => [ :bundleup, :up, :test, :'gem:make', :distclean ]
+task :build => [ :bundleup, :up, :test, :'gem:build', :'gem:install', :distclean ]

data/features/support/env.rb

@@ -1,6 +1,8 @@
 require 'rdoba'
 require 'tempfile'
 require 'open3'
+require 'coveralls'
+Coveralls.wear!
 
 RdobaSimSimpleHead=<<HEAD
 #!/usr/bin/env ruby

data/lib/rdoba.rb

@@ -1,20 +1,7 @@
 #encoding: utf-8
 
-#require 'rdoba/a'
-#require 'rdoba/dup'
-#require 'rdoba/require'
-#require 'rdoba/common'
-#require 'rdoba/debug'
-#require 'rdoba/yaml'
-#require 'rdoba/strings'
-#require 'rdoba/deploy'
-#require 'rdoba/roman'
-#require 'rdoba/combinations'
-#require 'rdoba/hashorder'
-#require 'rdoba/fenc'
-
 module Kernel
-  Modules = [ :io, :seqnum, :version, :bcd ]
+  Modules = [ :bcd ]
 
   def rdoba *options
     options.each do |option|
@@ -22,12 +9,49 @@ module Kernel
       [ ( k = option.keys.shift ).to_s.to_sym, option[ k ] ] ||
       [ option.to_s.to_sym ] )
       case key
+      when :mixin
+        require "rdoba/mixin"
+        Rdoba.mixin value
       when :log, :debug
         require "rdoba/#{key}"
         Rdoba.log( { :in => self }.merge( value || {} ) ) # TODO move log method into module
-        # and resolve some troubles with eval in main
-      when :classmatch
-        require 'rdoba/classmatch'
-        self.extend Rdoba::ClassMatch
-      else nil; end || if Modules.include? key
+        # TODO and resolve some troubles with eval in main
+      else
+        Kernel.puts STDERR, "Unknown rdoba module named as '#{key.to_s}'"
+        nil; end ||
+      if Modules.include? key
         require "rdoba/#{key}"; end; end; end; end
+
+require 'rbconfig'
+
+module Rdoba
+   def self.gemroot name = nil, path = ''
+      if !gem( name )
+         raise "Invalid gem named as #{name.inspect}" ; end
+      g = Gem::Specification.find_by_name( name )
+      File.join g.full_gem_path, path
+   end
+
+   def self.os
+      @@os ||= (
+         host_os = RbConfig::CONFIG['host_os']
+         case host_os
+         when /(mswin|msys|mingw|cygwin|bccwin|wince|emc)/
+            plat = $1 == 'mswin' && 'native' || $1
+            out = `ver`.encode( 'US-ASCII',
+                  :invalid => :replace, :undef => :replace )
+            if out =~ /\[.* (\d+)\.([\d\.]+)\]/
+               "windows-#{plat}-#{$1 == '5' && 'xp' || 'vista'}-#{$1}.#{$2}"
+            else
+               "windows-#{plat}" ; end
+         when /darwin|mac os/
+            'macosx'
+         when /linux/
+            'linux'
+         when /(solaris|bsd)/
+            "unix-#{$1}"
+         else
+            raise "unknown os: #{host_os.inspect}"
+         end)
+   end ; end
+

data/lib/rdoba/_version_.rb

@@ -1,3 +1,3 @@
 module Rdoba
-  VERSION = "0.9"
+  VERSION = "0.9.1"
 end

data/lib/rdoba/a.rb

@@ -1,56 +1,7 @@
 #!/usr/bin/ruby -KU
-#<Encoding:UTF-8>
+#coding:utf-8
 
 require 'rdoba/debug'
-require 'rdoba/common'
-
-class Object
-  def seta(index, value, options = {}) #TODO => [] + class Index
-    raise "Invalid class #{self.class} to set a value" unless
-	self.class == Hash or self.class == Array
-    dbp11 "[seta] <<< index: #{index.inspect}, value: #{value.inspect}, options: #{options.inspect}"
-    options[:сокр] ||= @сокр
-
-    return self[index] = value if index.class != Array # TODO spec index
-
-    back = 0
-    index = index.reverse.map do |x|
-      if x.empty?
-        back += 1
-        nil
-      elsif back > 0
-        back -= 1
-        nil
-      else
-        x
-      end
-    end.compact.reverse
-    dbp12 "[seta]> result index: #{index.inspect}"
-
-    par = self
-    par_idx = index.shift
-    index.each do |idx|
-      dbp14 "[seta]>> parent #{par.class} with idx: #{par_idx.inspect}"
-      obj = par[par_idx]
-      if not obj
-        obj = idx.to_s =~ /^\d+$/ && [] || {}
-        par[par_idx] = obj
-        dbp14 "[seta]>> new object #{obj.class}"
-      elsif obj.class != Hash and obj.class != Array
-	raise "Invalid class #{obj.class} for indexing"
-      end
-
-      par = obj
-      par_idx = idx
-    end
-
-    dbp14 "[seta]>> object #{par.class} with idx: #{par_idx.inspect}"
-
-    par[par_idx] = value
-    dbp11 "[seta] >>> #{self.inspect}"
-    self
-  end
-end
 
 class Array
   def geta(index, options = {}) #TODO => [] + class Index
@@ -60,12 +11,13 @@ class Array
     if index.class == Array
       return self if index == [] or index == ['']
       index = index.clone
-      value = self[index.shift.to_i]
+      value = self[index.shift]
       (value.class == Hash or value.class == Array) ? value.geta(index, options) : value
     else
       geta_value(index, options)
     end
   end
+
 end
 
 
@@ -107,5 +59,56 @@ public
       geta_value(index, options)
     end
   end
+
+  def seta(index, value, options = {}) #TODO => [] + class Index
+    dbp11 "[seta] <<< index: #{index.inspect}, value: #{value.inspect}, options: #{options.inspect}"
+    options[:сокр] ||= @сокр
+
+    return self[index] = value if index.class != Array # TODO spec index
+
+    back = 0
+    index = index.reverse.map do |x|
+      if x.empty?
+        back += 1
+        nil
+      elsif back > 0
+        back -= 1
+        nil
+      else
+        x
+      end
+    end.compact.reverse
+    dbp12 "[seta]> result index: #{index.inspect}"
+
+    obj = nil
+    o = self
+    dbp14 "[seta]>> self: #{o.inspect}"
+    set_idx = index.pop
+    par_class = set_idx =~ /^\d+$/ ? Array : Hash
+    par_idx = nil
+    index.each do |idx|
+      unless o
+        dbp14 "[seta]>> parent idx: #{par_idx.inspect}, idx: #{idx.inspect}, parent obj: #{o.inspect}"
+        o = idx =~ /^\d+$/ && [] || {}
+        obj[par_idx] = o
+      end
+      obj = o
+      o = (obj.class == Hash) ? obj.geta_value(idx, options) : obj[idx]
+      dbp14 "[seta]>> cur idx: #{idx.inspect}, parent obj: #{obj.inspect}, obj: #{o.inspect}"
+      unless o
+        if idx == index.last
+          o = par_class.new
+          obj[idx] = o
+        else
+          par_idx = idx =~ /^\d+$/ && idx.to_i || idx
+        end
+      end
+    end
+
+    raise "Invalid path" unless o # TODO special exception
+
+    o[set_idx] = value
+  end
+
 end
 

data/lib/rdoba/common.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby -KU
-#<Encoding:UTF-8>
+#coding:utf-8
 
 class Object
   def xor(val1)
@@ -38,15 +38,17 @@ class Object
 end
 
 module Kernel
-  require 'timeout'
+  def wait_if(timeout = 30)
+    require 'timeout'
 
-  def if_wait(timeout = 30)
-    Timeout::timeout(timeout) do
-      while yield(); end
+    begin
+      Timeout::timeout(timeout) do
+        while yield(); end
+      end
+      true
+    rescue Timeout::Error
+      false
     end
-    true
-  rescue Timeout::Error
-    false
   end
 end
 
@@ -102,17 +104,6 @@ class Array
     return __set__(index.to_i, value, *args) if index.class == String and index =~ /^\d+$/
     __set__(index, value, *args)
   end
-
-  def glue!(inval)
-    self.each_index do |i|
-      begin
-	self[i] |= inval[i]
-      rescue
-	self[i] = inval[i]
-      end if inval[i]
-    end
-    self
-  end
 end
 
 class String
@@ -157,36 +148,14 @@ class String
 end
 
 class Hash
-  def glue!(inval)
-    self.replace self.glue(inval)
-  end
-
-  def glue(inval)
-    res = self.dup
-    inval.each_pair do |key, val|
-      if val.class == res[key].class
-        if val.class == Hash
-          res[key].glue! val
-        elsif val.class == Array
-          res[key].glue! val
-        else
-          res[key] = val
-        end
-      else
-        res[key] = val
-      end
-    end
-    res
-  end
-
   def |(inval)
     res = self.dup
     inval.each_pair do |key, val|
       if val.class == res[key].class
         if val.class == Hash
-          res[key] |= val
+          res[key] |= inval[key]
         elsif val.class == Array
-          res[key] |= val
+          res[key].concat val
         else
           res[key] = val
         end

data/lib/rdoba/deploy.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby -KU
-#<Encoding:UTF-8>
+#coding:utf-8
 
 require 'rdoba/common'
 

data/lib/rdoba/dup.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby -KU
-#<Encoding:UTF-8>
+#coding:utf-8
 
 class Array
   alias :__dup__ :dup

data/lib/rdoba/gem.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/ruby -KU
+#encoding:utf-8
+
+require 'rbconfig'
+
+module Rdoba
+   def self.gemroot gemname = nil, path = ''
+      if !gem
+         raise "Undefined gem name" ; end
+      g = Gem::Specification.find_by_name( gemname )
+      File.join g.full_gem_path, 'share', 'settings.yaml'
+   end
+
+   def self.os
+      @@os ||= (
+         host_os = RbConfig::CONFIG['host_os']
+         case host_os
+         when /(mswin|msys|mingw|cygwin|bccwin|wince|emc)/
+            plat = $1 == 'mswin' && 'native' || $1
+            out = `ver`.encode( 'US-ASCII',
+                  :invalid => :replace, :undef => :replace )
+            if out =~ /\[.* (\d+)\.([\d\.]+)\]/
+               "windows-#{plat}-#{$1 == '5' && 'xp' || 'vista'}-#{$1}.#{$2}"
+            else
+               "windows-#{plat}" ; end
+         when /darwin|mac os/
+            'macosx'
+         when /linux/
+            'linux'
+         when /(solaris|bsd)/
+            "unix-#{$1}"
+         else
+            raise "unknown os: #{host_os.inspect}"
+         end)
+   end ; end
+

data/lib/rdoba/io.rb

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
+#!/usr/bin/ruby -KU
+#coding:utf-8
 
 require 'strscan'
 require 'rdoba/re'
@@ -11,7 +11,6 @@ module Kernel
   def sprintf(format, *args)
     nargs = []
     nformat = ''
-    oargs = args.dup
 
     fmt = format.split('%')
     nformat = fmt.shift
@@ -19,46 +18,23 @@ module Kernel
     while (not fmt.empty?)
       part = fmt.shift
       part = '%' + fmt.shift unless part
-      if part =~ /([0-9 #+\-*.]*)([csXx])(.*)/ # other keys bdEefGgiopu
+      if part =~ /([0-9 #+\-*.]*)([bcdEefGgiopsuXxP])(.*)/ and $2 == 'P'
         keys = $1 || ''
-        rest = $3 || ''
-        char = $2
-        if keys =~ /(?:([0-9*]*)\.([0-9*]+)([+-])?|(-)?)/
-          indent = ( $1 == '*' && args.shift || $1 ).to_i
-          padding_size = $2 == '*' && args.shift.to_i || $2
+        str = $3 || ''
+        if keys =~ /(-)?([0-9*]*)\.?([0-9\*]*)(\+?)/
           value = args.shift
-          def convert( value, char, *args )
-            case char
-            when 'c'
-              endian = args[ 1 ] == '+' && Fixnum::BigEndian ||
-                  args[ 1 ] == '-' && Fixnum::LittleEndian ||
-                  Fixnum::NativeEndian
-              value.to_i.to_p( :padding => ( args[ 0 ] && args[ 0 ].to_i || 1 ),
-              :endian => endian )
-            when 's'
-              rs = value.to_s
-              pad = args[ 0 ] && args[ 0 ].to_i || 0
-              padl = rs.size >= pad && '' || ( "\0" * ( pad - rs.size ) )
-              args[ 1 ] && ( padl + rs ) || ( rs + padl )
-            when /(x|X)/
-              rs = value.ord.to_s( 16 )
-              rs = rs.upcase if $1 == 'X'
-              pad = args[ 0 ] && args[ 0 ].to_i || 0
-              ( rs.size >= pad && '' || ( '0' * ( pad - rs.size ) ) ) + rs
-            end.gsub( Regexp.new( '%', Regexp::EXTENDED | Regexp::MULTILINE ),
-                '%%' )
-          end
-          plain = value && convert( value, char, padding_size, $3 ) || ''
-          indent = indent > plain.size && ( indent - plain.size ) || 0
-          nformat += ( $4 && ( plain + ' ' * indent ) ||
-              ( ' ' * indent + plain ) ) + rest
+          indent = ' ' * ($2 == '*' ? args.shift : $2).to_i
+          plain = value && value.to_p(
+	      :padding => ($3 == '*' ? args.shift : $3.empty? ? 1 : $3).to_i,
+	      :be => $4.empty? ? nil : true) || ''
+          nformat += ($1 ? plain + indent : indent + plain) + str
         else
-          nformat += '%' + keys + char + rest
+          nformat += '%' + keys + 'c' + str
           nargs.push args.shift
         end
       else
         nformat += '%' + part
-        l = $1 =~ /\*/ && 2 || 1
+        l = $1 =~ /\*/ ? 2 : 1
         while l > 0
           nargs.push args.shift
           l -= 1
@@ -66,11 +42,8 @@ module Kernel
       end
     end
     __sprintf__(nformat, *nargs).to_p
-  rescue ArgumentError
-    Kernel.puts "[sprintf] #{$!.class}: #{$!}\n\t" + $@.join("\n\t") +
-        "\n\tNew format string = #{nformat.inspect}, params = #{nargs.inspect}" +
-        "\n\tOld format string = #{format.inspect}, params = #{oargs.inspect}"
   end
+
 end
 
 class String
@@ -80,7 +53,7 @@ class String
 
     pos = 0
     argfs = []
-    while fss.scan_until(/%([0-9 #+\-*]*)(?:\.([0-9]+)([-+])?)?([bcdefgiosuxr])/)
+    while fss.scan_until(/%([0-9 #+\-*]*)(?:\.([0-9]+)(\+)?)?([bcdefgiosuxr])/)
       argfs << [ fss[1], fss[2], fss[3], fss[4] ]
       # TODO add performing the special case in fss[1]
       nformat += fss.pre_match[pos..-1].to_res + case fss[4]
@@ -97,7 +70,7 @@ class String
       when 'g'
         '([+\-]?[0-9]+(?:[eE][+\-]?[0-9]+|\.[0-9]*))'
       when 'c'
-        fss[2] ? "(.{#{fss[2]},#{fss[2]}})" : "(.)"
+        fss[2] ? "(.{1,#{fss[2]}})" : "(.)"
       when 'b'
         '([01]+)b?'
       when 'o'
@@ -115,7 +88,7 @@ class String
 
     nformat += fss.rest
 
-    [ r3 = Regexp.new(nformat, Regexp::EXTENDED | Regexp::MULTILINE), argfs ]
+    [ /#{nformat}/, argfs ]
   end
 
   (alias :__scanf__ :scanf) if self.instance_methods(false).include?(:scanf)
@@ -137,10 +110,7 @@ class String
         when /[efg]/
           value.to_f
         when 'c'
-          endian = argf[2] == '+' && Fixnum::BigEndian ||
-              argf[2] == '-' && Fixnum::LittleEndian ||
-              Fixnum::NativeEndian
-          value.to_i( endian )
+	  argf[2] ? value.to_i(:be) : value.to_i
         when 'b'
           value.to_i(2)
         when 'o'

data/lib/rdoba/mixin.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/ruby -KU
+#encoding:utf-8
+
+module Rdoba
+   module Mixin
+      module To_hArray
+         def to_h options = {}
+            h = {}
+            self.each do |v|
+               if v.is_a? Array
+                  if h.key? v[ 0 ]
+                     if !h[ v[ 0 ] ].is_a? Array
+                        h[ v[ 0 ] ] = [ h[ v[ 0 ] ] ] ; end
+
+                     if v.size > 2
+                        h[ v [ 0 ] ].concat v[ 1..-1 ]
+                     else
+                        h[ v [ 0 ] ] << v[ 1 ] ; end
+                  else
+                     h[ v[ 0 ] ] = v.size > 2 && v[ 1..-1] || v[ 1 ] ; end
+               else
+                  if h.key? v
+                     if !h[ v ].is_a? Array
+                        h[ v ] = [ h[ v ] ] ; end
+
+                     h[ v ] << v
+                  else
+                     h[ v ] = nil ; end ; end ; end
+
+            if options[ :save_unique ]
+               h.each_pair do |k,v|
+                  if v.is_a? Array
+                     v.uniq! ; end ; end ; end
+
+            h ; end ; end
+
+      module EmptyObject
+         def empty?
+            false ; end ; end
+
+      module EmptyNilClass
+         def empty?
+            true ; end ; end ; end
+
+   def self.mixin options
+      ( options || [] ).each do |value|
+         case value
+         when :to_h
+            Array.send :include, Rdoba::Mixin::To_hArray
+         when :empty
+            Object.send :include, Rdoba::Mixin::EmptyObject
+            NilClass.send :include, Rdoba::Mixin::EmptyNilClass
+         else
+            Kernel.puts STDERR, "Invalid rdoba-mixin options key: #{value.to_s}"
+            end ; end ; end ; end
+
+

data/lib/rdoba/numeric.rb

@@ -1,51 +1,68 @@
 #!/usr/bin/ruby -KU
-#<Encoding:UTF-8>
+#coding:utf-8
 
 require 'rdoba/common'
 require 'rdoba/strings'
 
-class Fixnum
-  NativeEndian = 0
-  LittleEndian = -1
-  BigEndian = -2
+class String
+  alias :_rdoba_to_i :to_i
+  def to_i(base = 10, *opts)
+    v = parse_opts(opts)
+    if v[:be]
+      (str, sign, num) = (self.match /\s*(-?)([0-9a-fx]+)/u).to_a
+      if str
+	n = num.reverse._rdoba_to_i(base)
+	sign.empty? && n || -n
+      else
+	0
+      end
+    else
+      _rdoba_to_i(base)
+    end
+  end
+end
 
+class Fixnum
   alias :_rdoba_to_s :to_s
-  def to_s( base = 10, opts = {} )
-    if !opts[ :padding ] && !opts[ :style_formatting ]
-      return _rdoba_to_s( base ); end
+  def to_s(base = 10, *opts)
+    v = parse_opts(opts)
 
-    if base <= 0
-      raise "Base of number can't be equal or less then zero"; end
-    if opts[ :padding ] <= 0
-      raise "Padding count numberr can't be equal or less then zero"; end
+    return _rdoba_to_s(base) unless v[:padding] or v[:style_formatting]
 
+    raise "Base of number can't be equal or less then zero" if base <= 0
+    raise "Padding count numberr can't be equal or less then zero" if v[:padding] <= 0
     value = self
-    minus = value < 0 && ( value = -value; true )
+    minus = if value < 0
+        value = -value
+        true
+      end
     res = ''
     while value != 0
       value, rem = value.divmod(base)
       rem += 0x40 - 0x39 if rem >= 10
-      res += (0x30 + rem).chr; end
-
-    if res.size < ( padding = opts[ :padding ].to_i )
-      res += "0" * ( padding - res.size ); end
-    if opts[ :style_formatting ] and base == 16
-      res += 'x0'; end
-    if minus
-      res += '-';end
-
+      res += (0x30 + rem).chr
+    end
+    res += "0" * (v[:padding].to_i - res.size) if res.size < v[:padding].to_i
+    res += 'x0' if v[:style_formatting] and base == 16
+    res += '-' if minus
     res.reverse
   end
 end
 
 class Numeric
-  def to_p( opts = {} )
+  def to_p(*opts)
+    v = parse_opts(opts)
+
     value = self
-    minus = value < 0 && ( value = -value; true )
+    minus = if value < 0
+        value = -value
+        true
+      end
     res = ''
     while value != 0
       value, rem = value.divmod(256)
-      res += rem.chr; end
+      res += rem.chr
+    end
 
     pad_char = if minus
         negres += ''
@@ -57,46 +74,19 @@ class Numeric
               0
             else
               over = 0
-              negbyte; end; end
+              negbyte
+            end
+        end
         res = negres
         "\xFF"
       else
-        "\0"; end
-
-    if res.size < ( padding = opts[ :padding ].to_i )
-      res += pad_char * ( padding - res.size ); end
+        "\0"
+      end
 
-    #TODO add detection of endianness of current system
-    if ( endian = opts[ :endian ] || Fixnum::NativeEndian ) ==
-    Fixnum::NativeEndian
-      endian = Fixnum::LittleEndian; end
-    ( ( endian == Fixnum::LittleEndian ) && res ||
-        res.reverse( String::ByteByByte ) ).to_p; end; end
+    res += pad_char * (v[:padding].to_i - res.size) if res.size < v[:padding].to_i
 
-class String
-  alias :_rdoba_to_i :to_i
-  def to_i( base = 10 )
-    return 0 if self.empty?
-
-    #TODO add detection of endianness of current system
-    if base == Fixnum::NativeEndian
-      base = Fixnum::LittleEndian; end
-    res = 0
-    if base == Fixnum::BigEndian
-      self.each_byte do |b|
-        res = ( res << 8 ) | b
-      end
-      res
-    elsif base == Fixnum::LittleEndian
-      size = self.size
-      (1..size).each do |i|
-        b = self.getbyte( size - i )
-        res = ( res << 8 ) | b
-      end
-      res
-    else
-      _rdoba_to_i base
-    end
+    plain = (v[:be] ? res.reverse(String::ByteByByte) : res).to_p
+    plain
   end
 end
 

data/lib/rdoba/re.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby -KU
-#<Encoding:UTF-8>
+#coding:utf-8
 
 class String
   def to_res

data/lib/rdoba/require.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby -KU
-#<Encoding:UTF-8>
+#coding:utf-8
 
 require 'rdoba/common'
 require 'rdoba/debug'

data/lib/rdoba/strings.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby -KU
-#<Encoding:UTF-8>
+#coding:utf-8
 
 class String
 
@@ -92,16 +92,15 @@ class String
   alias :to_p :to_s
 
   ByteByByte = 0
-  alias :of_rdoba_reverse :reverse
-  def reverse( step = 1 )
-      # of Plain
+  alias :__reverse__ :reverse
+  def reverse(step = 1)
       case step
       when ByteByByte
           arr = []
           self.each_byte do |byte| arr << byte.chr end
           arr.reverse.join
       when 1
-          of_rdoba_reverse
+          __reverse__
       else
           res = ''
           offset = (self.size + 1) / step * step - step

data/rdoba.gemspec

@@ -23,7 +23,10 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = [ 'README.md', 'LICENSE' ]
 
   s.required_rubygems_version = '>= 1.6.0'
+  s.required_ruby_version = '>= 1.9.0'
 
-  s.add_development_dependency 'bundler', '~> 1.3.1'
-  s.add_development_dependency 'cucumber'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'cucumber', '~> 1.3'
+  s.add_development_dependency 'coveralls'
 end

metadata

@@ -1,54 +1,65 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rdoba
-version: !ruby/object:Gem::Version
-  version: '0.9'
+version: !ruby/object:Gem::Version 
+  version: 0.9.1
 platform: ruby
-authors:
-- Малъ Скрылёвъ (Malo Skrylevo)
+authors: 
+- "\xD0\x9C\xD0\xB0\xD0\xBB\xD1\x8A \xD0\xA1\xD0\xBA\xD1\x80\xD1\x8B\xD0\xBB\xD1\x91\xD0\xB2\xD1\x8A (Malo Skrylevo)"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-10-01 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id005 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+      - &id003 !ruby/object:Gem::Version 
+        version: "1.3"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - *id003
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: coveralls
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id005
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Ruby extension library. It extends Kernel, Object, String, Hash, Array,
-  and some other classes. Also allows to log application state with debug lines to
-  an io
-email:
+  version_requirements: *id006
+description: Ruby extension library. It extends Kernel, Object, String, Hash, Array, and some other classes. Also allows to log application state with debug lines to an io
+email: 
 - 3aHyga@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
 - LICENSE
-files:
+files: 
 - .document
 - .gitignore
 - CHANGES.md
@@ -71,45 +82,49 @@ files:
 - lib/rdoba/deploy.rb
 - lib/rdoba/dup.rb
 - lib/rdoba/fe.rb
+- lib/rdoba/gem.rb
 - lib/rdoba/hashorder.rb
 - lib/rdoba/io.rb
 - lib/rdoba/log.rb
+- lib/rdoba/mixin.rb
 - lib/rdoba/numeric.rb
 - lib/rdoba/re.rb
 - lib/rdoba/require.rb
 - lib/rdoba/roman.rb
 - lib/rdoba/strings.rb
-- lib/rdoba/version.rb
 - lib/rdoba/yaml.rb
 - rdoba.gemspec
 - test/helper.rb
 - test/rdoba_test.rb.stub
 - test/test_rdoba.rb
 homepage: https://github.com/3aHyga/rdoba
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.9.0
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.6.0
 requirements: []
+
 rubyforge_project: rdoba
-rubygems_version: 2.0.0
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby extension library (Ruby DOBAvka)
-test_files:
+test_files: 
 - features/bcd.feature
 - features/log.feature
 - features/step_definitions/bcd_steps.rb

data/lib/rdoba/version.rb

@@ -1,51 +0,0 @@
-#encoding: utf-8
-
-class Version
-  attr_reader :subminor, :minor, :major
-
-  def self.parse value
-    case version.is_a?
-    when self
-      value
-    when Array
-      Version.new version[ 0 ].to_i, version[ 1 ].to_i, version[ 2 ].to_i
-    when Numeric
-      Version.new version >> 8, ( version >> 4 ) & 0xF, version & 0xF
-    else
-      if version.to_s =~ /(\d+)\.(\d+)(?:\.(\d+))?/
-        Version.new $1.to_i, $2.to_i, $3.to_i
-      elsif version.to_s =~ /([\da-z][\da-z])([\da-z])([\da-z])/i
-        Version.new $1.to_i( 16 ), $2.to_i( 16 ), $3.to_i( 16 )
-      else
-        Version.new 0, 0, 0; end; end; end
-
-  def == value
-    v = self.parse value
-    @major == v.major && @minor == v.minor && @subminor == v.subminor
-  end
-
-  def < value
-    v = self.parse value
-    @major < v.major || @major == v.major &&
-    ( @minor < v.minor || @minor == v.minor &&
-    @subminor < v.subminor ); end
-
-  def > value
-    v = self.parse value
-    @major > v.major || @major == v.major &&
-    ( @minor > v.minor || @minor == v.minor &&
-    @subminor > v.subminor ); end
-
-  def to_a
-    [ @major, @minor, @subminor ]; end
-
-  def to_s
-    "#{@major}.#{@minor}.#{@subminor}"; end
-
-  private
-
-  def initialize major, minor = 0, subminor = 0
-    @subminor = subminor
-    @minor = minor
-    @major = major; end; end
-