capykit 0.0.32 → 0.0.36

data/lib/capykit/base/ref.rb

@@ -5,31 +5,29 @@ module Capykit::Base::Ref
   
   def core_methods
     arr=Capykit::Base::Core.public_instance_methods.sort
-    ar2=arr.select{|x|x.length==1}
+    ar2=arr.select{|xx|xx.length==1}
     ar2 + (arr-ar2)
   end
   
   def capy_methods
     arr=modules_methods.sort!
-    ar2=arr.select{|x|x.length==1}
+    ar2=arr.select{|xx|xx.length==1}
     ar2 + (arr-ar2)
   end
   
   def auto_methods
     arr=modules_methods.sort!
-    arr.select{|m|m=~/^(aselector_|vsite_)/}
+    arr.select{|xx|xx=~/^(aselector_|vsite_)/}
   end
   
-  def execute_methods(pr='')
-    ym="x_#{pr}"
-    mo=modules_methods.select{|x|x[0,ym.length]==ym}.sort!
-    pr==''  ? mo : mo.collect{|x|x[ym.length,99]}
+  def execute_methods(pr='x_')
+    mo=modules_methods.select{|xx|xx=~/^#{pr}/}.sort!
+    pr==''  ? mo : mo.collect{|xx|xx[pr.to_s.length,99]}
   end
     
-  def test_methods(pr='')
-    ym="t_#{pr}"
-    mo=modules_methods.select{|x|x[0,ym.length]==ym}.sort!
-    pr==''  ? mo : mo.collect{|x|x[ym.length,99]}
+  def test_methods(pr='x_')
+    mo=modules_methods.select{|xx|xx=~/^#{pr}/}.sort!
+    pr==''  ? mo : mo.collect{|xx|xx[pr.to_s.length,99]}
   end
     
   def tasks_methods(*arg)
@@ -37,14 +35,22 @@ module Capykit::Base::Ref
     task_m='.*'
     idx=nil
     if arg!=[]
-      task_m=arg[0]
-      idx   =arg[1]
+      num   =arg.select{|nn|nn.class==Fixnum}
+      cls   =arg.select{|nn|nn.to_s[0,2]=='c_'}
+      mth   =arg.select{|nn|nn.to_s[0,2]=='m_'}
+      arg  -=num 
+      arg  -=cls 
+      arg  -=mth
+      idx   =num[0]
+      task_c=cls[0].to_s[2,99] if cls[0]
+      task_m=mth[0].to_s[2,99] if mth[0]
+      task_m=arg[0] if !mth[0] && arg[0]
     end
     tr=[]
     @tasks.each do|tk,tv|
       if tk.to_s=~/#{task_c}/
         tv.public_methods(nil).each do|tm|
-          tr << [tk,tm] if tm=~/#{task_m}/
+          tr << [tk,tm] if task_m.class==Fixnum || tm=~/#{task_m}/
           #tasks_run << "tasks[:#{tk}].#{tm}" if tm=~/#{task_m}/
         end
       end

data/lib/capykit/base/util.rb

@@ -1,30 +1,42 @@
 module Capykit::Base::Util
   attr_reader :tasks
   
-  def x(sym,*arg)
-    runs=[]
-    exec=execute_methods(sym)
-    arg.each do |oth|
-      mul=(oth.to_s[-1,1]=='_')
-      rgx=mul ? /#{oth}/ : /#{oth}$/
-      runs+=exec.select{|pr|pr=~rgx}
-    end
-    p runs
-    runs.each do|xx|
-      met="x_k#{xx}"
-      puts met
-      self.send met
+  def x(*arg)
+    if arg==[]
+      execute_methods.each_with_index do |vv,ii|
+        puts "#{ii}. #{vv}"
+      end
+      nil
+    else
+      runs=[]
+      sym=arg.shift
+      exec=execute_methods(sym)
+      arg.each do |oth|
+        mul=(oth.to_s[-1,1]=='_')
+        rgx=mul ? /#{oth}/ : /#{oth}$/
+        runs+=exec.select{|pr|pr=~rgx}
+      end
+      p runs
+      runs.each do|xx|
+        met="x_#{xx}"
+        puts met
+        self.send met
+      end
     end
   end
 
+  def xc(*arg)
+    tasks_methods(*arg)
+  end
+
   def xconf(xhash=nil)
     if xhash==:clear
-      @xconf={} 
+      @@xconf={} 
     else
-      @xconf||={}
-      @xconf  =@xconf.merge xhash if xhash
+      @@xconf||={}
+      @@xconf  =@@xconf.merge xhash if xhash
     end
-    @xconf
+    @@xconf
   end
   
   #def x_se_go(kwd,sym=:g)

data/lib/capykit/version.rb

@@ -1,3 +1,3 @@
 module Capykit
-  VERSION = "0.0.32"
+  VERSION = "0.0.36"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capykit
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 87
   prerelease: false
   segments: 
   - 0
   - 0
-  - 32
-  version: 0.0.32
+  - 36
+  version: 0.0.36
 platform: ruby
 authors: 
 - Widi Harsojo