firim 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0731d7d2b35bf81f320244a6a7c62a947f6a67
-  data.tar.gz: 5dbebf6ca5a24c7db39816a3ae229a1cc8caeede
+  metadata.gz: c14a9086ace96798689e6be574eef0dc5e917690
+  data.tar.gz: 89d4000d8b56fae1d2224f9b77d8faa1bc3b05e0
 SHA512:
-  metadata.gz: 851d13bbbdcf11e988d82eb972d130fe9c13874abdd2ffe058ade87ab5967673d307c4aa709d165f0848c1a4c294d661a0b58a980b4df4363a7f708da1506a56
-  data.tar.gz: 3a3c9dbbf0e6f9c438aafe4ad5de0283e69f42e350de429fcade6a795d0130b8e0f8ae517df49b429d979ace458661d1127d5da3ed7fc3fb00574d3466fed3f7
+  metadata.gz: 11244e647af64a7dbd34e85a8e9daf9aad666c2b4114a1d682de71ba5869b0fc965e54511f73d066fae58eaa046e8d58089c1530b29e9ad145ed9fced19f232f
+  data.tar.gz: 5a0530e2ddb7ece08eb6c99c6e83557d08b358379de5c30f6365407abb43d556e221581ccb5ebc8e7e76a02a12ea72e635ff9df0c976c95e3a30d9ea33418473

data/lib/firim/detect_values.rb

@@ -39,10 +39,73 @@ module Firim
       token = keychain_token.token(ask_if_missing: option_token == nil)
       if token
         options[:firim_api_token] = token
-        return 
+        return
       end
 
       options[:firim_api_token] ||= UI.input("The API Token of fir.im: ")
     end
   end
-end
+
+  class DetectAndroidValues
+    def run!(options)
+      find_firim_api_token(options)
+      find_app_identifier(options)
+      find_app_name(options)
+      find_version(options)
+      find_build_version(options)
+    end
+
+    def read_key_from_gradle_file(gradle_file, key)
+      return nil if gradle_file == nil
+      value = nil
+      begin
+        file = File.new(gradle_file, "r")
+        while (line = file.gets)
+          next unless line.include? key
+          components = line.strip.split(' ')
+          value = components[components.length - 1].tr("\"", "")
+          break
+        end
+        file.close
+      rescue => err
+        UI.error("An exception occured while reading gradle file: #{err}")
+        err
+      end
+      return value
+    end
+
+    def find_app_identifier(options)
+      return if options[:app_identifier]
+      options[:app_identifier] ||= self.read_key_from_gradle_file(options[:gradle_file], "applicationId")
+    end
+
+    def find_app_name(options)
+      return if options[:app_name]
+      options[:app_name] ||= self.read_key_from_gradle_file(options[:gradle_file], "appName")
+    end
+
+    def find_version(options)
+      return if options[:app_version]
+      options[:app_version] ||= self.read_key_from_gradle_file(options[:gradle_file], "versionName")
+    end
+
+    def find_build_version(options)
+      return if options[:app_build_version]
+      options[:app_build_version] ||= self.read_key_from_gradle_file(options[:gradle_file], "versionCode")
+    end
+
+    def find_firim_api_token(options)
+      option_token = options[:firim_api_token]
+      keychain_token = Firim::AccountManager.new(user: options[:firim_username])
+      token = keychain_token.token(ask_if_missing: option_token == nil)
+      if token
+        options[:firim_api_token] = token
+        return
+      end
+
+      options[:firim_api_token] ||= UI.input("The API Token of fir.im: ")
+    end
+
+  end
+
+end

data/lib/firim/options.rb

@@ -5,6 +5,10 @@ module Firim
   class Options
     def self.available_options
       [
+         # firim platform
+        FastlaneCore::ConfigItem.new(key: :platform,
+                                     optional: true,
+                                     description: "The fir platform, support ios/android"),
         # firim info
         FastlaneCore::ConfigItem.new(key: :firim_api_token,
                                      short_option: "-a",
@@ -13,9 +17,9 @@ module Firim
         FastlaneCore::ConfigItem.new(key: :firim_username,
                                      optional: true,
                                      description: "fir.im username, a sign for identify different token"),
-
         # Content path
         FastlaneCore::ConfigItem.new(key: :ipa,
+                                     optional: true,
                                      short_option: "-i",
                                      env_name: "DELIVER_IPA_PATH",
                                      description: "Path to your ipa file",
@@ -23,11 +27,24 @@ module Firim
                                      verify_block: proc do |value|
                                        UI.user_error!("Could not find ipa file at path '#{value}'") unless File.exist?(value)
                                        UI.user_error!("'#{value}' doesn't seem to be an ipa file") unless value.end_with?(".ipa")
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :apk,
+                                     optional: true,
+                                     env_name: "DELIVER_APK_PATH",
+                                     description: "Path to your apk file",
+                                     default_value: Dir["app/build/outputs/apk/prod/release/*.apk"].first,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Could not find apk file at path '#{value}'") unless File.exist?(value)
+                                       UI.user_error!("'#{value}' doesn't seem to be an apk file") unless value.end_with?(".apk")
                                      end,
-                                     conflicting_options: [:pkg],
+                                     conflicting_options: [:ipa],
                                      conflict_block: proc do |value|
-                                       UI.user_error!("You can't use 'ipa' and '#{value.key}' options in one run.")
+                                       UI.user_error!("You can't use 'apk' and '#{value.key}' options in one run.")
                                      end),
+        FastlaneCore::ConfigItem.new(key: :gradle_file,
+                                     short_option: "-g",
+                                     optional: true,
+                                     description: "Path to your gradle file"),
         FastlaneCore::ConfigItem.new(key: :icon,
                                      description: "Path to the app icon, MUST BE jpg",
                                      optional: true,
@@ -36,6 +53,10 @@ module Firim
                                        UI.user_error!("Could not find png file at path '#{value}'") unless File.exist?(value)
                                        UI.user_error!("'#{value}' doesn't seem to be a png file") unless value.end_with?(".jpg")
                                      end),
+
+        FastlaneCore::ConfigItem.new(key: :file,
+                                     optional: true,
+                                     description: "Path to your pkg file"),
         # APP info
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      description: "The app's identifier",
@@ -85,4 +106,4 @@ module Firim
       ]
     end
   end
-end
+end

data/lib/firim/runner.rb

@@ -11,6 +11,17 @@ module Firim
       return "http://api.fir.im/"
     end
 
+    def guess_platform
+      return self.options[:platform] if self.options[:platform]
+      if self.options[:ipa]
+        return "ios"
+      elsif self.options[:apk]
+        return "android"
+      else
+        return nil
+      end
+    end
+
     def initialize(options)
       self.options = options
       @app_info = {}
@@ -22,13 +33,26 @@ module Firim
         }
       }
 
+      if self.options[:apk]
+        self.options[:file] = self.options[:apk]
+      else
+        self.options[:file] = self.options[:ipa]
+      end
+      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|
         c.request  :url_encoded             # form-encode POST params
         c.adapter  :net_http
         c.response :json, :content_type => /\bjson$/
       end
 
-      Firim::DetectValues.new.run!(self.options)
+      if self.options[:platform] == 'ios'
+        Firim::DetectValues.new.run!(self.options)
+      else
+        Firim::DetectAndroidValues.new.run!(self.options)
+      end
+
       FastlaneCore::PrintTable.print_values(config: options, title: "firim #{Firim::VERSION} Summary")
     end
 
@@ -51,15 +75,18 @@ module Firim
     end
 
     def validation_response response_data
-      error_code = response_data['code'].to_i rescue 0
+      error_code = response_data['code'].to_i
+      return if error_code == 0
       if error_code == 100020
         UI.user_error!("Firim API Token(#{options[:firim_api_token]}) not correct")
+      else
+        UI.user_error!("Firim API ERROR error_code: #{error_code}")
       end
     end
 
     def get_app_info
       app_info_path = "apps/latest/" + options[:app_identifier]
-      response = self.firim_client.get app_info_path, { :api_token => options[:firim_api_token], :type => "ios" }
+      response = self.firim_client.get app_info_path, { :api_token => options[:firim_api_token], :type => options[:platform] }
       info = response.body == nil ? {} : response.body
       validation_response info
       info
@@ -69,10 +96,13 @@ module Firim
       upload_publish_path = "apps/"
       response = self.firim_client.post do |req|
         req.url upload_publish_path
-        req.body = { :type => 'ios', :bundle_id => options[:app_identifier], :api_token => options[:firim_api_token] }
+        req.body = { :type => options[:platform], :bundle_id => options[:app_identifier], :api_token => options[:firim_api_token] }
       end
       info = response.body
       validation_response info
+      if info['cert']['binary']['key'] == nil
+        UI.user_error!("Response body ERROR: #{response.body}")
+      end
       begin
         upload_binary info['cert']['binary']
         upload_icon info['cert']['icon']
@@ -99,10 +129,21 @@ module Firim
     end
 
     def upload_binary binary_info
+      UI.user_error!("app_name did not provide --app_name [name]") if self.options[:app_name] == nil
+      UI.user_error!("app_version did not provide --app_version [version]") if self.options[:app_version] == nil
+      UI.user_error!("app_build_version did not provide --app_build_version [build_version]") if self.options[:app_build_version] == nil
+      if self.options[:file] == nil
+        if self.options[:platform] == "ios"
+          UI.user_error!("ipa file did not provide --ipa [ipa_path]")
+        else
+          UI.user_error!("apk file did not provide --ipa [apk_path]")
+        end
+      end
+
       params = {
         'key' => binary_info['key'],
         'token' => binary_info['token'],
-        'file' => Faraday::UploadIO.new(self.options[:ipa], 'application/octet-stream'),
+        'file' => Faraday::UploadIO.new(self.options[:file], 'application/octet-stream'),
         'x:name' => self.options[:app_name],
         'x:version' => self.options[:app_version],
         'x:build' => self.options[:app_build_version]
@@ -156,4 +197,4 @@ module Firim
     end
 
   end
-end
+end

data/lib/firim/version.rb

@@ -1,3 +1,3 @@
 module Firim
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firim
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - whlsxl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: fir.im command tool