zaphire 0.0.8 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c4d8c4e337a2977087cbef6d051b1d74cbe122
-  data.tar.gz: 6275d94d423cb8c0e6d8cfb273208ff83aefa2c4
+  metadata.gz: 04eabf77d33c1a421a393a1983bd07f6706a881a
+  data.tar.gz: 09d1adab1102d694c8c58104a8a199f9983aea5a
 SHA512:
-  metadata.gz: 38cfa5f33403712a23b1de06139dce987465db7e4bf602e2c2a3e6804833eb57ae8ef3650dbab3bdaa6bfa5c63f92788c1ce3bdd2a2a4c63f42c8876dd7e976c
-  data.tar.gz: 9a11fa01b23806f8c3b4e1769dda36f9a2e273fa72cb57cd82a8eb278266961f3faa740e6492141c05d3989fc3dea59199b211d6bb71e8423d747d958ab9e823
+  metadata.gz: cec493e72d388a2f326e827171a7704d33c80638a857a6e264fe6bd6625037f0af7c361ad58b466f5ed96546dad5ec42dbdcae19f6c39b228bd4dbbedac403ea
+  data.tar.gz: a89d8d7d72f8927e5df1a4352769eb6727a0823255cf61698288a2b0f454bbd2826ffc9295c36367df0cf0f96348968876476058bd501b346bd9a95b1337a148

data/lib/zaphire.rb

@@ -5,33 +5,11 @@ require 'google_drive'
 require 'csv'
 require 'open-uri'
 
-module Zsave
-
-	def self.csv(arr,file,mode="w",opts={})
-
-		arr = arr.to_a
-    	
-		File.open(file,mode){ |f| f << arr.map(&:to_csv).join("\n") }
-
-    	#open(path,mode,opts){ |csv| array.each{ |row| csv << row } }
-  	end
-
-  	def self.cvs(array,path,mode="w",opts={})
- 	
- 		arr = arr.to_a
-    
-    	File.open(file,mode){ |f| f << arr.map(&:to_csv).join("\n") }
-	
-		#open(path,mode,opts){ |csv| array.each{ |row| csv << row } }
-  	end
-
-end
-
 # short version for short commands that rely on global variable well set to get things
 
 module Z
 
-	def self.get (pack=@iivar)
+	def self.get(pack=@iivar)
 
 
 		key = m(pack,'key')
@@ -43,8 +21,37 @@ module Z
 
 		
 	end
+
+	def self.v
+		return '18'
+	end
+
 end
 
+module Zsave
+
+	def self.csv(arr,file,mode="w",opts={})
+
+		arr = arr.to_a
+
+		File.open(file,mode){ |f| f << arr.map(&:to_csv).join("\n") }
+
+    	#open(path,mode,opts){ |csv| array.each{ |row| csv << row } }
+    end
+
+    def self.cvs(array,path,mode="w",opts={})
+
+    	arr = arr.to_a
+
+    	File.open(file,mode){ |f| f << arr.map(&:to_csv).join("\n") }
+
+		#open(path,mode,opts){ |csv| array.each{ |row| csv << row } }
+	end
+
+end
+
+
+
 module Zgdocs
 
 	def self.addvalue key,sheet,value,user,password
@@ -86,13 +93,13 @@ module Zgdocs
 
 		session = GoogleDrive.login(user, password)
 		ws = session.spreadsheet_by_key(key).worksheet_by_title(sheet)
-	
+
 		rows = t.last_row
 
 		ws.max_rows = (rows + 1) if ws.max_rows == rows
 
 		rows = 0 if rows == nil
-		 
+
 
 		aa = rows + 1
 		aa
@@ -121,7 +128,7 @@ module Zgdocs
 			curCol = colstart
 
 			m "ZgdocsSaving Row",therow,xx
-		
+
 			data.row(therow).each do |value|
 
 			#0.upto(row.column_count) do |col|
@@ -146,7 +153,7 @@ module Zgdocs
 		session = GoogleDrive.login(user, password)
 
 		ws = session.spreadsheet_by_key(key).worksheet_by_title(sheet)
-	
+
 		ws.max_rows = (rows + 2) if ws.max_rows < rows
 
 	end
@@ -183,46 +190,48 @@ def put a
 	puts a.to_s
 end
 
-def d a
-	puts a
-end
+def d itext,i,xx,iadditional
+	if i == nil
+		puts a
+		return ''
+	else
+		iadditional = '' if iadditional == nil
+		tt = xx.to_f + 1.00
+		aa =  trunc( (( (i.to_f+1) / tt) * 100) )
+		it = itext << ": (" << aa.to_s << "%)"
 
