fir-cli 1.6.13 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85d5471da637792a85904961eaa9e21db60e65c950430dca032e1ace30bd02e8
-  data.tar.gz: 397ddd58d70a640c09812654faee8e983e1c391fcb06d9505e63698261cf46d8
+  metadata.gz: f8c6da4ee5e12418303fdb4050554e145e04ce70b033e4460f6ca390d1fd9e18
+  data.tar.gz: ce18cbd160ac0018f5e04d1c02076281d162107449b6d3bdc5d647d5728aa1d9
 SHA512:
-  metadata.gz: 9288592cdbee544d3437fad3b126dce31f9be83985ee0254c96b7bf2873c8cb989b57e076367df70d251c2e7dd44a3bcc44b8f065f26a558162a1a0eefd41729
-  data.tar.gz: 296664dca956d645210e6a8eddbed4663c1529c6a63837ce996b0f1cca41faf2843b2cf23015e7ff52cd0ce17993aaa12af2adc64bd9a409929bdada88960418
+  metadata.gz: df1656d6250cdc7224eb7f4a5f1fe6a83df2cc3a6bd12d73b9d0a9c4582c5139ab575e5911d9077209700225865256a668e122310f77077d30fe0fd2cdf1ce73
+  data.tar.gz: f6f70fc679141dad2be96059a31b64542cd1f22f7d98538cedcb5642c72db41b26e873f8e156bf56d4e5c01ccd5d63cdec652ddd9b5d7ec0112a8cc4eb8a599d

data/README.md

@@ -14,10 +14,9 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 
 
 # 重要提示
-
+- 已过期 build_ipa 功能, 推荐用户使用 fastlane (fastlane gym)进行打包,生成好 ipa 文件后,再使用 `fir publish` 上传生成的ipa [2019年03月21日]
 - 由于 CDN 厂商技术原因, 部分老版本用户会出现 579 错误,解决该问题请升级fir-cli 至最新版
 - 由于部分地区上传时遇到的证书问题, 新版本默认忽略证书校验. 如需打开, 请在命令前加入`UPLOAD_VERIFY_SSL=1`
-- 介于在ios 等编译越来越复杂化, fir-cli 自带的 `build_ipa` 编译功能较为简单, 不能很好的满足用户需求, 推荐用户使用 fastlane (fastlane gym)进行打包,生成好 ipa 文件后,再使用 `fir publish` 上传生成的ipa
 - 现已添加 docker 版本, 具体请见 `Docker 运行 fir-cli ` 说明
 - 关于因为境外到境内网络不佳的而在上传出现 `stream closed`的问题, 我们已经联系了 CDN 厂商处理, 并将超时时间改为了 300 (秒), 如需修改, 可传入环境变量 `FIR_TIMEOUT=xxx` 
 
@@ -45,7 +44,7 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 docker run firhq/fir-cli:latest -e API_TOKEN=XXXX -v ./1.apk:1.apk publish 1.apk
 ```
 
-## 在 flow.ci 中的 Docker 使用 fir-cli
+## 在持续集成工具 flow.ci 中的 Docker 使用 fir-cli
 ```
 # 方便之处是: 不需要安装 Ruby 环境只需要安装Docker环境就行把镜像 flowci/fir-cli 拉下来就能跑
 # 不方便之处是: 不能使用 xcode 或者 gradle 编译代码，只能 publish 编译好的文件
