fir-cli 0.2.0 → 0.2.1.a

data/lib/fir-cli.chk.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+module Fir
+  class Cli
+    private
+    def _chk_login!(prompt = true)
+      if !_opt_token && prompt == true
+        token = _prompt_secret('请输入用户 token：')
+        @token = token if token.length > 0
+      end
+      if !@token
+        _puts_require_token
+        _exit
+      elsif !_user(@token)
+        _puts_invalid_token
+        _exit
+      end
+    end
+    def _chk_os!(os)
+      if _os != os
+        _puts "! #{Paint["该指令不支持在非 #{os} 系统执行", :red]}"
+        _exit
+      end
+    end
+    def _chk_opt!(*opts)
+      opts.each do |_opt|
+        if !_opt? _opt.to_sym
+          _puts "! #{Paint["缺少参数 #{_opt}", :red]}"
+          _exit
+        end
+      end
+    end
+  end
+end

data/lib/fir-cli.core.rb

@@ -0,0 +1,96 @@
+# coding: utf-8
+module Fir
+  class Cli
+    def initialize(*args)
+      super
+      @tmpfiles = []
+      _init_config
+      _load_config
+      _puts_welcome
+    end
+    private
+    def _info(path, more = false)
+      if _is_ipa? path
+        _ipa_info path, more
+      elsif _is_apk? path
+        _apk_info path, more
+      else
+        _puts "! #{Paint['只能支持后缀为 ipa 和 apk 的文件', :red]}"
+        _exit
+      end
+    end
+    def _apk_info(path, 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 ["icon-#{SecureRandom.hex}", '.png']
+          tfile.write data
+          @tmpfiles.push tfile
+          {
+            :name => File.basename(name),
+            :path => tfile.path
+          }
+        end
+      end
+      info
+    end
+    def _ipa_info(path, more = false)
+      path = _path path
+      ipa = Lagunitas::IPA.new path
+      _puts '> 正在解析 ipa 文件...'
+      app = ipa.app
+      info = {
+        :type => 'ios',
+        :identifier => app.identifier,
+        :name => app.name,
+        :display_name => app.display_name,
+        :version => app.version,
+        :short_version => app.short_version,
+        :devices => app.devices,
+        :release_type => app.release_type,
+        :distribution_name => app.distribution_name
+      }
+      if more
+        if app.icons
+          info[:icons] = app.icons.sort { |a,b| -(a[:width] <=> b[:width]) }.map do |icon|
+            tfile = Tempfile.new ["icon-#{SecureRandom.hex}", '.png']
+            @tmpfiles.push tfile
+            FileUtils.cp icon[:path], tfile.path
+            {
+              :name => File.basename(icon[:path]),
+              :path => tfile.path
+            }
+          end
+        end
+        info[:plist] = app.info
+        app.mobileprovision.delete 'DeveloperCertificates' if app.mobileprovision
+        info[:mobileprovision] = app.mobileprovision
+      end
+      ipa.cleanup
+      info
+    end
+    def _batch_publish(*dirs)
+      _puts "! #{ Paint['至少需要提供一个文件夹', :red] }" if dirs.length == 0
+      dirs.each do |dir|
+        Dir.foreach(dir) do |_f|
+          if _is_ipa?(_f) || _is_apk?(_f)
+            _puts "> 正在发布 #{ _f }"
+            begin
+              publish File.join dir, _f
+            # rescue Exception => e
+            #   _puts "! #{ _f } 失败：#{ e.to_s }"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/{fir-cli.core.ext.rb → fir-cli.fir.rb}

@@ -2,34 +2,41 @@
 module Fir
   class Cli
     private
+    def _fir_url
+      @base_path ||= begin
+        path = @config['base_path'] || 'http://fir.im'
+        path = path.strip
+        path = path.end_with?('/') ? path.chop : path
+      end
+    end
     def _fir_info(identifier, type = 'ios')
       _puts "> 正在获取 #{identifier}@FIR.im 的应用信息..."
-      _chk_login
+      _chk_login!
       body = { :token => @token, :type => type }
-      res = RestClient.get "#{_base_path}/api/v2/app/info/#{identifier}?#{URI.encode_www_form body}"
+      res = RestClient.get "#{_fir_url}/api/v2/app/info/#{identifier}?#{URI.encode_www_form body}"
       JSON.parse res.body, :symbolize_names => true
     end
     def _fir_put(id, body)
-      _chk_login
+      _chk_login!
       body[:token] = @token
       _puts '> 正在更新 fir 的应用信息...'
-      RestClient.put "#{_base_path}/api/v2/app/#{id}?#{URI.encode_www_form body}", body
+      RestClient.put "#{_fir_url}/api/v2/app/#{id}?#{URI.encode_www_form body}", body
       _puts '> 更新成功'
     end
     def _fir_vput_complete(id, body)
-      _chk_login
+      _chk_login!
       body[:token] = @token
       _puts '> 正在更新 fir 的应用版本信息...'
-      RestClient.put "#{_base_path}/api/v2/appVersion/#{id}/complete?#{URI.encode_www_form body}", body
+      RestClient.put "#{_fir_url}/api/v2/appVersion/#{id}/complete?#{URI.encode_www_form body}", body
       _puts '> 更新成功'
     end
     def _fir_vput(id, body)
-      _chk_login
+      _chk_login!
       body[:token] = @token
-      RestClient.put "#{_base_path}/api/v2/appVersion/#{id}?#{URI.encode_www_form body}", body
+      RestClient.put "#{_fir_url}/api/v2/appVersion/#{id}?#{URI.encode_www_form body}", body
     end
     def _user(token)
-      RestClient.get "#{_base_path}/api/v2/user/me?token=#{token}" do |res|
+      RestClient.get "#{_fir_url}/api/v2/user/me?token=#{token}" do |res|
         case res.code
         when 200
           JSON.parse res.body, :symbolize_names => true

data/lib/fir-cli.opt.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+module Fir
+  class Cli
+    no_commands do
+      %w(token email verbose origin branch mobile_provision sign entitlements).each do |_m| 
+        define_method "_opt_#{_m}" do
+          unless instance_variable_get("@#{_m}")
+            instance_variable_set("@#{_m}", options[_m.to_sym] || @config[_m] )
+          end
+          instance_variable_get("@#{_m}")
+        end
+        private "_opt_#{_m}".to_sym
+      end
+      %w(publish resign quiet color trim).each do |_m|
+        define_method "_opt_#{_m}" do
+          return false if options[_m.to_sym] == false
+          unless instance_variable_get("@#{_m}")
+            instance_variable_set("@#{_m}", options[_m.to_sym] || @config[_m] )
+          end
+          instance_variable_get("@#{_m}")
+        end
+        private "_opt_#{_m}".to_sym
+      end
+    end
+    private
+    def _opt (*opts)
+      opts.map { |_opt| method("_opt_#{_opt}").call }
+    end
+    def _opt? (*opts)
+      opts.each { |_opt| return false if !method("_opt_#{_opt}").call }
+    end
+  end
+end

data/lib/fir-cli.output.rb

@@ -0,0 +1,55 @@
+# coding: utf-8
+module Fir
+  class Cli
+    def self.output_options
+      option :verbose,
+             :desc => '设置输出辅助信息的详细程度',
+             :type => :string,
+             :enum => ['v', 'vv', 'vvv']
+      option :quiet,
+             :aliases => '-q',
+             :desc => '安静模式，不输出任何辅助信息',
+             :type => 'boolean'
+      option :color,
+             :desc => '设置输出带有颜色的信息',
+             :type => 'boolean'
+    end
+    private
+    def _puts(text)
+      return puts _format text if !/^[->!] /.match text
+      return if _opt_quiet
+      case _opt_verbose || 'vv' # If nothing about log is set, use the default option - vv
+      when 'v'
+        puts _format text if text.start_with?('!')
+      when 'vv'
+        puts _format text if text.start_with?('!') || text.start_with?('>')
+      when 'vvv'
+        puts _format text if text.start_with?('!') || text.start_with?('>') || text.start_with?('-')
+      end
+    end
+    def _format(text)
+      return text.gsub /\e\[\d+(?:;\d+)*m/, '' if _opt_color == false
+      text
+    end
+    def _puts_welcome
+      _puts "> #{Paint['欢迎使用 FIR.im 命令行工具，如需帮助请输入:', :green]} fir help"
+    end
+    def _puts_require_token
+      _puts "! #{Paint['用户 token 不能为空', :red]}"
+    end
+    def _puts_invalid_token
+      _puts "! #{Paint['输入的用户 token 不合法', :red]}"
+    end
+    def _puts_invalid_email
+      _puts "! #{Paint['输入的邮件地址不合法', :red]}"
+    end
+    def _prompt_secret(prompt)
+      prompt = '' if _opt_quiet
+      ask(prompt) { |_q| _q.echo = false }
+    end
+    def _prompt(prompt)
+      prompt = '' if _opt_quiet
+      ask(prompt) { |_q| _q }
+    end
+  end
+end

data/lib/fir-cli.utils.rb

@@ -0,0 +1,105 @@
+# coding: utf-8
+module Fir
+  class Cli
+    def initialize(*args)
+      super
+      @tmpfiles = []
+      _init_config
+      _load_config
+      _puts_welcome
+    end
+    def self.find_extends
+      `gem list --local`
+        .each_line("\n")
+        .map { |gem| /^[^\s]+/.match(gem)[0] }
+        .select { |gem| true if gem.start_with? 'fir-cli-' }
+    end
+    private
+    def _init_config
+      @uconfig = UserConfig.new '.fir'
+      @global_config = @uconfig['global.yaml']
+    end
+    def _load_config
+      @config = @uconfig[_profile]
+    end
+    def _set_config(configs)
+      if configs.length > 0
+        configs.each do |option|
+          _puts "> #{Paint[option[0].to_s.rjust(10), :blue]} : #{@config[option[0].to_s]} => #{option[1]}"
+          @config[option[0].to_s] = option[1]
+        end
+        if @config['token'] && !_user(@config['token'])
+          _puts_invalid_token
+          _exit
+        end
+        @config.save
+      end
+    end
+    def _profile
+      @global_config['profile'] || 'default.yaml'
+    end
+    def _path(path)
+      path = Pathname.new(Dir.pwd).join(path).cleanpath
+    end
+    def _is_ipa?(path)
+      path.end_with? '.ipa'
+    end
+    def _is_apk?(path)
+      path.end_with? '.apk'
+    end
+    def _is_workspace?(path)
+      path.end_with? '.xcworkspace'
+    end
+    def _is_xcodeproject?(path)
+      path.end_with? '.xcodeproj'
+    end
+    def _is_identifier?(str)
+      /^(?:(?:[a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*(?:[A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$/.match str
+    end
+    def _is_email?(str)
+      /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|mobi|name|aero|asia|jobs|museum)$/i.match str
+    end
+    def _os
+      return 'mac' if /darwin/ =~ RUBY_PLATFORM
+      return 'windows' if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+      return 'linux'
+    end
+    def _exit
+      exit 1
+    end
+    def _exec(cmd)
+      output = `#{cmd}`
+      if $?.exitstatus != 0
+        puts output
+        _exit
+      end
+    end
+    def _convert_settings(*settings)
+      settings.reduce({}) do |hash, setting|
+        key,val = setting.split('=', 2).map(&:strip)
+        hash[key.to_sym] = val
+        hash
+      end
+    end
+    def _edit(ipath, opath=nil)
+      ipath = _path ipath
+      if !opath then opath = ipath else opath = _path opath end
+      extname = File.extname opath
+      Dir.mktmpdir do |_d|
+        Dir.chdir(_d) do
+
+          Zip::ZipFile.open(ipath) do |_z|
+            _z.each do |_entry|
+              entrypath = File.join _d, _entry.name
+              FileUtils.mkdir_p File.dirname entrypath
+              _z.extract _entry, entrypath unless File.file? entrypath
+            end
+          end
+          yield _d if block_given?
+          File.unlink opath if File.file? opath
+          _exec "zip -qr #{opath} Payload"
+        end
+      end
+    end
+  end
+end

data/lib/lagunitas.ext.rb

@@ -15,7 +15,7 @@ module Lagunitas
     end
     def mobileprovision?
       return true if @mobileprovision
-      File.exists? File.join @path, 'embedded.mobileprovision'
+      File.file? File.join @path, 'embedded.mobileprovision'
     end
     def devices
       mobileprovision['ProvisionedDevices'] if mobileprovision
@@ -30,7 +30,7 @@ module Lagunitas
     end
     def metadata?
       return true if @metadata
-      File.exists? File.join @root, 'iTunesMetadata.plist'
+      File.file? File.join @root, 'iTunesMetadata.plist'
     end
     def release_type
       @release_type ||= begin

data/lib/lagunitas.patch.rb

@@ -19,8 +19,7 @@ module Lagunitas
     end
     def get_image(name)
       path = File.join @path, name
-      return nil unless File.exist? path
-
+      return nil unless File.file? path
       dimensions = Pngdefry.dimensions(path)
       {
         path: path,
@@ -42,7 +41,7 @@ module Lagunitas
           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
+            zip_file.extract f, f_path unless File.file? f_path
           end
         end
         tmp_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1.a
 platform: ruby
 authors:
 - FIR.im
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -171,11 +185,17 @@ files:
 - 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/10-resign.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.core.ext.rb
-- lib/fir-cli.utils.ext.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
@@ -196,9 +216,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.4