fir-cli 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f73f5c29991452ef8c835d92282a6d729c1e1fe2
-  data.tar.gz: 62e0112cce079963c4bddb9282bbf92fa2974a7d
+  metadata.gz: 7542e6029327b193019ad292029cda16611bb3df
+  data.tar.gz: a8211154ff64bd79f1111a4530bcf304a8a3516a
 SHA512:
-  metadata.gz: e2b25998a5c0e87bb5015854f48cc42999c317fb3a70a1504778451106b0a3260a124009e7b1d1a659d269b8384519a08f80d17f4b108bfe589a932607c2999f
-  data.tar.gz: ec57a6453ebe8db965d5e764e22a5853166364af25adebdc13690f2c4fdefca8eb21e6df2e774a04b856db6a6135cf39b1125e08167047ff5a8f6554e16dd58e
+  metadata.gz: 594509c71c4ef5933ceb9e80bbfed36dcb03971ece925301256da6a370e445d10728de088d6a8cc41255a68e5a4265b9b9d978182f0e1c0e84d6e0cb206440f0
+  data.tar.gz: ad35e24c12be9f02ee2335c4639736e85dd09be297192b4d42c0f01c951b4d6d372d44284643e2d1ccbec582b960b0bfde7c8ad0614ab31c82717848016dfb92

data/lib/fir-cli.rb

@@ -10,6 +10,7 @@ require 'pngdefry'
 require 'user_config'
 require 'rest_client'
 require 'lagunitas'
+require 'lagunitas.patch'
 require 'lagunitas.ext'
 
 # p Lagunitas::App.new('').respond_to? :mobileprovision
@@ -34,7 +35,7 @@ class FirCli < Thor
   end
 
   desc 'config', '配置全局设置'
-  option :resign, :aliases => '-r', :desc => '是否以企业签名发布，默认为否', :type => :boolean, :default => false
+  option :resign, :aliases => '-r', :desc => '是否以企业签名发布', :type => :boolean
   option :token, :aliases => '-t', :desc => '用户令牌'
   option :email, :aliases => '-e', :desc => '邮件地址'
   option :verbose, :aliases => '-v', :desc => '输出配置项', :type => :boolean
@@ -54,8 +55,8 @@ 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, false, true
+    fir_app = _fir_info app[:identifier]
     opt_short = options[:short]
     post = {}
     post[:public] = options[:public] != nil ? options[:public] : @ipa_config['public']
@@ -64,9 +65,9 @@ class FirCli < Thor
     post.each { |i| if i[1] == fir_app[i[0]] then post.delete i[0] end }
 
     if post.length == 0 then puts '> 没有可以更新的项目'; return end
-    fir_put fir_app[:id], post
+    _fir_put fir_app[:id], post
 
-    fir_app = fir_info app[:identifier]
+    fir_app = _fir_info app[:identifier]
     if opt_short && opt_short != fir_app[:short]
       puts "> 短地址 #{ opt_short } 被占用，FIR.im 自动更新短地址为 #{ fir_app[:short] }"
     end
@@ -79,13 +80,13 @@ class FirCli < Thor
   option :token, :aliases => '-t', :desc => '用户令牌，不写则使用已经登陆信息'
   option :changelog, :aliases => '-c', :desc => '修改纪录，默认为空字符串', :default => ''
   def publish(path)
-    if opt_resign
+    if _opt_resign
       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
+    fir_app = _fir_info app[:identifier]
 
     id = fir_app[:id]
     short = fir_app[:short]
@@ -115,13 +116,13 @@ class FirCli < Thor
       puts '上传图标成功'
     end
 
-    fir_put fir_app[:id],
+    _fir_put fir_app[:id],
             :name => app[:display_name] || app[:name],
             :short => options[:short] || fir_app[:short],
             :version => app[:version],
             :versionShort => app[:short_version]
             
-    fir_vput upload_res[:versionOid],
+    _fir_vput upload_res[:versionOid],
              :version => app[:version],
              :versionShort => app[:short_version],
              :devices => app[:devices],
@@ -132,14 +133,14 @@ class FirCli < Thor
     puts "> http://fir.im/#{short}"
   end
   
-  desc 'digg IPA_FILE_PATH', '获取 .ipa 文件的信息'
+  desc 'info IPA_FILE_PATH', '获取 .ipa 文件的信息'
   option 'verbose', :aliases => '-v', :desc => '显示更多信息', :type => :boolean
   option 'fir', :aliases => '-f', :desc => '显示托管在 fir.im 的信息', :type => :boolean
-  def digg(path)
-    app = info path, false, options['verbose']
+  def info(path)
+    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]
       fir_app.each { |i| puts "#{ Paint[i[0].to_s.rjust(15), :blue] }  #{ i[1] }" }
     end
   end
@@ -154,7 +155,7 @@ class FirCli < Thor
     puts "! 用分发，请注意：#{ Paint['当证书失效后，所有安装以失效证', :red ] }"
     puts "! #{ Paint['书签名的的用户都会无法正常运行应用；同时托管在', :red ] }"
     puts "! #{ Paint['fir.im 的应用将无法正常安装。', :red ] }"
-    if opt_email == nil
+    if _opt_email == nil
       puts Paint['! 您需要提供邮件地址才能使用 resign.tapbeta.com 的签名服务', :red]
       puts Paint['! 使用 fir config --email=EMAIL 进行设置', :green]
       exit
@@ -198,7 +199,7 @@ class FirCli < Thor
   end
 
   private
-  def info(path, quiet = false, more = false)
+  def _info(path, quiet = false, more = false)
     path = Pathname.new(Dir.pwd).join(path).cleanpath
     ipa = Lagunitas::IPA.new path
     if !quiet then puts '> 正在解析 ipa 文件...' end
@@ -214,17 +215,14 @@ class FirCli < Thor
       # :distribution_name => app.distribution_name
     }
     if more
-      begin
-        info[:icons] = app.icons
-      rescue
-      end
+      info[:icons] = app.icons
       info[:plist] = app.info
     end
     ipa.cleanup
     info
   end
-  def fir_info(identifier, quiet = false)
-    if !opt_token
+  def _fir_info(identifier, quiet = false)
+    if !_opt_token
       puts Paint['! 您还没有登录', :red]
       puts Paint['! 请 fir login USER_TOKEN 登录', :green]
       exit
@@ -234,8 +232,8 @@ class FirCli < Thor
     res = RestClient.get "http://fir.im/api/v2/app/info/#{identifier}?#{URI.encode_www_form body}"
     JSON.parse res.body, :symbolize_names => true
   end
-  def fir_put(id, body, quiet = false)
-    if !opt_token
+  def _fir_put(id, body, quiet = false)
+    if !_opt_token
       puts Paint['! 您还没有登录', :red]
       puts Paint['! 请 fir login USER_TOKEN 登录', :green]
       exit
@@ -245,8 +243,8 @@ class FirCli < Thor
     RestClient.put "http://fir.im/api/v2/app/#{id}?#{URI.encode_www_form body}", body
     puts '> 更新成功'
   end
-  def fir_vput(id, body, quiet = false)
-    if !opt_token
+  def _fir_vput(id, body, quiet = false)
+    if !_opt_token
       puts Paint['! 您还没有登录', :red]
       puts Paint['! 请 fir login USER_TOKEN 登录', :green]
       exit
@@ -256,13 +254,13 @@ class FirCli < Thor
     RestClient.put "http://fir.im/api/v2/appVersion/#{id}/complete?#{URI.encode_www_form body}", body
     puts '> 更新成功'
   end
-  def opt_token
+  def _opt_token
     @token = options[:token] || @ipa_config['token'] || nil
   end
-  def opt_email
+  def _opt_email
     @email = options[:email] || @ipa_config['email'] || nil
   end
-  def opt_resign
+  def _opt_resign
     @resign = options[:resign] || @ipa_config['resign'] || nil
   end
 end

data/lib/lagunitas.ext.rb

@@ -2,25 +2,54 @@ require 'cfpropertylist'
 require 'lagunitas'
 module Lagunitas
   class App
-  	def name
-  		@info['CFBundleName']
-  	end
-  	def mobileprovision
-  		@mobileprovision = CFPropertyList.native_types CFPropertyList::List.new(:data => `security cms -D -i #{File.join @path, 'embedded.mobileprovision'}`).value
-  	end
-  	def devices
-  		mobileprovision['ProvisionedDevices']
-  	end
+    def initialize(path, root)
+      @path = path
+      @root = root
+    end
+    def name
+      @info['CFBundleName']
+    end
+    def mobileprovision
+      return if !mobileprovision?
+      @mobileprovision ||= CFPropertyList.native_types CFPropertyList::List.new(:data => `security cms -D -i #{File.join @path, 'embedded.mobileprovision'}`).value
+    end
+    def mobileprovision?
+      return true if @mobileprovision
+      File.exists? File.join @path, 'embedded.mobileprovision'
+    end
+    def devices
+      mobileprovision['ProvisionedDevices'] if mobileprovision
+    end
     def distribution_name
-      mobileprovision['DeveloperCertificates']
-    end
-  	def release_type
-  		if devices == nil
-  			'inhouse'
-  		else
-  			'adhoc'
-  		end
-  	end
-    
+      mobileprovision['DeveloperCertificates'] if mobileprovision
+    end
+    def metadata
+      return if !metadata?
+      @metadata ||= CFPropertyList.native_types(CFPropertyList::List.new(file: File.join(@root, 'iTunesMetadata.plist')).value)
+    end
+    def metadata?
+      return true if @metadata
+      File.exists? File.join @root, 'iTunesMetadata.plist'
+    end
+    def release_type
+      @release_type ||= begin
+        if mobileprovision?
+          if devices
+            'adhoc'
+          else
+            'inhouse'
+          end
+        elsif metadata?
+          'store'
+        else
+          'adhoc'
+        end
+      end
+    end
+  end
+  class IPA
+    def root_path
+      contents
+    end
   end
 end

data/lib/lagunitas.patch.rb

@@ -0,0 +1,40 @@
+require 'lagunitas'
+module Lagunitas
+  class App
+    def initialize(path, root)
+      @path = path
+      @root = root
+    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
+        # info['CFBundleIcons'] might be nil
+        nil
+      end
+    end
+  end
+  class IPA
+    def app
+      @app ||= App.new app_path, root_path
+    end
+    def contents
+      @contents ||= begin
+        tmp_path = "tmp/lagunitas-#{SecureRandom.hex}"
+        Zip::ZipFile.open @path do |zip_file|
+          zip_file.each do |f|
+            f_path = File.join tmp_path, f.name
+            FileUtils.mkdir_p File.dirname f_path
+            zip_file.extract f, f_path unless File.exist? f_path
+          end
+        end
+        tmp_path
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Yan
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - lib/fir-cli.rb
 - lib/lagunitas.ext.rb
+- lib/lagunitas.patch.rb
 - bin/fir
 homepage: https://github.com/idy/fir-cli
 licenses: