rmtools 2.1.1 → 2.2.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTk3ZDI3YzQ2NTBlZGE1ZjMzMTNhNmUyMjMxMjBlMzkzOTY5ZGE4Mg==
+  data.tar.gz: !binary |-
+    Yzc5ZWVlOTFmNzIwOTEyM2Q2YzAwNjcxZWRlMTlhYzJhNTg2ZDMxYQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NmE5NDE0ZDhjYjNkODU1MmFkMTkwMjZiM2MzMzVmMTk1ZDdkOGI0MmExMjIz
+    YjEyYmZmMWQwYmQ5MGViMjE1NTBmMDMyZGU2NjUwNWRhNmUwM2U5NDQ1MGY5
+    YThiZTY2ZTRiNmFmMDg2MzYyMjZlMTU3MjdjMThkNDk1YjQ3YjM=
+  data.tar.gz: !binary |-
+    YmRkZmE2NDhhZGRjNDJmOGMzM2E0ZjBkYTIyMmU2MDBkZGEyYzg3YTQxZDk5
+    ZjNjOWEzNmE3NDhjODIwMzY3MWRhNjA4ZmE5NmM3YmYzYTc0OWM2MDZhMmIy
+    MDQ2Y2IwMTczY2VkOWFmODU4YWM0OWE2ZDE2MjhjMDQzZjkzMzI=

data/README.md

@@ -27,6 +27,28 @@ It's still randomly documented since it's just my working tool.
 
 ### CHANGES
 
+##### Version 2.2.1
+
+* ::RMLogger
+  * Aliased #info -> #puts to be able to set RMLogger as default logger wherever it's possible
+  * Added #get_config
+  
+* ::Painter
+  * #method_missing now accepts :"_<effect key>" as well as :"<color key>[_<effect key>]"
+
+##### Version 2.2.0
+
+* Added ::FileWatcher
+  * Constantly checks files updated in a directory and does some action whenever a update has been met
+  * A subclass, ::ScpHelper copies updated files to specified host
+
+##### Version 2.1.1
+
+* Array
+  * Added #any and #none to iterators pattern
+* Hash
+  * Fixed #any? (and removed it for Ruby>=1.9)
+
 ##### Version 2.1.0
 
 * Array

data/lib/rmtools/console/coloring.rb

@@ -77,7 +77,7 @@ module RMTools
       #
       # Actually, transparent coloring is slower
       def method_missing(m, str, transparent=false)
-        paint str, transparent, *(m.to_s/"_")
+        paint str, transparent, *(m.to_s/"_").bs
       end
           
       def clean str

data/lib/rmtools/console/printing.rb

@@ -53,6 +53,13 @@ module RMTools
   def tick!
     print %W{|\b /\b -\b \\\b +\b X\b}.rand
   end
+  
+  def tick_while
+    ticker = thread {loop {RMTools::tick!}}
+    res = yield
+    ticker.kill
+    res
+  end
     
-  module_function :tick!
+  module_function :tick!, :tick_while
 end

data/lib/rmtools/dev/logging.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
+RMTools::require 'core'
 RMTools::require 'console/coloring'
 RMTools::require 'text/string_parse'
-RMTools::require 'b'
 
 module RMTools
 
@@ -46,7 +46,7 @@ module RMTools
     end
           
     def defaults