@@ -58,6 +57,7 @@ fir help
 ```
 
 ## 最近更新
+- (1.7.0) 过期了ipa_build 功能, 增加了对 android manifest instant run 的兼容
 - (1.6.13) 上传图标逻辑修改
 - (1.6.12) 修复了部分机器没有默认安装 byebug 的问题
 - (1.6.11) 变化了 ruby gem 仓库地址

data/fir-cli.gemspec

@@ -27,13 +27,10 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
+  - (1.7.0) 过期了ipa_build 功能, 增加了对 android manifest instant run 的兼容
   - (1.6.13) 上传图标逻辑修改
   - (1.6.12) 修复了部分机器没有默认安装 byebug 的问题
   - (1.6.11) 变化了 ruby gem 仓库地址
-  - (1.6.10) 增加显示release_id 以及 app_id
-  - (1.6.9) 取消了依赖 cfpropertylist 的具体版本号
-  - (1.6.8) 取消了远端回调, 改为本地callback
-  - (1.6.8) fir-cli 也支持了私有部署模式
   - [fir-cli](https://github.com/firhq/fir-cli) 已经开源
   - 欢迎 fork, issue 和 pull request
   )
@@ -50,5 +47,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'CFPropertyList'
   spec.add_dependency 'api_tools'
   spec.add_dependency 'byebug'
-  spec.add_dependency 'xcodeproj'
 end

data/lib/fir/util/build_ipa.rb

@@ -1,241 +1,11 @@
-# encoding: utf-8
-require 'xcodeproj'
+# frozen_string_literal: true
 
 module FIR
   module BuildIpa
-
-    def build_ipa(*args, options)
-      logger.warn "fir build ipa 即将过期, 请及时迁移打包部分, 推荐使用 fastlane gym"
-      initialize_build_common_options(args, options)
-
-      @build_tmp_dir = Dir.mktmpdir
-      @build_cmd = initialize_ipa_build_cmd(args, options)
-
-      logger_info_and_run_build_command
-
-      output_ipa_and_dsym
-      publish_build_app(options) if options.publish?
-      upload_build_dsym_mapping_file if options.mapping?
-
-      logger_info_blank_line
+    def build_ipa(*_args, _options)
+      logger.error "fir build ipa \b功能已过期, 请及时迁移打包部分, 推荐使用 fastlane gym 生成ipa 后再使用 fir-cli 上传"
     end
 
     private
-
-    def initialize_ipa_build_cmd(args, options)
-      @configuration = options[:configuration] || 'Release'
-      @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?
-
-      # 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
-
-    def ipa_custom_settings(args)
-      custom_settings = split_assignment_array_to_hash(args)
-
-      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']
-      setting_str
-    end
-
-    def output_ipa_and_dsym
-      apps = Dir["#{@build_tmp_dir}/*.app"].sort_by(&:size)
-      # check_no_output_app(apps)
-
-      @temp_ipa = "#{@build_tmp_dir}/#{Time.now.to_i}.ipa"
-      archive_ipa(apps)
-
-      # check_archived_ipa_is_exist
-      rename_ipa_and_dsym
-
-      FileUtils.rm_rf(@build_tmp_dir) unless $DEBUG
-      logger.info 'Build Success'
-    end
-
-    def archive_ipa(apps)
-      logger.info 'Archiving......'
-      logger_info_dividing_line
-
-      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
-
-    def check_archived_ipa_is_exist
-      unless File.exist?(@temp_ipa)
-        logger.error 'Archive failed'
-        exit 1
-      end
-    end
-
-    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
-      @temp_ipa = "#{@build_dir}/fir_build/#{@scheme_name}.ipa"
-      ipa_info = FIR.ipa_info(@temp_ipa)
-
-      if @name.blank?
-        @ipa_name = "#{ipa_info[:name]}-#{ipa_info[:version]}-build-#{ipa_info[:build]}"
-      else
-        @ipa_name = @name
-      end
-
-      @builded_app_path = "#{@output_path}/#{@ipa_name}.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)
-      end
-    end
-
-    def upload_build_dsym_mapping_file
-      logger_info_blank_line
-
-      @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
-    end
-
-    def initialize_xcode_build_path(options)
-      @xc_workspace = check_and_find_ios_xcworkspace(@build_dir)
-      @xc_project = check_and_find_ios_xcodeproj(@build_dir)
-
-      if options.workspace?
-        " -workspace '#{@xc_workspace}'"
-      else
-        " -project '#{@xc_project}'"
-      end
-    end
-
-    %w(xcodeproj xcworkspace).each do |workplace|
-      define_method "check_and_find_ios_#{workplace}" do |path|
-        unless File.exist?(path)
-          logger.error "The first param BUILD_DIR must be a #{workplace} directory"
-          exit 1
-        end
-
-        if File.extname(path) == ".#{workplace}"
-          build_dir = path
-        else
-          build_dir = Dir["#{path}/*.#{workplace}"].first
-          if build_dir.blank?
-            logger.error "The #{workplace} file is missing, check the BUILD_DIR"
-            exit 1
-          end
-        end
-
-        build_dir
-      end
-    end
-
-    def check_ios_scheme(scheme_name)
-      if scheme_name.blank?
-        logger.error 'Must provide a scheme by `-S` option when build a workspace'
-        exit 1
-      end
-    end
-
-    def check_no_output_app(apps)
-      if apps.length == 0
-        logger.error 'Builded has no output app, Can not be packaged'
-        exit 1
-      end
-    end
   end
 end

data/lib/fir/util/parser/apk.rb

@@ -1,7 +1,8 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative './common'
 
+require 'byebug'
 module FIR
   module Parser
     class Apk
@@ -13,30 +14,34 @@ module FIR
       end
 
       def full_info(options)
-        if options.fetch(:full_info, false)
-          basic_info.merge!(icons: tmp_icons)
-        end
+        basic_info[:icons] = tmp_icons if options.fetch(:full_info, false)
 
         basic_info
       end
 
       def basic_info
         @basic_info ||= {
-          type:       'android',
+          type: 'android',
+          name: fetch_label,
           identifier: @apk.manifest.package_name,
-          name:       @apk.label,
-          build:      @apk.manifest.version_code.to_s,
-          version:    @apk.manifest.version_name.to_s
+          build: @apk.manifest.version_code.to_s,
+          version: @apk.manifest.version_name.to_s
         }
+        @basic_info.reject! { |_k, v| v.nil? }
+        @basic_info
       end
 
       # @apk.icon is a hash, { icon_name: icon_binary_data }
       def tmp_icons
-        begin
-          @apk.icon.map { |_, data| generate_tmp_icon(data, :apk) }
-        rescue
-          []
-        end
+        @apk.icon.map { |_, data| generate_tmp_icon(data, :apk) }
+      rescue StandardError
+        []
+      end
+
+      def fetch_label
+        @apk.label
+      rescue NoMethodError
+        nil
       end
     end
   end

data/lib/fir/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.6.13
+  version: 1.7.0
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,20 +165,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: xcodeproj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: fir.im command tool, support iOS and Android
 email:
 - atpking@gmail.com
@@ -262,10 +248,10 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  - (1.6.13) 上传图标逻辑修改\n  - (1.6.12) 修复了部分机器没有默认安装 byebug 的问题\n  - (1.6.11)
-  变化了 ruby gem 仓库地址\n  - (1.6.10) 增加显示release_id 以及 app_id\n  - (1.6.9) 取消了依赖 cfpropertylist
-  的具体版本号\n  - (1.6.8) 取消了远端回调, 改为本地callback\n  - (1.6.8) fir-cli 也支持了私有部署模式\n  - [fir-cli](https://github.com/firhq/fir-cli)
-  已经开源\n  - 欢迎 fork, issue 和 pull request\n  "
+  \ ## 更新记录\n  - (1.7.0) 过期了ipa_build 功能, 增加了对 android manifest instant run 的兼容\n
+  \ - (1.6.13) 上传图标逻辑修改\n  - (1.6.12) 修复了部分机器没有默认安装 byebug 的问题\n  - (1.6.11) 变化了 ruby
+  gem 仓库地址\n  - [fir-cli](https://github.com/firhq/fir-cli) 已经开源\n  - 欢迎 fork, issue
+  和 pull request\n  "
 rdoc_options: []
 require_paths:
 - lib