-def md itext,i,xx,iadditional = ""
-	tt = xx.to_f + 1.00
-	aa =  trunc( (( (i.to_f+1) / tt) * 100) )
-	it = itext << ": (" << aa.to_s << "%)"
+		return "" if @mvar == it
+		@mvar = it 
 
-	return "" if @mvar == it
-	@mvar = it 
+		texttodisp = @mvar << " " << iadditional
 
-	texttodisp = @mvar << " " << iadditional
+		i += 1
+		xx += 1
 
-	i += 1
-	xx += 1
+		@mstart = theticks() if i == 1
+		return "" if i == 1 or xx == 1
+		
+		it = trunc( (i.to_f / tt*10) )
+		
+		ee = ( (theticks.to_f - @mstart.to_f) / 60)  *  ( (tt - i) / i.to_f )
+		aa = trunc( ee )
+		bb = trunc( aa.to_f / 60 )
+		cc1 = aa.to_f / 60
+		cc2 = trunc( (aa.to_f / 60) )
+		cc = trunc( (cc1  - cc2 ) * 60 )
 
-	@mstart = theticks() if i == 1
-	return "" if i == 1 or xx == 1
-	
-	it = trunc( (i.to_f / tt*10) )
-	
-	ee = ( (theticks.to_f - @mstart.to_f) / 60)  *  ( (tt - i)/i.to_f )
-	aa = trunc( ee )
-	bb = trunc( aa.to_f / 60 )
-	cc1 = aa.to_f / 60
-	cc2 = trunc( (aa.to_f / 60) )
-	cc = trunc( (cc1  - cc2 ) * 60 )
+		cc = "0" << cc.to_s if cc.to_s.size == 1
 
-	cc = "0" << cc.to_s if cc.to_s.size == 1
+		it = "[" << " XXXXXXXXXX"[1..it.to_i] << " __________"[1..(10-it.to_i)]  << "] " << texttodisp << " (" << bb.to_s << ":" << cc.to_s << " Min. left) " << i.to_i.to_s << " of " << tt.to_i.to_s
 
-	it = "[" << " XXXXXXXXXX"[1..it.to_i] << " __________"[1..(10-it.to_i)]  << "] " << texttodisp << " (" << bb.to_s << ":" << cc.to_s << " Min. left) " << i.to_i.to_s << " of " << tt.to_i.to_s
-  
-	d it
+		d it
 
-	iSetMsgForTerm(@itermattended, it) unless @itermattended 
+		iSetMsgForTerm(@itermattended, it) unless @itermattended 
+	end
 end
 
 def iSetMsgForTerm iterm,imessage
-
+	return ""
 end
 
 # on m itext,i,xx
@@ -250,11 +259,11 @@ end
 
 class String
 
-	def delete_lines(number_of_lines=1)
-	  split(/\r\n|\r|\n/, number_of_lines+1).last
+	def delete_lines(num_of_lines=1)
+		split(/\r\n|\r|\n/, num_of_lines+1).last
 	end
 
-	def delete_char(number=1,number2='')
+	def delete_char(number=1, number2='')
 		if number2==''
 			self[number-1]=''
 			self
@@ -264,7 +273,7 @@ class String
 		end
 	end
 
-	def char(number=1,number2='')
+	def char(number=1, number2='')
 		if number2==''
 			self[number-1]
 		else
@@ -272,7 +281,7 @@ class String
 		end
 	end
 
-	def line(number=1,number2='')
+	def line(number=1, number2='')
 		if number2==''
 			self.split('\n')[number-1]
 		else
@@ -285,50 +294,75 @@ class String
 	end
 
 	def lastchar(a=1)
+		return '' if self == nil
 		self[-a..-1]
 	end
 
-	def number_of_lines aa
-		aa.lines.count
+	def number_of_lines
+		return 0 if self == nil or self == ''
+		self.lines.count
+	end
+
+end
+
+class Nil
+	def lastchar
+		return ''
+	end
+
+	def number_of_lines
+		return 0
+	end
+
+	def contains
+		return false
+	end
+
+	def line
+		return ''
 	end
+
+	def char
+		return ''
+	end
+
 end
 
 class Matrix
-    def dump(firstLine = "")
-        str = ""
-        if firstLine != ""
-            str << firstLine << "\n"
-        end
-        for i in 0...self.row_size
-            space = ""
-            for j in 0...self.column_size
-                str << space << self[i,j].to_s
-                space = " "
-            end
-            str << "\n"
-        end
-        return str
-    end
+	def dump(firstLine = "")
+		str = ""
+		if firstLine != ""
+			str << firstLine << "\n"
+		end
+		for i in 0...self.row_size
+			space = ""
+			for j in 0...self.column_size
+				str << space << self[i,j].to_s
+				space = " "
+			end
+			str << "\n"
+		end
+		return str
+	end
     # La classe Matrix est immutable, or je veux pouvoir écrire :
     #   m[i,j] = v
     #
     def []=(i, j, v)
-        @rows[i][j] = v
+    	@rows[i][j] = v
     end
     # Il n'y a même pas de constructeur pour une matrice rectangulaire : bouhhh
     # Le prefixe "self." permet de déclarer une méthode de classe
     def self.create(nbRows, nbCols, value)
-         return Matrix.rows(Array.new(nbRows, Array.new(nbCols,value)))
+    	return Matrix.rows(Array.new(nbRows, Array.new(nbCols,value)))
     end
 end
 
-
 def left a,b
 	c = b-1
 	a.to_s[0..c]
 end
 
-def chars a,b,c
+def chars(a, b, c)
 	c.to_s[a-1..b-1]
 end
 
@@ -338,14 +372,14 @@ end
 #   end
 # end
 
-def offset tofind, pack
+def offset (tofind, pack)
 	a = pack.index(tofind)
 	if a == nill
-		a == 0
+		a = 0
 	else
 		a += 1
 	end
-	return a
+	a
 end
 
 def length a
@@ -353,118 +387,121 @@ def length a
 end
 
 def icrash imessage
- 	d "CRASH****:  " << imessage
- 	break
+	d "CRASH****:  " << imessage
+ #	break
 end
 
-def m ifld, ipack, icrashnow
-   r = "\n"
-   
-   get offset("ı" << ifld << ",",ipack)
+def m(ifld, ipack, icrashnow)
+	r = "\n"
+
+	get offset("ı" << ifld << ",",ipack)
    if @it == 0   # multiline pck
-      get offset("ı" << ifld << r,ipack)
-      ifldend = "ıend" << ifld 
-      iendc =  offset(ifldend, ipack)-2 
-      if iendc is 0 or iendc <= @it 
-         if icrashnow == true
-            icrash "mExtFrmPck:fldNotFound:'" << ifld << "'"
-            return "***CRASH"
-         end 
-         if ipack == ''
-            get m(ifld,fiivar(),true)
-         else
-            get m(ifld,mreformat(ipack),true)
-         end 
-      else
-         istart = @it+(ifld.length)+2
-         get ipack.char(istart,iendc)
-      end 
+   	get offset("ı" << ifld << r,ipack)
+   	ifldend = "ıend" << ifld 
+   	iendc =  offset(ifldend, ipack) - 2
+   	if iendc == 0 or iendc <= @it 
+   		if icrashnow == true
+   			icrash "mExtFrmPck:fldNotFound:'" << ifld << "'"
+   			return "***CRASH"
+   		end
+   		if ipack == ''
+   			get m(ifld, fiivar(), true)
+   		else
+   			get m(ifld, mreformat(ipack), true)
+   		end
+   	else
+   		istart = @it + (ifld.length) + 2
+   		get ipack.char(istart, iendc)
+   	end
    else
-      ifldend = r
-      istart = @it+length(ifld)+2
-      ilen = length(ipack)
-      iendc = offset(ifldend,(ipack.char(istart,ilen)) << r)-2 + istart
-      get ipack.char(istart, iendc)
-   end 
+   	ifldend = r
+   	istart = @it + length(ifld) + 2
+   	ilen = length(ipack)
+   	rrr = ipack.char(istart, ilen) << r
+   	iendc = offset(ifldend, rrr) - 2 + istart
+   	get ipack.char(istart, iendc)
+   end
    return @it
 end
 
 
 def mreformat ipack
 	r = "\n"
