nixenvironment 0.0.50 → 0.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0f118362f5a037e4afb97abbcbe2fa0d1e0d0d6
-  data.tar.gz: 80b463b4223b3011dc44891ab29040d61c48aa32
+  metadata.gz: 44349d4dc48d9cbd02f685b3c046c9c0c97a5cad
+  data.tar.gz: 83e080e2e960646c01370c2a86e4afc8a9227441
 SHA512:
-  metadata.gz: 66b790bb9190bd64932aa09f46d9c0f4dc58359ba4b1d4ef8dd2960cf353ffedfbb8900d73ff5826503f6e0e4f842a91337f4b58b142b4d69a6ad6ab9c9de222
-  data.tar.gz: 0253e641451e391e19f5718a53e826f82ee718e53d4236ddcb85fc1c6db75b275d7ffaff09c0ecbda08aa153324106b92f035d37ad7b7806c1b72ba7ea09e045
+  metadata.gz: e7723062a74e7ab25e668a6838b07ae9b03e8312b2ef9836f6db640d4106c775c2b338e1bc15cf185829a4ae03fceb9ff28da98346cbebdec461ec7e75327588
+  data.tar.gz: f52b3a436ac78d7b82cbeb526abfa45e20cd5a21febd290717c389d303eba96c16c73f6e09026635115b012e7bdf6391ff924ff533e2ef6e6404a2e745d164db

data/bin/nixenvironment

@@ -88,6 +88,11 @@ command :build do |c|
       begin
         read_config_settings
 
+        if @config_settings['WORKSPACE_TO_BUILD'] and @config_settings['WORKSPACE_TO_BUILD'].length > 0
+          scheme = @config_settings['WORKSPACE_SCHEME_TO_BUILD']
+          abort("Build error! Scheme #{scheme} doesn't exist") unless xcode_project_contains_scheme?(scheme)
+        end
+
         if is_unity_platform
           @config_settings['ICONS_PATH'] = 'Unity-iPhone/Images.xcassets' unless $icons_path
         end
@@ -338,6 +343,9 @@ def supplement_config_settings(config)
                                 -configuration \"#{config}\"\
                                 -sdk \"#{@config_settings['SDK']}\"\
                                 -showBuildSettings ]
+
+    @unescaped_watchkit_extension_product_settings_path = unescaped_product_settings_path(' WatchKit Extension', config)
+    @unescaped_watchkit_app_product_settings_path = unescaped_product_settings_path(' WatchKit App', config)
   else
     abort('Build error! Either PROJECT_TO_BUILD or WORKSPACE_TO_BUILD must be specified!')
   end
@@ -373,10 +381,50 @@ def supplement_config_settings(config)
   @config_settings['DWARF_DSYM_FOLDER_PATH'] = build_directory
 end
 
+def unescaped_product_settings_path(scheme_suffix, config)
+  scheme = @config_settings['WORKSPACE_SCHEME_TO_BUILD'] + scheme_suffix
+  if xcode_project_contains_scheme?(scheme)
+    cmd_output = %x[ xcodebuild -workspace \"#{@config_settings['WORKSPACE_TO_BUILD']}\"\
+                                -scheme \"#{scheme}\"\
+                                -showBuildSettings ]
+    # Parse build settings
+    env_vars_list = cmd_output.split(/\n/).reject(&:empty?)
+    if env_vars_list and env_vars_list.length > 0
+      build_settings_to_strip = Hash.new.compare_by_identity
+      env_vars_list.each do |it|
+        key_value = it.split('=', 2)
+        build_settings_to_strip[key_value[0]] = key_value[1]
+      end
+
+      build_settings_to_strip.each do |key, value|
+        if key and value
+          stripped_key = key.strip
+          stripped_value = value.strip
+          if stripped_key == 'PRODUCT_SETTINGS_PATH'
+            if stripped_value.include?(scheme_suffix)
+              return stripped_value
+            end
+          end
+        end
+      end
+    end
+  end
+
+  nil
+end
+
 def xcode_project_contains_config?(config)
+  xcode_project_info['Build Configurations'].include?(config)
+end
+
+def xcode_project_contains_scheme?(scheme)
+  xcode_project_info['Schemes'].include?(scheme)
+end
+
+def xcode_project_info
   # Parse information about project
   cmd_output = %x[ xcodebuild -list 2>&1 ]
-  abort("Validate configuration error! #{cmd_output}") if cmd_output.include?('error')
+  abort("Getting xcode_project_info error! #{cmd_output}") if cmd_output.include?('error')
 
   cmd_output = cmd_output.lines[1..-1].join # Get all lines except first in order to ignore description message
 
@@ -390,7 +438,7 @@ def xcode_project_contains_config?(config)
     info[key.strip] = lines
   end
 
-  info['Build Configurations'].include?(config)
+  info
 end
 
 def save_build_env_vars
@@ -607,6 +655,24 @@ def backup_info_plist
   FileUtils.cp(@unescaped_product_settings_path, @info_plist_backup_name)
 
   p('Info.plist was backuped.')
+
+  unless @unescaped_watchkit_app_product_settings_path.nil?
+    p('Backuping WatchKit App Info.plist ...')
+
+    @watchkit_app_info_plist_backup_name = @unescaped_watchkit_app_product_settings_path + '.backup'
+    FileUtils.cp(@unescaped_watchkit_app_product_settings_path, @watchkit_app_info_plist_backup_name)
+
+    p('WatchKit App Info.plist was backuped.')
+  end
+
+  unless @unescaped_watchkit_extension_product_settings_path.nil?
+    p('Backuping WatchKit Extension Info.plist ...')
+
+    @watchkit_extension_info_plist_backup_name = @unescaped_watchkit_extension_product_settings_path + '.backup'
+    FileUtils.cp(@unescaped_watchkit_extension_product_settings_path, @watchkit_extension_info_plist_backup_name)
+
+    p('WatchKit Extension Info.plist was backuped.')
+  end
 end
 
 def update_info_plist(config)
@@ -626,6 +692,30 @@ def update_info_plist(config)
   end
 
   p('Info.plist was updated.')
+
+  unless @unescaped_watchkit_app_product_settings_path.nil?
+    p('Updating WatchKit App Info.plist ...')
+
+    update_success = system("/usr/libexec/PlistBuddy -c 'Set :CFBundleVersion \"#{monotonic_revision}\"' \"#{@unescaped_watchkit_app_product_settings_path}\"")
+    unless update_success
+      restore_info_plist
+      abort('Update WatchKit App Info.plist error!')
+    end
+
+    p('WatchKit App Info.plist was updated.')
+  end
+
+  unless @unescaped_watchkit_extension_product_settings_path.nil?
+    p('Updating Extension App Info.plist ...')
+
+    update_success = system("/usr/libexec/PlistBuddy -c 'Set :CFBundleVersion \"#{monotonic_revision}\"' \"#{@unescaped_watchkit_extension_product_settings_path}\"")
+    unless update_success
+      restore_info_plist
+      abort('Update WatchKit Extension Info.plist error!')
+    end
+
+    p('WatchKit Extension Info.plist was updated.')
+  end
 end
 
 def restore_info_plist
@@ -635,6 +725,24 @@ def restore_info_plist
   File.rename(@info_plist_backup_name, @unescaped_product_settings_path)
 
   p('Info.plist was restored.')
+
+  unless @unescaped_watchkit_app_product_settings_path.nil?
+    p('Restoring WatchKit App Info.plist ...')
+
+    File.delete(@unescaped_watchkit_app_product_settings_path)
+    File.rename(@watchkit_app_info_plist_backup_name, @unescaped_watchkit_app_product_settings_path)
+
+    p('WatchKit App Info.plist was restored.')
+  end
+
+  unless @unescaped_watchkit_extension_product_settings_path.nil?
+    p('Restoring WatchKit Extension Info.plist ...')
+
+    File.delete(@unescaped_watchkit_extension_product_settings_path)
+    File.rename(@watchkit_extension_info_plist_backup_name, @unescaped_watchkit_extension_product_settings_path)
+
+    p('WatchKit Extension Info.plist was restored.')
+  end
 end
 
 def deploy(deliver_deploy)

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.50'
+  VERSION = '0.0.51'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.50
+  version: 0.0.51
 platform: ruby
 authors:
 - Karen Arzumanian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler