fir-cli 0.2.3.1 → 1.0.0

data/lib/fir/util/publish.rb

@@ -0,0 +1,103 @@
+# encoding: utf-8
+
+module FIR
+  module Publish
+
+    def publish *args, options
+      file_path = File.absolute_path(args.first.to_s)
+      token     = options[:token] || current_token
+      changelog = options[:changelog].to_s
+
+      check_supported_file file_path
+      check_token_cannot_be_blank token
+      fetch_user_info(token)
+
+      logger.info "Publishing app......."
+      logger_info_dividing_line
+
+      file_type      = File.extname(file_path).delete('.')
+      app_info       = send("#{file_type}_info", file_path, true)
+      uploading_info = fetch_uploading_info(app_info, token)
+
+      app_id      = uploading_info[:id]
+      bundle_app  = uploading_info[:bundle][:pkg]
+      bundle_icon = uploading_info[:bundle][:icon]
+
+      unless app_info[:icons].empty?
+        large_icon_path     = app_info[:icons].max_by { |f| File.size(f) }
+        uncrushed_icon_path = convert_icon(large_icon_path)
+        upload_app_icon(bundle_icon, uncrushed_icon_path)
+      end
+
+      uploaded_info = upload_app_file(bundle_app, file_path)
+      version_id    = uploaded_info[:versionOid]
+      short         = options[:short].blank? ? uploading_info[:short] : options[:short]
+
+      update_app_info(app_id, name:   app_info[:name],
+                              short:  short,
+                              token:  token,
+                              source: 'fir-cli')
+      update_app_version_info(version_id, version:      app_info[:version],
+                                          versionShort: app_info[:short_version],
+                                          devices:      app_info[:devices],
+                                          release_type: app_info[:release_type],
+                                          changelog:    changelog,
+                                          token:        token)
+      published_app_info = fetch_app_info(app_id, token)
+
+      logger_info_dividing_line
+      logger.info "Published succeed: #{api[:base_url]}/#{published_app_info[:short]}"
+    end
+
+    private
+
+      def convert_icon origin_path
+        logger.info "Converting app's icon......"
+        output_path = Tempfile.new('uncrushed_icon.png').path
+        Parser.uncrush_icon(origin_path, output_path)
+        File.size(output_path) == 0 ? origin_path : output_path
+      end
+
+      def upload_app_icon bundle_icon, icon_path
+        logger.info "Uploading app's icon......"
+        hash = {
+          key:   bundle_icon[:key],
+          token: bundle_icon[:token],
+          file:  File.new(icon_path, 'rb')
+        }
+        post bundle_icon[:url], hash, 'multipart/form-data'
+      end
+
+      def upload_app_file bundle_app, file_path
+        logger.info "Uploading app......"
+        hash = {
+          key:   bundle_app[:key],
+          token: bundle_app[:token],
+          file:  File.new(file_path, 'rb')
+        }
+        post bundle_app[:url], hash, 'multipart/form-data'
+      end
+
+      def update_app_info id, hash
+        logger.info "Updating app info......"
+        put api[:app_url] + "/#{id}?#{URI.encode_www_form hash}", hash
+      end
+
+      def update_app_version_info id, hash
+        logger.info "Updating app's version info......"
+        put api[:version_url] + "/#{id}/complete?#{URI.encode_www_form hash}", hash
+        put api[:version_url] + "/#{id}?#{URI.encode_www_form hash}", hash
+      end
+
+      def fetch_uploading_info app_info, token
+        logger.info "Fetching #{app_info[:identifier]}@FIR.im uploading info......"
+        get api[:uploading_info_url] + "/#{app_info[:identifier]}", type:  app_info[:type],
+                                                                    token: token
+      end
+
+      def fetch_app_info id, token
+        logger.info "Fetch app info from FIR.im"
+        get api[:app_url] + "/#{id}", token: token
+      end
+  end
+end

data/lib/fir/util.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+require_relative './util/login'
+require_relative './util/info'
+require_relative './util/build'
+require_relative './util/publish'
+
+module FIR
+  module Util
+
+    def self.included base
+      base.extend ClassMethods
+      base.extend Login
+      base.extend Info
+      base.extend Build
+      base.extend Publish
+    end
+
+    module ClassMethods
+
+      def fetch_user_info token
+        get api[:me_url], token: token
+      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"
+          exit 1
+        end
+      end
+
+      def check_token_cannot_be_blank token
+        if token.blank?
+          logger.error "Token can't be blank"
+          exit 1
+        end
+      end
+
+      def logger_info_dividing_line
+        logger.info "✈ -------------------------------------------- ✈"
+      end
+    end
+
+  end
+end

data/lib/fir/version.rb

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

data/lib/fir-cli.rb

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

data/lib/fir.rb

@@ -0,0 +1,87 @@
+# encoding: utf-8
+
+require 'thor'
+require 'logger'
+require 'yaml'
+require 'rest-client'
+require 'json'
+require 'securerandom'
+require 'fileutils'
+require 'cfpropertylist'
+require 'tempfile'
+
+# TODO: remove rescue when https://github.com/tajchert/ruby_apk/pull/4 merged
+begin
+  require 'ruby_android'
+rescue LoadError
+  require 'ruby_apk'
+end
+
+require 'fir/patches'
+require 'fir/util'
+require 'fir/version'
+require 'fir/cli'
+
+module FIR
+  CONFIG_PATH   = "#{ENV['HOME']}/.fir-cli"
+  API_YML_PATH  = "#{File.dirname(__FILE__)}/fir/api.yml"
+  APP_FILE_TYPE = %w(.ipa .apk).freeze
+
+  include Util
+
+  class << self
+    attr_accessor :logger, :api, :config
+
+    def api
+      @api ||= YAML.load_file(API_YML_PATH).symbolize_keys
+    end
+
+    def config
+      @config ||= YAML.load_file(CONFIG_PATH).symbolize_keys if File.exist?(CONFIG_PATH)
+    end
+
+    def reload_config
+      @config = YAML.load_file(CONFIG_PATH).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
+
+    def get url, params = {}
+      begin
+        res = RestClient.get(url, params: params)
+      rescue RestClient::Exception => e
+        logger.error e.response
+        exit 1
+      end
+      JSON.parse(res.body, symbolize_names: true)
+    end
+
+    def post url, query, content_type = :json
+      begin
+        res = RestClient.post(url, query, { content_type: content_type })
+      rescue RestClient::Exception => e
+        logger.error e.response
+        exit 1
+      end
+      JSON.parse(res.body, symbolize_names: true)
+    end
+
+    def put url, query, content_type = :json
+      begin
+        res = RestClient.put(url, query, { content_type: content_type })
+      rescue RestClient::Exception => e
+        logger.error e.response
+        exit 1
+      end
+      JSON.parse(res.body, symbolize_names: true)
+    end
+
+    alias_method :☠, :exit
+  end
+end

data/lib/fir_cli.rb

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

metadata

@@ -1,65 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - FIR.im
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: lagunitas
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: user_config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: pngdefry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: rest-client
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,83 +25,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: paint
-  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: thor
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: ruby_apk
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
+        version: '0.11'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -151,64 +95,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: ruby_android
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-description: FIR.im 命令行工具，支持 ios 和 android
-email: fir-cli@fir.im
+        version: '0.7'
+description: FIR.im command tool, support iOS and Android
+email:
+- dev@fir.im
 executables:
 - fir
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
+- Rakefile
 - bin/fir
 - fir-cli.gemspec
-- fir-cli.rb
-- lib/fir-cli-commands/00-info.rb
-- lib/fir-cli-commands/00-login.rb
-- lib/fir-cli-commands/00-profile.rb
-- lib/fir-cli-commands/00-upgrade.rb
-- lib/fir-cli-commands/00-version.rb
-- lib/fir-cli-commands/01-config.rb
-- lib/fir-cli-commands/100-resign_codesign.rb
-- lib/fir-cli-commands/100-resign_tapbeta.rb
-- lib/fir-cli-commands/101-resign.rb
-- lib/fir-cli-commands/11-publish.rb
-- lib/fir-cli-commands/12-build_ipa.rb
-- lib/fir-cli.chk.rb
-- lib/fir-cli.core.rb
-- lib/fir-cli.fir.rb
-- lib/fir-cli.opt.rb
-- lib/fir-cli.output.rb
-- lib/fir-cli.utils.rb
-- lib/fir-cli/version.rb
-- lib/lagunitas.ext.rb
-- lib/lagunitas.patch.rb
-- lib/user_config.patch.rb
-homepage: http://blog.fir.im/2014/fir-cli
+- lib/fir-cli.rb
+- lib/fir.rb
+- lib/fir/api.yml
+- lib/fir/cli.rb
+- lib/fir/patches.rb
+- lib/fir/patches/bin/pngcrush
+- lib/fir/patches/native_patch.rb
+- lib/fir/patches/os_patch.rb
+- lib/fir/patches/parser_patch.rb
+- lib/fir/util.rb
+- lib/fir/util/build.rb
+- lib/fir/util/info.rb
+- lib/fir/util/login.rb
+- lib/fir/util/publish.rb
+- lib/fir/version.rb
+- lib/fir_cli.rb
+homepage: http://blog.fir.im/2014/fir_cli
 licenses:
 - GPLv3
 metadata: {}
-post_install_message: 
+post_install_message: "\n        ______________        ________    ____\n       /
+  ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
+  /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
+  \ ## 更新记录\n  ### FIR-CLI 1.0.0\n  - 重大重构\n  - 优化启动及运行速度\n  - 增加各指令的 alias\n  - 增加全局参数,
+  -T, -L, -V, -q, -h, 分别为 token, log, verbose, quite, help 参数\n  - 增加输入 log\n  - 修正部分系统安装失败问题\n
+  \ - 修正部分服务器安装出现编码失败问题\n  - 重写 ipa 解析器, 去除 `miniz.c`, 增加 pngcrash\n  - build_ipa
+  增加默认 build 路径, `fir b` 则默认 build 当前路径\n  - build_ipa 增加输出 dSYM 符号表文件\n  - build_ipa
+  增加输出 xcodebuild 的信息\n  - 去掉输出信息颜色, 方便查看 log\n  - 简化 --verbose 参数, 简化为 `--verbose
+  --no-verbose`, 默认输出为 INFO\n  "
 rdoc_options: []
 require_paths:
 - lib
-- "./"
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -224,5 +171,6 @@ rubyforge_project:
 rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
-summary: FIR.im 命令行工具
+summary: FIR.im command tool
 test_files: []
+has_rdoc: 

data/Gemfile.lock

@@ -1,45 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fir-cli (0.2.1.1)
-      highline (~> 1.6)
-      lagunitas (= 0.0.1)
-      paint (~> 0.9)
-      pngdefry (= 0.1.1)
-      rest-client (~> 1.7)
-      ruby_apk (~> 0.7)
-      rubyzip (~> 0.9.9)
-      thor (~> 0.19)
-      user_config (= 0.0.4)
-
-GEM
-  remote: https://ruby.taobao.org/
-  specs:
-    CFPropertyList (2.3.0)
-    highline (1.6.21)
-    lagunitas (0.0.1)
-      CFPropertyList
-      pngdefry (>= 0.1.0)
-      zip
-    mime-types (2.4.3)
-    netrc (0.10.2)
-    paint (0.9.0)
-    pngdefry (0.1.1)
-    rake (10.4.2)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    ruby_apk (0.7.1)
-      rubyzip (< 1.0.0)
-    rubyzip (0.9.9)
-    thor (0.19.1)
-    user_config (0.0.4)
-    zip (2.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.7)
-  fir-cli!
-  rake (~> 10.0)

data/fir-cli.rb

@@ -1,27 +0,0 @@
-require 'rubygems'
-require 'uri'
-require 'json'
-require 'pathname'
-require 'tempfile'
-require 'securerandom'
-
-require 'thor'
-require 'paint'
-require 'pngdefry'
-require 'user_config'
-require 'rest_client'
-require 'lagunitas'
-require 'ruby_apk'
-require 'highline/import'
-
-require 'zip'
-require 'zip/zip'
-
-
-module Fir
-  class Cli < Thor; end
-end
-
-Dir[File.dirname(__FILE__) + '/lib/fir-cli/*.rb'].each { |f| require f }
-Dir[File.dirname(__FILE__) + '/lib/*.rb'].each { |f| require f }
-Dir[File.dirname(__FILE__) + '/lib/fir-cli-commands/*.rb'].each { |f| require f }

data/lib/fir-cli/version.rb

@@ -1,5 +0,0 @@
-module Fir
-  class Cli
-    VERSION = '0.2.3.1'
-  end
-end

data/lib/fir-cli-commands/00-info.rb

@@ -1,17 +0,0 @@
-# coding: utf-8
-module Fir
-  class Cli
-    desc 'info APP_FILE_PATH', '获取应用文件的信息（支持 ipa 文件和 apk 文件）'
-    option :all, :aliases => '-a', :desc => '显示全部应用信息', :type => :boolean
-    option :fir, :aliases => '-f', :desc => '显示托管在 fir.im 的应用信息', :type => :boolean
-    output_options
-    def info(path)
-      app = _info path, options[:all]
-      app.each { |i| _puts "#{Paint[i[0].to_s.rjust(18), :blue]}  #{i[1]}" }
-      if options[:fir]
-        fir_app = _fir_info app[:identifier], app[:type]
-        fir_app.each { |i| _puts "#{Paint[i[0].to_s.rjust(18), :blue]}  #{i[1]}" }
-      end
-    end
-  end
-end

data/lib/fir-cli-commands/00-login.rb

@@ -1,30 +0,0 @@
-# coding: utf-8
-module Fir
-  class Cli
-    desc 'login', '登录'
-    output_options
-    def login
-      token = _prompt_secret('输入你的用户 token：')
-      if token.empty?
-        _puts_require_token
-        _exit
-      end
-      user = _user token
-      if !user
-        _puts_invalid_token
-        _exit
-      end
-      if _opt_token && _opt_token != token
-        _puts "> 已登陆用户: #{_opt_token}"
-        _puts "> 替换为用户: #{token}"
-      end
-      if user[:email]
-        _puts "> 设置用户邮件地址为: #{user[:email]}"
-        @config['email'] = user[:email]
-      end
-      @config['token'] = token
-      @config.save
-      _puts "> 当前登陆用户为：#{token}"
-    end
-  end
-end

data/lib/fir-cli-commands/00-profile.rb

@@ -1,31 +0,0 @@
-# coding: utf-8
-module Fir
-  class Cli
-    desc 'profile', '切换配置文件'
-    option :delete, :aliases => '-d', :desc => '删除指定的配置文件', :type => :boolean
-    output_options
-    def profile(prof)
-      if prof == 'global'
-        _puts '! 不能使用 global 作为配置文件名'
-        _exit
-      end
-      prof = "#{prof}.yaml"
-      if options[:delete]
-        _puts "> 正在删除配置文件：#{prof}"
-        @uconfig.delete prof
-      else
-        if _profile == prof
-          _puts "! #{Paint["你正在使用该配置：#{prof}", :red]}"
-          _exit
-        end
-        _puts "> 正在使用配置文件：#{_profile}"
-        _puts "> 即将替换为：#{prof}"
-        @global_config['profile'] = prof
-        @global_config.save
-        _load_config
-        _puts "> 已替换为：#{prof}"
-        config
-      end
-    end
-  end
-end