nixenvironment 0.0.70 → 0.0.71

data/lib/nixenvironment/build_env_vars_loader.rb

@@ -1,24 +1,87 @@
 module Nixenvironment
   class BuildEnvVarsLoader
     def self.load
-      cmd_output     = %x[ source \"#{LOAD_BUILD_ENV_VARS_SCRIPT_PATH}\" ].strip!
+      build_env_vars = load_last_revision.merge(load_last_build_vars)
+
+      built_products_dir = build_env_vars[BUILT_PRODUCTS_DIR_KEY]
+      app_product        = build_env_vars[APP_PRODUCT_KEY]
+      ipa_product        = build_env_vars[IPA_PRODUCT_KEY]
+      app_infoplist_file = build_env_vars['APP_INFOPLIST_FILE']
+      embedded_profile   = build_env_vars['EMBEDDED_PROFILE']
+      monotonic_revision = build_env_vars['MONOTONIC_REVISION']
+      sdk                = build_env_vars[SDK_NAME_KEY]
+
+      raise "error: directory '#{built_products_dir}' must exist (build products dir)!" unless File.exist?(built_products_dir)
+      raise "error: app product directory '#{app_product}' or ipa file '#{ipa_product}' must exist!" unless File.exist?(app_product) && File.exist?(ipa_product)
+      raise "error: file '#{app_infoplist_file}' must exist (app info plist)!" unless File.exist?(app_infoplist_file)
+
+      if sdk.include?('ios')
+        embedded_profile_exist = embedded_profile.present? && File.exist?(embedded_profile)
+        embedded_profile_name = embedded_profile_exist ? %x[ /usr/libexec/PlistBuddy -c 'Print :Name' /dev/stdin <<< $(security cms -D -i '#{embedded_profile}') ].strip : 'SIMULATOR'
+      end
+
+      current_app_version = %x[ /usr/libexec/PlistBuddy -c 'Print CFBundleShortVersionString' '#{app_infoplist_file}' ].strip
+
+      build_env_vars[EMBEDDED_PROFILE_NAME_KEY] = embedded_profile_name
+      build_env_vars[CURRENT_APP_VERSION_KEY]   = current_app_version
+      build_env_vars[CURRENT_BUILD_VERSION_KEY] = monotonic_revision
+
+      puts
+      puts "#{EMBEDDED_PROFILE_NAME_KEY} = #{embedded_profile_name}"
+      puts "#{CURRENT_APP_VERSION_KEY} = #{current_app_version}"
+      puts "#{CURRENT_BUILD_VERSION_KEY} = #{monotonic_revision}"
+      puts
+
+      build_env_vars
+    end
+
+    def self.load_last_revision
+      load_internal(AUTOGENERATED_LAST_REVISION, false)
+    end
+
+    def self.load_last_build_vars
+      load_internal(AUTOGENERATED_LAST_BUILD_VARS, false)
+    end
+
+    def self.working_copy_is_clean?
+      working_copy_is_clean = load_last_revision['WORKING_COPY_IS_CLEAN'] == '1'
+
+      if working_copy_is_clean
+        puts 'Working copy is clean. Continuing ...'
+      else
+        puts 'error: working copy must not have local modifications.'
+        puts 'You must add following files and folders to .gitignore:'
+        Git.status(:porcelain => true)
+      end
+
+      working_copy_is_clean
+    end
+
+    def self.load_internal(file, print_log = true)
+      raise "error: file '#{file}' must exist!" unless File.exist?(file)
+
       build_env_vars = {}
 
-      vars_list = cmd_output.split(/\n/).reject(&:empty?)
+      vars_list = File.read(file).lines.reject(&:empty?)
       if vars_list.present?
+        puts if print_log
+
         vars_to_strip = Hash[vars_list.map { |it| it.split('=', 2) }]
         vars_to_strip.each do |key, value|
-          if key.present? && value.present?
+          if key.present? && !key.include?(AUTOGENERATED_FILES_HEADER)
             stripped_key   = key.strip
-            stripped_value = value.strip
-
-            puts "#{stripped_key} : #{stripped_value}"
+            stripped_value = value ? value.tr("'", '').strip : 'unknown'
+            puts "#{stripped_key} = #{stripped_value}" if print_log
             build_env_vars[stripped_key] = stripped_value
           end
         end
+
+        puts if print_log
       end
 
       build_env_vars
     end
+
+    private_class_method :load_internal
   end
 end

data/lib/nixenvironment/config.rb

@@ -12,15 +12,10 @@ module Nixenvironment
 
   # ninbas legacy
   BUILD_SCRIPTS_PATH                  = File.expand_path('../../../legacy', __FILE__)
-  SAVE_REVISION_SCRIPT_PATH           = File.join(BUILD_SCRIPTS_PATH, 'SaveRevision.sh')
   UNITY_BUILD_ANDROID_SCRIPT_PATH     = File.join(BUILD_SCRIPTS_PATH, 'UnityBuildAndroid.py')
-  LOAD_BUILD_ENV_VARS_SCRIPT_PATH     = File.join(BUILD_SCRIPTS_PATH, 'LoadBuildEnvVars.sh')
   CODE_COVERAGE_REPORT_SCRIPT_PATH    = File.join(BUILD_SCRIPTS_PATH, 'GenerateCodeCoverageForXCTests.sh')
   CODE_DUPLICATION_REPORT_SCRIPT_PATH = File.join(BUILD_SCRIPTS_PATH, 'GenerateCodeDuplicationReport.sh')
-  MAKE_TAG_SCRIPT_PATH                = File.join(BUILD_SCRIPTS_PATH, 'MakeTag.sh')
-  CLEAN_WORKING_COPY_SCRIPT_PATH      = File.join(BUILD_SCRIPTS_PATH, 'CleanWorkingCopy.sh')
   DEPLOY_SCRIPT_PATH                  = File.join(BUILD_SCRIPTS_PATH, 'Deploy.sh')
-  DEPLOY_IPA_SCRIPT_PATH              = File.join(BUILD_SCRIPTS_PATH, 'DeployIPA.sh')
   DEPLOY_APK_SCRIPT_PATH              = File.join(BUILD_SCRIPTS_PATH, 'DeployAPK.py')
 
   # utils
@@ -34,11 +29,20 @@ module Nixenvironment
 
   # file extensions
   APP_EXT   = '.app'
+  IPA_EXT   = '.ipa'
   APPEX_EXT = '.appex'
   DSYM_EXT  = '.dSYM'
   ZIP_EXT   = '.zip'
   GIT_EXT   = '.git'
 
+  # autogenerated
+  AUTOGENERATED_FILES_HEADER    = '### AUTOGENERATED BY Nixenvironment; DO NOT EDIT ###'
+  AUTOGENERATED_LAST_REVISION   = '_last_revision.sh'
+  AUTOGENERATED_LAST_BUILD_VARS = '_last_build_vars.sh'
+  AUTOGENERATED_COVERAGE        = 'coverage.xml'
+  AUTOGENERATED_DUPLICATION     = 'duplication.xml'
+  AUTOGENERATED_TEST_RESULTS    = 'test-results/'
+
   # watch, extensions, widgets
   WATCHKIT_APP_KEY                   = 'WatchKit App'
   WATCHKIT_EXTENSION_KEY             = 'WatchKit Extension'

data/lib/nixenvironment/deployer.rb

@@ -0,0 +1,129 @@
+require 'net/scp'
+require 'colorize'
+
+module Nixenvironment
+  class Deployer
+    def self.deploy(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy)
+      build_env_vars = BuildEnvVarsLoader.load
+      raise 'Error! Working copy is not clean!' unless BuildEnvVarsLoader.working_copy_is_clean?
+
+      ipa_product                           = build_env_vars[IPA_PRODUCT_KEY]
+      ipa_product_resigned_device           = build_env_vars['IPA_PRODUCT_RESIGNED_DEVICE']
+      ipa_product_resigned_adhoc            = build_env_vars['IPA_PRODUCT_RESIGNED_ADHOC']
+      ipa_product_resigned_appstore         = build_env_vars['IPA_PRODUCT_RESIGNED_APPSTORE']
+
+      ipa_bundle_id                         = build_env_vars[IPA_BUNDLE_ID_KEY]
+      ipa_bundle_id_resigned_device         = build_env_vars['IPA_BUNDLE_ID_RESIGNED_DEVICE']
+      ipa_bundle_id_resigned_adhoc          = build_env_vars['IPA_BUNDLE_ID_RESIGNED_ADHOC']
+      ipa_bundle_id_resigned_appstore       = build_env_vars['IPA_BUNDLE_ID_RESIGNED_APPSTORE']
+
+      current_app_version                   = build_env_vars[CURRENT_APP_VERSION_KEY]
+      current_build_version                 = build_env_vars[CURRENT_BUILD_VERSION_KEY]
+
+      name_for_deployment                   = build_env_vars[NAME_FOR_DEPLOYMENT_KEY]
+      name_for_deployment_resigned_device   = build_env_vars['NAME_FOR_DEPLOYMENT_RESIGNED_DEVICE']
+      name_for_deployment_resigned_adhoc    = build_env_vars['NAME_FOR_DEPLOYMENT_RESIGNED_ADHOC']
+      name_for_deployment_resigned_appstore = build_env_vars['NAME_FOR_DEPLOYMENT_RESIGNED_APPSTORE']
+
+      executable_name                       = build_env_vars[EXECUTABLE_NAME_KEY]
+      app_dsym                              = build_env_vars[APP_DSYM_KEY]
+      sdk                                   = build_env_vars[SDK_NAME_KEY]
+
+      ipa_count = 0
+
+      if ipa_product.present? && File.exist?(ipa_product)
+        ipa_count += 1
+        deploy_internal(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy,
+                        ipa_bundle_id, ipa_product, current_app_version, current_build_version, name_for_deployment, executable_name, app_dsym, sdk)
+      end
+
+      if ipa_product_resigned_device.present? &&  File.exist?(ipa_product_resigned_device)
+        ipa_count += 1
+        ipa_bundle_id_resigned_device = ipa_bundle_id if ipa_bundle_id_resigned_device.blank?
+        deploy_internal(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy,
+                        ipa_bundle_id_resigned_device, ipa_product_resigned_device, current_app_version, current_build_version, name_for_deployment_resigned_device,
+                        executable_name, app_dsym, sdk)
+      end
+
+      if ipa_product_resigned_adhoc.present? &&  File.exist?(ipa_product_resigned_adhoc)
+        ipa_count += 1
+        ipa_bundle_id_resigned_adhoc = ipa_bundle_id if ipa_bundle_id_resigned_adhoc.blank?
+        deploy_internal(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy,
+                        ipa_bundle_id_resigned_adhoc, ipa_product_resigned_adhoc, current_app_version, current_build_version, name_for_deployment_resigned_adhoc,
+                        executable_name, app_dsym, sdk)
+      end
+
+      if ipa_product_resigned_appstore.present? &&  File.exist?(ipa_product_resigned_appstore)
+        ipa_count += 1
+        ipa_bundle_id_resigned_appstore = ipa_bundle_id if ipa_bundle_id_resigned_appstore.blank?
+        deploy_internal(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy,
+                        ipa_bundle_id_resigned_appstore, ipa_product_resigned_appstore, current_app_version, current_build_version, name_for_deployment_resigned_appstore,
+                        executable_name, app_dsym, sdk)
+      end
+
+      raise 'Nothing to upload!' if ipa_count == 0
+    end
+
+    def self.deploy_internal(deploy_host, deploy_dir, deploy_user, deploy_password, deploy_itunesconnect_user, deliver_deploy,
+                             ipa_bundle_id, ipa_product, current_app_version, current_build_version, name_for_deployment, executable_name, app_dsym, sdk)
+      is_macos_build = sdk.include?('macos')
+
+      local_path_to_app       = File.join(Dir.tmpdir, ipa_bundle_id)
+      local_path_to_build     = File.join(local_path_to_app, "v.#{current_app_version}_#{current_build_version}")
+      configuration_full_path = File.join(local_path_to_build, name_for_deployment)
+      destination_ipa_product = File.join(configuration_full_path, executable_name + (is_macos_build ? ZIP_EXT : IPA_EXT))
+
+      FileUtils.rm_rf(local_path_to_build)
+      FileUtils.mkdir_p(configuration_full_path)
+      FileUtils.cp_r(ipa_product, destination_ipa_product)
+
+      unless is_macos_build
+        if deploy_itunesconnect_user.present?
+          puts
+          print 'Starting pilot ...'.blue
+          puts
+
+          skip_submission = deliver_deploy ? '' : '--skip_submission'
+          system("pilot upload -i '#{ipa_product}' -u '#{deploy_itunesconnect_user}' #{skip_submission}")
+        end
+
+        # zip dsym
+        dsym_path        = executable_name + APP_EXT + DSYM_EXT
+        zipped_dsym_path = File.join(configuration_full_path, dsym_path + ZIP_EXT)
+
+        if File.exist?(app_dsym)
+          Dir.chdir(File.dirname(app_dsym)) do
+            system("/usr/bin/zip --symlinks --verbose --recurse-paths '#{zipped_dsym_path}' '#{File.basename(app_dsym)}'")
+          end
+        end
+      end
+
+      FileUtils.chmod_R(0775, local_path_to_app)
+
+      scp(deploy_host, deploy_dir, deploy_user, deploy_password, local_path_to_app)
+
+      FileUtils.rm_rf(local_path_to_app)
+    end
+
+    def self.scp(deploy_host, deploy_dir, deploy_user, deploy_password, local_path_to_app)
+      puts
+      puts "Uploading build from '#{local_path_to_app}' ...".blue
+      puts
+
+      max_percentage = 100
+      progress_step = 5
+      max_progress = max_percentage / progress_step
+
+      Net::SCP.upload!(deploy_host, deploy_user, local_path_to_app, deploy_dir, :ssh => { :password => deploy_password }, :recursive => true, :preserve => true) do |_ch, _name, sent, total|
+        percentage = (sent.to_f / total.to_f * max_percentage).round(1)
+        current_progress = (percentage / progress_step).floor
+        progress_bar = '|' + '#' * current_progress + '_' * (max_progress - current_progress) + '|'
+        print "#{percentage}% #{progress_bar}\r"
+      end
+
+      puts
+    end
+
+    private_class_method :deploy_internal, :scp
+  end
+end

data/lib/nixenvironment/scm.rb

@@ -0,0 +1,179 @@
+module Nixenvironment
+  class SCM
+    SCM_SVN       = 'svn'
+    SCM_GIT       = 'git'
+    SCM_MERCURIAL = 'mercurial'
+
+    def self.current
+      %x[ git status ]
+      return SCM_GIT if $?.success?
+
+      %x[ hg status ]
+      return SCM_MERCURIAL if $?.success?
+
+      %x[ svn info ]
+      return SCM_SVN if $?.success?
+
+      return 'undefined'
+    end
+
+    def self.save_revision
+      scm_type = current
+      case scm_type
+        when SCM_SVN
+          puts 'SVN working copy detected'
+          current_revision = %x[ svnversion ]
+          current_monotonic_revision = current_revision
+
+          # simply check that the SVN version is a digit
+          if Integer(current_revision)
+            working_copy_is_clean = 1
+          else
+            puts "Working copy is not clean because of svnversion returning #{current_revision}"
+            working_copy_is_clean = 0
+          end
+        when SCM_GIT
+          puts 'GIT working copy detected'
+          current_revision = %x[ git rev-parse HEAD ]
+          last_revision_in_repo = %x[ git rev-list --all -n 1 ]
+
+          # number of pushes before current
+          current_monotonic_revision = %x[ git rev-list --all --count ]
+
+          if current_revision == last_revision_in_repo
+            current_monotonic_revision = current_monotonic_revision.succ
+          end
+
+          status = %x[ git status --porcelain ]
+
+          if status == ''
+            working_copy_is_clean = 1
+          else
+            # TODO: check this out for Unity builds
+            # ignore changes to build folder, because it's created by Xcode before the script runs as a build phase
+            lines_count = status.lines.count
+
+            if lines_count != 1
+              puts "Working copy is not clean because of status:\n#{status}"
+              puts
+              working_copy_is_clean = 0
+            else
+              wc_root = %[ git rev-parse --show-toplevel ]
+              modified_path = status[3..-1]
+              abs_modified_path = File.join(wc_root, modified_path)
+
+              # compare path to Xcode env var
+              if abs_modified_path == ENV['BUILD_ROOT']
+                working_copy_is_clean = 1
+              else
+                puts "Working copy is not clean because of status:\n#{status}"
+                puts
+                working_copy_is_clean = 0
+              end
+            end
+          end
+        when SCM_MERCURIAL
+          puts 'Mercurial working copy detected'
+          current_revision = %x[ hg id -i ]
+          # number of pushes in current branch
+          # TODO: compare with: "$(hg log --template '{rev}:{node|short} {desc|firstline} ({author})\n' | wc -l | tr -d ' ')"
+          current_monotonic_revision = %x[ hg id --num --rev tip ]
+
+          status = %x[ hg status ]
+
+          if status == ''
+            working_copy_is_clean = 1
+          else
+            # TODO: check this out for Unity builds
+            # ignore changes to build folder, because it's created by Xcode before the script runs as a build phase
+            lines_count = status.lines.count
+
+            if lines_count != 1
+              puts "Working copy is not clean because of status:\n#{status}"
+              puts
+              working_copy_is_clean = 0
+            else
+              wc_root = %[ hg root ]
+              modified_path = status[3..-1]
+              abs_modified_path = File.join(wc_root, modified_path)
+
+              # compare path to Xcode env var
+              if abs_modified_path == ENV['BUILD_ROOT']
+                working_copy_is_clean = 1
+              else
+                puts "Working copy is not clean because of status:\n#{status}"
+                puts
+                working_copy_is_clean = 0
+              end
+            end
+          end
+        else
+          puts 'warning: script must be run from working copy. Revision is undefined.'
+          current_revision = 'undefined'
+          current_monotonic_revision = 'undefined'
+          working_copy_is_clean = 0
+      end
+
+      system("
+echo \"#!/bin/sh\
+#{AUTOGENERATED_FILES_HEADER}
+REVISION='#{current_revision.strip!}'
+MONOTONIC_REVISION='#{current_monotonic_revision.strip!}'
+WORKING_COPY_IS_CLEAN='#{working_copy_is_clean}'\" > #{AUTOGENERATED_LAST_REVISION}
+      ")
+    end
+
+    # TODO: implement --all for svn
+    def self.clean_working_copy(all)
+      puts '--- Clean all specified' if all.present?
+      scm_type = current
+
+      case scm_type
+        when SCM_SVN
+          puts 'SVN working copy detected, cleaning ...'
+
+          # revert all changes
+          system('svn revert --depth=infinity .')
+
+          # revert all changes in external directories
+          # TODO: rework this for Windows
+          system("
+          for i in $(svn status | grep ^Performing | cut -d\' -f 2)
+          do
+            svn revert -R $i
+          done")
+
+          # Wipes out unversioned files from Subversion working copy
+          system('svn cleanup . --remove-unversioned')
+        when SCM_GIT
+          puts 'GIT working copy detected, cleaning ...'
+
+          # revert all changes
+          system('git reset --hard')
+
+          if all
+            # wipe out unversioned files (force, remove whole directories, remove ignored files)
+            system('git clean -fdx')
+          else
+            # wipe out unversioned files (force, remove whole directories)
+            system('git clean -fd')
+          end
+        when SCM_MERCURIAL
+          puts 'Mercurial working copy detected, cleaning ...'
+
+          # revert all changes
+          system('hg revert --all')
+
+          if all
+            # wipe out unversioned files
+            system('hg --config extensions.purge= clean --all')
+          else
+            # wipe out unversioned files (except ignored files)
+            system('hg --config extensions.purge= clean')
+          end
+        else
+          puts 'Error: script must be run from working copy!'
+      end
+    end
+  end
+end

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.70'
+  VERSION = '0.0.71'
 end

data/lib/nixenvironment/xcodebuild.rb

@@ -107,6 +107,8 @@ module Nixenvironment
       build_args << '-showBuildSettings'
 
       puts 'Reading config settings ...'
+      puts
+
       cmd_output = execute(nil, build_args, true)
 
       env_vars_list = cmd_output.split(/\n/).reject(&:empty?)
@@ -167,7 +169,11 @@ module Nixenvironment
 
     def self.read_info
       @info      = {}
+
+      puts
       cmd_output = execute(nil, %w(-list 2>&1))
+      puts
+
       raise "Getting xcode_project_info error! #{cmd_output}" if cmd_output.include?('error')
 
       cmd_output = cmd_output.lines[1..-1].join.split(/\n\n/)