firim 0.2.3 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04ba419f4d44e1deb98fd2a54f60bfd3b3423d1e0af267be37dc0ed6e777dff6
-  data.tar.gz: 5c37017077f788a72d88503fc90e80a3c6c18c54c7c0d7efca032664ac3d84c5
+  metadata.gz: 339e2d1d86ea02e446677222594455558c3fa6876d9f823e69adb6928956fa72
+  data.tar.gz: 42e5e8010082ec75f884e22b2a1104b84de14b5c5ec2dacd6481df8e0cfd21d0
 SHA512:
-  metadata.gz: 4c86ef0f93eed48e722c740b9100922e787d67aa56a6533d84226da61e1b3032db47af9139e4853b17d15adbdcc6a8eb104dc7933aada701026b81e0d707928c
-  data.tar.gz: 8ce0799b7763a600f2a2d2fd14e0cff71930b28b3b70399ce63f995c30d3e6b061b5433462a1cbf671495a4915d4b699c85fbbc62d7d589036848c87a117ab29
+  metadata.gz: f0caec2a42a9f3fc5554d365dadb5ddd3630f760a37b3ab9aa7bed1b00bb7348a194d35c16104081d20f846326d8954a9a12b274880dbfaa9a994bdf6f160150
+  data.tar.gz: 9eab57e4111869ca0396fc7d64b843c90472698f4bb4504550fa0ec40eec61a940c6f54a52bd130e24a6c0a4953933d270535d82496ca4b367ab21304bb5a745

data/README.md

@@ -1,3 +1,10 @@
+***Important***
+
+***For the reason of fir.im had changed the Base URL, pls set `firim_api_url` to `https://fir-api.fircli.cn/` or `https://api.bq04.com`.*** [issue](https://github.com/whlsxl/firim/issues/26)
+
+From v0.2.5, the default `firim_api_url` set to `https://api.bq04.com`.
+
+From firim v0.2.6, add show download url in terminal. [issue](https://github.com/whlsxl/firim/issues/32)
 # Firim
 
 Firim is a command tool to directly upload ipa and change app infomation on fir.im. fir.im is a Beta APP host website, you can upload ipa for AdHoc or InHouse distribution for testing.
@@ -22,7 +29,7 @@ Or install it yourself as:
 
 * `cd [your_project_folder]`
 * `firim init`
-* Enter your fir.im API Token (From [Fir.im](http://fir.im/apps))
+* Enter your fir.im API Token (From [Fir.im](https://fir.im/apps))
 * `firim -i [your_ipa_path]`
 
 # Usage
@@ -37,9 +44,17 @@ Upload with icon ***NOTICE: Icon must be jpg format***
 
     firim -i [your_ipa_path] -l [your_icon_path]
     
-# Assgin API Token
+Use `firim_api_url` to set API URL, if `fir.im` change the Base URL. default is `https://api.fir.im`.
+
+After upload app to fir.im, firim will export some environment variables.
+
+* `FIRIM_APP_SHORT` app's short path
+* `FIRIM_APP_NAME` app's name
+* `FIRIM_APP_URL` the download page of the app
+
+# Assign API Token
 
-There are three ways to assgin Firim API Token
+There are three ways to assign Firim API Token
 
 1. Set `FIRIM_TOKEN` environment variables
 2. Add `token` to `macOS Keychain`
@@ -64,7 +79,6 @@ The gem is available as open source under the terms of the [MIT License](http://
 
 # TODO
 
-* Export all app infomation to a file
-* Generate a web page show all the app's link and infomations
-* Show the app list, and export all app infomations to a file
-* force reset icon
+- [ ]  Generate a web page show all the app's link and infomations
+- [x]  Show the app list, and export all app infomations to a file
+- [ ]  force reset icon

data/lib/firim/options.rb

@@ -9,6 +9,10 @@ module Firim
         FastlaneCore::ConfigItem.new(key: :platform,
                                      optional: true,
                                      description: "The fir platform, support ios/android"),
+        # fir.im api url
+        FastlaneCore::ConfigItem.new(key: :firim_api_url,
+                                     default_value: "https://api.bq04.com",
+                                     description: "fir.im api URL"),
         # firim info
         FastlaneCore::ConfigItem.new(key: :firim_api_token,
                                      short_option: "-a",
@@ -17,6 +21,12 @@ module Firim
         FastlaneCore::ConfigItem.new(key: :firim_username,
                                      optional: true,
                                      description: "fir.im username, a sign for identify different token"),
+
+        FastlaneCore::ConfigItem.new(key: :download_page_prefix,
+                                     short_option: "-p",
+                                     optional: true,
+                                     default_value: "http://d.firim.top/",
+                                     description: "fir.im user api token"),
         # Content path
         FastlaneCore::ConfigItem.new(key: :ipa,
                                      optional: true,

data/lib/firim/runner.rb

@@ -7,8 +7,9 @@ module Firim
     attr_accessor :options
     attr_reader :firim_client
 
-    def self.firim_hostname
-      return "http://api.fir.im/"
+    def firim_hostname
+      api_url = self.options[:firim_api_url]
+      return api_url
     end
 
     def guess_platform
@@ -41,7 +42,7 @@ module Firim
       self.options[:platform] = self.guess_platform
       UI.user_error!("Platform not given --platform ios/android") if self.options[:platform] == nil
 
-      @firim_client = Faraday.new(self.class.firim_hostname, conn_options) do |c|
+      @firim_client = Faraday.new(self.firim_hostname, conn_options) do |c|
         c.request  :url_encoded             # form-encode POST params
         c.adapter  :net_http
         c.response :json, :content_type => /\bjson$/
@@ -62,6 +63,10 @@ module Firim
       @app_info.merge!( update_app_info(@app_info["id"]))
       write_app_info_to_file
       options = @app_info
+      options[:download_page_url] = download_url
+      ENV["FIRIM_APP_URL"] = download_url
+      ENV["FIRIM_APP_NAME"] = options["name"]
+      ENV["FIRIM_APP_SHORT"] = options["short"]
       FastlaneCore::PrintTable.print_values(config: options, title: "#{@app_info["name"]}'s' App Info")
     end
 
@@ -69,11 +74,20 @@ module Firim
       file_path = self.options[:app_info_to_file_path]
       return if file_path == nil
       File.open(file_path, "at") do |f|
-        f.write("#{@app_info["name"]}: http://fir.im/#{@app_info["short"]} \n")
+        d_url = download_url
+        f.write("#{@app_info["name"]}:  #{d_url}\n")
         UI.success "Write app info to #{file_path} successed!"
       end
     end
 
+    def download_url
+      prefix = self.options[:download_page_prefix]
+      if prefix[1..-1] != "/"
+        return "#{prefix}/#{@app_info["short"]}"
+      end
+      return "#{prefix}#{@app_info["short"]}"
+    end
+
     def validation_response response_data
       error_code = response_data['code'].to_i
       return if error_code == 0

data/lib/firim/version.rb

@@ -1,3 +1,3 @@
 module Firim
-  VERSION = "0.2.3"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firim
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.7
 platform: ruby
 authors:
 - whlsxl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-04 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -30,34 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement