nixenvironment 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bd12ac49d83333b46c6224ca844e7bc9f71fba9
-  data.tar.gz: 203348fc5d303e290f296f166aaf4f20066806ef
+  metadata.gz: 46e42318b0a0b848a40f1a26874872681c99a5a0
+  data.tar.gz: 2dfab4c22a3cdcaf0bcbf0d1aac369447573c6e1
 SHA512:
-  metadata.gz: fad838e3f7ad06064281a3c9ee11718d8ea8f923348a1758c369605e7e38081bd7c0a8947c3959b7eaf2babe866bd9828a69b6ec685802c32e54480622187c0b
-  data.tar.gz: 8932f6f7a9b6c347bf90e53d96fd700b4768e0d1893a3ec83b626b31c351e8ba2ced1bb58386bd56c24dce669dd2fb5e49153c8f3751b2da8cb2f79e58089167
+  metadata.gz: bb885c5e80d09ffdc42ed9f5f9dcc367a16a92f8eae6d9a3fa26813643f254d29dd9ca2047e2b81d207aaebd4b9704af52525e08d3b14ae389fa28c5eca4d7c5
+  data.tar.gz: 1701715645899b4abf0bfd1802f06033dea8e6c9b08cea41d497d417620ef3518a1ec4e63568276d5d2facd22b83c36e3e00e0d86019baa2378df07b8204d300

data/bin/nixenvironment

@@ -75,9 +75,9 @@ command :build do |c|
     end
 
     begin
-      read_config
+      read_config_settings
       enable_ci_build(options.ci_build)
-      setup(options.config)
+      supplement_config_settings(options.config)
       prebuild(options.config)
       build(options.config, options.ipa)
       restore_info_plist
@@ -102,7 +102,7 @@ command :deploy do |c|
     end
 
     begin
-      read_config
+      read_config_settings
       deploy
     rescue
       raise # re-rise exception but chdir to root_working_dir in ensure block first if needed
@@ -126,7 +126,7 @@ command :test do |c|
   c.syntax = 'nixenvironment test'
   c.description = 'Build xctest unit tests and run them in simulator'
   c.action do |args, options|
-    read_config
+    read_config_settings
     test
   end
 end
@@ -135,7 +135,7 @@ command :code_coverage do |c|
   c.syntax = 'nixenvironment code_coverage'
   c.description = 'Generate xctest unit tests code coverage report'
   c.action do |args, options|
-    read_config
+    read_config_settings
     code_coverage
   end
 end
@@ -144,7 +144,7 @@ command :code_duplication_report do |c|
   c.syntax = 'nixenvironment code_duplication_report'
   c.description = 'Generate code duplication report for xctest'
   c.action do |args, options|
-    read_config
+    read_config_settings
     code_duplication_report
   end
 end
@@ -203,7 +203,7 @@ def update(ninbas)
 
       system("git fetch -t")
       tags = IO.popen('git tag').readlines
-      tags.map! { |tag| tag = tag.strip }
+      tags.map! { |tag| tag.strip! }
 
       if tags.size > 0
         p("Checkout newest #{repo_name} tag...")
@@ -224,41 +224,41 @@ def update(ninbas)
   end
 end
 
-def read_config
+def read_config_settings
   begin
     @config_settings = YAML.load(File.read(File.join(File.dirname(__FILE__), 'Config')))
   rescue
     abort('Config file processing error!')
   end
 
-  update_config('PROJECT_TO_BUILD',                      $project_to_build)
-  update_config('PROJECT_TARGET_TO_BUILD',               $project_target_to_build)
-  update_config('PROJECT_TARGET_TO_TEST',                $project_target_to_test)
-  update_config('WORKSPACE_TO_BUILD',                    $workspace_to_build)
-  update_config('WORKSPACE_SCHEME_TO_BUILD',             $workspace_scheme_to_build)
-  update_config('WORKSPACE_SCHEME_TO_TEST',              $workspace_scheme_to_test)
-  update_config('SDK',                                   $sdk)
-  update_config('SDK_FOR_TESTS',                         $sdk_for_tests)
-  update_config('EXCLUDE_PATTERN_FOR_CODE_COVERAGE',     $exclude_pattern_for_code_coverage)
-  update_config('EXCLUDE_PATTERN_FOR_CODE_DUPLICATION',  $exclude_pattern_for_code_duplication)
-  update_config('DEPLOY_HOST',                           $deploy_host)
-  update_config('DEPLOY_PATH',                           $deploy_path)
-  update_config('DEPLOY_USERNAME',                       $deploy_username)
-  update_config('DEPLOY_PASSWORD',                       $deploy_password)
-  update_config('ICONS_PATH',                            $icons_path)
-  update_config('XCTEST_DESTINATION_DEVICE',             $xctest_destination_device)
-  update_config('CONFIGURATION_FILES_PATH',              $configuration_files_path)
-  update_config('CODE_COVERAGE_CONFIGURATION',           $code_coverage_configuration)
-  update_config('CODE_COVERAGE_OUTPUT_DIRECTORY',        $code_coverage_output_directory)
-  update_config('ENV_VAR_PREFIX',                        $env_var_prefix)
-  update_config('INFOPLIST_PATH',                        $infoplist_path)
-  update_config('BUNDLE_ID',                             $bundle_id)
-  update_config('RESIGNED_BUNDLE_ID',                    $resigned_bundle_id)
-  update_config('RESIGNED_BUNDLE_NAME',                  $resigned_bundle_name)
-  update_config('RESIGNED_ENTITLEMENTS_PATH',            $resigned_entitlements_path)
-end
-
-def update_config(key, value)
+  update_config_settings('PROJECT_TO_BUILD',                      $project_to_build)
+  update_config_settings('PROJECT_TARGET_TO_BUILD',               $project_target_to_build)
+  update_config_settings('PROJECT_TARGET_TO_TEST',                $project_target_to_test)
+  update_config_settings('WORKSPACE_TO_BUILD',                    $workspace_to_build)
+  update_config_settings('WORKSPACE_SCHEME_TO_BUILD',             $workspace_scheme_to_build)
+  update_config_settings('WORKSPACE_SCHEME_TO_TEST',              $workspace_scheme_to_test)
+  update_config_settings('SDK',                                   $sdk)
+  update_config_settings('SDK_FOR_TESTS',                         $sdk_for_tests)
+  update_config_settings('EXCLUDE_PATTERN_FOR_CODE_COVERAGE',     $exclude_pattern_for_code_coverage)
+  update_config_settings('EXCLUDE_PATTERN_FOR_CODE_DUPLICATION',  $exclude_pattern_for_code_duplication)
+  update_config_settings('DEPLOY_HOST',                           $deploy_host)
+  update_config_settings('DEPLOY_PATH',                           $deploy_path)
+  update_config_settings('DEPLOY_USERNAME',                       $deploy_username)
+  update_config_settings('DEPLOY_PASSWORD',                       $deploy_password)
+  update_config_settings('ICONS_PATH',                            $icons_path)
+  update_config_settings('XCTEST_DESTINATION_DEVICE',             $xctest_destination_device)
+  update_config_settings('CONFIGURATION_FILES_PATH',              $configuration_files_path)
+  update_config_settings('CODE_COVERAGE_CONFIGURATION',           $code_coverage_configuration)
+  update_config_settings('CODE_COVERAGE_OUTPUT_DIRECTORY',        $code_coverage_output_directory)
+  update_config_settings('ENV_VAR_PREFIX',                        $env_var_prefix)
+  update_config_settings('INFOPLIST_PATH',                        $infoplist_path)
+  update_config_settings('BUNDLE_ID',                             $bundle_id)
+  update_config_settings('RESIGNED_BUNDLE_ID',                    $resigned_bundle_id)
+  update_config_settings('RESIGNED_BUNDLE_NAME',                  $resigned_bundle_name)
+  update_config_settings('RESIGNED_ENTITLEMENTS_PATH',            $resigned_entitlements_path)
+end
+
+def update_config_settings(key, value)
   if value
     @config_settings[key] = value
     p("#{key} |SPECIFIED| directly: #{value}")
@@ -278,7 +278,7 @@ def enable_ci_build(ci_build)
 end
 
 def working_copy_is_clean?
-  is_clean = system("
+  system("
   LAST_REVISION_FILE=\"_last_revision.sh\"
 
   source ${LAST_REVISION_FILE}
@@ -291,24 +291,10 @@ def working_copy_is_clean?
     echo \"$(git status --porcelain)\"
     exit 1
   fi")
-
-  return is_clean
 end
 
-def setup(config)
-  # Parse information about project
-  cmd_output = %x[ xcodebuild -list ]
-  cmd_output = cmd_output.lines.to_a[1..-1].join # TODO: handle if to_a returns 0 or count less than expected
-  info = {}
-  cmd_output.split(/\n\n/).each do |pair|
-    key,value = pair.split(/:/)
-    next unless key and value
-    lines = value.lines.map { |line| line.strip }
-    lines.reject! { |line| line.empty? }
-    info[key.strip] = lines
-  end
-
-  abort("Build error! Configuration #{config} doesn't exist") unless info['Build Configurations'].include?(config)
+def supplement_config_settings(config)
+  abort("Build error! Configuration #{config} doesn't exist") unless xcode_project_contains_config?(config)
 
   if @config_settings['PROJECT_TO_BUILD'] and @config_settings['PROJECT_TO_BUILD'].length > 0
     if @config_settings['PROJECT_TARGET_TO_BUILD'] and @config_settings['PROJECT_TARGET_TO_BUILD'].length > 0
@@ -334,6 +320,7 @@ def setup(config)
     abort('Build error! Either PROJECT_TO_BUILD or WORKSPACE_TO_BUILD must be specified!')
   end
 
+  # Parse build settings
   env_vars_list = cmd_output.split(/\n/).reject(&:empty?)
 
   if env_vars_list and env_vars_list.length > 0
@@ -342,7 +329,7 @@ def setup(config)
       if key and value
         stripped_key = key.strip
         stripped_value = value.strip
-        @config_settings[stripped_key] ||= stripped_value.shellescape # assign new value only if @config_settings[stripped_key] is nil
+        @config_settings[stripped_key] ||= stripped_value.shellescape # Assign new value only if assignee is nil
       end
     end
   end
@@ -353,6 +340,26 @@ def setup(config)
   @config_settings['DWARF_DSYM_FOLDER_PATH'] = build_directory
 end
 
+def xcode_project_contains_config?(config)
+  # Parse information about project
+  cmd_output = %x[ xcodebuild -list 2>&1 ]
+  abort("Validate configuration 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
+
+  info = {}
+
+  cmd_output.split(/\n\n/).each do |pair|
+    key,value = pair.split(/:/)
+    next unless key and value
+    lines = value.lines.map { |line| line.strip }
+    lines.reject! { |line| line.empty? }
+    info[key.strip] = lines
+  end
+
+  info['Build Configurations'].include?(config)
+end
+
 def save_build_env_vars
   app_product = File.join(@config_settings['BUILT_PRODUCTS_DIR'], @config_settings['EXECUTABLE_NAME']) + '.app'
 
@@ -518,7 +525,7 @@ end
 def backup_info_plist
   p('Backuping Info.plist ...')
 
-  @info_plist_backup_name = @config_settings['INFOPLIST_PATH'] + '.backup'
+  @info_plist_backup_name = @config_settings['INFOPLIST_PATH'] + '.backup' # PRODUCT_SETTINGS_PATH
   FileUtils.cp(@config_settings['INFOPLIST_PATH'], @info_plist_backup_name)
 
   p('Info.plist was backuped.')
@@ -546,7 +553,7 @@ end
 def restore_info_plist
   p('Restoring Info.plist ...')
 
-  File.delete(@config_settings['INFOPLIST_PATH'])
+  File.delete(@config_settings['INFOPLIST_PATH']) # PRODUCT_SETTINGS_PATH
   File.rename(@info_plist_backup_name, @config_settings['INFOPLIST_PATH'])
 
   p('Info.plist was restored.')

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.27'
+  VERSION = '0.0.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Karen Arzumanian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler