platinum-deployer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6965447723e076da1ca02acdb1eb08c182d3b3e4
-  data.tar.gz: 4d74616d606db76561aac45528b067a84b143e3a
+  metadata.gz: 3d5cec55da399cafaff4b6f2ca64dddb6c411798
+  data.tar.gz: 6f692c291c9f67703cc7debc5c6c49e319a75093
 SHA512:
-  metadata.gz: 930cc1e85ea013e44367639cfac803e50fcca54b2976e3bfdf6cf51cd47b79d062d76b4f77d14b161eb72213eb5d15bb0ef8dab10e945286c9eb79053039b662
-  data.tar.gz: b29706aa50a4443db203c8fc6ed7b13cbdf1bfcb99af7ea838950fa4255bbb975419ae81fdf4f3a801bc701f71e6879b024dcc3cac38593c14c726ef71d048c8
+  metadata.gz: 02507e63c23b4f4c63784ef2e26c944ce270934dbfcfaeedd2c42e1638269d8fd72eec95e1bed2a2dcaaa06270845a668ef026468b4cddf9ea53935948108b4b
+  data.tar.gz: b1957765a08a581edc0f12618232b163530bbf5270d9fc8555e4d48cb461595d3091bded552e327f36ef41ef2ea44cb42ad07bcd542a39008d3770e0e79d6ec7

data/Session.vim

@@ -15,7 +15,7 @@ badd +1 \'/Users/smit1625/Sites/platinum-deployer/exe/platinum\'
 badd +358 exe/platinum
 badd +1 \'/Users/smit1625/Sites/platinum-deployer/exe/platinum-ios-simulate.js\'
 badd +1 \'/Users/smit1625/Sites/platinum-deployer/exe/platinum-ios-simulate\'
-badd +19 exe/platinum-ios-simulate.js
+badd +38 exe/platinum-ios-simulate.js
 badd +68 exe/platinum-appicon
 badd +18 README.md
 argglobal
@@ -24,25 +24,21 @@ edit lib/platinum/deployer/version.rb
 set splitbelow splitright
 wincmd _ | wincmd |
 split
-wincmd _ | wincmd |
-split
-2wincmd k
+1wincmd k
 wincmd _ | wincmd |
 vsplit
 1wincmd h
 wincmd w
 wincmd w
-wincmd w
 set nosplitbelow
 set nosplitright
 wincmd t
 set winheight=1 winwidth=1
-exe '1resize ' . ((&lines * 19 + 30) / 60)
+exe '1resize ' . ((&lines * 28 + 30) / 60)
 exe 'vert 1resize ' . ((&columns * 52 + 92) / 185)
-exe '2resize ' . ((&lines * 19 + 30) / 60)
+exe '2resize ' . ((&lines * 28 + 30) / 60)
 exe 'vert 2resize ' . ((&columns * 132 + 92) / 185)
-exe '3resize ' . ((&lines * 18 + 30) / 60)
-exe '4resize ' . ((&lines * 19 + 30) / 60)
+exe '3resize ' . ((&lines * 29 + 30) / 60)
 argglobal
 setlocal fdm=manual
 setlocal fde=0
@@ -53,12 +49,12 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 3 - ((2 * winheight(0) + 9) / 19)
+let s:l = 3 - ((2 * winheight(0) + 14) / 28)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
 3
-normal! 018|
+normal! 020|
 wincmd w
 argglobal
 edit bin/setup
@@ -71,7 +67,7 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 12 - ((6 * winheight(0) + 9) / 19)
+let s:l = 12 - ((9 * winheight(0) + 14) / 28)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
@@ -79,24 +75,6 @@ normal! zt
 normal! 03|
 wincmd w
 argglobal
-edit exe/platinum-ios-simulate.js
-setlocal fdm=manual
-setlocal fde=0
-setlocal fmr={{{,}}}
-setlocal fdi=#
-setlocal fdl=0
-setlocal fml=1
-setlocal fdn=20
-setlocal fen
-silent! normal! zE
-let s:l = 35 - ((10 * winheight(0) + 9) / 18)
-if s:l < 1 | let s:l = 1 | endif
-exe s:l
-normal! zt
-35
-normal! 011|
-wincmd w
-argglobal
 edit exe/platinum
 setlocal fdm=manual
 setlocal fde=0
@@ -107,19 +85,19 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 410 - ((13 * winheight(0) + 9) / 19)
+let s:l = 257 - ((6 * winheight(0) + 14) / 29)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-410
-normal! 068|
+257
+normal! 0
 wincmd w
-exe '1resize ' . ((&lines * 19 + 30) / 60)
+3wincmd w
+exe '1resize ' . ((&lines * 28 + 30) / 60)
 exe 'vert 1resize ' . ((&columns * 52 + 92) / 185)
