RubyGems - rdoba - Versions diffs - 0.9.3 → 0.9.4 - Mend

rdoba 0.9.3 → 0.9.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (41) hide show

checksums.yaml +5 -5
data/Gemfile +4 -4
data/README.md +21 -27
data/Rakefile +21 -19
data/features/step_definitions/mixin_steps.rb +237 -198
data/features/support/env.rb +26 -160
data/features/support/mixin_support.rb +13 -9
data/lib/rdoba/_version_.rb +3 -1
data/lib/rdoba/a.rb +44 -42
data/lib/rdoba/bcd.rb +43 -26
data/lib/rdoba/blank.rb +14 -0
data/lib/rdoba/combinations.rb +17 -15
data/lib/rdoba/common.rb +53 -53
data/lib/rdoba/debug.rb +7 -5
data/lib/rdoba/deploy.rb +55 -50
data/lib/rdoba/dup.rb +31 -31
data/lib/rdoba/fe.rb +6 -5
data/lib/rdoba/gem.rb +33 -29
data/lib/rdoba/hashorder.rb +24 -24
data/lib/rdoba/io.rb +81 -74
data/lib/rdoba/merge.rb +16 -16
data/lib/rdoba/mixin/time.rb +13 -7
data/lib/rdoba/mixin/try.rb +10 -5
data/lib/rdoba/mixin/try_1_9_0.rb +8 -3
data/lib/rdoba/mixin/wait_if.rb +24 -18
data/lib/rdoba/mixin.rb +363 -306
data/lib/rdoba/numeric.rb +19 -17
data/lib/rdoba/os.rb +127 -0
data/lib/rdoba/re.rb +4 -4
data/lib/rdoba/require.rb +24 -19
data/lib/rdoba/roman.rb +47 -35
data/lib/rdoba/strings.rb +5 -6
data/lib/rdoba/yaml.rb +20 -18
data/lib/rdoba.rb +53 -44
data/rdoba.gemspec +10 -9
metadata +44 -46
data/features/log.feature +0 -277
data/features/step_definitions/log_steps.rb +0 -200
data/features/support/fulltest_as_log.rb.in +0 -143
data/features/support/fulltest_as_self.rb.in +0 -144
data/lib/rdoba/log.rb +0 -419

data/features/support/env.rb CHANGED Viewed

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 require 'rdoba'
 require 'tmpdir'
 require 'open3'
 require 'coveralls'
-require "codeclimate-test-reporter"
 require 'simplecov'
 require 'rspec/expectations'
@@ -10,176 +11,41 @@ require 'rspec/expectations'
 #
 #
 Coveralls.wear!
-CodeClimate::TestReporter.start
 SimpleCov.start
 ##############################################
-RdobaSimSimpleHead=<<HEAD
-#!/usr/bin/env ruby
-require 'rdoba'
-HEAD
-RdobaCodeClassDeclaration=<<HEAD
-class Cls
-  def initialize
-    log > {:variable=>"value"}
-  end
-end
+RdobaSimSimpleHead = <<~HEAD
+  #!/usr/bin/env ruby
+  require 'rdoba'
 HEAD
-RdobaSimClsHead=<<HEAD
-#!/usr/bin/env ruby
-require 'rdoba'
-class Cls
+RdobaSimClsHead = <<~HEAD
+  #!/usr/bin/env ruby
+  require 'rdoba'
+  class Cls
 HEAD
-def format str
+def format(str)
   puts str
-  "   " * @deep + str + "\n" ; end
+  '   ' * @deep + str + "\n"
+end
 def store
-  file = @inithead + @init + @echo + ( "end\n" * @deep )
+  file = @inithead + @init + @echo + ("end\n" * @deep)
   puts file
-  File.open( @tmpfile, 'w+' ) do |f|
-    f.puts file ; end ; end
-def match_keywords keystr
-  keys = ( keystr || '' ).split( /[,:\s]/ ).map do |k|
-  [ :basic, :extended, :enter, :leave, :compat, :timestamp, :pid,
-      :function_name, :function_line, :function ].include?( k.to_sym ) && k.to_sym || nil
-    end.compact ; end
-def rdoba_sim sub, cmd, *args
-  echo = nil
-  case sub
-  when :log, :debug
-    case cmd
-    when :init
-      $tmpdir ||= Dir.mktmpdir
-      @tmpfile ||= File.join( $tmpdir, 'tmp.log' )
-      if args[ 1 ] == 'class'
-        @deep = 1
-        @inithead = RdobaSimClsHead
-      else
-        @deep = 0
-        @inithead = RdobaSimSimpleHead ; end
-      @echo = ''
-      @init = ''
-      puts @inithead
-    when :apply
-      opts = match_keywords args[ 1 ]
-#      opts = opts.size > 2 && opts || opts.size > 0 && opts[ 1 ] || nil
-      param = case args[ 0 ]
-      when 'io'
-        { :io => "File.new( File.join( '#{@tmpfile}' ), 'w+' )", :functions => :basic }
-      when 'as'
-        { :as => ":self", :functions => :basic }
-      when 'in'
-        { :in => "Cls", :functions => :basic }
-#      when /in.*as/
-#        { :in => "Cls", :as => args[ 2 ].to_sym, :functions => :basic }
-      when 'prefix'
-#        basic|extended|enter|leave|compat
-        { args[ 0 ].to_sym => opts, :functions => :basic }
-      when 'functions'
-        { args[ 0 ].to_sym => opts }
-      else
-        { :functions => :basic }
-      end
-      if args[ 2 ]
-         param.merge!( :as => args[ 2 ].to_sym ) ; end
-      param = "{" + ( param ).to_a.map do |v|
-        "#{v[ 0 ].inspect} => #{v[ 1 ].is_a?( String ) &&
-            v[ 1 ] || v[ 1 ].inspect}" end.join(',') + "}"
-      @echo << "   " * @deep + "rdoba :#{sub} => #{param}\n"
-    when :func
-      call = case args[ 0 ]
-      when 'keyword'
-        'self'
-      when 'invalid keyword'
-        'errlog'
-      when /^db/
-        @echo << "self.dbgl = 0xff\n"
-        args[ 0 ]
-      else
-        ( args[ 0 ] || :log ).to_sym
-      end
-      sep = ( args[ 1 ] == :e ) && '.' || ' '
-      param = []
-      args[ 2..-1 ].each do |arg|
-        case arg
-        when NilClass
-        when Symbol
-          param << " #{arg}"
-        else
-          param << " #{arg.inspect}" ; end ; end
-      str = "#{call}#{sep}#{args[ 1 ]}#{param.join(',')}"
-      echo = format str
-      @echo << echo
-   when :close
-      while @deep > 0
-        @deep -= 1
-        @echo << ( format "end" ) ; end
-    when :declare
-      @echo << ( format RdobaCodeClassDeclaration )
-    when :create
-      @echo << ( format "Cls.new" )
-    when :call
-      @echo << ( format "Cls.singleton" )
-    when :def
-      if @inithead == RdobaSimClsHead
-        @deep = 1
-      else
-        @deep = 0 ; end
-      echo = case args[ 0 ]
-      when :init
-        @deep += 1
-        format 'def initialize'
-      when :single
-        @deep += 1
-        format 'def self.singleton'
-      else;
-        '' ; end
-      @echo << echo
-    when :exec
-      if !@echo.empty?
-        store
-        puts '-' * 15
-        File.chmod 0755, @tmpfile
-        Open3.popen3( @tmpfile ) do |stdin, stdout, stderr, wait_thr|
-          @out = stdout.read
-          @err = stderr.read
-        end
-        @echo = ''
-      end
-      res = case args[ 0 ]
-      when :file
-        File.new( @tmpfile, 'r' ).read
-      when :stdout
-        @out
-      when :stderr
-        @err;
-      else return; end
-      puts res
-      res
-    end
+  File.open(@tmpfile, 'w+') do |f|
+    f.puts file
   end
 end
-at_exit { $tmpdir && ( FileUtils.remove_entry_secure $tmpdir ) }
+def match_keywords(keystr)
+  keys =
+    (keystr || '').split(/[,:\s]/).map do |k|
+      %i[basic extended enter leave compat timestamp pid function_name function_line function].include?(k.to_sym) &&
+        k.to_sym || nil
+    end.compact
+end
+at_exit { $tmpdir && (FileUtils.remove_entry_secure $tmpdir) }

data/features/support/mixin_support.rb CHANGED Viewed

@@ -1,13 +1,17 @@
+# frozen_string_literal: true
 module MixinSupport
-   def random_string count
-      Random.new.bytes( ( count + 1 ) / 2 ).split( '' ).map do |b|
-         b.ord.to_s( 16 )
-      end.join[ 0...count ] ; end
+  def random_string(count)
+    Random.new.bytes((count + 1) / 2).split('').map do |b| b.ord.to_s(16)end.join[0...count]
+  end
-   def tmpfile
-      filename = File.join( Dir.mktmpdir, random_string( 20 ) )
-      File.open( filename, 'w' ) do |f|
-         f.print( random_string( 20 ) ) ; end
-      filename ; end ; end
+  def tmpfile
+    filename = File.join(Dir.mktmpdir, random_string(20))
+    File.open(filename, 'w') do |f|
+      f.print(random_string(20))
+    end
+    filename
+  end
+end
 World(MixinSupport)

data/lib/rdoba/_version_.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module Rdoba
-  VERSION = "0.9.3"
+  VERSION = '0.9.4'
 end

data/lib/rdoba/a.rb CHANGED Viewed

@@ -1,42 +1,42 @@
 #!/usr/bin/ruby -KU
-#coding:utf-8
+# frozen_string_literal: true
 require 'rdoba/debug'
 class Array
-  def geta(index, options = {}) #TODO => [] + class Index
-    dbp11 "[geta] <<< array = #{self.inspect}, index = #{index.inspect}, options = #{options.inspect}"
+  # TODO: => [] + class Index
+  def geta(index, options = {})
+    dbp11 "[geta] <<< array = #{inspect}, index = #{index.inspect}, options = #{options.inspect}"
     options[:сокр] ||= @сокр
-    if index.class == Array
-      return self if index == [] or index == ['']
+    if index.instance_of?(Array)
+      return self if [[], ['']].include?(index)
       index = index.clone
       value = self[index.shift]
-      (value.class == Hash or value.class == Array) ? value.geta(index, options) : value
+      (value.instance_of?(Hash) or value.instance_of?(Array)) ? value.geta(index, options) : value
     else
       geta_value(index, options)
     end
   end
 end
 class Hash
-protected
+  protected
   def geta_value(cid, options = {})
-    res = ((not cid) || cid.empty?) && self || self[cid] ||
+    res =
+      (!cid || cid.empty?) && self || self[cid] ||
         (options[:сокр] && (self[options[:сокр][cid]] || self[options[:сокр].reverse[cid]]))
-    if not res and options[:try_regexp]
-      self.keys.each do |key|
+    if !res and options[:try_regexp]
+      keys.each do |key|
         break res = self[key] if key.rmatch(cid)
-        if options[:сокр]
-          options[:сокр].each_pair do |val1, val2|
-            break res = self[key] if key.rmatch(cid.gsub(/#{val1}/, val2)) or
-                key.rmatch(cid.gsub(/#{val2}/, val1))
-          end
+        next unless options[:сокр]
+        options[:сокр].each_pair do |val1, val2|
+          break res = self[key] if key.rmatch(cid.gsub(/#{val1}/, val2)) or key.rmatch(cid.gsub(/#{val2}/, val1))
         end
       end
     end
@@ -44,47 +44,51 @@ protected
     res
   end
-public
+  public
-  def geta(index, options = {}) #TODO => [] + class Index
-    dbp11 "[geta] <<< hash = #{self.inspect}, index = #{index.inspect}, options = #{options.inspect}"
+  # TODO: => [] + class Index
+  def geta(index, options = {})
+    dbp11 "[geta] <<< hash = #{inspect}, index = #{index.inspect}, options = #{options.inspect}"
     options[:сокр] ||= @сокр
-    if index.class == Array
-      return self if index == [] or index == ['']
+    if index.instance_of?(Array)
+      return self if [[], ['']].include?(index)
       index = index.clone
       value = geta_value(index.shift, options)
-      (value.class == Hash or value.class == Array) ? value.geta(index, options) : value
+      (value.instance_of?(Hash) or value.instance_of?(Array)) ? value.geta(index, options) : value
     else
       geta_value(index, options)
     end
   end
-  def seta(index, value, options = {}) #TODO => [] + class Index
+  # TODO: => [] + class Index
+  def seta(index, value, options = {})
     dbp11 "[seta] <<< index: #{index.inspect}, value: #{value.inspect}, options: #{options.inspect}"
     options[:сокр] ||= @сокр
-    return self[index] = value if index.class != Array # TODO spec index
+    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
+    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_class = /^\d+$/.match?(set_idx) ? Array : Hash
     par_idx = nil
     index.each do |idx|
       unless o
@@ -93,7 +97,7 @@ public
         obj[par_idx] = o
       end
       obj = o
-      o = (obj.class == Hash) ? obj.geta_value(idx, options) : obj[idx]
+      o = obj.instance_of?(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
@@ -105,10 +109,8 @@ public
       end
     end
-    raise "Invalid path" unless o # TODO special exception
+    raise 'Invalid path' unless o # TODO: special exception
     o[set_idx] = value
   end
 end

data/lib/rdoba/bcd.rb CHANGED Viewed

@@ -1,61 +1,78 @@
-#encoding: utf-8
-#
+# frozen_string_literal: true
 module BCD
-  class ParseError < Exception
-    def initialize msg = "Invalid positive integer value"; end; end
+  class ParseError < RuntimeError
+    def initialize(msg = 'Invalid positive integer value'); end
+  end
-  class ConvertError < Exception
-    def initialize msg = "Invalid number has given"; end; end
+  class ConvertError < RuntimeError
+    def initialize(msg = 'Invalid number has given'); end
+  end
   def to_i
     res = 0
     mul = 1
-    self.each_byte do |c|
-      def pow value, mul
+    each_byte do |c|
+      def pow(value, mul)
         if value >= 10
-          raise ConvertError; end
+          raise ConvertError
+        end
         value * mul
       end
-      res += pow( c.ord & 0xF,  mul )
+      res += pow(c.ord & 0xF, mul)
       mul *= 10
-      res += pow( c.ord >> 4, mul )
+      res += pow(c.ord >> 4, mul)
       mul *= 10
     end
-    res; end
+    res
+  end
-  def self.parse value
+  def self.parse(value)
     if value < 0
-      raise ParseError; end
+      raise ParseError
+    end
     res = BCDString.new
     if res.respond_to? :force_encoding
-      res.force_encoding( 'ASCII-8BIT' ); end
+      res.force_encoding('ASCII-8BIT')
+    end
     if value > 0
       part = nil
       while value > 0
-        ( value, mod ) = value.divmod 10
+        value, mod = value.divmod 10
         if part
-          res << ( ( mod << 4 ) | part ).chr
+          res << ((mod << 4) | part).chr
           part = nil
         else
-          part = mod; end; end
+          part = mod
+        end
+      end
       if part
-        res << part.chr; end
+        res << part.chr
+      end
     else
-      res << 0.chr; end
-    res; end; end
+      res << 0.chr
+    end
+    res
+  end
+end
 class BCDString < String
   include BCD
-  def initialize value = nil
+  def initialize(value = nil)
     if value.is_a? Numeric
-      self.replace BCD.parse( value )
+      replace BCD.parse(value)
     else
-      super value.to_s; end; end; end
+      super value.to_s
+    end
+  end
+end
 class Numeric
   def to_bcd
     # NOTE: return as plain LSB string
-    BCD.parse value; end; end
+    BCD.parse value
+  end
+end

data/lib/rdoba/blank.rb ADDED Viewed

@@ -0,0 +1,14 @@
+class Object
+   def blank?
+      case self
+      when NilClass, FalseClass
+         true
+      when TrueClass
+         false
+      when Hash, Array
+         !self.any?
+      else
+         self.to_s == ""
+      end
+   end
+end

data/lib/rdoba/combinations.rb CHANGED Viewed

@@ -1,12 +1,12 @@
 #!/usr/bin/ruby
+# frozen_string_literal: true
 class Array
-private
+  private
   def __comby(i, size)
-    s = "0#{sprintf("%.*b", size, i)}0"
-    v = { :res => [], :c0 => 0, :c1 => 0, :j => 0}
+    s = "0#{format('%.*b', size, i)}0"
+    v = { res: [], c0: 0, c1: 0, j: 0 }
     def up1(v)
       sub_j = v[:j] + v[:c1] + 1
@@ -17,7 +17,9 @@ private
     def up0(v)
       sub_j = v[:j] + v[:c0] - 1
-      self[v[:j]...sub_j].each do |x| v[:res] << [x] end
+      self[v[:j]...sub_j].each do |x|
+        v[:res] << [x]
+      end
       v[:j] = sub_j
     end
@@ -35,25 +37,25 @@ private
     v[:res]
   end
-public
+  public
   def each_comby(*args)
-    return self if self.empty? or not block_given?
+    return self if empty? or !block_given?
     if args.include?(:backward)
-      yield [ self.dup ]
-      ((1 << (self.size - 1)) - 2).downto(0) do |i|
-        c = __comby(i, self.size - 1)
+      yield [dup]
+      ((1 << (size - 1)) - 2).downto(0) do |i|
+        c = __comby(i, size - 1)
         yield c
       end
     else
-      0.upto((1 << (self.size - 1)) - 2) do |i|
-        c = __comby(i, self.size - 1)
+      0.upto((1 << (size - 1)) - 2) do |i|
+        c = __comby(i, size - 1)
         yield c
       end
-      yield [ self.dup ]
+      yield [dup]
     end
-    return self
+    self
   end
 end