-      puts %{    # #{@c.y 'common options:'}
+      Kernel::puts %{    # #{@c.y 'common options:'}
     :q => false,   # not print
     :out => false, # output to file, may contain strftime's %H%M%Y etc for filename
     :time => ["%H:%M:%S", "%03d"], # strftime, [msecs]
@@ -127,14 +127,18 @@ module RMTools
       str << "\n" if opts&INLINE==0
       log_str = cfg.color_out ? str : @c.clean(str)
       RMTools.write out, log_str if log_
-      Kernel.print str if print_
+      Kernel::print str if print_
     end
         
     def get_config!
       @file_formats.empty? ? @default_format : @file_formats[File.expand_path((@current_caller = caller)[1].till ':')]
     end
         
-    # controllers:
+    def get_config(file=nil)
+      @file_formats[file && File.expand_path(file)]
+    end
+        
+    # controls:
     # - $panic: print debug messages
     # - $verbose: print log messages
     # - $quiet: print only warn messages regardless of other globals
@@ -189,6 +193,11 @@ module RMTools
     alias :<= :debug
     alias :<< :info
     alias :<   :warn
+    alias :puts :info
+    
+    def print text
+      info text, caller: 1, mute: INLINE 
+    end
         
     Modes.each {|m| define_method("#{m}=") {|mute| send :"mute_#{m}=", !mute}}
     

data/lib/rmtools/dev/watching.rb

@@ -0,0 +1,156 @@
+# encoding: utf-8
+module RMTools
+  
+  class FileWatcher
+    cattr_reader :threads
+    attr_reader :thread
+    @@threads = {}
+    
+    def initialize(params={})
+      @debug ||= params[:debug]
+      @pwd ||= params[:pwd] || Dir.pwd
+      @thread_name ||= params[:thread_name] || "#{self.class.name.underscore}:#@host"
+      @interval ||= params[:interval] || 1
+    end
+    
+    def files_stats(*stat_params)
+      Dir(@pwd || Dir.pwd).recursive_content.flatten.map_hash {|fn| 
+        if File.file? fn
+          if stat_params
+            stats = stat_params.map_hash {|param| 
+              [param, File.__send__(param, fn)]
+            }
+          else
+            stats = File.stats fn
+          end
+          [fn, stats]
+        end
+      } 
+    end
+    
+    def kill
+      @@threads[@thread_name].kill
+    end
+    
+    def temp_string(str, color=nil)
+      # space is needed because cursor is on the left
+      str = "  " + str.to_s
+      backspace = "\b"*str.size
+      if color
+        str = Painter.send(color, str)
+      end
+      str << backspace
+    end
+    
+    def print_temp(str, color=nil)
+      print temp_string str, color
+    end
+    
+    def puts_temp(str, color=nil)
+      print_temp(str.to_s+"\n", color)
+    end
+    
+    def watch(opts={})
+      if @@threads[@thread_name]
+        kill
+      end
+      @@threads[@thread_name] = @thread = Thread.new {
+        loop {watch_cycle}
+      }
+    end
+    
+    # Памятка про printf для чисел:
+    # precision = минимальное число цифр; 
+    #   %f -> справа || 6
+    #   %d -> слева, заполняется нулями || 1
+    # len = минимальная длина строки; если начинается с 0, заполняется нулями, иначе пробелами || 0
+    # "%[<len>.][<precision>]d"
+    # "%[<len>][.<precision>]f"
+    def print_time(seconds)
+      minutes, seconds = seconds.to_i.divmod 60
+      hours, minutes = minutes.divmod 60
+      diff = "#{"#{hours}:" if hours.b}#{"%2d:"%minutes if hours.b or minutes.b}#{"%2d"%seconds}"
+      print_temp(diff, :b_b)
+    end
+    
+    def print_idle_time
+      print_time(Time.now - @cur_time)
+    end
+    
+    def watch_cycle
+      @files = select_files
+      process
+      wait
+    end
+    
+    # => [pathname, ...] or {pathname => [action, ...]} or {pathname => action}
+    def select_files
+      {}
+    end
+    
+    def process
+      raise NotImplementedError, "do something with @files"
+    end
+    
+    def wait
+      sleep @interval
+    end
+    
+  end
+  
+  class ScpHelper < FileWatcher
+    
+    def initialize(params={})
+      @pwd = params[:pwd] || (params[:host] ? File.join(Dir.pwd, params[:host]) : Dir.pwd)
+      @host = params[:host] || File.basename(@pwd)
+      super params
+    end
+    
+    def files_mtimes
+      files_stats :mtime
+    end
+    
+    # @ fpath : "/<relative path>"
+    def scp(fpath)
+      fullpath = File.join @pwd, fpath
+      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}"
+      else
+        print "[ #{Painter.g('OK')} ]"
+      end
+    end
+    
+    def watch
+      @cur_time, @prev_time = Time.now, nil
+      super
+    end
+    
+    def select_files
+      @cur_time, @prev_time = Time.now, @cur_time
+      files_mtimes.select {|f, s| s.mtime >= @prev_time}.to_a.firsts
+      .map {|fpath| fpath.sub(@pwd, '')}
+    end
+    
+    def process
+      if @files.b
+        $log.debug {[prev_time.to_f, File.mtime(@pwd+@files[0]).to_f]}
+        puts Painter.w("\nMODIFIED IN #@host: ") + @files*', '
+        @files.each {|fpath| scp fpath}
+      else
+        $log.debug {[@prev_time.to_f, File.mtime('var/rails/nzm/app/assets/stylesheets/app.css').to_f]}
+        @cur_time = @prev_time 
+      end
+    end
+    
+    def wait
+      (@interval*10).times {
+        sleep 0.1
+        print_idle_time
+      }
+    end
+    
+  end
+  
+end

data/lib/rmtools/enumerable/range.rb

@@ -125,12 +125,14 @@ class Range
   # and (0...1.0).include? 1.0
   # => false
   def include?(number_or_range)
-    if Numeric === number_or_range
+    if Numeric === number_or_range or String === number_or_range
       include_number? number_or_range
     elsif XRange === number_or_range
       number_or_range.include? self
-    else
+    elsif Range === number_or_range
       include_number? number_or_range.first and include_number? number_or_range.last
+    else
+      raise TypeError, "can not find #{number_or_range.class} in Range"
     end
   end
   

data/lib/rmtools/functional/fold.rb

@@ -9,8 +9,8 @@ module Enumerable
         reduce(m) {|m, i| m ? o.call(m, i) : i}
     when Symbol
       block_given? ?
-        reduce(m && yield(m)) {|m, i| m ? m.send(o, yield(i)) : yield(i)} : 
-        reduce(m) {|m, i| m ? m.send(o, i) : i}
+        reduce(m && yield(m)) {|m, i| m ? m.__send__(o, yield(i)) : yield(i)} : 
+        reduce(m) {|m, i| m ? m.__send__(o, i) : i}
     else TypeError! o, Proc, Symbol
     end
   end
@@ -24,8 +24,8 @@ module Enumerable
       reverse.reduce(m) {|m, i| m ? o.call(i, m) : i}
     when Symbol
     block_given? ?
-      reverse.reduce(m && yield(m)) {|m, i| m ? yield(i).send(o, m) : yield(i)} : 
-      reverse.reduce(m) {|m, i| m ? i.send(o, m) : i}
+      reverse.reduce(m && yield(m)) {|m, i| m ? yield(i).__send__(o, m) : yield(i)} : 
+      reverse.reduce(m) {|m, i| m ? i.__send__(o, m) : i}
     else TypeError! o, Proc, Symbol
     end
   end

data/lib/rmtools/version.rb

@@ -1,3 +1,3 @@
 module RMTools
-  VERSION = '2.1.1'
+  VERSION = '2.2.1'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rmtools
 version: !ruby/object:Gem::Version
-  version: 2.1.1
-  prerelease: 
+  version: 2.2.1
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -117,6 +110,7 @@ files:
 - lib/rmtools/dev/timer.rb
 - lib/rmtools/dev/trace_format.rb
 - lib/rmtools/dev/void.rb
+- lib/rmtools/dev/watching.rb
 - lib/rmtools/enumerable.rb
 - lib/rmtools/enumerable/array.rb
 - lib/rmtools/enumerable/array_iterators.rb
@@ -171,27 +165,26 @@ files:
 homepage: https://github.com/tinbka/rmtools
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Collection of helpers for debug, text/array/file processing and simply easing
   a coding process
 test_files: []