omt-cli 1.6.3 → 1.6.4

data/lib/fir/util/parser/pngcrush.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+module FIR
+  module Parser
+    module Pngcrush
+
+      class << self
+
+        def png_bin
+          @png_bin ||= File.expand_path('../bin/pngcrush', __FILE__)
+        end
+
+        def uncrush_icon crushed_icon_path, uncrushed_icon_path
+          system("#{png_bin} -revert-iphone-optimizations #{crushed_icon_path} #{uncrushed_icon_path} &> /dev/null")
+        end
+
+        def crush_icon uncrushed_icon_path, crushed_icon_path
+          system("#{png_bin} -iphone #{uncrushed_icon_path} #{crushed_icon_path} &> /dev/null")
+        end
+      end
+    end
+  end
+end

data/lib/fir/util/publish.rb

@@ -0,0 +1,106 @@
+# encoding: utf-8
+module FIR
+  module Publish
+
+    def publish(*args, options)
+      initialize_publish_options(args, options)
+      @app_info       = send("#{@file_type}_info", @file_path, full_info: true)
+      @uploading_info = fetch_uploading_info
+      upload_app
+    end
+
+    def upload_app
+       upload_app_icon unless @app_info[:icons].blank?
+       upload_app_binary
+    end
+
+    def upload_app_icon
+      logger.info 'Uploading app icon......'
+      uploaded_info = post(fir_api[:app_my_url], uploading_icon_info)
+
+      return if uploaded_info[:is_completed]
+
+      logger.error 'Upload app icon failed'
+      logger.error uploaded_info[:msg]
+      exit 1
+    end
+
+    def uploading_icon_info
+      large_icon_path     = @app_info[:icons].max_by { |f| File.size(f) }
+      uncrushed_icon_path = convert_icon(large_icon_path)
+      {
+        id:@uploading_info[:id],
+        token: @token,
+        file:  File.new(uncrushed_icon_path, 'rb'),
+        # Custom variables
+        'type'              => @app_info[:type],
+        'identifier'        => @app_info[:identifier],
+        'name'              => @app_info[:display_name] || @app_info[:name],
+        'build'             => @app_info[:build],
+        'version'           => @app_info[:version],
+        'release_type'      => @app_info[:release_type],
+        'distribution_name' => @app_info[:distribution_name]
+      }
+    end
+
+    def upload_app_binary
+      logger.info 'Uploading app binary......'
+      uploaded_info = post(fir_api[:app_my_url], uploading_binary_info)
+      return if uploaded_info[:is_completed]
+      logger.error 'Upload app binary failed'
+      logger.error uploaded_info[:msg]
+      exit 1
+    end
+
+    def uploading_binary_info
+      {
+        id:@uploading_info[:id],
+        token: @token,
+        file:  File.new(@file_path, 'rb'),
+        # Custom variables
+        'type'              => @app_info[:type],
+        'identifier'        => @app_info[:identifier],
+        'name'              => @app_info[:display_name] || @app_info[:name],
+        'build'             => @app_info[:build],
+        'version'           => @app_info[:version],
+        'release_type'      => @app_info[:release_type],
+        'distribution_name' => @app_info[:distribution_name]
+      }
+    end
+
+    def initialize_publish_options(args, options)
+      @file_path     = File.absolute_path(args.first.to_s)
+      @file_type     = File.extname(@file_path).delete('.')
+      @token         = options[:token] || current_token
+      @changelog     = read_changelog(options[:changelog]).to_s.to_utf8
+      @short         = options[:short].to_s
+      @passwd        = options[:password].to_s
+      @is_opened     = @passwd.blank? ? options[:open] : false
+      @export_qrcode = !!options[:qrcode]
+    end
+
+    def read_changelog(changelog)
+      return if changelog.blank?
+      File.exist?(changelog) ? File.read(changelog) : changelog
+    end
+
+    def fetch_uploading_info
+      logger.info "Fetching #{@app_info[:identifier]}@fir.im uploading info......"
+      logger.info "Uploading app: #{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]})"
+
+      post fir_api[:app_my_version], type:      @app_info[:type],
+                              bundle_id: @app_info[:identifier],
+                              api_token: @token
+    end
+
+    def convert_icon origin_path
+      logger.info "Converting app's icon......"
+      if @app_info[:type] == 'ios'
+        output_path = Tempfile.new(['uncrushed_icon', '.png']).path
+        FIR::Parser::Pngcrush.uncrush_icon(origin_path, output_path)
+        origin_path = output_path if File.size(output_path) != 0
+      end
+      origin_path
+    end
+  end
+end

data/lib/fir/util/publish.rb.bak

@@ -0,0 +1,185 @@
+# encoding: utf-8
+
+module FIR
+  module Publish
+
+    def publish(*args, options)
+      initialize_publish_options(args, options)
+      check_supported_file_and_token
+
+      logger_info_publishing_message
+
+      @app_info       = send("#{@file_type}_info", @file_path, full_info: true)
+      @uploading_info = fetch_uploading_info
+      @app_id         = @uploading_info[:id]
+
+      upload_app
+
+      logger_info_dividing_line
+      logger_info_app_short_and_qrcode
+
+      upload_mapping_file_with_publish(options)
+      logger_info_blank_line
+    end
+
+    def logger_info_publishing_message
+      user_info = fetch_user_info(@token)
+
+      email = user_info.fetch(:email, '')
+      name  = user_info.fetch(:name, '')
+
+      logger.info "Publishing app via #{name}<#{email}>......."
+      logger_info_dividing_line
+    end
+
+    def upload_app
+      @icon_cert   = @uploading_info[:cert][:icon]
+      @binary_cert = @uploading_info[:cert][:binary]
+
+      upload_app_icon unless @app_info[:icons].blank?
+      upload_app_binary
+      upload_device_info
+      update_app_info
+      fetch_app_info
+    end
+
+    %w(icon binary).each do |postfix|
+      class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def upload_app_#{postfix}
+          logger.info "Uploading app #{postfix}......"
+          uploaded_info = post(@#{postfix}_cert[:upload_url], uploading_#{postfix}_info)
+
+          return if uploaded_info[:is_completed]
+
+          logger.error "Uploading app #{postfix} failed"
+          exit 1
+        end
+      METHOD
+    end
+
+    def uploading_icon_info
+      large_icon_path     = @app_info[:icons].max_by { |f| File.size(f) }
+      uncrushed_icon_path = convert_icon(large_icon_path)
+
+      {
+        key:   @icon_cert[:key],
+        token: @icon_cert[:token],
+        file:  File.new(uncrushed_icon_path, 'rb'),
+        'x:is_converted' => '1'
+      }
+    end
+
+    def uploading_binary_info
+      {
+        key:   @binary_cert[:key],
+        token: @binary_cert[:token],
+        file:  File.new(@file_path, 'rb'),
+        # Custom variables
+        'x:name'              => @app_info[:display_name] || @app_info[:name],
+        'x:build'             => @app_info[:build],
+        'x:version'           => @app_info[:version],
+        'x:changelog'         => @changelog,
+        'x:release_type'      => @app_info[:release_type],
+        'x:distribution_name' => @app_info[:distribution_name]
+      }
+    end
+
+    def upload_device_info
+      return if @app_info[:devices].blank?
+
+      logger.info 'Updating devices info......'
+
+      post fir_api[:udids_url], key:       @binary_cert[:key],
+                                udids:     @app_info[:devices].join(','),
+                                api_token: @token
+    end
+
+    def update_app_info
+      update_info = { short: @short, passwd: @passwd, is_opened: @is_opened }.compact
+
+      return if update_info.blank?
+
+      logger.info "Updating app info......"
+
+      patch fir_api[:app_my_url] + "/#{@app_id}", update_info.merge(api_token: @token)
+    end
+
+    def fetch_uploading_info
+      logger.info "Fetching #{@app_info[:identifier]}@fir.im uploading info......"
+      logger.info "Uploading app: #{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]})"
+
+      post fir_api[:app_my_version], type:      @app_info[:type],
+                              bundle_id: @app_info[:identifier],
+                              api_token: @token
+    end
+
+    def fetch_app_info
+      logger.info 'Fetch app info from fir.im'
+
+      @fir_app_info = get(fir_api[:app_my_url] + "/#{@app_id}", api_token: @token)
+      write_app_info(id: @fir_app_info[:id], short: @fir_app_info[:short], name: @fir_app_info[:name])
+      @fir_app_info
+    end
+
+    def upload_mapping_file_with_publish(options)
+      return if !options[:mappingfile] || !options[:proj]
+
+      logger_info_blank_line
+
+      mapping options[:mappingfile], proj:    options[:proj],
+                                     build:   @app_info[:build],
+                                     version: @app_info[:version],
+                                     token:   @token
+    end
+
+    def logger_info_app_short_and_qrcode
+      short = "#{fir_api[:domain]}/#{@fir_app_info[:short]}"
+
+      logger.info "Published succeed: #{short}"
+
+      if @export_qrcode
+        qrcode_path = "#{File.dirname(@file_path)}/fir-#{@app_info[:name]}.png"
+        FIR.generate_rqrcode(short, qrcode_path)
+
+        logger.info "Local qrcode file: #{qrcode_path}"
+      end
+    end
+
+    private
+
+    def initialize_publish_options(args, options)
+      @file_path     = File.absolute_path(args.first.to_s)
+      @file_type     = File.extname(@file_path).delete('.')
+      @token         = options[:token] || current_token
+      @changelog     = read_changelog(options[:changelog]).to_s.to_utf8
+      @short         = options[:short].to_s
+      @passwd        = options[:password].to_s
+      @is_opened     = @passwd.blank? ? options[:open] : false
+      @export_qrcode = !!options[:qrcode]
+    end
+
+    def read_changelog(changelog)
+      return if changelog.blank?
+      File.exist?(changelog) ? File.read(changelog) : changelog
+    end
+
+    def check_supported_file_and_token
+      check_file_exist(@file_path)
+      check_supported_file(@file_path)
+      check_token_cannot_be_blank(@token)
+      fetch_user_info(@token)
+    end
+
+    def convert_icon origin_path
+      logger.info "Converting app's icon......"
+
+      if @app_info[:type] == 'ios'
+        output_path = Tempfile.new(['uncrushed_icon', '.png']).path
+        FIR::Parser::Pngcrush.uncrush_icon(origin_path, output_path)
+        origin_path = output_path if File.size(output_path) != 0
+      end
+
+      origin_path
+    end
+  end
+end

data/lib/fir/version.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+module FIR
+  VERSION = '1.6.4'
+end

data/lib/fir/xcode_wrapper.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+#!/bin/bash --login
+
+which rvm > /dev/null
+
+if [[ $? -eq 0 ]]; then
+  echo "RVM detected, forcing to use system ruby since xcodebuild cause error"
+  [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+  rvm use system
+fi
+
+if which rbenv > /dev/null; then
+  echo "rbenv detected, removing env variables since xcodebuild cause error"
+  rbenv shell system
+fi
+
+shell_session_update() { :; }
+
+unset RUBYLIB
+unset RUBYOPT
+unset BUNDLE_BIN_PATH
+unset _ORIGINAL_GEM_PATH
+unset BUNDLE_GEMFILE
+unset GEM_HOME
+unset GEM_PATH
+
+set -x
+xcodebuild "$@"

data/lib/omt-cli.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+# This file exists for backward compatbility with require 'fir-cli'
+require_relative './fir'

data/lib/omt_cli.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+# This file exists for backward compatbility with require 'fir_cli'
+require_relative './fir'

data/omt-cli.gemspec

@@ -0,0 +1,48 @@
+# coding: utf-8
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'fir/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'omt-cli'
+  spec.version       = FIR::VERSION
+  spec.authors       = ['NaixSpirit']
+  spec.email         = ['neverlandxy.naix@gmail.com']
+  spec.date          = Time.now.strftime('%Y-%m-%d')
+  spec.summary       = 'fir.im command tool'
+  spec.description   = 'fir.im command tool, support iOS and Android'
+  spec.homepage      = 'https://github.com/FIRHQ/fir-cli'
+  spec.license       = 'MIT'
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
+
+  spec.post_install_message = %q(
+        ______________        ________    ____
+       / ____/  _/ __ \      / ____/ /   /  _/
+      / /_   / // /_/ /_____/ /   / /    / /
+     / __/ _/ // _, _/_____/ /___/ /____/ /
+    /_/   /___/_/ |_|      \____/_____/___/
+
+  ## 更新记录
+  ### fir-cli 1.5.1
+  - 修复了在 ruby 2.4.0 中登录出错的bug
+  - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG
+  - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源
+  - 欢迎 fork, issue 和 pull request
+  )
+
+  spec.add_development_dependency 'bundler',  '~> 1.7'
+  spec.add_development_dependency 'rake',     '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.7'
+  spec.add_development_dependency 'pry',      '~> 0.10'
+
+  spec.add_dependency 'thor',           '~> 0.19'
+  spec.add_dependency 'CFPropertyList', '~> 2.3'
+  spec.add_dependency 'rest-client',    '~> 2.0'
+  spec.add_dependency 'ruby_android',   '~> 0.7.7'
+  spec.add_dependency 'rqrcode',        '~> 0.7'
+  spec.add_dependency 'xcodeproj',      '~> 1.4'
+end

data/test/build_ipa_test.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+class BuildAppTest < Minitest::Test
+
+  def test_build_app
+    if ENV['BUILD_TEST']
+      options = OpenStruct.new
+      options.send('publish?=', true)
+
+      assert FIR.build_ipa(default_ipa_project, options)
+      assert FIR.build_apk(default_apk_project, options)
+
+      assert FIR.build_ipa(default_ipa_git_url, options)
+      assert FIR.build_apk(default_apk_git_url, options)
+    end
+  end
+end

data/test/cases/test_apk_txt

@@ -0,0 +1 @@
+this is a text

data/test/info_test.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+class InfoTest < Minitest::Test
+
+  def test_apk_info
+    info = FIR.apk_info(default_apk, full_info: true)
+
+    assert_equal 'android',                 info[:type]
+    assert_equal 'com.bughd.myapplication', info[:identifier]
+    assert_equal 'My Application',          info[:name]
+    assert_equal '1',                       info[:build]
+    assert_equal '1.0',                     info[:version]
+
+    assert_equal true, File.exist?(info[:icons].first)
+
+    assert FIR.info(default_apk, {})
+  end
+
+  def test_ipa_info
+    info = FIR.ipa_info(default_ipa, full_info: true)
+
+    assert_equal 'ios',              info[:type]
+    assert_equal 'im.fir.build-ipa', info[:identifier]
+    assert_equal 'build_ipa',        info[:name]
+    assert_equal '1',                info[:build]
+    assert_equal '1.0',              info[:version]
+
+    # Only for OSX
+    # assert_equal nil,                       info[:display_name]
+    # assert_equal default_device_udid,       info[:devices].first
+    # assert_equal 'adhoc',                   info[:release_type]
+    # assert_equal default_distribution_name, info[:distribution_name]
+
+    assert FIR.info(default_ipa, {})
+  end
+end