fir-cli 1.1.5 → 1.1.7

data/lib/fir/util/build.rb

@@ -4,73 +4,37 @@ module FIR
   module Build
 
     def build_ipa *args, options
-      # initialize build options
+      # check build environment and make build cmd
+      check_osx
+
       if args.first.blank? || !File.exist?(args.first)
         @build_dir = Dir.pwd
       else
         @build_dir = File.absolute_path(args.shift.to_s) # pop the first param
       end
 
-      @build_cmd       = "xcodebuild build -sdk iphoneos"
-      @build_tmp_dir   = Dir.mktmpdir
-      @custom_settings = parse_custom_settings(args) # convert ['a=1', 'b=2'] => { 'a' => '1', 'b' => '2' }
-      @configuration   = options[:configuration]
-      @wrapper_name    = File.basename(options[:name].to_s, '.*') + '.app' unless options[:name].blank?
-      @target_name     = options[:target]
-      @scheme_name     = options[:scheme]
-      @output_path     = options[:output].blank? ? "#{@build_dir}/build_ipa" : File.absolute_path(options[:output].to_s)
-      @dsym_name       = @wrapper_name + '.dSYM' unless @wrapper_name.blank?
-
-      # check build environment and make build cmd
-      check_osx
-      if options.workspace?
-        @workspace = check_and_find_workspace(@build_dir)
-        check_scheme(@scheme_name)
-        @build_cmd += " -workspace '#{@workspace}' -scheme '#{@scheme_name}'"
-      else
-        @project = check_and_find_project(@build_dir)
-        @build_cmd += " -project '#{@project}'"
-      end
-
-      @build_cmd += " -configuration '#{@configuration}'" unless @configuration.blank?
-      @build_cmd += " -target '#{@target_name}'" unless @target_name.blank?
+      @token     = options[:token] || current_token
+      @changelog = options[:changelog].to_s
+      @short     = options[:short].to_s
+      @proj      = options[:proj].to_s
 
-      # convert { "a" => "1", "b" => "2" } => "a='1' b='2'"
-      @setting_str =  @custom_settings.collect { |k, v| "#{k}='#{v}'" }.join(' ')
-      @setting_str += " WRAPPER_NAME='#{@wrapper_name}'" unless @wrapper_name.blank?
-      @setting_str += " TARGET_BUILD_DIR='#{@build_tmp_dir}'" unless @custom_settings['TARGET_BUILD_DIR']
-      @setting_str += " CONFIGURATION_BUILD_DIR='#{@build_tmp_dir}'" unless @custom_settings['CONFIGURATION_BUILD_DIR']
-      @setting_str += " DWARF_DSYM_FOLDER_PATH='#{@output_path}'" unless @custom_settings['DWARF_DSYM_FOLDER_PATH']
-      @setting_str += " DWARF_DSYM_FILE_NAME='#{@dsym_name}'" unless @dsym_name.blank?
+      @build_tmp_dir = Dir.mktmpdir
+      @output_path   = options[:output].blank? ? "#{@build_dir}/fir_build_ipa" : File.absolute_path(options[:output].to_s)
+      @ipa_build_cmd = initialize_ipa_build_cmd(args, options)
 
-      @build_cmd += " #{@setting_str} 2>&1"
-      puts @build_cmd if $DEBUG
+      puts @ipa_build_cmd if $DEBUG
 
       logger.info "Building......"
       logger_info_dividing_line
 
-      logger.info `#{@build_cmd}`
-
-      FileUtils.mkdir_p(@output_path) unless File.exist?(@output_path)
-      Dir.chdir(@build_tmp_dir) do
-        apps = Dir["*.app"]
-        if apps.length == 0
-          logger.error "Builded has no output app, Can not be packaged"
-          exit 1
-        end
+      logger.info `#{@ipa_build_cmd}`
 
-        apps.each do |app|
-          ipa_path = File.join(@output_path, "#{File.basename(app, '.app')}.ipa")
-          zip_app2ipa(File.join(@build_tmp_dir, app), ipa_path)
-        end
-      end
+      output_ipa
 
-      logger.info "Build Success"
+      publish_build_ipa if options.publish?
+      upload_build_mapping_file if options.mapping?
 
-      if options.publish?
-        ipa_path = Dir["#{@output_path}/*.ipa"].first
-        publish(ipa_path, short: options[:short], changelog: options[:changelog], token: options[:token])
-      end
+      logger_info_blank_line
     end
 
     def build_apk *args, options
@@ -78,12 +42,89 @@ module FIR
 
     private
 
-      def parse_custom_settings args
+      def initialize_ipa_build_cmd args, options
+        ipa_build_cmd = "xcodebuild build -sdk iphoneos"
+
+        @configuration = options[:configuration]
+        @wrapper_name  = File.basename(options[:name].to_s, '.*') + '.app' unless options[:name].blank?
+        @target_name   = options[:target]
+        @scheme_name   = options[:scheme]
+        @dsym_name     = @wrapper_name + '.dSYM' unless @wrapper_name.blank?
+
+        if options.workspace?
+          workspace = check_and_find_ios_workspace(@build_dir)
+          check_ios_scheme(@scheme_name)
+          ipa_build_cmd += " -workspace '#{workspace}' -scheme '#{@scheme_name}'"
+        else
+          project = check_and_find_ios_project(@build_dir)
+          ipa_build_cmd += " -project '#{project}'"
+        end
+
+        ipa_build_cmd += " -configuration '#{@configuration}'" unless @configuration.blank?
+        ipa_build_cmd += " -target '#{@target_name}'" unless @target_name.blank?
+        ipa_build_cmd += " #{ipa_custom_settings(args)} 2>&1"
+
+        ipa_build_cmd
+      end
+
+      def ipa_custom_settings args
+        custom_settings = parse_ipa_custom_settings(args)
+
+        # convert { "a" => "1", "b" => "2" } => "a='1' b='2'"
+        setting_str =  custom_settings.collect { |k, v| "#{k}='#{v}'" }.join(' ')
+        setting_str += " WRAPPER_NAME='#{@wrapper_name}'" unless @wrapper_name.blank?
+        setting_str += " TARGET_BUILD_DIR='#{@build_tmp_dir}'" unless custom_settings['TARGET_BUILD_DIR']
+        setting_str += " CONFIGURATION_BUILD_DIR='#{@build_tmp_dir}'" unless custom_settings['CONFIGURATION_BUILD_DIR']
+        setting_str += " DWARF_DSYM_FOLDER_PATH='#{@output_path}'" unless custom_settings['DWARF_DSYM_FOLDER_PATH']
+        setting_str += " DWARF_DSYM_FILE_NAME='#{@dsym_name}'" unless @dsym_name.blank?
+        setting_str
+      end
+
+      def output_ipa
+        FileUtils.mkdir_p(@output_path) unless File.exist?(@output_path)
+        Dir.chdir(@build_tmp_dir) do
+          apps = Dir["*.app"]
+          if apps.length == 0
+            logger.error "Builded has no output app, Can not be packaged"
+            exit 1
+          end
+
+          apps.each do |app|
+            ipa_path = File.join(@output_path, "#{File.basename(app, '.app')}.ipa")
+            zip_app2ipa(File.join(@build_tmp_dir, app), ipa_path)
+          end
+        end
+
+        logger.info "Build Success"
+      end
+
+      def publish_build_ipa
+        logger_info_blank_line
+        publish Dir["#{@output_path}/*.ipa"].first, short:     @short,
+                                                    changelog: @changelog,
+                                                    token:     @token
+      end
+
+      def upload_build_mapping_file
+        logger_info_blank_line
+
+        @app_info     = ipa_info(Dir["#{@output_path}/*.ipa"].first)
+        @mapping_file = Dir["#{@output_path}/*.dSYM/Contents/Resources/DWARF/*"].first
+
+        mapping @mapping_file, proj:    @proj,
+                               build:   @app_info[:build],
+                               version: @app_info[:version],
+                               token:   @token
+      end
+
+      # convert ['a=1', 'b=2'] => { 'a' => '1', 'b' => '2' }
+      def parse_ipa_custom_settings args
         hash = {}
         args.each do |setting|
           k, v = setting.split('=', 2).map(&:strip)
           hash[k] = v
         end
+
         hash
       end
 
@@ -94,13 +135,13 @@ module FIR
         end
       end
 
-      def check_and_find_project path
+      def check_and_find_ios_project path
         unless File.exist?(path)
           logger.error "The first param BUILD_DIR must be a xcodeproj directory"
           exit 1
         end
 
-        if is_project?(path)
+        if is_ios_project?(path)
           project = path
         else
           project = Dir["#{path}/*.xcodeproj"].first
@@ -113,13 +154,13 @@ module FIR
         project
       end
 
-      def check_and_find_workspace path
+      def check_and_find_ios_workspace path
         unless File.exist?(path)
           logger.error "The first param BUILD_DIR must be a xcworkspace directory"
           exit 1
         end
 
-        if is_workspace?(path)
+        if is_ios_workspace?(path)
           workspace = path
         else
           workspace = Dir["#{path}/*.xcworkspace"].first
@@ -132,18 +173,18 @@ module FIR
         workspace
       end
 
-      def check_scheme scheme_name
+      def check_ios_scheme scheme_name
         if scheme_name.blank?
           logger.error "Must provide a scheme by `-S` option when build a workspace"
           exit 1
         end
       end
 
-      def is_project? path
+      def is_ios_project? path
         File.extname(path) == '.xcodeproj'
       end
 
-      def is_workspace? path
+      def is_ios_workspace? path
         File.extname(path) == '.xcworkspace'
       end
 

data/lib/fir/util/config.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+module FIR
+  module Config
+    CONFIG_PATH   = "#{ENV['HOME']}/.fir-cli"
+    API_YML_PATH  = File.expand_path("../../", __FILE__) + '/api.yml'
+    APP_FILE_TYPE = %w(.ipa .apk).freeze
+
+    def fir_api
+      @fir_api ||= YAML.load_file(API_YML_PATH).deep_symbolize_keys[:fir]
+    end
+
+    def bughd_api
+      @bughd_api ||= YAML.load_file(API_YML_PATH).deep_symbolize_keys[:bughd]
+    end
+
+    def config
+      @config ||= YAML.load_file(CONFIG_PATH).deep_symbolize_keys if File.exist?(CONFIG_PATH)
+    end
+
+    def reload_config
+      @config = YAML.load_file(CONFIG_PATH).deep_symbolize_keys
+    end
+
+    def write_config hash
+      File.open(CONFIG_PATH, 'w+') { |f| f << YAML.dump(hash) }
+    end
+
+    def current_token
+      @token ||= config[:token] if config
+    end
+
+    alias_method :☠, :exit
+  end
+end

data/lib/fir/util/http.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+module FIR
+  module Http
+
+    DEFAULT_TIMEOUT = 300
+
+    def get url, params = {}
+      begin
+        res = ::RestClient::Request.execute(
+          method:  :get,
+          url:     url,
+          timeout: DEFAULT_TIMEOUT,
+          headers: default_headers.merge(params: params)
+        )
+      rescue => e
+        logger.error e.message.to_s + " - " + e.response.to_s
+        exit 1
+      end
+
+      JSON.parse(res.body.force_encoding("UTF-8"), symbolize_names: true)
+    end
+
+    %w(post patch put).each do |method|
+      define_method method do |url, query|
+        begin
+          res = ::RestClient::Request.execute(
+            method:  method.to_sym,
+            url:     url,
+            payload: query,
+            timeout: DEFAULT_TIMEOUT,
+            headers: default_headers
+          )
+        rescue => e
+          logger.error e.message.to_s + " - " + e.response.to_s
+          exit 1
+        end
+
+        JSON.parse(res.body.force_encoding("UTF-8"), symbolize_names: true)
+      end
+    end
+
+    private
+
+      def default_headers
+        { content_type: :json, source: 'fir-cli', version: FIR::VERSION }
+      end
+  end
+end

data/lib/fir/util/info.rb

@@ -7,6 +7,7 @@ module FIR
       file_path = File.absolute_path(args.first.to_s)
       is_all    = !options[:all].blank?
 
+      check_file_exist file_path
       check_supported_file file_path
 
       file_type = File.extname(file_path).delete('.')
@@ -16,10 +17,12 @@ module FIR
 
       app_info  = send("#{file_type}_info", file_path, is_all)
       app_info.each { |k, v| logger.info "#{k}: #{v}" }
+
+      logger_info_blank_line
     end
 
-    def ipa_info ipa_path, is_all
-      ipa = Parser::IPA.new(ipa_path)
+    def ipa_info ipa_path, is_all = false
+      ipa = FIR::Parser::Ipa.new(ipa_path)
       app = ipa.app
 
       info = {
@@ -52,7 +55,7 @@ module FIR
       info
     end
 
-    def apk_info apk_path, is_all
+    def apk_info apk_path, is_all = false
       apk  = Android::Apk.new(apk_path)
       info = {
         type:       'android',

data/lib/fir/util/login.rb

@@ -12,6 +12,7 @@ module FIR
       write_config(email: user_info.fetch(:email, ''), token: token)
       reload_config
       logger.info "Login succeed, current  user's email: #{config[:email]}"
+      logger_info_blank_line
     end
   end
 end

data/lib/fir/util/mapping.rb

@@ -0,0 +1,65 @@
+# encoding: utf-8
+
+module FIR
+  module Mapping
+
+    def mapping *args, options
+      @file_path = File.absolute_path(args.first.to_s)
+      @token     = options[:token] || current_token
+      @proj      = options[:proj].to_s
+      @version   = options[:version].to_s
+      @build     = options[:build].to_s
+
+      check_file_exist @file_path
+      check_token_cannot_be_blank @token
+      check_project_id_cannot_be_blank
+
+      logger.info "Creating bughd project's version......."
+      logger_info_dividing_line
+
+      @full_version = find_or_create_bughd_full_version
+
+      logger.info "Uploading mapping file......."
+      logger_info_dividing_line
+
+      upload_mapping_file
+
+      logger.info "Uploaded succeed: #{bughd_api[:domain]}/project/#{@proj}/settings"
+      logger_info_blank_line
+    end
+
+    def find_or_create_bughd_full_version
+      url = bughd_api[:project_url] + "/#{@proj}/full_versions"
+      post url, version: @version, build: @build, uuid: uuid
+    end
+
+    def upload_mapping_file
+      if File.is_dsym?(@file_path)
+        tmp_file_path = "#{Dir.tmpdir}/#{File.basename(@file_path)}-fircli.dSYM"
+        FileUtils.cp(@file_path, tmp_file_path)
+      elsif File.is_txt?(@file_path)
+        tmp_file_path = "#{Dir.tmpdir}/#{File.basename(@file_path)}-fircli.txt"
+        FileUtils.cp(@file_path, tmp_file_path)
+      else
+        tmp_file_path = @file_path
+      end
+
+      url = bughd_api[:full_version_url] + "/#{@full_version[:id]}"
+      patch url, file: File.new(tmp_file_path, 'rb'), project_id: @proj, uuid: uuid
+    end
+
+    private
+
+      def check_project_id_cannot_be_blank
+        if @proj.blank?
+          logger.error "Project id can't be blank"
+          exit 1
+        end
+      end
+
+      def uuid
+        @uuid ||= fetch_user_uuid(@token)
+      end
+
+  end
+end

data/lib/fir/util/me.rb

@@ -6,13 +6,14 @@ module FIR
     def me
       check_logined
 
-      if user_info = fetch_user_info(current_token)
-        email = user_info.fetch(:email, '')
-        name  = user_info.fetch(:name, '')
+      user_info = fetch_user_info(current_token)
 
-        logger.info "Login succeed, current user's email: #{email}"
-        logger.info "Login succeed, current user's name:  #{name}"
-      end
+      email = user_info.fetch(:email, '')
+      name  = user_info.fetch(:name, '')
+
+      logger.info "Login succeed, current user's email: #{email}"
+      logger.info "Login succeed, current user's name:  #{name}"
+      logger_info_blank_line
     end
   end
 end

data/lib/fir/util/parser.rb

@@ -0,0 +1,157 @@
+# encoding: utf-8
+
+module FIR
+  module Parser
+
+    class Ipa
+
+      def initialize(path)
+        @path = path
+      end
+
+      def app
+        @app ||= App.new(app_path)
+      end
+
+      def app_path
+        @app_path ||= Dir.glob(File.join(contents, 'Payload', '*.app')).first
+      end
+
+      def cleanup
+        return unless @contents
+        FileUtils.rm_rf(@contents)
+        @contents = nil
+      end
+
+      def metadata
+        return unless has_metadata?
+        @metadata ||= CFPropertyList.native_types(CFPropertyList::List.new(file: metadata_path).value)
+      end
+
+      def has_metadata?
+        File.file? metadata_path
+      end
+
+      def metadata_path
+        @metadata_path ||= File.join(@contents, 'iTunesMetadata.plist')
+      end
+
+      def release_type
+        has_metadata? ? 'store' : 'adhoc'
+      end
+
+      def contents
+        return if @contents
+        @contents = "fir-cli_tmp/ipa_files-#{Time.now.to_i}"
+
+        Zip::File.open(@path) do |zip_file|
+          zip_file.each do |f|
+            f_path = File.join(@contents, f.name)
+            FileUtils.mkdir_p(File.dirname(f_path))
+            zip_file.extract(f, f_path) unless File.exist?(f_path)
+          end
+        end
+
+        @contents
+      end
+
+      class App
+
+        def initialize(path)
+          @path = path
+        end
+
+        def info
+          @info ||= CFPropertyList.native_types(
+            CFPropertyList::List.new(file: File.join(@path, 'Info.plist')).value)
+        end
+
+        def name
+          info['CFBundleName']
+        end
+
+        def identifier
+          info['CFBundleIdentifier']
+        end
+
+        def display_name
+          info['CFBundleDisplayName']
+        end
+
+        def version
+          info['CFBundleVersion']
+        end
+
+        def short_version
+          info['CFBundleShortVersionString']
+        end
+
+        def icons
+          @icons ||= begin
+            icons = []
+            info['CFBundleIcons']['CFBundlePrimaryIcon']['CFBundleIconFiles'].each do |name|
+              icons << get_image(name)
+              icons << get_image("#{name}@2x")
+            end
+            icons.delete_if { |i| !i }
+          rescue NoMethodError
+            []
+          end
+        end
+
+        def mobileprovision
+          return unless has_mobileprovision?
+          return @mobileprovision if @mobileprovision
+
+          cmd = "security cms -D -i \"#{mobileprovision_path}\""
+          begin
+            @mobileprovision = CFPropertyList.native_types(CFPropertyList::List.new(data: `#{cmd}`).value)
+          rescue CFFormatError
+            @mobileprovision = {}
+          end
+        end
+
+        def has_mobileprovision?
+          File.file? mobileprovision_path
+        end
+
+        def mobileprovision_path
+          @mobileprovision_path ||= File.join(@path, 'embedded.mobileprovision')
+        end
+
+        def hide_developer_certificates
+          mobileprovision.delete('DeveloperCertificates') if has_mobileprovision?
+        end
+
+        def devices
+          mobileprovision['ProvisionedDevices'] if has_mobileprovision?
+        end
+
+        def distribution_name
+          "#{mobileprovision['Name']} - #{mobileprovision['TeamName']}" if has_mobileprovision?
+        end
+
+        def release_type
+          if has_mobileprovision?
+            if devices
+              'adhoc'
+            else
+              'inhouse'
+            end
+          end
+        end
+
+        private
+
+          def get_image name
+            path = File.join(@path, "#{name}.png")
+            return nil unless File.exist?(path)
+            path
+          end
+      end
+    end
+
+    class Apk
+    end
+  end
+end