nixenvironment 0.0.65 → 0.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75c1eef3f33d03ebe3e67692aee6967fb28701fc
-  data.tar.gz: 0200541c06f63d158ab537150c4abf6386e1480c
+  metadata.gz: ad1a673aa13db0acba59cf7cac6ded70f4d93ee0
+  data.tar.gz: 523923efe703537bc3e38873681aa8f14150e140
 SHA512:
-  metadata.gz: b24e313955f68c4985aca1b1774a0cfca3cfc0b270f3c6278b82e78c77deabd2b3bd255711adb9463c84dbf99a5820cdcb7183d3237bb329ab3a0de3583e547b
-  data.tar.gz: e2c2527f139ff86921fa711f9d6294106570cfbddaa91c81b119514131610133e72d4ba80f2f6fabbcbcef6275e7078589a03ab7d3c102bfe5b738ae0d5869bb
+  metadata.gz: 5f458279ff5703405675e9bf0b02284f291f7330c8c9f7045a2a336288614e90e55aa6d8c83237e5589d710f0c3e2314d0e94032b21ae9e4e5a9b00ea0a23ea8
+  data.tar.gz: 571f9d3ab26b5ac02a164298db91f3373dc32935df24ef77807891240d2c491f04ddae320689a1901222574d368dbc9f76f447bb276845459fea602e831f7a78

data/README.md

@@ -8,94 +8,9 @@ Nixenvironment installs, updates and manages inner NIX environment stuff to make
 
 ## Usage
 
-  COMMANDS:
-
-    build                    # Build project for selected configuration and make signed/resigned ipa
-                 
-    clean                    # Remove temp files and clean all targets for xcode project
-             
-    clean_working_copy       # Make working copy clean
-    
-    code_coverage            # Generate xctest unit tests code coverage report     
-                    
-    code_duplication_report  # Generate code duplication report
-                
-    deploy                   # Deploy built artifacts to given server
-             
-    help                     # Display global or [command] help documentation
-             
-    svn_tag_from_jenkins     # Make tag by finding the first credential in local credential storage
-                 
-    tag                      # Make SVN/git/mercurial tag, SCM_USERNAME and SCM_PASSWORD must be defined on calling this target
-                 
-    test                     # Build xctest unit tests and run them in simulator
-
-  GLOBAL OPTIONS:
-
-    -h, --help
-        Display help documentation. Default command
-
-    -v, --version
-        Display version information
-
-    -t, --trace
-        Display backtrace when an error occurs
-        
-    # Options to override default Config
- 
-    --project_to_build VALUE
-
-    --project_target_to_build VALUE
-
-    --project_target_to_test VALUE
-
-    --workspace_to_build VALUE
-
-    --workspace_scheme_to_build VALUE
-
-    --workspace_scheme_to_test VALUE
-
-    --sdk VALUE
-
-    --sdk_for_tests VALUE
-
-    --exclude_pattern_for_code_coverage VALUE
-
-    --exclude_pattern_for_code_duplication VALUE
-
-    --deploy_host VALUE
-
-    --deploy_path VALUE
-
-    --deploy_username VALUE
-
-    --deploy_password VALUE
-
-    --icons_path VALUE
-
-    --xctest_destination_device VALUE
-
-    --configuration_files_path VALUE
-
-    --code_coverage_configuration VALUE
-
-    --code_coverage_output_directory VALUE
-
-    --env_var_prefix VALUE
-
-    --infoplist_path VALUE
-
-  EXAMPLES:
+  To get help in usage please tape this:
   
-    nixenvironment [-h]
-    
-    nixenvironment build # Make Debug build and create .ipa file from last built app product by default
-    
-    nixenvironment build --config Release --ipa resigned_ipa_for_device
-    
-    nixenvironment deploy
-    
-    ...
+    $ nixenvironment [-h | --help]
 
 ## TODO:
 
@@ -111,10 +26,19 @@ Nixenvironment installs, updates and manages inner NIX environment stuff to make
     jenkins ALL=(ALL) NOPASSWD: /usr/bin/bundle
     jenkins ALL=(ALL) NOPASSWD: /usr/bin/gem
   
-  Read http://osxdaily.com/2014/02/06/add-user-sudoers-file-mac/ and
-  http://stackoverflow.com/questions/12736351/exit-save-edit-to-sudoers-file-putty-ssh to know how to do it correctly.
+    To know how to do it correctly please read this:
+    
+      http://osxdaily.com/2014/02/06/add-user-sudoers-file-mac/
+      
+    and this:
+    
+      http://stackoverflow.com/questions/12736351/exit-save-edit-to-sudoers-file-putty-ssh 
 
   Then run this in Execute shell:
 
     # See credentials for deploy on https://qwiki.nixsolutions.com/display/IPT/Credentials
-    ./gemify.sh && bundle update && sudo gem install nixenvironment --verbose
+    $ ./gemify.sh && bundle update && sudo gem install nixenvironment --verbose
+    
+  NOTE! CI must be configured with UTF-8 locale! Please see how to implement it for Jenkins:
+    
+    https://github.com/KrauseFx/fastlane/issues/227#issuecomment-139449487

data/bin/nixenvironment

@@ -505,13 +505,13 @@ def tag_icon(short_version)
   icons_dir          = File.join(Dir.pwd, @config_settings[ICONS_PATH_KEY])
   app_product        = File.join(@config_settings[BUILT_PRODUCTS_DIR_KEY], @config_settings[EXECUTABLE_NAME_KEY]) + APP_EXT
 
-  system("#{TAGGER_UTILITY_PATH} --shortVersion=#{version}\
-                                 --buildNumber=#{monotonic_revision}\
-                                 --style=#{style}\
-                                 --maskPath=\"#{mask_path}\"\
-                                 --plist=\"#{plist_path}\"\
-                                 --sourceIconsPath=\"#{icons_dir}\"\
-                                 --destinationIconsPath=#{app_product}")
+  system("#{TAGGER_UTILITY_PATH} --shortVersion='#{version}'\
+                                 --buildNumber='#{monotonic_revision}'\
+                                 --style='#{style}'\
+                                 --maskPath='#{mask_path}'\
+                                 --plist='#{plist_path}'\
+                                 --sourceIconsPath='#{icons_dir}'\
+                                 --destinationIconsPath='#{app_product}'")
 end
 
 def backup_info_plists

data/legacy/DeployAPK.py

@@ -27,7 +27,7 @@ def build_data(build_path):
     build_name_regex = regex_template % "name"
     build_version_regex = regex_template % "versionName"
 
-    aapt_path = os.path.join(os.path.dirname(__file__), "Utils/aapt")
+    aapt_path = os.path.join(os.path.dirname(__file__), "..", "utils/aapt")
     output = os.popen("'%s' dump badging '%s'" % (aapt_path, build_path)).read()
 
     build_name = re.match(build_name_regex, output).groups()[0]

data/legacy/DeployIPA.sh

@@ -56,7 +56,7 @@ if [[ -f "${IPA_PRODUCT_RESIGNED_APPSTORE}" ]]; then
         echo "DEPLOY_ITUNESCONNECT_USER isn't specified, skipping deliver..."
     else
         if [ "${DELIVER_DEPLOY}" == 1 ]; then
-            deliver testflight "${IPA_PRODUCT_RESIGNED_APPSTORE}" -u "${DEPLOY_ITUNESCONNECT_USER}"
+            deliver testflight "${IPA_PRODUCT_RESIGNED_APPSTORE}" -u "${DEPLOY_ITUNESCONNECT_USER}" # --submit_for_review
         else
             deliver testflight "${IPA_PRODUCT_RESIGNED_APPSTORE}" -u "${DEPLOY_ITUNESCONNECT_USER}" --skip-deploy
         fi

data/legacy/GenerateCodeDuplicationReport.sh

@@ -19,6 +19,5 @@ do
 done
 
 currentScriptDir="$(dirname "$0")"
-source "${currentScriptDir}/LoadBuildEnvVars.sh"
 
 java -jar "${currentScriptDir}/../utils/simian-2.3.33.jar" "**/*.m" "**/*.h" ${excludes} -threshold=5 -failOnDuplication- -formatter=xml:${output}

data/legacy/LoadBuildEnvVars.sh

@@ -82,6 +82,9 @@ echo "BUILT_PRODUCTS_DIR = ${BUILT_PRODUCTS_DIR}"
 echo "OBJECTS_NORMAL_DIR = ${OBJECTS_NORMAL_DIR}"
 echo "EXECUTABLE_NAME = ${EXECUTABLE_NAME}"
 echo "APP_PRODUCT = ${APP_PRODUCT}"
+echo "WATCHKIT_APP_RELATIVE_PRODUCT = ${WATCHKIT_APP_RELATIVE_PRODUCT}"
+echo "WATCHKIT_EXTENSION_RELATIVE_PRODUCT = ${WATCHKIT_EXTENSION_RELATIVE_PRODUCT}"
+echo "WIDGET_RELATIVE_PRODUCT = ${WIDGET_RELATIVE_PRODUCT}"
 echo "IPA_PRODUCT = ${IPA_PRODUCT}"
 echo "APP_DSYM = ${APP_DSYM}"
 echo "APP_INFOPLIST_FILE = ${APP_INFOPLIST_FILE}"
@@ -91,8 +94,13 @@ echo "CONFIGURATION = ${CONFIGURATION}"
 echo "SDK_NAME = ${SDK_NAME}"
 echo "IPA_BUNDLE_ID = ${IPA_BUNDLE_ID}"
 echo "RESIGNED_BUNDLE_ID = ${RESIGNED_BUNDLE_ID}"
+echo "RESIGNED_WATCHKIT_APP_BUNDLE_ID = ${RESIGNED_WATCHKIT_APP_BUNDLE_ID}"
+echo "RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID = ${RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID}"
+echo "RESIGNED_WIDGET_BUNDLE_ID = ${RESIGNED_WIDGET_BUNDLE_ID}"
 echo "RESIGNED_BUNDLE_NAME = ${RESIGNED_BUNDLE_NAME}"
 echo "RESIGNED_ENTITLEMENTS_PATH = ${RESIGNED_ENTITLEMENTS_PATH}"
+echo "RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH = ${RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH}"
+echo "RESIGNED_WIDGET_ENTITLEMENTS_PATH = ${RESIGNED_WIDGET_ENTITLEMENTS_PATH}"
 echo "NAME_FOR_DEPLOYMENT = ${NAME_FOR_DEPLOYMENT}"
 
 checkDirExists "${BUILT_PRODUCTS_DIR}" "build products dir"

data/lib/nixenvironment/archiver.rb

@@ -97,6 +97,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
       def make_ipa(profile_type, ipa_product_suffix, ipa_product_key, ipa_bundle_id_key, name_for_deployment_key)
         is_resigned = ipa_product_suffix.present? && ipa_product_suffix.include?('Resigned')
         is_appstore = ipa_product_suffix.present? && ipa_product_suffix.include?('Appstore')
+        is_adhoc    = ipa_product_suffix.present? && ipa_product_suffix.include?('AdHoc')
 
         build_env_vars     = BuildEnvVarsLoader.load
         built_products_dir = build_env_vars[BUILT_PRODUCTS_DIR_KEY].presence
@@ -138,10 +139,18 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
 
         ipa_bundle_id = is_resigned ? resigned_bundle_id : get_bundle_id(app_product)
 
+        if is_appstore
+          name_for_deployment = 'Appstore'
+        elsif is_adhoc
+          name_for_deployment = 'AdHoc'
+        else
+          name_for_deployment = configuration
+        end
+
         system("echo \"\n# generated by Nixenvironment:
 #{ipa_product_key}='#{ipa_product}'
 #{ipa_bundle_id_key}='#{ipa_bundle_id}'
-#{name_for_deployment_key}='#{configuration}'
+#{name_for_deployment_key}='#{name_for_deployment}'
         \" >> _last_build_vars.sh")
 
         FileUtils.rm_rf(temp_app_product) if is_appstore
@@ -266,42 +275,42 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
           if watchkit_app_relative_product_path.present?
             dest_watchkit_app_product_path      = File.join(dest_app_product_path, watchkit_app_relative_product_path)
             _is_watchkit_app_provision_replaced = replace_provision(dest_watchkit_app_product_path, watchkit_app_profile_path)
-            _is_watchkit_app_bundle_id          = rename_bundle_id(dest_watchkit_app_product_path, new_watchkit_app_bundle_id)
+            _is_watchkit_app_bundle_id_changed  = rename_bundle_id(dest_watchkit_app_product_path, new_watchkit_app_bundle_id)
           end
 
-          is_watchkit_extension_provision_replaced        = nil
-          is_watchkit_extension_bundle_id_or_name_changed = nil
+          is_watchkit_extension_provision_replaced = nil
+          is_watchkit_extension_bundle_id_changed  = nil
 
           dest_watchkit_extension_product_path = nil
 
           # replace provision, rename bundle_id and bundle_name for watchkit extension
           if watchkit_extension_relative_product_path.present?
-            dest_watchkit_extension_product_path            = File.join(dest_app_product_path, watchkit_extension_relative_product_path)
-            is_watchkit_extension_provision_replaced        = replace_provision(dest_watchkit_extension_product_path, watchkit_extension_profile_path)
-            is_watchkit_extension_bundle_id_or_name_changed = rename_bundle_id_and_name(dest_watchkit_extension_product_path, new_watchkit_extension_bundle_id, nil)
+            dest_watchkit_extension_product_path     = File.join(dest_app_product_path, watchkit_extension_relative_product_path)
+            is_watchkit_extension_provision_replaced = replace_provision(dest_watchkit_extension_product_path, watchkit_extension_profile_path)
+            is_watchkit_extension_bundle_id_changed  = rename_bundle_id(dest_watchkit_extension_product_path, new_watchkit_extension_bundle_id)
           end
 
-          is_widget_provision_replaced        = nil
-          is_widget_bundle_id_or_name_changed = nil
+          is_widget_provision_replaced = nil
+          is_widget_bundle_idchanged   = nil
 
           dest_widget_product_path = nil
 
           # replace provision, rename bundle_id and bundle_name for widget
           if widget_relative_product_path.present?
-            dest_widget_product_path            = File.join(dest_app_product_path, widget_relative_product_path)
-            is_widget_provision_replaced        = replace_provision(dest_widget_product_path, widget_profile_path)
-            is_widget_bundle_id_or_name_changed = rename_bundle_id_and_name(dest_widget_product_path, new_widget_bundle_id, nil)
+            dest_widget_product_path     = File.join(dest_app_product_path, widget_relative_product_path)
+            is_widget_provision_replaced = replace_provision(dest_widget_product_path, widget_profile_path)
+            is_widget_bundle_idchanged   = rename_bundle_id(dest_widget_product_path, new_widget_bundle_id)
           end
 
           # codesign watchkit extension
           if watchkit_extension_relative_product_path.present?
             codesign(watchkit_extension_identity_name, new_watchkit_extension_entitlements_path, is_watchkit_extension_provision_replaced,
-                     is_watchkit_extension_bundle_id_or_name_changed, dest_watchkit_extension_product_path, watchkit_extension_profile_path, new_watchkit_extension_bundle_id)
+                     is_watchkit_extension_bundle_id_changed, dest_watchkit_extension_product_path, watchkit_extension_profile_path, new_watchkit_extension_bundle_id)
           end
 
           # codesign widget
           if widget_relative_product_path.present?
-            codesign(widget_identity_name, new_widget_entitlements_path, is_widget_provision_replaced, is_widget_bundle_id_or_name_changed,
+            codesign(widget_identity_name, new_widget_entitlements_path, is_widget_provision_replaced, is_widget_bundle_idchanged,
                      dest_widget_product_path, widget_profile_path, new_widget_bundle_id)
           end
 
@@ -318,7 +327,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
       end
 
       def codesign(identity_name, new_entitlements_path, is_provision_replaced, is_bundle_id_or_name_changed, dest_app_product_path, profile_path, new_bundle_id)
-        codesign_args = ['/usr/bin/codesign', '--force', '--sign', "'#{identity_name}'"]
+        codesign_args = ['/usr/bin/codesign', '--force', '--sign', '--deep', "'#{identity_name}'"]
 
         # now let's figure out the entitlements...
         if new_entitlements_path.present?

data/lib/nixenvironment/plist.rb

@@ -4,17 +4,11 @@ module Nixenvironment
   class Plist
     FORMAT_BINARY = CFPropertyList::List::FORMAT_BINARY
     FORMAT_XML    = CFPropertyList::List::FORMAT_XML
-    FORMAT_PLAIN  = CFPropertyList::List::FORMAT_PLAIN
+    # FORMAT_PLAIN  = CFPropertyList::List::FORMAT_PLAIN
     FORMAT_AUTO   = CFPropertyList::List::FORMAT_AUTO
 
     def self.from_file(path)
-      # FIXME
-      # used instead of new(CFPropertyList::List.new(:file => path))
-      # because of odd <ArgumentError: invalid byte sequence in US-ASCII>
-      plist = CFPropertyList::List.new
-      plist.load_str(File.read(path))
-      plist.filename = path
-      new(plist)
+      new(CFPropertyList::List.new(:file => path))
     end
 
     def self.from_hash(hash)
@@ -42,7 +36,7 @@ module Nixenvironment
 
     def []=(key, value)
       @data[key] = value
-      @plist.value = CFPropertyList.guess(@data)
+      @plist.value = CFPropertyList.guess(@data, :convert_unknown_to_string => true)
     end
 
     def save(path = nil, format = nil, formatted = true)

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.65'
+  VERSION = '0.0.66'
 end

data/lib/nixenvironment/xcodebuild.rb

@@ -30,10 +30,18 @@ module Nixenvironment
       build_args = []
       build_args << "-sdk '#{sdk}'"              if sdk.present?
       build_args << "-configuration '#{config}'" if config.present?
-      build_args << "-project '#{project}'"      if project.present?
-      build_args << "-target '#{target}'"        if target.present?
-      build_args << "-workspace '#{workspace}'"  if workspace.present?
-      build_args << "-scheme '#{scheme}'"        if scheme.present?
+
+      if project.present?
+        build_args << "-project '#{project}'"
+      elsif workspace.present?
+        build_args << "-workspace '#{workspace}'"
+      end
+
+      if target.present?
+        build_args << "-target '#{target}'"
+      elsif scheme.present?
+        build_args << "-scheme '#{scheme}'"
+      end
 
       if env_var_prefix.present?
         vars_to_define = ''
@@ -83,10 +91,19 @@ module Nixenvironment
       build_args = []
       build_args << "-sdk '#{sdk}'"              if sdk.present?
       build_args << "-configuration '#{config}'" if config.present?
-      build_args << "-project '#{project}'"      if project.present?
-      build_args << "-target '#{target}'"        if target.present?
-      build_args << "-workspace '#{workspace}'"  if workspace.present?
-      build_args << "-scheme '#{scheme}'"        if scheme.present?
+
+      if project.present?
+        build_args << "-project '#{project}'"
+      elsif workspace.present?
+        build_args << "-workspace '#{workspace}'"
+      end
+
+      if target.present?
+        build_args << "-target '#{target}'"
+      elsif scheme.present?
+        build_args << "-scheme '#{scheme}'"
+      end
+
       build_args << '-showBuildSettings'
 
       puts 'Reading config settings ...'
@@ -139,7 +156,7 @@ module Nixenvironment
             if key.present? && value.present?
               stripped_key   = key.strip
               stripped_value = value.strip
-              return stripped_value if stripped_key == PRODUCT_SETTINGS_PATH_KEY && stripped_value.include?(scheme_suffix)
+              return stripped_value if stripped_key == PRODUCT_SETTINGS_PATH_KEY
             end
           end
         end

data/nixenvironment.gemspec

@@ -23,14 +23,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deliver'
   spec.add_dependency 'xcpretty'
   spec.add_dependency 'ocunit2junit'
+  spec.add_dependency 'terminal-table'
+  spec.add_dependency 'colorize'
+  spec.add_dependency 'CFPropertyList', '= 2.2.8'
 
   # Development only
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'commander'
-  spec.add_development_dependency 'terminal-table'
-  spec.add_development_dependency 'colorize'
   spec.add_development_dependency 'fuzzy_match'
-  spec.add_development_dependency 'CFPropertyList'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.65
+  version: 0.0.66
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -68,13 +68,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -82,13 +82,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -96,21 +96,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.2.8
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.8
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -138,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -152,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fuzzy_match
+  name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -166,7 +166,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: CFPropertyList
+  name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='