From a124d2c9bfb663aed593d453676de35d09da466e Mon Sep 17 00:00:00 2001 From: Lachlan Kermode Date: Fri, 4 Jan 2019 12:16:58 +0000 Subject: [PATCH 1/2] deep regex non-greedy --- src/blueprinters/deeprows.js | 2 +- src/sheets_config.js | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/blueprinters/deeprows.js b/src/blueprinters/deeprows.js index 036d4af..98e7bad 100644 --- a/src/blueprinters/deeprows.js +++ b/src/blueprinters/deeprows.js @@ -17,7 +17,7 @@ export default (data) => { const output = [] // create a structure to indicate which columns needs to be aggregated - const endsWithNumber = new RegExp('(.*)[0-9]+$') + const endsWithNumber = new RegExp('(.*?)[0-9]+$') const structure = { __flat: [] } diff --git a/src/sheets_config.js b/src/sheets_config.js index 42af2e9..b2dcc9e 100644 --- a/src/sheets_config.js +++ b/src/sheets_config.js @@ -14,18 +14,6 @@ export default { export_sites: BP.rows, export_tags: BP.tree } - }, - { - name: 'ilovaisk', - id: '1fmK02NZSYM4gJL1KiSgjkIeo90NwY58o2QNYUepu1Fw', - tabs: { - export_events: [BP.deeprows, BP.rows], - export_categories: [BP.groups, BP.rows], - export_narratives: BP.rows, - export_sources: BP.deepids, - export_sites: BP.rows, - export_tags: BP.tree - } } ] } From f32c1f8a02ae6d79962264018f7b7d38fc85bdf5 Mon Sep 17 00:00:00 2001 From: Lachlan Kermode Date: Fri, 4 Jan 2019 12:18:12 +0000 Subject: [PATCH 2/2] :lipstick: --- .env.enc | Bin 1936 -> 1888 bytes .travis.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.enc b/.env.enc index f30ad97e78245fa783340c66399d841923695ec9..911f1efce9338b65c28cc2e8d0b1b847136f73af 100644 GIT binary patch literal 1888 zcmV-m2cP(#%Hd}O67K~^TPpXPt<_$&9iYJ{+^bOS&f$n`-QndUA#FVzRl19vVE$ot zYglp{c85I8<_s{$RgMRtMHv%8E3srCJ^f%@+14~9K^Equ(6VlQl;nHF!mF~I&ZK_F z%afiP-Dn`uV`b#E&AEe=~qvT)0)87vGG|5OmKNlbtybvwK_Os@L{V584t zHr}G-{s|CB(uS!{%a;y%t5e2!kH7_J4Iuc|8oCJ5Ei^&d_BZZ4;DZQC_vRE>`+LnT0fbk-dP#t>3fZUv*pf*7O1#T3*Nb zHAP2Wt!xFr9}VXXB}dM-a9im0mb~UB%AAuoCcK=pGiBi;AL=*_GQ?K@_Ei#x0l=l{ zc5Xx#K{=6i`{#3&FYjwxe;DkCC@RG|9$C_^d1cNC`8XDgsUGFC64!lhMLL0r(H6Sv z87R1weWn;bSLAd**kQ-H6`v4WsvF5;1P#jXA`Z`+QUf0D?gG~}nd7~b^B-EQ%dxp7 z151U^PvkAmci|_=c0dlDl_tc7{(oX%F{Meik1p>JPq8Wx$21!B#3rNj6eP{9I`f0u zWq!Xdp?y%IC?pfe$O>&D^XIWJcGg75pT;T$Gs*dz|e_hoA)87Yo&f&`uh08Mt4XGFjl&vUt(#O1L zecbymD&N@2FSQR1AO8d`Hv&%PvPTQ%ra9-#cMs>#XUov?pGxM<6z8zl26;nSGVV%& z#Dd2rH~!j*^5Mz(5`}X=q7gI_5Rh-z9$4sf3+8~)r-O;za%S*=zrih*4O0_!v-jhm z=a8@Zxrw8DUGV|LAn!sarLvJIZl}TXw9KH{D>S$n9!ihizk`H)|J+CuTkGSujiF>1 zRPczjuNv&_eIK;jl6n)fJb{CZUQRNDy(4LG^e{9Xh+C2jti9O<<1Q#-tHJ%^)41FKLVjEEvfpK5AmWC;-`bG!Z%r2-;m`cCfZ`XlzxpdAx;gxwD9;}xHT}9fmnqRVb?UY-r*GPs~|}lgRcU!YA; z_x~3bNMDAragnQ!e-E}nY&Rsh-wi-Sx{yG88`chhI_*&wARIZVf6)OuaTRTuw}k7zEfdo@Jt(9CL_r?pBiXoCur#c zE@>6&o$Gx~9YS;k|9>!`s4@7@2x~>zhQkO2n5Fhtv^J7q%c+(d`l3W8>`vy<`yC5= z-}YK36wP0_lLv6~=K@@9J|!cCbUZ!-=fpBa8{ILK8-vYXjZPG5zSpLuIvGL-!Pqg~ zs&%6k!#3w6z@k2X??keNn^}Ux1pMSuq>TD3aCJl&1#Ch{sS?G~oXIDfVOe*#b7lvF zphL{v8(nUTue;xQ6Fuh0653;(3)v(?tOUabuNH-_Q?=b(_p+aB}E) z$cI*eU@*!NIFObWNc<)_kx&J4cMKc4!`FFBKyCy1hw;uDq!hued0HDoRLMZ&*BQDu z-IO|j{*Kss8+Z%8hd)E#^!ybw>-QaW~ zp0&7UMrF{x(}km5;OC@V!Mk)ji4YjwOt{rG2%zeI$NMeI{X2&x zz14quMHO1nSOu)q^wXPc5O98J0EHTQVZB0X5d7eH7K0vo7^HLIJx4IZ3Vr7G28So3 zhYJ&uHPoG+g>%H8LUdBo6qjgl)xxC?ak_eyWR`R(G~fuOF3`gEQf#T)nd*!dI??Bg z`UK~6I(oa>t4a>B2V>vPSe0@w?}Y}BD?@yd1{IjRfk2Js-8rK~~o9;hzW^GqMe a_=(Uy^>R8xMUV?u3NfS+$Kce^W+se&=9td_ literal 1936 zcmV;B2XFXCDEl6t{VqYAZ9`!XJU5^-_V#xz@qbwp#!_68$k;*egi}%jUm)g|QBP<< zlde*4DY!FAWHmOpn+2C@g6DW{vz>)qOERBc->2=b6A-oqsEIFxO_7@Q1ctQpA3vl` z_fr;c0%W_NUu9FA<-`&Rp4~KgL5mYP^+&^y1FY7>MuLSmA+1jj^Fl)JSKSrZy z=vx5h_#Y)h3+}Ac5hGfumbO5;T<#6wKxOys7+68%@?79HW;ihd!ppDUZ2iZS!z?h; zu5+%b2cgUf<01oA^lrt(n&khG7$tT?6cYfLsOp23Yy-57=*TZ5Wrsn%{0dGsxEHMgg96>l!wh-o{MMt zxQ8m^RL6z(+j{O$UX$hNa1FWJ^ zuJ>T@mL&;XMtegx<&f^=%|`$G*>W^I{bPJLa)vd`UDjZX>6~6wRE^#B^SyOb-;N*e zorS<3mxq%uLCjV#jH=7KoaPAT8zOOdO87k!dZRb^TE|o2N}aeTK+LqjYtLfr9)Cr* zww>6n0U7@3x^#t)Y14pdj_!C(H;a^<=mEgdFb##GircdnZwyMLFXIrunUya5BfCcu zM7vJ9Om0%p8j+`k(J`9b2v=kd_5hk1F6@mYc=X4^#*QU?p~F(tX<&NZay^E zIwBSkt{9yrQqDe-aST)OdXwMul4rxNH}j-Zhtz&}m7ecrq7w`Sgh%V*`k}+0*UiNNP@hBh)(XuRm~s zHK-frujN>+*Bjf6TE`hizd>m$n7ovV%e3aE2X8(@c=rRj%#6}7>YYyPw5wM#2@1kh+5jqjcXJwTKUmfwgJ1zn)3mRwzy z0TT~jMK9dJ;UwLe!{y_VnRu0V>$stg;Dh7S>v0@^Y`=j9z4ARjeV~B_A+rOIY-%lk zz`y1O<_8|v$}}odjsU1IW}C#+19s5|vtu8L2<+#R7}t&J*vlAYz)2+HXbbA{u9wA_ zZY39Sz(d$zfD7Ryd{3G>@d*`iI7n*nRk{Useim|cSe;$oYsOmiMJlYtl1~c{?yGja=I41ja?p-4 zr1ik3=348*e38PEKtBMJh109Yw?#MvS}O?k@0EG52Di!PgqrCYE{iq;E1C%jV?NtY#~x>=mg*<)aI@Gj;! zExP=E?*+O-yZFSQJ6*-Qf_@1FPVRwAgP7pjD5QUkcb#3;E&h!`*cRG0R^O4LBw8|MUo> zdqW6qCSrjbRf%xpPKc%i-GO@`S@(z&Fug7(2r2Qgzvu4|Pv6$ISb1ADz|;leiqjkx z((m?_0oF^|jv^Yw~ zQ3pPV`kz268Vjw49@jCe*~b_7gfTssS}pu=CclYdDCZy{RY^razp%8X!BOHfZLXFv zsL^F(tj1Bw8;#rrWIDIk(hYsz4oQ#SzLo<)gQhi_64kJMcGo;-JK;FUg6d|O+rRx# zQC<8%lu6Z<1BUtp4k^;`Kg|`##In{dLKzOz*t3;65p>L&j4EJO-d)l;RV(Bn+J`rh zI@9(!O^SX^fsE=XJ9dF3&9Qc0!oJ+RLn}ssFzqkbiW7p+_)WbtYSsm;3E_R*)Ued5 Wn0D)YH1Vme-b9zRqz@4LBXTu)0LHlh diff --git a/.travis.yml b/.travis.yml index 164ebb0..914e305 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,5 +13,5 @@ script: - yarn lint - yarn test before_install: -- openssl aes-256-cbc -K $encrypted_fb307c69bf51_key -iv $encrypted_fb307c69bf51_iv +- openssl aes-256-cbc -K $encrypted_eeb74e8d35d1_key -iv $encrypted_eeb74e8d35d1_iv -in .env.enc -out .env -d