fir-cli 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7542e6029327b193019ad292029cda16611bb3df
-  data.tar.gz: a8211154ff64bd79f1111a4530bcf304a8a3516a
+  metadata.gz: 57e26467b901310219bb57a2b199da8f27aff22e
+  data.tar.gz: 9acdc07d57db5c388e9cc7b7aaff1123d4ce25e2
 SHA512:
-  metadata.gz: 594509c71c4ef5933ceb9e80bbfed36dcb03971ece925301256da6a370e445d10728de088d6a8cc41255a68e5a4265b9b9d978182f0e1c0e84d6e0cb206440f0
-  data.tar.gz: ad35e24c12be9f02ee2335c4639736e85dd09be297192b4d42c0f01c951b4d6d372d44284643e2d1ccbec582b960b0bfde7c8ad0614ab31c82717848016dfb92
+  metadata.gz: d70acc52ac8ef678d5f8ed17d4760b5a5b201fa721796412cbc0ada45fdd45cfb85ad0e886c61051d6328fc7ddbc3b6f66ab1554b6ec9ad583b5df58b602f25e
+  data.tar.gz: a8ed609c3a197976fb6c4d102e1908bc2cc2711febfaacd12e90d1eedab4092670db2b31afa3106964cdd6170a76aeb1a36ea5bad9de433c54c8dcb96f8d061b

data/lib/fir-cli.rb

@@ -12,6 +12,7 @@ require 'rest_client'
 require 'lagunitas'
 require 'lagunitas.patch'
 require 'lagunitas.ext'
+require 'ruby_apk'
 
 # p Lagunitas::App.new('').respond_to? :mobileprovision
 
@@ -20,7 +21,8 @@ class FirCli < Thor
     super
     @uconfig = UserConfig.new '.fir'
     @ipa_config = @uconfig['ipa.yaml']
-    if @ipa_config['resign'] == nil then @ipa_config['resign'] = false end
+    @ipa_config['resign'] = false if @ipa_config['resign'] == nil
+    @tmpfiles = []
   end
 
   desc 'login USER_TOKEN', '以 USER_TOKEN 身份登陆'
@@ -55,19 +57,18 @@ class FirCli < Thor
   option :short, :aliases => '-s', :desc => '自定义短地址'
   option :token, :aliases => '-t', :desc => '用户令牌，不写则使用已经登陆信息'
   def update(path)
-    app = _info path, false, true
-    fir_app = _fir_info app[:identifier]
+    app = _info path
+    fir_app = _fir_info app[:identifier], app[:type]
     opt_short = options[:short]
     post = {}
-    post[:public] = options[:public] != nil ? options[:public] : @ipa_config['public']
-    if opt_short then post[:short] = opt_short end
+    post[:short] = opt_short if opt_short
 
-    post.each { |i| if i[1] == fir_app[i[0]] then post.delete i[0] end }
+    post.each { |i| post.delete i[0] if i[1] == fir_app[i[0]] }
 
     if post.length == 0 then puts '> 没有可以更新的项目'; return end
     _fir_put fir_app[:id], post
 
-    fir_app = _fir_info app[:identifier]
+    fir_app = _fir_info app[:identifier], app[:type]
     if opt_short && opt_short != fir_app[:short]
       puts "> 短地址 #{ opt_short } 被占用，FIR.im 自动更新短地址为 #{ fir_app[:short] }"
     end
@@ -80,13 +81,13 @@ class FirCli < Thor
   option :token, :aliases => '-t', :desc => '用户令牌，不写则使用已经登陆信息'
   option :changelog, :aliases => '-c', :desc => '修改纪录，默认为空字符串', :default => ''
   def publish(path)
-    if _opt_resign
+    if _opt_resign && _is_ipa(path)
       tfile = Tempfile.new SecureRandom.hex
       resign path, tfile.path
       path = tfile.path
     end
-    app = _info path
-    fir_app = _fir_info app[:identifier]
+    app = _info path, false, true
+    fir_app = _fir_info app[:identifier], app[:type]
 
     id = fir_app[:id]
     short = fir_app[:short]
@@ -104,8 +105,10 @@ class FirCli < Thor
     if app[:icons] != nil
       icon_path = app[:icons][0][:path]
 
-      puts '> 转换图标...'
-      Pngdefry.defry icon_path, icon_path
+      if _is_ipa path
+        puts '> 转换图标...'
+        Pngdefry.defry icon_path, icon_path
+      end
 
       puts "> 上传图标..."
       RestClient.post bundle_icon[:url],
@@ -113,7 +116,7 @@ class FirCli < Thor
                       :token => bundle_icon[:token],
                       :file => File.new(icon_path, 'rb')
 
-      puts '上传图标成功'
+      puts '> 上传图标成功'
     end
 
     _fir_put fir_app[:id],
@@ -140,7 +143,7 @@ class FirCli < Thor
     app = _info path, false, options['verbose']
     app.each { |i| puts "#{ Paint[i[0].to_s.rjust(15), :blue] }  #{ i[1] }" }
     if options[:fir]
-      fir_app = _fir_info app[:identifier]
+      fir_app = _fir_info app[:identifier], app[:type]
       fir_app.each { |i| puts "#{ Paint[i[0].to_s.rjust(15), :blue] }  #{ i[1] }" }
     end
   end
@@ -190,7 +193,7 @@ class FirCli < Thor
         puts '> 正在签名...'
         nped = false
       end
-      if info[:url] != '' then break end
+      break if info[:url] != ''
       sleep 5
     end
     opath = Pathname.new(Dir.pwd).join(opath).cleanpath
@@ -199,12 +202,48 @@ class FirCli < Thor
   end
 
   private
-  def _info(path, quiet = false, more = false)
+  def _path(path)
     path = Pathname.new(Dir.pwd).join(path).cleanpath
+  end
+  def _info(path, quiet = false, more = false, bin = false)
+    if _is_ipa path
+      _ipa_info path, quiet, more
+    elsif _is_apk path
+      _apk_info path, quiet, more
+    else
+      puts Paint['! 只能支持后缀为 ipa 和 apk 地文件', :red]
+    end
+  end
+  def _apk_info(path, quiet = false, more = false)
+    path = _path path
+    apk = Android::Apk.new path
+    info = {
+      :type => 'android',
+      :identifier => apk.manifest.package_name,
+      :name => apk.label,
+      :version => apk.manifest.version_code,
+      :short_version => apk.manifest.version_name
+    }
+    if more
+      info[:icons] = apk.icon.map do |name, data|
+        tfile = Tempfile.new SecureRandom.hex
+        tfile.write data
+        @tmpfiles.push tfile
+        {
+          :name => File.basename(name),
+          :path => tfile.path
+        }
+      end
+    end
+    info
+  end
+  def _ipa_info(path, quiet = false, more = false, bin = false)
+    path = _path path
     ipa = Lagunitas::IPA.new path
-    if !quiet then puts '> 正在解析 ipa 文件...' end
+    puts '> 正在解析 ipa 文件...' if !quiet
     app = ipa.app
     info = {
+      :type => 'ios',
       :identifier => app.identifier,
       :name => app.name,
       :display_name => app.display_name,
@@ -215,20 +254,29 @@ class FirCli < Thor
       # :distribution_name => app.distribution_name
     }
     if more
-      info[:icons] = app.icons
+      info[:icons] = app.icons.map do |icon|
+        tfile = Tempfile.new SecureRandom.hex
+        @tmpfiles.push tfile
+        File.copy icon[:path], tfile.path
+        {
+          :name => File.basename(icon[:path]),
+          :path => tfile.path
+        }
+      end
       info[:plist] = app.info
     end
     ipa.cleanup
     info
   end
-  def _fir_info(identifier, quiet = false)
+  def _fir_info(identifier, type = 'ios', quiet = false)
     if !_opt_token
       puts Paint['! 您还没有登录', :red]
       puts Paint['! 请 fir login USER_TOKEN 登录', :green]
       exit
     end
     body = { :token => @token }
-    if !quiet then puts '> 正在获取 fir 的应用信息...' end
+    body[:type] = type 
+    puts '> 正在获取 fir 的应用信息...' if !quiet
     res = RestClient.get "http://fir.im/api/v2/app/info/#{identifier}?#{URI.encode_www_form body}"
     JSON.parse res.body, :symbolize_names => true
   end
@@ -239,7 +287,7 @@ class FirCli < Thor
       exit
     end
     body[:token] = @token
-    if !quiet then puts '> 正在更新 fir 的应用信息...' end
+    puts '> 正在更新 fir 的应用信息...' if !quiet
     RestClient.put "http://fir.im/api/v2/app/#{id}?#{URI.encode_www_form body}", body
     puts '> 更新成功'
   end
@@ -250,7 +298,7 @@ class FirCli < Thor
       exit
     end
     body[:token] = @token
-    if !quiet then puts '> 正在更新 fir 的应用版本信息...' end
+    puts '> 正在更新 fir 的应用版本信息...' if !quiet
     RestClient.put "http://fir.im/api/v2/appVersion/#{id}/complete?#{URI.encode_www_form body}", body
     puts '> 更新成功'
   end
@@ -261,6 +309,13 @@ class FirCli < Thor
     @email = options[:email] || @ipa_config['email'] || nil
   end
   def _opt_resign
+    return options[:resign] if defined? options[:resign]
     @resign = options[:resign] || @ipa_config['resign'] || nil
   end
+  def _is_ipa(path)
+    /\.ipa$/.match path
+  end
+  def _is_apk(path)
+    /\.apk$/.match path
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Yan
@@ -94,7 +94,21 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.1
-description: FIR.im 命令行工具
+- !ruby/object:Gem::Dependency
+  name: ruby_apk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+description: FIR.im 命令行工具，支持 ios 和 android
 email: idy0013@gmail.com
 executables:
 - fir