fir-cli 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 983c34c1ff6964b4cff980a06a83900468aa5d56
-  data.tar.gz: 16e5217fd7d08a5aed2dd4451a0e46d19cd9ab63
+  metadata.gz: 273a3d4a1727d563e204dbdad7fc16e6c9763c08
+  data.tar.gz: dcd37c2d1bba37d0bbb5f770b9aaaede8cb37eef
 SHA512:
-  metadata.gz: da2875e4eea8e5f5b9263462ef7ed27afbe81831fa2614b10a3ef244074e68d79ba65938a28f710a568275e5bc5354d377894d1bf9f74cc287df3861982309f6
-  data.tar.gz: f174fb83ee008253cdb62689c30ca5c0e566de20af1375b13aa41b40cc41dc993ccb45ac99e848120cc4c8cfd15e991b13c7709dc74087ed64d0ee879d80a12f
+  metadata.gz: a9ac2d63c1d9fe1ec682a17a94964dd6a7460b90b2b70a5a8d10047bb1abf307ce6fd18bf952593bdd6e55cc45d0a5296114dd78292b2328ff1f7d9aaeb616b3
+  data.tar.gz: 021bdb6ed3dfd98aed9941eef21569cfb466e1c8a63a37a115052d366cade76432f0fca3ccd4a2e79935d9507c47f0b62ceebf147ce066ca59df1fd2f047bd8b

data/.gitignore

@@ -20,3 +20,5 @@ Gemfile.lock
 /test/cases/*.png
 /build_apk_example_*
 /build_ipa_example_*
+
+.idea/

data/.travis.yml

@@ -1,28 +1,31 @@
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - ruby-head
-  - rbx-2
-  - jruby
-  - jruby-head
+- 1.9.2
+- 1.9.3
+- 2.0.0
+- 2.1
+- 2.2
+- 2.3
+- ruby-head
+- rbx-2
+- jruby
+- jruby-head
 matrix:
   allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby
-    - rvm: jruby-head
-    - rvm: rbx-2
+  - rvm: ruby-head
+  - rvm: jruby
+  - rvm: jruby-head
+  - rvm: rbx-2
 env:
+  matrix:
   - USE_OFFICIAL_GEM_SOURCE=true
+  global:
+    secure: XiWKHPcQNB/mGv8Q5VuBqETS1bmYZ3t5xJkR/JFHrhWi30O+QWulMM5YjzkVawPjpUS/rtefDEASc4bN+a1iRVi6kf8fxjeKNFAzNc/hEKiPgANELf1JJgGAcz4oygzrH94Vqj90fuf6DoUh9r+IO+Z0PF39GL9GCnUjJeg+zao=
 notifications:
   recipients:
-    - hxy@fir.im
+  - hxy@fir.im
 branches:
   only:
-    - master
+  - master
 addons:
   code_climate:
     repo_token: 7158bd5d0218441524b8663790dd28edba8a870387ed000a1b56968e3315af2a

data/doc/build_ipa.md

@@ -15,6 +15,8 @@ Options:
   -C, [--configuration=CONFIGURATION]  # Use the build configuration NAME for building each target
   -d, [--destination=DESTINATION]      # Set the destinationspecifier
   -t, [--target=TARGET]                # Build the target specified by targetname
+  -E, [--export_method=METHOD]         # for exportOptionsPlist method, ad-hoc as default
+  -O, [--optionPlistPath]              # User defined exportOptionsPlist path
   -f, [--profile=PROFILE]              # Set the export provisioning profile
   -o, [--output=OUTPUT]                # IPA output path, the default is: BUILD_DIR/fir_build_ipa
   -p, [--publish], [--no-publish]      # true/false if publish to fir.im
@@ -55,3 +57,10 @@ Options:
   ```sh
   $ fir build_ipa path/to/workspace -w -S <scheme name>
   ```
+
+
+ChangeLog 1.6.0
+
+- 支持 XCode 8.3 打包      
+ * 新增参数 -E，指定 exportOptionsPlist plist 文件中的方法, 默认为 ad-hoc
+ * 用户可自定义 -exportOptionsPlist 中的 plist 路径

data/fir-cli.gemspec

@@ -44,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rest-client',    '~> 2.0'
   spec.add_dependency 'ruby_android',   '~> 0.7'
   spec.add_dependency 'rqrcode',        '~> 0.7'
+  spec.add_dependency 'xcodeproj',      '~> 1.4'
 end

data/lib/fir/cli.rb

@@ -29,13 +29,15 @@ module FIR
     method_option :workspace,     type: :boolean, aliases: '-w', desc: 'true/false if build workspace'
     method_option :scheme,        type: :string,  aliases: '-S', desc: 'Set the scheme NAME if build workspace'
     method_option :configuration, type: :string,  aliases: '-C', desc: 'Use the build configuration NAME for building each target'
-    method_option :destination,   type: :string,  aliases: '-d', desc: 'Set the destinationspecifier'
-    method_option :target,        type: :string,  aliases: '-t', desc: 'Build the target specified by targetname'
+    method_option :destination,   type: :string,  aliases: '-d', desc: 'Set the destination specifier'
+    method_option :target,        type: :string,  aliases: '-t', desc: 'Build the target specified by target name'
+    method_option :export_method, type: :string,  aliases: '-E', desc: 'for exportOptionsPlist method, ad-hoc as default'
+    method_option :optionPlistPath, type: :string,  aliases: '-O', desc: 'User defined exportOptionsPlist path'
     method_option :profile,       type: :string,  aliases: '-f', desc: 'Set the export provisioning profile'
     method_option :output,        type: :string,  aliases: '-o', desc: 'IPA output path, the default is: BUILD_DIR/fir_build_ipa'
     method_option :publish,       type: :boolean, aliases: '-p', desc: 'true/false if publish to fir.im'
     method_option :short,         type: :string,  aliases: '-s', desc: 'Set custom short link if publish to fir.im'
-    method_option :name,          type: :string,  aliases: '-n', desc: 'Set custom ipa name when builded'
+    method_option :name,          type: :string,  aliases: '-n', desc: 'Set custom ipa name when built'
     method_option :changelog,     type: :string,  aliases: '-c', desc: 'Set changelog if publish to fir.im'
     method_option :qrcode,        type: :boolean, aliases: '-Q', desc: 'Generate qrcode'
     method_option :mapping,       type: :boolean, aliases: '-M', desc: 'true/false if upload app mapping file to BugHD.com'

data/lib/fir/util/build_ipa.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'xcodeproj'
 
 module FIR
   module BuildIpa
@@ -7,7 +8,7 @@ module FIR
       initialize_build_common_options(args, options)
 
       @build_tmp_dir = Dir.mktmpdir
-      @build_cmd     = initialize_ipa_build_cmd(args, options)
+      @build_cmd = initialize_ipa_build_cmd(args, options)
 
       logger_info_and_run_build_command
 
@@ -22,17 +23,32 @@ module FIR
 
     def initialize_ipa_build_cmd(args, options)
       @configuration = options[:configuration]
-      @target_name   = options[:target]
-      @scheme_name   = options[:scheme]
-      @profile_name  = options[:profile]
-      @destination   = options[:destination]
-
-      build_cmd =  'xcodebuild build -sdk iphoneos'
+      @target_name = options[:target]
+      @scheme_name = options[:scheme]
+      @profile_name = options[:profile]
+      @destination = options[:destination]
+      @export_method = options[:export_method] || 'ad-hoc'
+      @optionPlistPath = options[:optionPlistPath]
+
+      build_cmd = 'xcodebuild archive -sdk iphoneos'
       build_cmd += initialize_xcode_build_path(options)
+
+      build_settings = find_build_setting
+      @team_id = build_settings['DEVELOPMENT_TEAM']
+      provisioning_profile_id = build_settings['PROVISIONING_PROFILE']
+
+      check_ios_scheme(@scheme_name)
+      build_cmd += " -scheme '#{@scheme_name}'" unless @scheme_name.blank?
       build_cmd += " -configuration '#{@configuration}'" unless @configuration.blank?
-      build_cmd += " -target '#{@target_name}'" unless @target_name.blank?
-      build_cmd += " -destination '#{@destination}'" unless @destination.blank?
-      build_cmd += " -exportProvisioningProfile '#{@profile_name}'" unless @profile_name.blank?
+
+      # build_cmd += " -target '#{@target_name}'" unless @target_name.blank?
+
+      # xcarchive name for build -exportArchive
+      @xcarchive_name = @scheme_name.nil? ? @target_name : @scheme_name + '.xcarchive'
+      @xcarchive_path = "#{@build_dir}/fir_build/#{@xcarchive_name}"
+
+      build_cmd += " -archivePath #{@xcarchive_path}"
+      build_cmd += " PROVISIONING_PROFILE='#{provisioning_profile_id}'"
       build_cmd += " #{ipa_custom_settings(args)} 2>&1"
       build_cmd
     end
@@ -40,7 +56,7 @@ module FIR
     def ipa_custom_settings(args)
       custom_settings = split_assignment_array_to_hash(args)
 
-      setting_str =  convert_hash_to_assignment_string(custom_settings)
+      setting_str = convert_hash_to_assignment_string(custom_settings)
       setting_str += " TARGET_BUILD_DIR='#{@build_tmp_dir}'" unless custom_settings['TARGET_BUILD_DIR']
       setting_str += " CONFIGURATION_BUILD_DIR='#{@build_tmp_dir}'" unless custom_settings['CONFIGURATION_BUILD_DIR']
       setting_str += " DWARF_DSYM_FOLDER_PATH='#{@output_path}'" unless custom_settings['DWARF_DSYM_FOLDER_PATH']
@@ -49,16 +65,15 @@ module FIR
 
     def output_ipa_and_dsym
       apps = Dir["#{@build_tmp_dir}/*.app"].sort_by(&:size)
-      check_no_output_app(apps)
+      # check_no_output_app(apps)
 
       @temp_ipa = "#{@build_tmp_dir}/#{Time.now.to_i}.ipa"
       archive_ipa(apps)
 
-      check_archived_ipa_is_exist
+      # check_archived_ipa_is_exist
       rename_ipa_and_dsym
 
       FileUtils.rm_rf(@build_tmp_dir) unless $DEBUG
-
       logger.info 'Build Success'
     end
 
@@ -66,7 +81,13 @@ module FIR
       logger.info 'Archiving......'
       logger_info_dividing_line
 
-      @xcrun_cmd = "xcrun -sdk iphoneos PackageApplication -v #{apps.join(' ')} -o #{@temp_ipa}"
+      option_plist_path = @optionPlistPath || gen_option_plist
+
+      @xcrun_cmd = "#{FIR::Config::XCODE_WRAPPER_PATH} -exportArchive"
+      @xcrun_cmd += " -archivePath #{@xcarchive_path}"
+      @xcrun_cmd += " -exportOptionsPlist #{option_plist_path}"
+      @xcrun_cmd += " -exportPath #{@build_dir}/fir_build"
+
       puts @xcrun_cmd if $DEBUG
       logger.info `#{@xcrun_cmd}`
     end
@@ -78,18 +99,80 @@ module FIR
       end
     end
 
-    def rename_ipa_and_dsym
-      ipa_info  = FIR.ipa_info(@temp_ipa)
-      dsym_name = "#{@output_path}/#{ipa_info[:name]}.app.dSYM"
+    def gen_option_plist
+      plist = "
+<plist version=\"1.0\">
+<dict>
+        <key>teamID</key>
+        <string>#{@team_id}</string>
+        <key>method</key>
+        <string>#{@export_method}</string>
+        <key>uploadSymbols</key>
+        <true/>
+        <key>compileBitcode</key>
+        <false/>
+        <key>uploadBitcode</key>
+        <false/>
+</dict>
+</plist>"
+
+      logger.info 'Generated plist file for exportOptionsPlist argument'
+      logger.info "{"
+      logger.info "  teamID:#{@team_id}" unless @team_id.nil?
+      logger.info "  method:#{@export_method}"
+      logger.info "  uploadSymbols:true"
+      logger.info "  uploadBitcode:false"
+      logger.info "}"
+
+      begin
+        plist_path = "#{@build_dir}/fir_build/exportOptions.plist"
+        file = File.open(plist_path, "w")
+        file.write(plist)
+        plist_path
+      rescue IOError => e
+        raise e
+      ensure
+        file.close unless file.nil?
+      end
+    end
+
+    # Find build setting from xcode project by target and configuration
+    def find_build_setting
+      project = Xcodeproj::Project.open(@xc_project)
 
+      # find target
+      used_target = project.targets[0]
+      if @target_name
+        project.targets.each do |target|
+          if target.name == @target_name
+            used_target = target
+          end
+        end
+      end
+
+      # find configuration settings
+      used_target.build_configurations.each do |config|
+        if config.name == @configuration
+          return config.build_settings
+        end
+      end
+
+      logger.info "configuration '#{@configuration}' not found"
+    end
+
+    def rename_ipa_and_dsym
       if @name.blank?
         @ipa_name = "#{ipa_info[:name]}-#{ipa_info[:version]}-build-#{ipa_info[:build]}"
       else
         @ipa_name = @name
       end
 
+      @temp_ipa = "#{@build_dir}/fir_build/#{@scheme_name}.ipa"
       @builded_app_path = "#{@output_path}/#{@ipa_name}.ipa"
 
+      ipa_info = FIR.ipa_info(@temp_ipa)
+      dsym_name = " #{@output_path}/#{ipa_info[:name]}.app.dSYM"
+
       FileUtils.mv(@temp_ipa, @builded_app_path, force: true)
       if File.exist?(dsym_name)
         FileUtils.mv(dsym_name, "#{@output_path}/#{@ipa_name}.app.dSYM", force: true)
@@ -99,25 +182,22 @@ module FIR
     def upload_build_dsym_mapping_file
       logger_info_blank_line
 
-      @app_info     = ipa_info(@builded_app_path)
+      @app_info = ipa_info(@builded_app_path)
       @mapping_file = Dir["#{@output_path}/#{@ipa_name}.app.dSYM/Contents/Resources/DWARF/*"].first
 
-      mapping @mapping_file, proj:    @proj,
-                             build:   @app_info[:build],
-                             version: @app_info[:version],
-                             token:   @token
+      mapping @mapping_file, proj: @proj,
+              build: @app_info[:build],
+              version: @app_info[:version],
+              token: @token
     end
 
     def initialize_xcode_build_path(options)
       if options.workspace?
-        workspace = check_and_find_ios_xcworkspace(@build_dir)
-        check_ios_scheme(@scheme_name)
-
-        return " -workspace '#{workspace}' -scheme '#{@scheme_name}'"
+        @xc_workspace = check_and_find_ios_xcworkspace(@build_dir)
+        " -workspace '#{@xc_workspace}'"
       else
-        project = check_and_find_ios_xcodeproj(@build_dir)
-
-        return " -project '#{project}'"
+        @xc_project = check_and_find_ios_xcodeproj(@build_dir)
+        " -project '#{@xc_project}'"
       end
     end
 

data/lib/fir/util/config.rb

@@ -5,6 +5,7 @@ module FIR
     CONFIG_PATH   = "#{ENV['HOME']}/.fir-cli"
     APP_INFO_PATH = "#{ENV['HOME']}/.fir-cli-app"
     API_YML_PATH  = File.expand_path('../../', __FILE__) + '/api.yml'
+    XCODE_WRAPPER_PATH  = File.expand_path('../../', __FILE__) + '/xcode_wrapper.sh'
     APP_FILE_TYPE = %w(.ipa .apk).freeze
 
     def fir_api

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 end

data/lib/fir/xcode_wrapper.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+#!/bin/bash --login
+
+which rvm > /dev/null
+
+if [[ $? -eq 0 ]]; then
+  echo "RVM detected, forcing to use system ruby since xcodebuild cause error"
+  [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+  rvm use system
+fi
+
+if which rbenv > /dev/null; then
+  echo "rbenv detected, removing env variables since xcodebuild cause error"
+  rbenv shell system
+fi
+
+shell_session_update() { :; }
+
+unset RUBYLIB
+unset RUBYOPT
+unset BUNDLE_BIN_PATH
+unset _ORIGINAL_GEM_PATH
+unset BUNDLE_GEMFILE
+unset GEM_HOME
+unset GEM_PATH
+
+set -x
+xcodebuild "$@"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - NaixSpirit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: fir.im command tool, support iOS and Android
 email:
 - neverlandxy.naix@gmail.com
@@ -197,6 +211,7 @@ files:
 - lib/fir/util/parser/pngcrush.rb
 - lib/fir/util/publish.rb
 - lib/fir/version.rb
+- lib/fir/xcode_wrapper.sh
 - lib/fir_cli.rb
 - test/build_ipa_test.rb
 - test/cases/test_apk.apk
@@ -234,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: fir.im command tool