platinum-deployer 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dacdf8eeb5e68ca36155608de081883062ba96e4
-  data.tar.gz: afce813801e394f83fb09c33e578a62d47520350
+  metadata.gz: c1ff324a17358c77eda7da632621c67bec0d2ac3
+  data.tar.gz: 4110761f19c2133e91ab1aaabb83ceb3aa0f3ba0
 SHA512:
-  metadata.gz: e4b2cbb6c62530fef2bb0144bbd9d00f15ff8cd61567b3c00496a0c4b4fd7a424e9e2611486e62cb517eae4b44e417d9958a72bdb4a536a213cff4ef356d7720
-  data.tar.gz: 56b8ff89a9fac88a955f0b0477980e312757480bd0242086575756d201b1bd68ac1344abf67b7539d80aaad30f872a3dca29be0420d6f257c25dd30d86cf828f
+  metadata.gz: cfd5d8db2b78987aef48eb31743c568448f041705ca3a8979e18c0d7269986e54c4a1758e08509bafd16572e10003fd3a02f72a06b4986b5b97be7a6f37a4043
+  data.tar.gz: a34a6631f0861e971efa1a87052ad96f1abb9eda42e920233b75deb0384b2297e9374ae275649fe31ca34fcb0518eb9c9e7211783011785c3f8dd114faa65330

data/Session.vim

@@ -34,11 +34,11 @@ set nosplitbelow
 set nosplitright
 wincmd t
 set winheight=1 winwidth=1
-exe '1resize ' . ((&lines * 28 + 30) / 60)
-exe 'vert 1resize ' . ((&columns * 52 + 92) / 185)
-exe '2resize ' . ((&lines * 28 + 30) / 60)
-exe 'vert 2resize ' . ((&columns * 132 + 92) / 185)
-exe '3resize ' . ((&lines * 29 + 30) / 60)
+exe '1resize ' . ((&lines * 23 + 25) / 50)
+exe 'vert 1resize ' . ((&columns * 52 + 69) / 138)
+exe '2resize ' . ((&lines * 23 + 25) / 50)
+exe 'vert 2resize ' . ((&columns * 85 + 69) / 138)
+exe '3resize ' . ((&lines * 24 + 25) / 50)
 argglobal
 setlocal fdm=manual
 setlocal fde=0
@@ -49,7 +49,7 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 3 - ((2 * winheight(0) + 14) / 28)
+let s:l = 3 - ((2 * winheight(0) + 11) / 23)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -67,7 +67,7 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 9 - ((6 * winheight(0) + 14) / 28)
+let s:l = 9 - ((5 * winheight(0) + 11) / 23)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -85,19 +85,18 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 457 - ((7 * winheight(0) + 14) / 29)
+let s:l = 580 - ((18 * winheight(0) + 12) / 24)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-457
-normal! 042|
+580
+normal! 011|
 wincmd w
-3wincmd w
-exe '1resize ' . ((&lines * 28 + 30) / 60)
-exe 'vert 1resize ' . ((&columns * 52 + 92) / 185)
-exe '2resize ' . ((&lines * 28 + 30) / 60)
-exe 'vert 2resize ' . ((&columns * 132 + 92) / 185)
-exe '3resize ' . ((&lines * 29 + 30) / 60)
+exe '1resize ' . ((&lines * 23 + 25) / 50)
+exe 'vert 1resize ' . ((&columns * 52 + 69) / 138)
+exe '2resize ' . ((&lines * 23 + 25) / 50)
+exe 'vert 2resize ' . ((&columns * 85 + 69) / 138)
+exe '3resize ' . ((&lines * 24 + 25) / 50)
 tabnext 1
 if exists('s:wipebuf')
   silent exe 'bwipe ' . s:wipebuf

data/exe/platinum

@@ -261,6 +261,7 @@ end
 
 def compile_source!
   if @options[:skip_compile]; log_info 'Skipping compilation.'; return true end
+  ensure_mounted_as_satellite! if satellite_mode_enabled?
   log_info 'Compiling project source...'
   return false unless compile_coffeescript_files! && compile_haml_files!
   log_success 'Compilation complete!'; true
@@ -512,12 +513,38 @@ def list_things!
 end
 
 def create_satellite!
+  require_satellite_app_src_set!
   log_info 'Creating satellite installation...'
   log_success 'Satellite installation created!'; puts
 end
 def update_satellite!
-  satellite_opts = @options[:satellite_mode]
-  unless satellite_opts[:enabled]
+  require_satellite_mode_enabled!
+  require_satellite_app_src_set!
+  log_info 'Updating satellite installation...'; puts
+
+  log_info 'Unmounting current app_src...'
+  app_src_fullpath = File.expand_path File.join(Dir.pwd, 'app_src')
+  system %[diskutil unmount "#{app_src_fullpath}"] if mounted_as_satellite?
+  log_info 'Pulling changes from Git...'
+  git = Git.open '.'
+  git.reset_hard
+  git.pull
+  log_info 'Remounting app_src to remote source...'
+  FileUtils.rm_rf File.join(Dir.pwd, 'app_src', '*')
+  mount_as_satellite!
+
+  puts; log_success 'Satellite installation updated!'; puts
+end
+def mount_as_satellite!
+  require_satellite_app_src_set!
+  system "sudo sshfs #{satellite_opts[:app_src_source]} app_src -oallow_other"
+end
+def mounted_as_satellite?
+  return false unless satellite_mode_enabled?
+  `bash -c 'df | awk \'{print $9}\' | grep $(pwd)/app_src'`.strip.length > 0
+end
+def require_satellite_mode_enabled!
+  unless satellite_mode_enabled?
     warn 'You must enable Satellite Mode to use this feature.'
     warn "Add the following to your #{@config_friendly_filepath} to enable it:"
     puts
@@ -527,6 +554,8 @@ def update_satellite!
     puts
     fatal 'Satellite Mode is required!'
   end
+end
+def require_satellite_app_src_set!
   unless satellite_opts[:app_src_source]
     warn 'You must set your app_src_source to use this feature.'
     warn "Add the following to your #{@config_friendly_filepath} to enable it:"
@@ -537,21 +566,18 @@ def update_satellite!
     puts
     fatal 'Satellite Mode requires app_src_source to be set!'
   end
-  log_info 'Updating satellite installation...'; puts
-
-  log_info 'Unmounting current app_src...'
-  app_src_fullpath = File.expand_path File.join(Dir.pwd, 'app_src')
-  system %[diskutil unmount "#{app_src_fullpath}"]
-  log_info 'Pulling changes from Git...'
-  git = Git.open '.'
-  git.reset_hard
-  git.pull
-  log_info 'Remounting app_src to remote source...'
-  FileUtils.rm_rf File.join(Dir.pwd, 'app_src', '*')
-  system "sudo sshfs #{satellite_opts[:app_src_source]} app_src -oallow_other"
-
-  puts; log_success 'Satellite installation updated!'; puts
 end
+def ensure_mounted_as_satellite!
+  require_satellite_mode_enabled!
+  require_satellite_app_src_set!
+  unless mounted_as_satellite?
+    warn 'Satellite is not mounted.  Mounting now...'
+    mount_as_satellite!
+    log_success 'Satellite mounted!'
+  end
+end
+def satellite_opts; @options[:satellite_mode] end
+def satellite_mode_enabled?; satellite_opts[:enabled] end
 
 if @command
   case @command

data/lib/platinum/deployer/version.rb

@@ -1,5 +1,5 @@
 module Platinum
   module Deployer
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: platinum-deployer
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler