dyndoc-ruby-core 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fca389823485e0db54ce3b7f9ec1582f28c2f31
-  data.tar.gz: e09a282bcb037243f5414b123ae962d16df5139f
+  metadata.gz: 959ac04a47a0a747a74d9fc9412693de2f16e3bb
+  data.tar.gz: 1656c0ea29f80098f637aaf16b66774728e6d59a
 SHA512:
-  metadata.gz: 0e5a6ac0ce89d9ee738a6144c4e9d7568cbce05e384ca350a3263fd9cb256a8e6393e1d1880d4a44b8668251d2bf8e193c0487ce39d413ea2c047b9eb12f502f
-  data.tar.gz: 29d60202888c1f07ae9f094213a84f4c2837ecceb4496f23a9ff2c4acc406eb41f3bfebf081f9e1f732d0e200422a27dd977cd0a27c8fc0235b8032f3c9e0810
+  metadata.gz: 92513ff73b9d2028e87848b27b8b8a9124d1a0c80e1c36574d3caf3cb9b1da7e942c8d6c549d8ee0bb972a1bbabcbb82bbc268fa10f4d78a56b3052789a61e83
+  data.tar.gz: 2e0f677656d6b279cc85d4b7eda91740ee774b25702f01070e7b435fca73fe4df12993195a474600b6b050ba5df037f405b40b0093ae6be1e8295b3a209aeaa1

data/lib/dyndoc-core.rb

@@ -60,5 +60,8 @@ Settings.resolve!
 require 'dyndoc/init/config'
 Dyndoc.init_dyndoc_library_path
 Dyndoc.init_rootDoc
+Dyndoc.add_logger
+Dyndoc.logger.info("dyndoc-core loaded!")
+## Dyndoc.logger.info(".dyndoc.yml: "+File.join(ENV["HOME"],".dyndoc.yml"))
 
 CqlsDoc=Dyndoc #for compatibity

data/lib/dyndoc/base/filter/server.rb

@@ -818,7 +818,7 @@ module Dyndoc
 		## Dyndoc.warn "JLServer.inputsAndOutputs",res
 		res.map!{|input,output,output2,error,error2|
 			{:input=>input,:output=>output,:output2=>output2,:error=>error,:error2=>error2}
-		} if hash
+		} if res and hash
 		res
 	end
 

data/lib/dyndoc/base/tmpl/manager.rb

@@ -77,23 +77,30 @@ module Dyndoc
       if RUBY_PLATFORM =~ /mingw/
         require File.join(ENV["DYNDOC_HOME"],"bin","msys2","file_tools.rb") if ENV["DYNDOC_HOME"]
       end
+      Dyndoc.logger.info "R initialized inside dyndoc!"
     end
 
     def TemplateManager.initJulia
+      Dyndoc.logger.info "initJulia: first"
       first=require "jl4rb" #save if it the first initialization!
+      Dyndoc.logger.info "initJulia: require"
       Julia.init
+      Dyndoc.logger.info "initJulia: init"
       # init rb4jl stuff
       # since inside ruby, no need Ruby.start and Ruby.stop like in rb4R.
       # sort of equivalent of JLServer.init_filter (but not yet defined)!
       Julia << "include(\""+File.join(Dyndoc.cfg_dir[:gem_path],"share","julia","ruby.jl")+"\")"
+      Dyndoc.logger.info "initJulia: ruby.jl"
       Julia << "include(\""+File.join(Dyndoc.cfg_dir[:gem_path],"share","julia","dynArray.jl")+"\")"
+      Dyndoc.logger.info "initJulia: dynArray.jl"
       #-| To debug ruby.jl and dynArray.jl => uncomment below and commnt above
       # Julia << "include(\""+File.expand_path("~/Github/dyndoc/share/julia/ruby.jl")+"\")"
       # Julia << "include(\""+File.expand_path("~/Github/dyndoc/share/julia/dynArray.jl")+"\")"
       Julia << "using Dyndoc"
+      Dyndoc.logger.info "initJulia: using Dyndoc"
       Julia << "Ruby.alive(true)"
       #Julia << "global const _dynArray=DynArray()"
-      Dyndoc.warn "Julia initialized inside dyndoc!"
+      Dyndoc.logger.info "Julia initialized inside dyndoc!"
 
     end
 

data/lib/dyndoc/init/config.rb

@@ -19,7 +19,7 @@ module Dyndoc
   }
 
   require 'logger'
-  @@dyn_logger = Logger.new @@cfg_dir[:log_file], 7, 1048576
+  @@dyn_logger = nil
 
   def Dyndoc.cfg_dir
     @@cfg_dir
@@ -29,10 +29,18 @@ module Dyndoc
     Settings[:cfg_dyn]
   end
 
+  def Dyndoc.add_logger
+    @@dyn_logger = Logger.new(@@cfg_dir[:log_file], 7, 1048576)
+  end
+
   def Dyndoc.logger
     @@dyn_logger
   end
 
+  def Dyndoc.logger_info(txt)
+    @@dyn_logger.info(txt)
+  end
+
   @@dyn_block={}
 
   def Dyndoc.dyn_block

data/share/julia/dynArray.jl

@@ -8,14 +8,14 @@ importall Ruby
 export DynVector,DynArray,getindex,setindex!,show,Vector,sync,getkey
 
 # this is just a wrapper of Vector type with update of all connected vectors
-# when change on the vector occurs 
+# when change on the vector occurs
 
 
 type DynVector
 	ary::Vector
-	key::ASCIIString
+	key::String
 
-	DynVector(a::Vector,k::ASCIIString)=(x=new();x.ary=a;x.key=k;x)
+	DynVector(a::Vector,k::String)=(x=new();x.ary=a;x.key=k;x)
 end
 
 function getindex(dynvect::DynVector,i::Integer)
@@ -26,8 +26,8 @@ end
 function setindex!(dynvect::DynVector,value,i::Integer)
 	dynvect.ary[i]=value
 	## println("inisde vect:",Ruby.alive())
-	if Ruby.alive() 
-		Ruby.run("Dyndoc::Vector[\""*dynvect.key*"\"].sync(:jl)") 
+	if Ruby.alive()
+		Ruby.run("Dyndoc::Vector[\""*dynvect.key*"\"].sync(:jl)")
 	end
 end
 
@@ -43,18 +43,18 @@ end
 
 global const Vec=DynArray()
 
-function getindex(dynary::DynArray,key::ASCIIString)
+function getindex(dynary::DynArray,key::String)
 	#println("getindex(" * key * ")->todo")
 	#if Ruby.alive()
 		#println("getindex(" * key * ")->to sync")
-		#Ruby.run("Dyndoc::Vector[\""*key*"\"].sync_to(:jl)") 
+		#Ruby.run("Dyndoc::Vector[\""*key*"\"].sync_to(:jl)")
 	#end
 	#println("getindex(" * key * ")->done")
 	dynary.vars[key]
 end
 getindex(dynary::DynArray,key::Symbol)=getindex(dynary,string(key))
 
-function setindex!(dynary::DynArray,value,key::ASCIIString)
+function setindex!(dynary::DynArray,value,key::String)
 	#println("key:" * key)
 	#println(keys(dynary.vars))
 	if(haskey(dynary.vars,key))
@@ -65,7 +65,7 @@ function setindex!(dynary::DynArray,value,key::ASCIIString)
 	end
 
 	## println("inside array:",Ruby.alive())
-	
+
 	if Ruby.alive()
 		Ruby.run("Dyndoc::Vector[\""*key*"\"].sync(:jl)")
 	end
@@ -73,13 +73,13 @@ end
 setindex!(dynary::DynArray,value,key::Symbol)=setindex!(dynary,value,string(key))
 
 
-sync(dynary::DynArray,key::ASCIIString)= if Ruby.alive() Ruby.run("Dyndoc::Vector[\""*key*"\"].sync(:jl)") end
+sync(dynary::DynArray,key::String)= if Ruby.alive() Ruby.run("Dyndoc::Vector[\""*key*"\"].sync(:jl)") end
 
 show(io::IO,dynary::DynArray)=show(io,dynary.vars)
 
 # NO MORE KEY WITH THE FORM "<name>@<ruby id object>"
 # function getkey(dynary::DynArray,k::Symbol)
-# 	for k2 in keys(dynary.vars)  
+# 	for k2 in keys(dynary.vars)
 # 	 	if split(k2,"@")[1] == string(k)
 # 	 		return k2
 # 	 	end
@@ -90,4 +90,3 @@ show(io::IO,dynary::DynArray)=show(io,dynary.vars)
 # setindex!(dynary::DynArray,value,key::Symbol)=setindex!(dynary,value,getkey(dynary,key))
 
 end
-

data/share/julia/dyndoc.jl

@@ -95,12 +95,12 @@ function capture_julia(cmd::AbstractString)
 			try
 				result=eval(DyndocSandbox, pcmd0)
 			catch e
-	            #io = IOBuffer()
-	            #print(io, "ERROR: ")
-	            #Base.error_show(io, e)
-	            error = "Error: $(string(e))"
-	            #close(io)
-	        end
+          #io = IOBuffer()
+          #print(io, "ERROR: ")
+          #Base.error_show(io, e)
+          error = "Error: $(string(e))"
+          #close(io)
+      end
 			push!(res,(join(cmd0,"\n"),string(result),get_stdout_iobuffer(),error,get_stderr_iobuffer()))
 			cmd0=AbstractString[]
 		end

data/share/julia/ruby.jl

@@ -2,7 +2,7 @@
 
 module Ruby
 
-	librb=Libdl.dlopen(("JULIA_RUBYLIB_PATH" in keys(ENV)) ? ENV["JULIA_RUBYLIB_PATH"] : "libruby")
+	librb=Libdl.dlopen(("JULIA_RUBYLIB_PATH" in keys(ENV)) ? ENV["JULIA_RUBYLIB_PATH"] : "/usr/lib/libruby")
 
 	export start,stop,run,alive
 
@@ -22,7 +22,7 @@ module Ruby
 	function run(code::AbstractString)
 		state=1 #not modified then
 		##println(code)
-		res=ccall(Libdl.dlsym(librb,:rb_eval_string_protect),Ptr{UInt64},(Ptr{UInt8},Ptr{UInt32}),bytestring(code),&state)
+		res=ccall(Libdl.dlsym(librb,:rb_eval_string_protect),Ptr{UInt64},(Ptr{UInt8},Ptr{UInt32}),string(code),&state)
 	 	return nothing
 	end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby-core
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere