fir-cli 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4dadc3c8317c2bfcccbf19e81602551715437e6
-  data.tar.gz: 55dd33294782a6e08832cff2e3b2cf6843c59be8
+  metadata.gz: 7bae17900d51069bd8719fdb6c23258955512965
+  data.tar.gz: 8d5be267862b9978e0da3c51a1740dab1143e3fa
 SHA512:
-  metadata.gz: 78523c9c30c19604b95ea0514a677c2297b78901561ea9323c6e7aa2c5bdad28cbd4f8f22b36aada563fcb949f8899c11d1a774f51dbd85c61b101670d5830e8
-  data.tar.gz: a5d4c2b47d02280ad3c67be1604bf4da70d194e119dffb08c98278fa25f413fdfebec0f0d78390ec9bdab7e7f50c22b0193428de75d19a3824f699e765b753da
+  metadata.gz: 309af7c8868108104451bc0a3e8f162083cc7bf35be9cfaa111658a87b669ada8477c60d4b5e96e8e3940fec909b9d73f74bb29f9b91c72e68b331d31d4067b2
+  data.tar.gz: 61e5bac2993c08e132bc97f96361d39f74dfcf30edceb318bddb4d47e608842224c66a7ec039fda4b05ab2519e3c105c085f2877c1621732cd448063aaf97641

data/.gitignore

@@ -7,6 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/fir-cli_tmp/
 *.bundle
 *.so
 *.o

data/.travis.yml

@@ -0,0 +1,23 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2
+  - ruby-head
+  - rbx-2
+  - jruby
+  - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx-2
+notifications:
+  recipients:
+    - hxy@fir.im
+
+branches:
+  only:
+    - master

data/CHANGELOG

@@ -1,4 +1,11 @@
 ## 更新记录
+
+### FIR-CLI 1.1.4
+- 增加 `fir me` 指令查看当前登录用户
+
+### FIR-CLI 1.1.3
+- 增加 Travis.ci
+
 ### FIR-CLI 1.1.1
 - android app 不转换 icon
 

data/README.md

@@ -2,6 +2,8 @@ FIR.im CLI
 ---
 
 [![Join the chat at https://gitter.im/FIRHQ/fir-cli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/FIRHQ/fir-cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+![Build Status Images](https://travis-ci.org/FIRHQ/fir-cli.svg)
+
 > FIR.im CLI 可以通过指令查看, 上传, 编译应用
 
 ## 使用入门
@@ -10,7 +12,19 @@ FIR.im CLI
 FIR.im CLI 使用 Ruby 构建，只要安装相应 ruby gem 即可:
 
 ```shell
-$ sudo gem install fir-cli --no-ri --no-rdoc
+$ sudo gem install fir-cli
+```
+
+如果出现无法安装的现象, 请先升级下系统自带的 gem 包后再执行命令安装 fir-cli
+
+```shell
+sudo gem update --system
+```
+
+如果出现无法安装的现象, 请先升级下系统自带的 gem 包后再执行命令安装 fir-cli
+
+```shell
+sudo gem update --system
 ```
 
 安装后，你可以在命令行执行指令

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+
+desc "Run the tests."
+task :test do
+  $: << "lib" << "test"
+  Dir["test/*_test.rb"].each { |f| require f[5..-1] }
+end
+
+task :default => :test
+

data/fir-cli.gemspec

@@ -28,16 +28,17 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### FIR-CLI 1.1.2
+  ### FIR-CLI 1.1.4
   - 完全兼容新版 API ✔
   - 请使用新版 API Token
   - 新版 API Token 查看地址: `http://fir.im/user/info`
+  - 增加 `fir me` 指令查看当前登录用户
   - https://github.com/FIRHQ/fir-cli
   )
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "pry", "~> 0.11"
+  spec.add_development_dependency "minitest", "~> 5.7"
 
   spec.add_dependency "thor", "~> 0.19"
   spec.add_dependency "CFPropertyList", "~> 2.3"

data/lib/fir/cli.rb

@@ -64,6 +64,14 @@ module FIR
       FIR.login(token)
     end
 
+    desc "me", "Show current user info if user is logined (aliases: 'm')."
+    map "m" => :me
+    def me *args
+      prepare :me
+
+      FIR.me
+    end
+
     desc "upgrade", "Upgrade FIR-CLI and quit (aliases: u)."
     map "u" => :upgrade
     def upgrade

data/lib/fir/util/info.rb

@@ -27,8 +27,8 @@ module FIR
         identifier:        app.identifier,
         name:              app.name,
         display_name:      app.display_name,
-        build:             app.version,
-        version:           app.short_version,
+        build:             app.version.to_s,
+        version:           app.short_version.to_s,
         devices:           app.devices,
         release_type:      app.release_type || ipa.release_type,
         distribution_name: app.distribution_name
@@ -58,8 +58,8 @@ module FIR
         type:       'android',
         identifier: apk.manifest.package_name,
         name:       apk.label,
-        build:      apk.manifest.version_code,
-        version:    apk.manifest.version_name
+        build:      apk.manifest.version_code.to_s,
+        version:    apk.manifest.version_name.to_s
       }
 
       # apk.icon is a hash, { icon_name: icon_data }

data/lib/fir/util/me.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module FIR
+  module Me
+
+    def me
+      check_logined
+
+      if user_info = fetch_user_info(current_token)
+        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}"
+      end
+    end
+  end
+end

data/lib/fir/util.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require_relative './util/login'
+require_relative './util/me'
 require_relative './util/info'
 require_relative './util/build'
 require_relative './util/publish'
@@ -11,6 +12,7 @@ module FIR
     def self.included base
       base.extend ClassMethods
       base.extend Login
+      base.extend Me
       base.extend Info
       base.extend Build
       base.extend Publish
@@ -36,6 +38,13 @@ module FIR
         end
       end
 
+      def check_logined
+        if current_token.blank?
+          logger.error "Please use `fir login` first"
+          exit 1
+        end
+      end
+
       def logger_info_dividing_line
         logger.info "✈ -------------------------------------------- ✈"
       end

data/lib/fir/version.rb

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

data/test/fir_cli_test.rb

@@ -0,0 +1,88 @@
+# encoding: utf-8
+
+require 'minitest/autorun'
+require 'fir'
+
+class Minitest::Test
+
+  def default_token
+    '2dd8a99ef9d19c540bb583624b939960'
+  end
+
+  def default_email
+    'fir-cli_test@fir.im'
+  end
+
+  def default_apk
+    File.expand_path('../cases', __FILE__) + '/test_apk.apk'
+  end
+
+  def default_ipa
+    File.expand_path('../cases', __FILE__) + '/test_ipa.ipa'
+  end
+
+  def default_device_udid
+    "cf8b87e3f469d7b185fd64c057778aecbc2017a6"
+  end
+
+  def default_distribution_name
+    'iOSTeam Provisioning Profile: im.fir.* - Fly It Remotely LLC.'
+  end
+end
+
+class LoginTest < Minitest::Test
+
+  def test_login
+    user_info = FIR.fetch_user_info(default_token)
+
+    assert_equal default_email, user_info.fetch(:email, '')
+  end
+end
+
+class MeTest < Minitest::Test
+
+  def test_me
+    user_info = FIR.fetch_user_info(default_token)
+
+    FIR.write_config(email: user_info.fetch(:email, ''), token: default_token)
+    FIR.reload_config
+
+    me_info = FIR.fetch_user_info(FIR.current_token)
+
+    assert_equal default_email, me_info.fetch(:email, '')
+  end
+end
+
+class InfoTest < Minitest::Test
+
+  def test_apk_info
+    info = FIR.apk_info(default_apk, true)
+
+    assert_equal 'android',         info[:type]
+    assert_equal 'im.fir.sdk.test', info[:identifier]
+    assert_equal 'TestCrash',       info[:name]
+    assert_equal '3',               info[:build]
+    assert_equal '3.0',             info[:version]
+
+    assert_equal true, File.exist?(info[:icons].first)
+  end
+
+  def test_ipa_info
+    info = FIR.ipa_info(default_ipa, 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_equal true, info[:plist].is_a?(Hash)
+    assert_equal true, info[:mobileprovision].is_a?(Hash)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - FIR.im
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,19 +40,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '5.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '5.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
@@ -138,9 +139,13 @@ files:
 - lib/fir/util/build.rb
 - lib/fir/util/info.rb
 - lib/fir/util/login.rb
+- lib/fir/util/me.rb
 - lib/fir/util/publish.rb
 - lib/fir/version.rb
 - lib/fir_cli.rb
+- test/cases/test_apk.apk
+- test/cases/test_ipa.ipa
+- test/fir_cli_test.rb
 homepage: http://blog.fir.im/fir_cli
 licenses:
 - MIT
@@ -148,8 +153,9 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### FIR-CLI 1.1.2\n  - 完全兼容新版 API ✔\n  - 请使用新版 API Token\n  - 新版 API
-  Token 查看地址: `http://fir.im/user/info`\n  - https://github.com/FIRHQ/fir-cli\n  "
+  \ ## 更新记录\n  ### FIR-CLI 1.1.4\n  - 完全兼容新版 API ✔\n  - 请使用新版 API Token\n  - 新版 API
+  Token 查看地址: `http://fir.im/user/info`\n  - 增加 `fir me` 指令查看当前登录用户\n  - https://github.com/FIRHQ/fir-cli\n
+  \ "
 rdoc_options: []
 require_paths:
 - lib
@@ -169,4 +175,7 @@ rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: FIR.im command tool
-test_files: []
+test_files:
+- test/cases/test_apk.apk
+- test/cases/test_ipa.ipa
+- test/fir_cli_test.rb