fir-cli 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dbb82db6a565fb7b448b2dd8643b8991250b022
-  data.tar.gz: 8ebacaa4ee598e06fcdf645c0070cef5822f1205
+  metadata.gz: a24b1b028bb3fa518bb091e2ab408a7adda62fe8
+  data.tar.gz: 68f5fa9e8492ee4ebb397f254254fb5b307b82d0
 SHA512:
-  metadata.gz: 8f53a74550bce7e5f7294f7f613b9db1e544b79cfb94fa1ef588590b8f7a92566d9589e56c2700d79c7ca38ce0cea37bcb3014ea9312b0e6a26d3eebc00ad0ab
-  data.tar.gz: 67616767e8c833f3d73c246d05a06580a364723c4757b71ace737ff6e1c1c189e2f3ac94eceb0210d32d8e90f75af68993b24e657b16ac30cd35af17a842fafa
+  metadata.gz: a5423d1e143c6413724ab28bed45a95377b63fd8f6dafce2468a802e743cb83160f6821a0c71bae3f997500aeb292c7e16be0eda2156124a944d688dfca01b74
+  data.tar.gz: 8d74ec61bbcc0ed9b2f0d6f271222953c2b699e2667c3c407fc31a6bc88a9cc39b98ec11211c4444e05f5e421d00ec76ab9612ec0c270f215e3982e95fa90d26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fir-cli (0.1.9)
+    fir-cli (0.2.0)
       highline (~> 1.6)
       lagunitas (= 0.0.1)
       paint (~> 0.9)

data/lib/fir-cli/version.rb

@@ -1,5 +1,5 @@
 module Fir
   class Cli
-    VERSION = '0.1.9'
+    VERSION = '0.2.0'
   end
 end

data/lib/fir-cli-commands/01-config.rb

@@ -6,7 +6,6 @@ module Fir
     option :email, :aliases => '-e', :desc => '邮件地址'
     option :resign, :aliases => '-r', :desc => '是否以企业签名发布 ios 应用', :type => :boolean
     option :publish, :aliases => '-p', :desc => '编译打包自动发布至 FIR.im', :type => :boolean
-    git_options
     output_options
     def config
       if options.length > 0

data/lib/fir-cli-commands/12-build_ipa.rb

@@ -2,97 +2,155 @@
 module Fir
   class Cli
     def self.build_ipa_options
-      option :x_project, :desc => '选择编译的项目文件'
-      option :x_scheme, :desc => '选择使用的 Scheme'
-      option :x_target, :desc => '选择编译的 Target'
-      option :x_alltarget, :desc => '编译全部 Target', :type => :boolean
-      option :x_configuration, :desc => '选择编译使用的配置'
-      option :output_ipa, :aliases => '-o', :desc => '指定 ipa 的输出路径'
-      option :output_app, :desc => '指定 app 的输出路径'
-      option :publish, :aliases => '-p', :desc => '设置是否直接发布到 FIR.im', :type => :boolean
+      option :workspace, :aliases => '-w', :desc => '编译指定路径中的 workspace', :type => :boolean
+      option :scheme, :aliases => '-s', :desc => '如果编译 workspace 则必须指定 scheme'
+      option :configuration, :aliases => '-C', :desc => '选择编译的配置，如 Release'
+      option :output, :aliases => '-o', :desc => '指定 ipa 的输出路径'
+      option :publish, :aliases => '-p', :desc => '设置是否发布到 FIR.im', :type => :boolean
     end
-    desc 'build_ipa PATH [options] [settings]', '编译 ios app 项目，输出至 ODIR'
+    desc 'build_ipa PATH [options] [settings]', '编译 ios app 项目'
     build_ipa_options
     publish_options
     output_options
-    def build_ipa(path, *settings)
+    def build_ipa(path, *args)
       if _os != 'mac'
         _puts "! #{Paint['不支持在非 mac 系统上编译打包', :red]}"
         exit 1
       end
-      settings = _convert_settings *settings
-      ipa_path = _path options[:output_ipa] if options[:output_ipa]
-      if !ipa_path
-        use_tmpfile = true
-        ipa_path = Tempfile.new(["#{SecureRandom.hex}", '.ipa']).path
-      end
-      app_path = _path options[:output_app] if options[:output_app]
-      mp_path = _path options[:mobileprovision] if options[:mobileprovision]
+      settings = _convert_settings *args
 
-      vars = {
-        :ipa_path => ipa_path,
-        :app_path => app_path
-      }
-      # TODO: pull from a git repo
-      # if options[:git] != nil
-      #   git(path) { |_d| _build_ipa _d, settings, vars }
-      # else
-      # end
-      
-      path = _path path
+      path = _path(path).to_s
       project_dir = (Dir.exist? path) ? path : (File.dirname path)
-      _build_ipa project_dir, settings, vars
 
+      ipa_path = _path(options[:output]).to_s if options[:output]
+      if !ipa_path && !_opt_publish
+        _puts "! #{Paint['如果不发布到 FIR.im，则需要指定 ipa 文件的输出路径', :red]}"
+        exit 1
+      end
+      if !ipa_path
+        Dir.mktmpdir do |_d|
+          ipa_path = _d.to_s
+          _build_ipa project_dir, settings, options,
+                     :ipa_path => ipa_path
+          return _batch_publish ipa_path
+        end
+      end
+      _build_ipa project_dir, settings, options,
+                 :ipa_path => ipa_path
       return if !_opt_publish
-      publish ipa_path.to_s
+      if Dir.exists? ipa_path
+        _batch_publish ipa_path
+      elsif File.exists? ipa_path
+        publish ipa_path
+      end
     end
 
     private
+    # *args 的每一个参数必须为 hash, 可以以任何顺序包含 settings, arguments, opts 的参数
+    # settings 的特点是 key 全部为大写字母
+    # arguments 的特点是 key 为 x_ 开头
+    # 不符合 settings 及 arguments 的为 opts
     def _build_ipa(project_dir, *args)
-      settings = {}
-      vars = {}
-      if args.length == 1
-        args[0].each { |_k, _v| if _k.match /^[A-Z]+$/ then settings[_k] = _v else vars[_k] = _v end }
-      else
-        settings, vars = args[0..1]
-      end
+      ignore_args = %w(:project :workspace :sdk :scheme)
+      ignore_sets = %w(TARGET_BUILD_DIR)
 
-      settings = settings.select { |_k| _k != 'TARGET_BUILD_DIR' }
-                         .map { |_k, _v| "#{_k}=\"#{_v}\"" }
-                         .join(' ')
-      arguments = '-sdk iphoneos'
-      options.each do |_k, _v|
-        break if !_k.start_with? 'x_'
-        arguments += " -#{_k[2..-1]}" if _v
-        arguments += " #{_v}" if _v.class == String
+      setstr, argstr, opts = begin
+        _setstr, _argstr, _opts = ['', '-sdk iphoneos', {}]
+        args.inject(&:merge).each do |_k, _v|
+          _k = _k.to_s
+          if _k.match /^[_A-Z0-9]+$/
+            next if ignore_sets.include? _k
+            _setstr += " #{_k}"
+            _setstr += "=\"#{_v}\"" if _v
+          elsif _k.start_with? ':'
+            next if ignore_args.include? _k
+            _argstr += " -#{_k[1..-1]}"
+            _argstr += " \"#{_v}\"" if _v.class == String && !_v.empty?
+          else
+            _opts[_k.to_sym] = _v
+          end
+        end
+        [_setstr, _argstr, _opts]
       end
-      Dir.mktmpdir do |_d|
-        settings += " TARGET_BUILD_DIR=#{_d}"
-        Dir.chdir(project_dir) do
-          _puts '> 正在清除缓存'
-          _exec "xcodebuild clean 2>&1"
-          _puts '> 正在编译'
-          _exec "xcodebuild build #{arguments} #{settings} 2>&1"
+      project = begin
+        if _is_xcodeproject project_dir
+          project_dir
+        elsif _is_workspace project_dir
+          opts[:workspace] = true
+          project_dir
+        elsif opts[:workspace]
+          _spaces = Dir["#{project_dir}/*.xcworkspace"]
+          if _spaces.length == 0
+            _puts "! #{Paint['指定目录中找不到 workspace 文件，无法编译', :red]}"
+            exit 1
+          end
+          _spaces[0]
+        else
+          _projs = Dir["#{project_dir}/*.xcodeproj"]
+          if _projs.length == 0
+            _puts "! #{Paint['指定目录中找不到 project 文件，无法编译', :red]}"
+            exit 1
+          else
+            _projs[0]
+          end
         end
-        Dir.chdir(_d) do
-          ipa_path = vars[:ipa_path]
-          if ipa_path
-            basename = File.basename Dir['*.app'][0], '.app'
-            ipa_path = File.join(ipa_path, 'build_ipa.ipa') if Dir.exist? ipa_path
-            _puts '> 正在打包'
-            _exec 'mkdir Payload'
-            _exec 'mv *.app ./Payload'
-            _exec "rm #{ipa_path}" if File.exist? ipa_path
-            _exec "zip -qr #{ipa_path} Payload"
+      end
+
+      Dir.mktmpdir do |_d|
+        setstr += " TARGET_BUILD_DIR=#{_d} CONFIGURATION_BUILD_DIR=#{_d}"
+        if opts[:workspace]
+          unless opts[:scheme]
+            _puts "! #{Paint['如果编译 workspace, 则必须指定一个 scheme', :red]}"
+            exit 1
           end
+          argstr += " -workspace \"#{project}\" -scheme \"#{opts[:scheme]}\""
+        else
+          argstr += " -project \"#{project}\""
+        end
+
+        argstr += " -configuration \"#{opts[:configuration]}\"" if opts[:configuration]
 
-          if vars[:app_path]
-            _puts '> 正在复制 app 文件'
-            _exec "mv ./Payload/*.app #{vars[:app_path]}"
+        # _puts '> 正在清除缓存'
+        # _exec "xcodebuild clean #{argstr} 2>&1"
+        _puts '> 正在编译'
+        _exec "xcodebuild build #{argstr} #{setstr} 2>&1"
+        Dir.chdir(_d) do
+          apps = Dir['*.app']
+          if opts[:ipa_path]
+            ipa_path = opts[:ipa_path]
+            if Dir.exist? ipa_path
+              apps.each do |app|
+                _ipa_path = File.join ipa_path, "#{File.basename app, '.app'}.ipa"
+                _zip_ipa File.join(_d, app), _ipa_path
+              end
+            elsif apps.length > 1
+              _puts "! #{Paint['项目编译输出了多个 app，需要指定一个已经存在的目录作为输出目录', :red]}"
+              exit 1
+            elsif apps.length == 0
+              _puts "! #{Paint['项目编译没有输出 app，无法打包 ipa', :red]}"
+              exit 1
+            else
+              ipa_path += '.ipa' unless ipa_path.end_with? '.ipa'
+              _zip_ipa File.join(_d, apps[0]), ipa_path
+            end
           end
         end
         _puts '> 完成'
       end
     end
+    def _zip_ipa(app_path, ipa_path)
+      Dir.mktmpdir do |_d|
+        Dir.chdir(_d) do
+          Dir.mkdir "Payload"
+          FileUtils.cp_r app_path, 'Payload'
+          if File.exist? ipa_path
+            _puts "> 删除已有文件 #{ipa_path}"
+            _exec "rm -r #{ipa_path}"
+          end
+          _puts "> 正在打包 app： #{File.basename app_path} 到 #{ipa_path}"
+          _exec "zip -qr #{ipa_path} Payload"
+        end
+      end
+    end
   end
 end

data/lib/fir-cli.utils.ext.rb

@@ -71,6 +71,12 @@ module Fir
     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
@@ -175,7 +181,7 @@ module Fir
       }
       if more
         if app.icons
-          info[:icons] = app.icons.reverse.map do |icon|
+          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
@@ -222,5 +228,20 @@ module Fir
         hash
       end
     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/lagunitas.patch.rb

@@ -6,17 +6,29 @@ module Lagunitas
       @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
+      icons = []
+      info['CFBundleIcons']['CFBundlePrimaryIcon']['CFBundleIconFiles'].each do |name|
+        icons << get_image(name)
+        icons << get_image("#{name}.png")
+        icons << get_image("#{name}@2x.png")
+        icons << get_image("#{name}@3x.png")
       end
+      icons.delete_if { |i| !i }
+    rescue
+      nil
+    end
+    def get_image(name)
+      path = File.join @path, name
+      return nil unless File.exist? path
+
+      dimensions = Pngdefry.dimensions(path)
+      {
+        path: path,
+        width: dimensions.first,
+        height: dimensions.last
+      }
+    rescue Errno::ENOENT
+      nil
     end
   end
   class IPA

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - FIR.im
@@ -165,7 +165,6 @@ files:
 - bin/fir
 - fir-cli.gemspec
 - fir-cli.rb
-- lib/fir-cli-commands/00-git.rb
 - lib/fir-cli-commands/00-info.rb
 - lib/fir-cli-commands/00-login.rb
 - lib/fir-cli-commands/00-profile.rb

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

@@ -1,33 +0,0 @@
-# coding: utf-8
-module Fir
-  class Cli
-    def self.git_options
-      option :git, :desc => '设置 git 源'
-      option :origin, :desc => '设置 git clone 的 origin'
-      option :branch, :desc => '设置 git clone 的 branch'
-    end
-    no_commands do
-      def git(path)
-        arguments = '--depth 1'
-        %w(origin branch).each do |_m|
-          opt = method("_opt_#{_m}".to_sym).call
-          arguments += " --#{_m} #{opt}" if opt
-        end
-
-        Dir.mktmpdir do |dir|
-          _puts "> 克隆源代码 #{_opt_git}#{path}"
-          Dir.chdir(dir) do
-            _exec "git clone -q #{_opt_git}#{path} ./ #{arguments}"
-            yield dir if block_given?
-          end
-        end
-      end
-    end
-    private
-    def _opt_git
-      default = @config['git'] || 'git@github.com'
-      return default if options[:git] == 'git'
-      options[:git] || default
-    end
-  end
-end