lib/fir/util.rb in fir-cli-1.1.5 vs lib/fir/util.rb in fir-cli-1.1.7

@@ -1,34 +1,52 @@
 # encoding: utf-8
 
+require_relative './util/http'
+require_relative './util/config'
+require_relative './util/parser'
 require_relative './util/login'
 require_relative './util/me'
 require_relative './util/info'
 require_relative './util/build'
 require_relative './util/publish'
+require_relative './util/mapping'
 
 module FIR
   module Util
+    extend ActiveSupport::Concern
 
-    def self.included base
-      base.extend ClassMethods
-      base.extend Login
-      base.extend Me
-      base.extend Info
-      base.extend Build
-      base.extend Publish
-    end
-
     module ClassMethods
+      include FIR::Http
+      include FIR::Config
+      include FIR::Login
+      include FIR::Me
+      include FIR::Info
+      include FIR::Build
+      include FIR::Publish
+      include FIR::Mapping
 
+      attr_accessor :logger
+
       def fetch_user_info token
-        get api[:user_url], api_token: token
+        get fir_api[:user_url], api_token: token
       end
 
+      def fetch_user_uuid token
+        user_info = fetch_user_info(token)
+        user_info[:uuid]
+      end
+
+      def check_file_exist path
+        unless File.file?(path)
+          logger.error "File does not exist"
+          exit 1
+        end
+      end
+
       def check_supported_file path
-        unless File.file?(path) || APP_FILE_TYPE.include?(File.extname(path))
-          logger.error "File does not exist or unsupported file type"
+        unless APP_FILE_TYPE.include?(File.extname(path))
+          logger.error "Unsupported file type"
           exit 1
         end
       end
 
       def check_token_cannot_be_blank token
@@ -41,9 +59,13 @@
       def check_logined
         if current_token.blank?
           logger.error "Please use `fir login` first"
           exit 1
         end
+      end
+
+      def logger_info_blank_line
+        logger.info ""
       end
 
       def logger_info_dividing_line
         logger.info "✈ -------------------------------------------- ✈"
       end