-	istate = ''
-  
-# str.lines.count
-
-   while 1 < 2 do
-      if ipack.lines.count == 0 then break
-      get ipack.lines.first
-      ipack = ipack.delete_lines(1)
-      
-      if @it.char(1) == "ı" 
-         aa = aa << it << r
-
-         if @it.contains(",") == false 
-            @it = @it.delete_char(1)
-            iend = offset("ıend" << @it,ipack)
-            if iend == 0 then icrash "reformat:StartedButNoEnd"
-            aa = aa << ipack.char(1,iend)
-            ipack = ipack.delete_char(1,iend)
-
-            aa = aa << ipack.line(1) << r
-            ipack = ipack.delete_lines(1)
-         end 
-         next repeat
-      else
-         aa = aa << "ı" << it << r
-      end
-   end 
-
-   aa = aa << "≤"
-   return aa
+	until 1 == 2 do
+		break if ipack.lines.count == 0 
+		get ipack.lines.first
+		ipack = ipack.delete_lines(1)
+
+		if @it.char(1) == "ı"
+			aa = aa << it << r
+
+			next if @it.contains(",")
+			
+			@it = @it.delete_char(1)
+			iend = offset("ıend" << @it, ipack)
+			icrash "reformat:StartedButNoEnd" if iend == 0
+			aa = aa << ipack.char(1, iend)
+			ipack = ipack.delete_char(1, iend)
+			aa = aa << ipack.line(1) << r
+			ipack = ipack.delete_lines(1)
+
+			next
+		else
+			aa = aa << "ı" << it << r
+		end
+	end
 
+	aa = aa << "≤"
+	return aa
 end
 
-def ireplaceachar aa
+def ireplaceachar(aa)
 	a = aa[0]
 	b = aa[1]
-	aa = aa.delete_char(1,2)
-	aa.gsub(a, b)
+	aa = aa.delete_char(1, 2)
+	aa = aa.gsub(a, b)
+	aa
 end
 
 # need to check strange symbols on a Mac, since Window mixes up chars
-def ms iPart,iNewValue,iPack
-   r = "\n"
-   if ipart == nil then icrash "ms():part not defined"
-   if ipack.lastchar() != "≤" then ipack = mreformat(ipack) 
-   if ipart.contains("≤") then ipart = ireplaceachar("≤Ì" << ipart) 
-   if iNewValue.contains("≤") then iNewValue = ireplaceachar("≤Ì" << iNewValue) 
-   if inewvalue.number_of_lines < 2
-     	iNewPart = "" << iPart << "," << inewvalue 
- 	else
- 		iNewPart = "" << ipart << r << inewvalue << r << "end" << ipart
- 	end
-   get offset(r << "" << iPart << ",", r << ipack)
-   if @it == 0 then get offset(r << "" << iPart << r, r << ipack)
-   if @it == 0 
-      if ipack == '' 
-      	  return inewpart << r << "≤"
-      else
-          ipack[-1] = iNewPart << r << "≤"
-         return ipack
-      end 
-   end
-   istartchar = it 
-   iendoffset = offset("end" << ipart << r, ipack << r)
-   ilastChar = iendoffset + length(ipart) + 3
-   if iendoffset == 0 
-   		yyy = ipack << r
-    	ilastChar = offset(r, yyy.char(istartchar, (length(ipack)+1))) - 2 + istartchar 
-   end 
-   	ipack[istartchar-1..ilastchar-1] = iNewPart
-   return ipack
+def ms(ipart, inewvalue, ipack)
+	r = "\n"
+
+	icrash "ms():part not defined" if ipart == nil
+	ipack = mreformat(ipack) if ipack.lastchar() != "≤"
+	ipart = ireplaceachar("≤Ì" << ipart) if ipart.contains("≤")
+	inewvalue = ireplaceachar("≤Ì" << inewvalue) if inewvalue.contains("≤") 
+
+	if inewvalue.number_of_lines < 2
+		inewpart = "" << ipart << "," << inewvalue 
+	else
+		inewpart = "" << ipart << r << inewvalue << r << "end" << ipart
+	end
+
+	get offset(r << "" << ipart << ",", r << ipack)
+	get offset(r << "" << ipart << r, r << ipack) if @it == 0  
+
+	if @it == 0
+		if ipack == ''
+			return inewpart << r << "≤"
+		else
+			ipack[-1] = inewpart << r << "≤"
+			return ipack
+		end
+	end
+	istartchar = it 
+	iendoffset = offset("end" << ipart << r, ipack << r)
+	ilastChar = iendoffset + length(ipart) + 3
+	if iendoffset == 0 
+		yyy = ipack << r
+		ilastChar = offset(r, yyy.char(istartchar, (length(ipack)+1))) - 2 + istartchar 
+	end 
+	ipack[istartchar-1..ilastchar-1] = inewpart
+	return ipack
 end 
 
-def fiivar
-	@iivar
+def fiivar(aa=nil)
+	@iivar = '' if @iivar == nil
+	@iivar = aa unless aa == nil
+	return @iivar
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaphire
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.18
 platform: ruby
 authors:
 - Lima90001