From ce5128b2445b619d5c53bbf28ea47f7b27bd6a43 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 5 Jun 2012 20:21:13 -0400 Subject: [PATCH] finalize some stuff, make it ready for use --- Rakefile | 5 ----- assets/unison.icns | Bin 0 -> 49383 bytes bin/setfileicon | Bin 0 -> 50904 bytes lib/unison/bridge.rb | 13 ++++++++----- lib/unison/cli.rb | 2 ++ lib/unison/config.rb | 15 ++++++++++++++- lib/unison/ui/about.rb | 0 lib/unison/ui/fileview.rb | 5 +++++ lib/unison/ui/preferences.rb | 11 +++++++++++ lib/unison/watcher.rb | 11 +++++------ skel/UnisonWatch.app/Contents/Info.plist | 2 +- 11 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 assets/unison.icns create mode 100755 bin/setfileicon create mode 100644 lib/unison/ui/about.rb diff --git a/Rakefile b/Rakefile index 1788316..e69de29 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +0,0 @@ -desc 'Build app' -task :build_app do - cp_r 'skel/UnisonWatch.app', '.' -end - diff --git a/assets/unison.icns b/assets/unison.icns new file mode 100644 index 0000000000000000000000000000000000000000..4ece3c274d08d6bd7fe352101644a5ba1e74b26a GIT binary patch literal 49383 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 K8*?_`=Kldu6?8@b literal 0 HcmV?d00001 diff --git a/bin/setfileicon b/bin/setfileicon new file mode 100755 index 0000000000000000000000000000000000000000..6dee14af812c9e75ff1058edde5ac02f31213ad2 GIT binary patch literal 50904 zcmeHQ4|G)3nZGj`WFUdWnzFc1ok*xqF$0x$#}Hrw2@M58mIO^#?aO55g-n^u#F;lR z=wK!Ux{Q%-Jk_(-3MLjg?m3(m_gISsAr?g4x*oN*$5!p)F>S*_cWtFzwUpW4ci(+8 zZzhw3#?$uLbKl{c`@Q?;yWjoY@80((-~0HFi{C%S7_)*t0m4xNY97K*5oj`~fU!;_ zH@zu9h%zV~Z7Uh$%4DBr?j8!1b$PjuIBCiB`gn|(btbU9f%W`^Ogh_BxYSu%v z;EAw_n(C%%bG92N=$_jJrN%oa!zO$l%|qGxp(y#6P;QZ^EpBW z+Otx~pwukmGMrN$+5|k~$XJMKosdDPSq9m583;0b+X6n~^dpZR{V1WaP->QeQ~ek@ z7bC`U6g2_lLP||CGOVJsMj}EUC3*CC5!v+qkB&@3eLvutq(?_bD9BInlSjsBWG@!w zu#NNqJ4hekZATSl{faNHOy_}V0AUEsEz-12T#gL%<@IQaHxN-eRIQ!P^R=g%Zu&_d zB+)o@8Ge|xE@Wad^yR69TEC)twTbGHC1hfHbf}StXOpUg)izA*C^FmvkMw*3588YA zfqg;^C~f{&v{Rgqz|^hRbc<9!%fS?LqU%7VdGw&RGoc5iqv+uccudxrM@BQ+;&6*p zKg-qwcHx162tgB*k+Co8VPY~e_BC-Co#Buc@`eKXI47nD){D9+6yElcWDuOn7EhRO z9TU@o@bCn^sxD??GCD%OXh2o`!M4!o^8$0=_F=X$eek@Eelaliz&v_jSE0i#QvJ+q zW5}U>4EIKBSJ$tpty$fq*I}#$j2+j(29ff;%h>a1ADj-NYf6zb8VNfC{#Iw^vOs$- zNt(Ix>5fMkU47Bg*|;sDsU6O>{?@Q3yv?~P?CDUqhQga8&XuqXPeq%N;k-!=NBp>0 zJFE2~2;loT?ZdjvW=jE=Y4nZ$b@3G|DxinIm74IiiFHb2V7SR>f=;$R@T3vXqyll! zy(7^)BV%OR*n+&Jj5X4lHL##+Ge9MbZ8(gS+S7h?2t;*oPWOBAkO)WwBmxoviGV~v zA|Mfv2uK7Z0uljr=Y3_V!NeVSuz!%*mUx-v<~vI& zJzrIuG7pOw_6V!?@qmoc6PMuU-2-T)HQ595RcD_#rMvM z#gAPVt7DUpeaDPLJbh%w6FmLFjKh>BR?K*@dk3EJ?_sQZA1m6P)a8q^*YcIs zv0^T>d&i8y1l|}p6WML+nB}cHX8mbZ7slZ&dBWArTy@O$R>H$v&K_RZUdN`Np)reo zUhc!2lJ4!0)r+?t`&gomu^PyAg15)NctvdcHEUwKr!aQod}fKW$x-)?)R6OTF00fv zm03tmpLNDjv@0V1-qsmM6IU_Tb?UvC(65yEotH5ioxAs?-tX#pC)Tz9Y^>|q_hPP7 z%vQ%H{~PqWe0L#Z)JOG>)ZrViW0vi$x5RFAGqxs`>Lknw=k2?#2bKb}xV_-OjrU9& z7PvX`mruTR?DFy27aSbBy(KnwIcpxfd|KVu<<{5C%@C8$gVQ#tVvz`hU=l}cBKC)*5<9Ej@zgs@@rh*oL=JUXEwC2$tjzMJi~^{ z7GU1cZ)rS$eMszAz`bP2&zYrb@4K}2;;@MXbmlg31bB{a6Bi9VMzNVc4hdaGDQBHV zIqjj{o8A2jdKp{$OU!LQtFHonEjue|zOC4gY&CfIh-wVyOK@(X^DgYQL`zXOQRMEA zPboM+yyu=0*oMs^PtC%bYb*t|M6^-R2FR;=$T z=1zPWbQQ|2%qI9acsudXVIFwaa}0co<$AQcw{JTuAwIE>Y-y?|Q3kyXEYa`iSWX=W z%RjCB_%o^Z^NtbtVO({(zEj@D*xjzHm>YRD7*kCG;~`t6y&ZND<9RFST7>ZfhprvG zY^^EZj{LaDUu?*rKDw7d-j`V&WR~>d`XG3cKM(6-b{(5iX2@|-9q5349P?n{hjPdf zYlmc$tRitf+c;0$#p>ck1;##GM(1_R{%98Vz+-gm?K=%S%zurr?;oe!H%@t${M@-Q z_9Et{r|M`~Ar$zxcj6v8on+@6=xfyGnQ)+=-nHtd33F=G@B);$5?1u!RLx zgSg*7J*+=V;*@)V%e!PD_JA^6`wyY+Qd*m^$K5@5F&oK2S%GWklBVV0m-jQa~~%6D@zk`Mtx4A{P>--Vu@o|!#uC(H_iu<=i_=5 zp^qCuMY0a-? zvWqWcFF@Z#NxHs3Z{pWs+_e8YsEqD)kmskq;_9pz#?=fRI+qNvK9>h=5_Z=0=-HSH zvR$X4AR`%tXGn&72P^Nlu+zL;)NNvu9y^3Q)cG#q>wK8+nXLL4Tb${y@B>qSal*dq zml&s)uqVt5zrn|CvAA4imW4+!HuG4Iy`6f~G}ear19LFe3vNRu@N!@slAia*?|`0< zuz4fqxS!3zJRjBPxbRCfW@A3Pu09dNoHk)j%W2N^xhkyX^D*fJ&Br{~GqlGRE~0Co z`xvX@Wd*zpdrKjoJHm`G<+cS}Gvk~3l&dB6<2qLGz-|k3(>;gSR~{lcRsFz2m$kt4 zs2lgLQ(xe=13YzIrar~T3Ok1`3-z&1eU$6)3vMrq<87GB(~$G6vzXth$t*o}n}VKG zZ>KgndY(4vc{%ia3HR*WwrEb4l(GKAzJ}SA7aOSkqOS5E#&o-y@;kb(0M_MQbC5@J zF%E7wZ?gv7Zl*j=YZGga?oCQa4#~uQ&AU~J<;!7j4OG8n=kn$8U2~8>#RFO=?pI*1 zM*S)J__@7S;aXvJxjeYhVN)*e@3t`B|A55`Sp}}Q*}K?}&*YI2t>vzj zKZ;@AU4%E}{Uh4$rL}}~7v)iT&rx3XIcg95t7uJAKI)gzx~KK5<8H6k*Oz^MRl@Hj z8>I7=oxzCf)bb%$|M91=SN;*Q{bGKK9`lgClYff5ja=tPXq_74wm)Oixg9#Yv+U;> z)@^rzK7LxayWYuJxAsLOQ(w0Q4OFhrm7TRPH#=l0Xdr!1N1vl(==)!xGoK?nw|{+) zsCoeFsn zbEL1;?RehXjCGE^cvtV_-6O7L+2w(8${WThUp!9v%(2TayD(1q>2b#@b-;)#Ex?h?C#|k)LhC7tDXwXZ(5k|gev#R*ifM=WPqe{B>ge!J@NspOl-Wz;vW4TUyGI~%#z z-s<3Ll4;VlzOmZp3&ZPaeVbl|%HX^JPb@EFP_jDcNB>Rjs$;Vn4ypl1B-+^-3TuwG zP}rd%+qVt6_`QyRKZqI*f5Z_CX^u`vRfC#C3pv8kASxmsE;yUuVo@=bu_*ajRXQT7 z*5(hWemF)ts_1u_qlz+?p$fa+$Jk0wkfgQwgFgHORL9(iqtc;X2SE z6o)q&(Lx;#F0?J+*~B%?({45Tn}+r#B`O_Wy~9Ar;}a6l>r|r;Z&-y3P^MsnIznGj z59)-XVXsOWY<76G5!DU3p-wgE7{7LUtXso=sBsAmggzLequuZGp_kDSG1a{!2%RbFOc^nVfh!Jzf=UYPg?ked8+3+d5AWW)_C5 zpt_am4uUuPwf2oot6aLAN|a&Ug}g}puyiV2847Ap0&9X~RI*6BC#?E1eE>`{ok~n9 zuMq0g$XAF&F`+FZTh;x6HmG7Lc&HZDAy3?V{rJ>2Pc)#Vl_nXrF@HphRBH_$t-aD8 zsqu&5AqfvO>P#Qcifuqs4f^2UOqEuKIyyr^s9(wZq5gDZBvpkRD9;C2>CpgYYgALY z@&PrtiTprYw;==VmbSooz1N+7=O@lvj6G4Dr=RDLj4=ZMnZ` zb&{8`KBs^zAg-SDnXS?odx25&?;TL_i`S5s(N-1SA3y0f~S_Kq4R! zkO=%05wI28={em^DijIc2EJ7AMc~QB8g=jwF};eX^ZKX3uMzwZ_;$e$ga4Y~&w(Eh z{JY?f2p;bQ*iQuiKKS`7KsxK{u!8F>%qmU_>cJcNiiuZEeB4z3VH5wXiT{y_{~*KL%1rz`6Ti^J zyTA(_Y|BmgwI-hQ6gu0QO#H3jjkY0E{#Fy;W#E9CLsn+F0n~`{N-ML@x3Gd_DPw;J zdax9q7=U(zz6Cl68U(#k%B(Me-YR9b`cgLOI|cmn3d=vkM)2Os@d7#gL zTp&2bSeN6!!MFwV9zIc83|Et-ppBsKflh%wWXz7b_8);>gR$O;^>mc6@&*j(v!J;k zCkQgxe9(0u$YB+r>p=@Z3qevp{n|SA(ts{XOUg(5FEE0Qww= z+`m5$LZn9?PwCT0uLb?3bzn+;b9HzVd@*^t1wNSyc~NrjPetiySJas5g#(vj_+Lx@&5 zYL|H`b3IQ?!AuBl8}83;vGoKlZWS=IOjRa*%U#XxA& zYKje~=NQ#j!PByyT#u2x9&U%}e9@R(5ZA%cd4t+URT@Xg>RicPXw&`Gt%X%FrEX)8 z%nNp|ZmshKeWVKN)RLnw8U4yt@XDm1cbY!Hl@vt}ov2}zTZf`-R=0I*3M;;?o^ab| zF*%#yI0>)n2>d06vYv2z{$zHrm1}#?{7Mhnc>JvWMKE zc6d8FQG~P;tDD<%M`TkY79sXNc}N5#0uljX)4M$x(og@#6nCDl29_KhOSu491f|!^G{G{+SDS zI&!ff8P5ZB(!+S_rFv#w#{&U=0}6dgH$ukyc%me{-=`-+(@~g(2R@n^BX<7<$e=zi zret2 z^l)6_7)yq?%{&>oG8PCu7Uaq>DK%cq{3^)6%P4-BnsMwzHrd3OG4mTBgI)^ILGx-H zfIfW?KL}Ek)$1D8Z)i#vxWScxAcIm`TSSH~SQjDOPSb-dKk~Jw=DfXLh5s6BlTH-n zE76WlMf0@cDTkkD>rmoG9puxTm=C*+?WFOLU6B4qaWW$2b^{7X0k@tSw!{PeBTJ9h zpNYwyw>|3d_LOE0J}f%bWn^NqPfUhxNu$R6r*Y8X=D+42vmRMOCZ@+YG5?_lR{=j( zlNOi*lOAKo{CA77xVa#ckSrNAC!@#wCmHlYi)4(hM>wDXnz#%+Fpm-Q{}RVCX3YOflrd(^|4WlGcFg}vlac=FJa5c@l0k+* z_F=X$WSQ(^?3n-UkU>Ygnj=sGzt63LOwtB2O)>vBdA&-cVo^Hezqt+R zQDA8v(I)r*2_USg4;uGEB(oc_w`1^ydKQ(Wk57Ojq8Hbr9fKS2@*ahUksA0>UGbj; zFgNn4JzYo8C9hM0biBj3wW0e*l27MG-gs?gxkNxBAQ6xVNCYGT5`jxa;43Woi=Lr( zd(M^g-eybQTF&;YvnSV<+j>q|o_WV=`606G!*r8#eq-_%H{aCQb8f+KJ8r^yYwgLN zPR>0Eqd*bN->}AO#l=jw^^thN-Na>&rZ1jDk=(GqqNbC?vD$r2S;fuHR^@Sd%ftt2=upj+B2W_aEJ<$h}8nPjBF|v~ zy9T4qw(dupQ6=?<{8a}sRc(vjID12uItNi`R;L;23>3L>?|TS+(>M}TV~IX zZtm?&H=feW&6ne#=9H4f-h_t3^E0ipmqj^gWLg$O80(ogAac*HV=y9`&Z|*H-*mW| z7%&P4sSsl<{+?bB9g3l1s(y=yFrjO9Z%?AY+*>JLPM_&OZv!@CvbpV2w|7%rr1w&K zg1C*~G8OM9BPYY~P=!+i^u!2_Y`tj-btve)0`SsWu~F4eQB_R+)kq05dO42N{?zeQ ziZF`=y?!dc7Ujdg!{$Wmyr}p%wp{dYrQH8QZr-u|3(ERja2(R6e86$Z`z#1 zN-IHiLIo8JMZ}7K{gW6Y?XAvC8-2~cNhKyb;@j)jNdO<)Xd}-Wh`v-XO?N|BW|P&& zY|E;e9&=TuDs8f#&*-J^8Z|k3^<(JS`_N3Pfqj;?RntD(b8hWGl`yG+CSqU#zsK|? zPxNfJ7if!3QpDa`hT+l#ioNw^bT#|}S{$Z~GvCAyU5nkeWbJFm&!g}uT1pp^r`|ho z7!1><7C*TvRs7`o)cog@wL`tp*J#KCE<=e1p~UT^#3{^G?+X1QFrvnK)aczfwCmOA zRMPr;@265{`4yY?gYSNjN)3?TB3~3R_A=C7G}v=;EgwB;B7BTKa=b_*UYilW?NZ~t z8GlvMU!sp5M{c}0bh&ZsNN&FPb|h!Cn0Q9qys={I<;LL~Enc4y&rcuM$asGg3oti6 zU?y&0#!W60U$D^>b8uu#Lg&T^{vPD?Aqu7%bT;TgF7amt=X&^(1tN}!pF0RTF*bt0 zkG~{VbYT8Pyv09DY)eyLqsFwPAcoU2dWe{nq+b3|n?hevFZ?$h+wxN5llIOoKS68R zd>DV%Hs=w4usoCVJnqb&z)b+XgO!IwKq4R!kO)WwBmxoviGV~vA|Mfv2uK7Z0v}HV z&i{Fjk0&TnYl(nFKq4R!kO)WwBmxoviGV~vA|Mfv2z<;Dh%bPbBj_H`6QHA@H$fLb zMb{&O8ORN)1NlH2=pN90po5@8ph3{{pw~cef`&o#Ia~?o0(km1S{@PsiGV~vA|Mfv z2uK7Z0uljr9>M<+9|j@oaUj@!nn&>eG(QDj78-S~G4WL<{!5(KWA(S0 zc+JFr)x_^L@sFGMK@_sCf{()Z5HPOmIB%iP#8|za&-o@3 zznSxToro#_4pV-@#3xPsy{7v6P5B3Po?~krLd>Nb5P=_2_$@pNKO*u&NGU#sEPW7^ zu&~nIpl^W=f(AjafL^k)(zihMHdgwbNvxm_-xJ;mk;g$7K~JNTXJMUhfac?C6Ax$y zK0dk1&TMxgU_R!!Tz^Hy1L|K33_cC|3}`NB9*ANEIY1O3AD^u7;Q3`pDfm9VUFHG# z@tTVV-M>#{@log}.stderr >>#{@log}.stdout'} - system %{bash -c 'unison -log -logfile #{@log} -batch #{profile}'} + @config.profiles.each do |profile| + system %{bash -c '#{@config.unison_binary} -ui text -log -logfile #{@log} -batch #{profile}'} + + if $?.exitstatus != 0 + system %{bash -c '#{@config.unison_binary} -ui graphic #{profile}'} + end end block.call diff --git a/lib/unison/cli.rb b/lib/unison/cli.rb index bab9ad0..218d950 100644 --- a/lib/unison/cli.rb +++ b/lib/unison/cli.rb @@ -30,6 +30,8 @@ module Unison end File.chmod(0755, "UnisonWatch.app/Contents/MacOS/UnisonWatch") + + system %{bin/setfileicon assets/unison.icns UnisonWatch.app} end no_tasks do diff --git a/lib/unison/config.rb b/lib/unison/config.rb index a5192ed..9105a60 100644 --- a/lib/unison/config.rb +++ b/lib/unison/config.rb @@ -14,7 +14,11 @@ module Unison end def self.skel_data - { 'profiles' => [], 'time_between_checks' => DEFAULT_TIME_BETWEEN_CHECKS } + { + 'profiles' => [], + 'time_between_checks' => DEFAULT_TIME_BETWEEN_CHECKS, + 'unison_binary' => '/usr/bin/unison' + } end def set_profile(profile, is_set) @@ -63,6 +67,15 @@ module Unison save end + def unison_binary + data['unison_binary'] + end + + def unison_binary=(binary) + data['unison_binary'] = binary + save + end + def data @data.update { |d| d || YAML.load_file(@file) } @data.value diff --git a/lib/unison/ui/about.rb b/lib/unison/ui/about.rb new file mode 100644 index 0000000..e69de29 diff --git a/lib/unison/ui/fileview.rb b/lib/unison/ui/fileview.rb index 37e34ef..3216a4a 100644 --- a/lib/unison/ui/fileview.rb +++ b/lib/unison/ui/fileview.rb @@ -15,6 +15,11 @@ module Unison self.connect(SIGNAL(:textChanged), &method(:on_text_change)) end + def show + super + self.raise + end + def on_text_change self.moveCursor Qt::TextCursor::End end diff --git a/lib/unison/ui/preferences.rb b/lib/unison/ui/preferences.rb index 597fe40..95991cd 100644 --- a/lib/unison/ui/preferences.rb +++ b/lib/unison/ui/preferences.rb @@ -9,6 +9,11 @@ module Unison generate end + def show + super + self.raise + end + def generate layout = Qt::GridLayout.new @@ -35,8 +40,14 @@ module Unison count_field = Qt::LineEdit.new(@config.time_between_checks.to_s) count_field.connect(SIGNAL "textChanged(QString)") { |string| @config.time_between_checks = string.to_i } + binary_label = Qt::Label.new("Unison binary:") + binary_field = Qt::LineEdit.new(@config.unison_binary) + binary_field.connect(SIGNAL "textChanged(QString)") { |string| @config.unison_binary = string } + fields_layout.addWidget(count_label, 0, 0) fields_layout.addWidget(count_field, 0, 1) + fields_layout.addWidget(binary_label, 1, 0) + fields_layout.addWidget(binary_field, 1, 1) performance_group_layout.addWidget(fields) layout.addWidget(profile_group, 0, 0) diff --git a/lib/unison/watcher.rb b/lib/unison/watcher.rb index 6ff2d63..241c636 100644 --- a/lib/unison/watcher.rb +++ b/lib/unison/watcher.rb @@ -3,11 +3,10 @@ require 'forwardable' module Unison class Watcher < Qt::Application TRANSFER_LOG = '~/unison.log' - SYNC_CHECK_TIME = 0.1 + SYNC_CHECK_TIME = 0.05 extend Forwardable - def_delegators :@config, :profiles def initialize(profiles, *args) super(*args) @@ -22,7 +21,7 @@ module Unison end def time_between_checks - @config.time_between_checks * 10 + @config.time_between_checks * 20 end def <<(dirs) @@ -30,7 +29,7 @@ module Unison end def processed_profiles - @processed_profiles ||= Unison::Profile.process(profiles) + @processed_profiles ||= Unison::Profile.process(@config.profiles) end def watch @@ -68,7 +67,7 @@ module Unison end def ui - @icon = Unison::UI::Icon.new(menu, self, profiles, File.join(Unison.root, 'assets')) + @icon = Unison::UI::Icon.new(menu, self, @config.profiles, File.join(Unison.root, 'assets')) @config.on_update { @icon.profiles = @config.profiles } @current_icon = 'idle' @@ -129,7 +128,7 @@ module Unison @done = false - Unison::Bridge.run(profiles, TRANSFER_LOG) { @done = true } + Unison::Bridge.run(@config, TRANSFER_LOG) { @done = true } show_working diff --git a/skel/UnisonWatch.app/Contents/Info.plist b/skel/UnisonWatch.app/Contents/Info.plist index d7f7127..25fad93 100644 --- a/skel/UnisonWatch.app/Contents/Info.plist +++ b/skel/UnisonWatch.app/Contents/Info.plist @@ -7,7 +7,7 @@ CFBundleGetInfoString Unison Watch CFBundleIdentifier - webapps.webrunner + unisonwatch CFBundleInfoDictionaryVersion 6.0 CFBundleName