firim 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d10b9f9286fc4d3c9c4897f048d5f559fa8b3c4b5526d5810dc48d8136532dcd
-  data.tar.gz: 5506efee56904e79f3fee67b422ad39a10f306ddc7aab45a75150c94a8e561e4
+  metadata.gz: 99d4a5e75424bb3b1bbfdccf40ccaf363ad04a2bdccc92912da706716a63119c
+  data.tar.gz: 5a185dc631b20f68dc485c6d877c153568e175be7e4e99ab0cb0518de3a0b728
 SHA512:
-  metadata.gz: 071a4bbacde1eebd65ba5c4bd228ac8baa5a755f7185ddc0c9d245c05ca00dff4040d95beeff0b6b76bcc23dd3c31bae86972635f478dace601e499f5dd992cc
-  data.tar.gz: cbd0e92fcfb4c6b0a87653c0fac6fbba70defbebd592237c8154780b94d43888a9a84e8282d13f50fbb129a3f099b8dda3a74fc08f734300094dd1b0d60b7741
+  metadata.gz: 6f9d2e3d57c1b69f97ba74e26a2e27fe21754c897eb01d9ac07540293d0dff486cbbc8dbe7671c70c2b5020701bc33aabd3f03bc977a426b07b51841e7cb5cde
+  data.tar.gz: ce37927d5f4dea8127b5fc3c04e386252d6f5aa24c0d40432c64a14ddd19f2c5d1cbf9be120bc6d05654c2def91d19fd85303fba571f0ff11db09a11784a268f

data/README.md

@@ -1,3 +1,9 @@
+***Important***
+
+***For the reason of fir.im had changed the Base URL, pls set `firim_api_url` to `http://fir-api.fircli.cn/` or `http://api.bq04.com`.*** [issue](https://github.com/whlsxl/firim/issues/26)
+
+From v0.2.5, the default `firim_api_url` set to `http://api.bq04.com`.
+
 # 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.
@@ -37,9 +43,11 @@ 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`.
+
+# 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`
@@ -67,4 +75,4 @@ The gem is available as open source under the terms of the [MIT License](http://
 * 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
+* 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,
@@ -56,7 +66,7 @@ module Firim
 
         FastlaneCore::ConfigItem.new(key: :file,
                                      optional: true,
-                                     description: "Path to your pkg file"),
+                                     description: "Don't use this for upload file"),
         # APP info
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      description: "The app's identifier",
@@ -77,11 +87,11 @@ module Firim
         FastlaneCore::ConfigItem.new(key: :app_is_show_plaza,
                                      description: "Whether the app show in plaza",
                                      is_string: false,
-                                     conflicting_options: [:app_is_opened],
+                                    #  conflicting_options: [:app_is_opened],
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :app_passwd,
                                      description: "The app's download page password",
-                                     conflicting_options: [:app_is_opened, :app_is_show_plaza],
+                                    #  conflicting_options: [:app_is_opened, :app_is_show_plaza],
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :app_store_link_visible,
                                      description: "Whether show store link in download page",

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,7 @@ 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
       FastlaneCore::PrintTable.print_values(config: options, title: "#{@app_info["name"]}'s' App Info")
     end
 
@@ -69,11 +71,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.1"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firim
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - whlsxl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2020-12-23 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
@@ -140,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: fir.im command tool