-exe '2resize ' . ((&lines * 19 + 30) / 60)
+exe '2resize ' . ((&lines * 28 + 30) / 60)
 exe 'vert 2resize ' . ((&columns * 132 + 92) / 185)
-exe '3resize ' . ((&lines * 18 + 30) / 60)
-exe '4resize ' . ((&lines * 19 + 30) / 60)
+exe '3resize ' . ((&lines * 29 + 30) / 60)
 tabnext 1
 if exists('s:wipebuf')
   silent exe 'bwipe ' . s:wipebuf

data/exe/platinum

@@ -64,7 +64,9 @@ DEFAULT_OPTIONS = {
     }
   },
   :ios_simulator => {
-    :udid => nil
+    :devicetypeid => nil,
+    :udid => nil,
+    :autofocus => true
   },
   :testfairy => {
     :api_key => nil,
@@ -138,6 +140,7 @@ def bundle_path
                 when 'device' then 'Debug-iphoneos'
                 end
     path = File.join path, debug_dir, "#{@options[:app_name]}.app"
+  # TODO: android support
   end
   File.expand_path path
 end
@@ -210,34 +213,32 @@ OptionParser.new do |opts|
     else fatal "Target \"#{v}\" not recognized." end
   end
 
-  opts.on('-O', '--output-dir=dir', 'Titanium Output Directory') do |v|
-    parsed_options[:titanium_command][:output_dir] = v
-  end
+  opts.on('-O', '--output-dir=dir', 'Titanium Output Directory') {|v|
+    parsed_options[:titanium_command][:output_dir] = v }
 
-  opts.on('-L', '--log-level=level', 'Titanium Log Level') do |v|
-    parsed_options[:titanium_command][:log_level] = v
-  end
+  opts.on('-L', '--log-level=level', 'Titanium Log Level') {|v|
+    parsed_options[:titanium_command][:log_level] = v }
 
   opts.on('-V', '--developer-certificate=certificate',
-          'iOS Developer Certificate') do |v|
+          'iOS Developer Certificate') {|v|
     parsed_options[:ios_credentials][:development][:developer_certificate] = v
-    parsed_options[:ios_credentials][:production][:developer_certificate] = v
-  end
-
+    parsed_options[:ios_credentials][:production][:developer_certificate] = v }
   opts.on('-P', '--provisioning-profile=profile',
-          'iOS Provisioning Profile') do |v|
+          'iOS Provisioning Profile') {|v|
     parsed_options[:ios_credentials][:development][:provisioning_profile] = v
-    parsed_options[:ios_credentials][:production][:provisioning_profile] = v
-  end
+    parsed_options[:ios_credentials][:production][:provisioning_profile] = v }
 
-  opts.on('-U', '--simulator-udid=udid', 'iOS Simulator UDID') do |v|
-    parsed_options[:ios_simulator][:udid] = v
-  end
+  opts.on('-U', '--simulator-udid=udid', 'iOS Simulator UDID') {|v|
+    parsed_options[:ios_simulator][:udid] = v }
+  opts.on('-D', '--devicetypeid=dtid', 'iOS Simulator DeviceTypeID') {|v|
+    parsed_options[:ios_simulator][:devicetypeid] = v }
 
-  opts.on('--skip-compile', 'Skip Source Compilation') do
-    parsed_options[:skip_compile] = true end
-  opts.on('--skip-build', 'Skip Titanium Build') do
-    parsed_options[:skip_build] = true end
+  opts.on('--no-autofocus', 'Disable iOS Simulator Autofocus') {
+    parsed_options[:ios_simulator][:autofocus] = false }
+  opts.on('--skip-compile', 'Skip Source Compilation') {
+    parsed_options[:skip_compile] = true }
+  opts.on('--skip-build', 'Skip Titanium Build') {
+    parsed_options[:skip_build] = true }
 
   opts.on('--help', 'Prints this help') do
     puts opts.banner
@@ -305,7 +306,7 @@ end
 #
 
 def build!
-  if @options[:skip_compile]; log_info 'Skipping build.'; return true end
+  if @options[:skip_build]; log_info 'Skipping build.'; return true end
   log_info 'Building Titanium project...'; puts
   build_success = case build_cmd_opts[:target]
   when 'device' then build_for_device!
@@ -368,55 +369,38 @@ def deploy!
   log_success 'Application deployed successfully!'; puts; true
 end
 def deploy_to_emulator!
-  # TODO: Android support
   sim_opts = @options[:ios_simulator]
-  # base_cmd = base_cmd_for_simjs
-  # if sim_opts[:udid].nil?
-  #   sim_list = get_simjs_sims
-  #   # ap sim_list; puts
-  #   sim_choices = {}
-  #   sim_list.each {|ios_version, simulators|
-  #     simulators.each {|s|
-  #       sim_choices[s['udid']] = "#{s['name']} running iOS #{ios_version}" } }
-  #   if sim_choices.keys.any?
-  #     choose do |menu|
-  #       menu.header = 'Installed iOS Simulators'
-  #       menu.prompt = 'Please choose a simulator to deploy to: '
-  #
-  #       sim_choices.each {|udid, name|
-  #         menu.choice(name) {|choice| sim_opts[:udid] = udid } }
-  #     end
-  #   else
-  #     fatal 'You have no iOS simulators installed.'
-  #   end
-  # end
-  # cmd = "#{base_cmd} command=launch appPath=#{bundle_path}"
-  # cmd << " simUDID=#{sim_opts[:udid]}"
-  
-  if sim_opts[:devicetypeid].nil?
-    devicetypes = `ios-sim showdevicetypes`.strip
-    if devicetypes.length
-      sim_choices = {}
-      devicetypes.lines.each do |line|
-        dtid, ios_version = line.strip.split ', '
-        title = dtid.gsub '-', ' '
-        sim_choices[dtid] = "#{title} running iOS #{ios_version} (#{dtid})"
-      end
-      choose do |menu|
-        menu.header = 'Installed iOS Simulators'
-        menu.prompt = 'Please choose a simulator to deploy to: '
 
-        sim_choices.each {|dtid, name|
-          menu.choice(name) {|choice| sim_opts[:devicetypeid] = dtid } }
+  case build_cmd_opts[:platform]
+  when 'ios'
+    if sim_opts[:devicetypeid].nil?
+      devicetypes = `ios-sim showdevicetypes`.strip
+      if devicetypes.length
+        sim_choices = {}
+        devicetypes.lines.each do |line|
+          dtid, ios_version = line.strip.split ', '
+          title = dtid.gsub '-', ' '
+          sim_choices[dtid] = "#{title} running iOS #{ios_version} (#{dtid})"
+        end
+        choose do |menu|
+          menu.header = 'Installed iOS Simulators'
+          menu.prompt = 'Please choose a simulator to deploy to: '
+
+          sim_choices.each {|dtid, name|
+            menu.choice(name) {|choice| sim_opts[:devicetypeid] = dtid } }
+        end
+      else
+        fatal 'You have no iOS simulators installed.'
       end
-    else
-      fatal 'You have no iOS simulators installed.'
     end
+    cmd = "ios-sim launch #{bundle_path} --exit"
+    cmd << " --devicetypeid #{sim_opts[:devicetypeid]}" if sim_opts[:devicetypeid]
+    system cmd
+    focus_simulator! if sim_opts[:autofocus]
+    # TODO: hook up lldb somehow
+  # TODO: Android support
   end
-  cmd = "ios-sim launch #{bundle_path} --exit"
-  cmd << " --devicetypeid #{sim_opts[:devicetypeid]}" if sim_opts[:devicetypeid]
-  system cmd
-  # TODO: hook up lldb somehow
+  true
 rescue Errno::ENOENT => e
   if e.message == 'No such file or directory - ios-sim'
     warn 'Looks like you haven\'t installed the ios-sim package yet.'
@@ -426,6 +410,12 @@ rescue Errno::ENOENT => e
   else raise e end
 end
 alias deploy_to_simulator! deploy_to_emulator!
+def focus_terminal!
+  # TODO: support for platforms besides OS X and iTerm
+  system 'osascript -e \'tell application "iTerm2" to activate\'' end
+def focus_simulator!
+  # TODO: support for platforms besides OS X
+  system 'osascript -e \'tell application "iOS Simulator" to activate\'' end
 @path_to_sim_script = File.expand_path(
   File.join(__dir__, 'platinum-ios-simulate.js'))
 def base_cmd_for_simjs; "node #{@path_to_sim_script}" end
@@ -434,6 +424,7 @@ def get_simjs_sims
   begin return JSON.parse json_sim_list
   rescue => e; fatal e.message; end
 end
+
 def deploy_to_device!
   cmd = "ios-deploy --debug --bundle #{bundle_path}"
   # system cmd
@@ -551,6 +542,7 @@ if @command
   when 'compile' then compile_source!
   when 'build' then build! if compile_source! # Compile and build.
   when 'deploy'
+    focus_terminal!
     # Force a git commit upfront.
     force_git_commit! if build_cmd_opts[:target] =~ /^dist/
     deploy! if compile_source! && build! # Compile, build and deploy.

data/lib/platinum/deployer/version.rb

@@ -1,5 +1,5 @@
 module Platinum
   module Deployer
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: platinum-deployer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - MacKinley Smith