fir-cli 1.6.4 → 1.6.6.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2112018904f94b190bc088220e41715575330d9e
-  data.tar.gz: c916bac62f787fe02bb83db9f65e4fd7ceefd715
+  metadata.gz: 3ba0f4ae8a95ea25c9eb921cda0e2960b0bfe8ba
+  data.tar.gz: 8fb23974060648a2ddb910796b4a046ccedb8b96
 SHA512:
-  metadata.gz: 547a43a639b6070a3c1d5eda6eb8009ed550999dc10ef95fe513e12d7c21451ab597ccfa84dc92d8ec6d218f780d7d2e9f85c50b3dd08f87e8e27617d8e2bba0
-  data.tar.gz: a4e8ad6a3358a06a1ef306ef22f0ad48949968f5774eb0330f71692185e1cc9f8915a487151982544ec3567ff0855131d1791f33b317208e3a02594a9dfdbcd6
+  metadata.gz: 58679a62595394041083b64542a8c51d21457e363b7a713672387ad00d7d1e426bcb057d312a3746dbf7d5285fa428bba0dda5c0f2fc1fcd4ee8f5539913dfa9
+  data.tar.gz: 9c2699f29cbb7aa03b9f163449a283378d6d59b42f84d7608c0852f3990be69d18040a24b07951870f7c81326b7233e6a4e94ec1b8eb798d80ce16d6b1694a2a

data/Dockerfile

@@ -2,11 +2,7 @@ FROM ruby:2.4.2
 
 ENV WORKDIR=/fir-cli
 ENV HOME=/fir-cli
-
 RUN gem install fir-cli
-
 RUN mkdir -p $WORKDIR
-
 WORKDIR $WORKDIR
-
-CMD ["fir"]
+ENTRYPOINT ["fir"]

data/Gemfile

@@ -5,6 +5,7 @@ else
   source 'http://gems.ruby-china.org'
 end
 
+# gem 'byebug'
 # Specify your gem's dependencies in fir.gemspec
 gemspec
 

data/README.md

@@ -11,9 +11,11 @@
 fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 
 ![fir-cli](http://7rf35s.com1.z0.glb.clouddn.com/fir-cli-new.gif)
-## 重要提示
+
+
+# 重要提示
 - 由于部分地区上传时遇到的证书问题, 新版本默认忽略证书校验. 如需打开, 请在命令前加入`UPLOAD_VERIFY_SSL=1`
-- 介于在ios 等编译越来越复杂化, fir-cli 自带的编译功能较为简单, 不能很好的满足用户需求, 推荐用户使用 fastlane (fastlane gym)进行打包,生成好 ipa 文件后,再使用 fir publish 上传生成的ipa 包
+- 介于在ios 等编译越来越复杂化, fir-cli 自带的 `build_ipa` 编译功能较为简单, 不能很好的满足用户需求, 推荐用户使用 fastlane (fastlane gym)进行打包,生成好 ipa 文件后,再使用 `fir publish` 上传生成的ipa
 
 ## 文档
 
@@ -35,6 +37,12 @@ chmod +x /usr/local/bin/fir
 fir login token
 fir help
 ```
+## 近期计划(2018年03-04月)
+- 集成 fastlane gym ,取代原有的 build_ipa 功能
+- 增加上传完毕后反馈 release_id 
+- 修复 changelog 不能换行的问题
+- 完善docker 版本, 用户可以直接挂载文件目录上传
+
 ## 提交反馈
 
 - 联系微信 `atpking` 

data/doc/install.md

@@ -22,16 +22,16 @@ $ gem install fir-cli
 
 - 出现 `Gem::RemoteFetcher::FetchError` 相关错误:
 
-  更换 Ruby 的淘宝源(由于国内网络原因, 你懂的), 并升级下系统自带的 gem
+  更换 Ruby 的源(由于国内网络原因, 你懂的), 并升级下系统自带的 gem
 
   ```sh
   $ gem sources --remove https://rubygems.org/
-  $ gem sources -a https://ruby.taobao.org/
+  $ gem sources -a https://gems.ruby-china.org/
   $ gem sources -l
   *** CURRENT SOURCES ***
 
-  https://ruby.taobao.org
-  # 请确保只有 ruby.taobao.org, 如果有其他的源, 请 remove 掉
+  https://gems.ruby-china.org
+  # 请确保只有 gems.ruby-china.org, 如果有其他的源, 请 remove 掉
 
   gem update --system
   gem install fir-cli

data/fir-cli.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  - 忽略了证书错误
+  - 推荐用户使用 fastlane gym build ipa文件 
   - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源
   - 欢迎 fork, issue 和 pull request
   )
@@ -42,6 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rest-client',    '~> 2.0'
   spec.add_dependency 'ruby_android',   '~> 0.7.7'
   spec.add_dependency 'rqrcode',        '~> 0.7'
-  spec.add_dependency 'xcodeproj',      '~> 1.5'
-  spec.add_dependency 'api_tools'
+  spec.add_dependency 'api_tools'       
+  spec.add_dependency 'xcodeproj'
 end

data/lib/fir.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'thor'
+# require 'byebug'
 require 'logger'
 require 'yaml'
 require 'rest-client'

data/lib/fir/cli.rb

@@ -94,6 +94,7 @@ module FIR
     long_desc <<-LONGDESC
       `publish` command will publish your app file to fir.im, also the command support to publish app's short & changelog.
 
+
       Example:
 
       $ fir p <app file path> [-c <changelog> -s <custom short link> -Q -T <your api token>]
@@ -106,6 +107,8 @@ module FIR
     method_option :short,       type: :string,  aliases: '-s', desc: 'Set custom short link'
     method_option :changelog,   type: :string,  aliases: '-c', desc: 'Set changelog'
     method_option :qrcode,      type: :boolean, aliases: '-Q', desc: 'Generate qrcode'
+    method_option :show_release_id,      type: :boolean, aliases: '-r', desc: 'show release id'
+    
     method_option :mappingfile, type: :string,  aliases: '-m', desc: 'App mapping file'
     method_option :proj,        type: :string,  aliases: '-P', desc: 'Project id in BugHD.com if upload app mapping file'
     method_option :open,        type: :boolean, desc: 'true/false if open for everyone'

data/lib/fir/util/build_ipa.rb

@@ -5,6 +5,7 @@ module FIR
   module BuildIpa
 
     def build_ipa(*args, options)
+
       logger.warn "fir build ipa 即将过期, 请及时迁移打包部分, 推荐使用 fastlane gym"
       initialize_build_common_options(args, options)
 

data/lib/fir/util/config.rb

@@ -4,7 +4,7 @@ module FIR
   module Config
     CONFIG_PATH   = "#{ENV['HOME']}/.fir-cli"
     APP_INFO_PATH = "#{ENV['HOME']}/.fir-cli-app"
-    API_YML_PATH  = File.expand_path('../../', __FILE__) + '/api.yml'
+    API_YML_PATH  = ENV['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
 
@@ -34,6 +34,7 @@ module FIR
     end
 
     def current_token
+      return @token = ENV["API_TOKEN"] if ENV["API_TOKEN"]
       @token ||= config[:token] if config
     end
 

data/lib/fir/util/info.rb

@@ -25,7 +25,6 @@ module FIR
       ipa  = FIR::Parser::Ipa.new(ipa_path)
       app  = ipa.app
       info = app.full_info(options)
-
       ipa.cleanup
       info
     end

data/lib/fir/util/login.rb

@@ -2,7 +2,6 @@
 
 module FIR
   module Login
-
     def login(token)
       check_token_cannot_be_blank token
 

data/lib/fir/util/publish.rb

@@ -19,6 +19,11 @@ module FIR
       logger_info_app_short_and_qrcode
 
       upload_mapping_file_with_publish(options)
+      if options[:show_release_id]
+        sleep 2
+        release_info = fetch_release_id
+        logger.info "release id = #{release_info[:id]}"
+      end
       logger_info_blank_line
     end
 
@@ -40,7 +45,10 @@ module FIR
       upload_app_binary
       upload_device_info
       update_app_info
+
       fetch_app_info
+     
+     
     end
      
     %w(binary icon).each do |word|
@@ -68,7 +76,6 @@ module FIR
     def uploading_icon_info
       large_icon_path     = @app_info[:icons].max_by { |f| File.size(f) }
       uncrushed_icon_path = convert_icon(large_icon_path)
-
       {
         key:   @icon_cert[:key],
         token: @icon_cert[:token],
@@ -121,6 +128,10 @@ module FIR
                               api_token: @token
     end
 
+    def fetch_release_id
+      get "#{fir_api[:base_url]}/apps/#{@app_id}/releases/find_release_by_key", api_token: @token, key: @binary_cert[:key]
+    end
+
     def fetch_app_info
       logger.info 'Fetch app info from fir.im'
 

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = '1.6.4'
+  VERSION = '1.6.6.beta1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.6.beta1
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,21 +138,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: xcodeproj
+  name: api_tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: api_tools
+  name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -247,8 +247,8 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  - 忽略了证书错误\n  - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源\n  -
-  欢迎 fork, issue 和 pull request\n  "
+  \ ## 更新记录\n  - 推荐用户使用 fastlane gym build ipa文件 \n  - [fir-cli](https://github.com/FIRHQ/fir-cli)
+  已经开源\n  - 欢迎 fork, issue 和 pull request\n  "
 rdoc_options: []
 require_paths:
 - lib
@@ -259,9 +259,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14