fir-cli 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9734a2a6211d82d058df273bd03c91cf9cc51f0a
-  data.tar.gz: f58003855b7eb3e568ce73171f18163e57dc001c
+  metadata.gz: 9dbb82db6a565fb7b448b2dd8643b8991250b022
+  data.tar.gz: 8ebacaa4ee598e06fcdf645c0070cef5822f1205
 SHA512:
-  metadata.gz: 6cc3a636a04a3c8adbe755803bc1ad55ca543b44cb430ab93c3f4610bf627ff05117f6c47919a093000bec9e76f10dbc5164cd0ae365e4924819ab944bb5ba6b
-  data.tar.gz: 737c734728115877b142729fae596a9d1b036616a34013d7d06e83a972d8d16f7ff235bcad7c625b966ead6314e375303bdd178cdd9bed1a61a8de18d5cad5c9
+  metadata.gz: 8f53a74550bce7e5f7294f7f613b9db1e544b79cfb94fa1ef588590b8f7a92566d9589e56c2700d79c7ca38ce0cea37bcb3014ea9312b0e6a26d3eebc00ad0ab
+  data.tar.gz: 67616767e8c833f3d73c246d05a06580a364723c4757b71ace737ff6e1c1c189e2f3ac94eceb0210d32d8e90f75af68993b24e657b16ac30cd35af17a842fafa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fir-cli (0.1.8)
+    fir-cli (0.1.9)
       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.8'
+    VERSION = '0.1.9'
   end
 end

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

@@ -0,0 +1,33 @@
+# 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

data/lib/fir-cli-commands/{config.rb → 01-config.rb}

@@ -5,6 +5,8 @@ module Fir
     option :token, :aliases => '-t', :desc => '用户 token'
     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
@@ -19,8 +21,8 @@ module Fir
         @config.save
       end
       _puts '> 设置完成，您现在使用的设置是'
-      @config.save 
-      @config.each { |conf| _puts "> #{Paint[conf[0].to_s.rjust(10), :blue]} => #{conf[1]}"}
+      @config.save
+      @config.each { |conf| _puts "> #{Paint[conf[0].to_s.rjust(10), :blue]} => #{conf[1]}" }
     end
   end
 end

data/lib/fir-cli-commands/{resign.rb → 10-resign.rb}

@@ -1,8 +1,11 @@
 # coding: utf-8
 module Fir
   class Cli
+    def self.resign_options
+      option :email, :aliases => '-e', :desc => '邮件地址'
+    end
     desc 'resign IPA_FILE_PATH OUTPUT_PATH', '使用 resign.tapbeta.com 进行企业签名'
-    option :email, :aliases => '-e', :desc => '邮件地址'
+    resign_options
     output_options
     def resign(ipath, opath)
       _puts "! #{Paint['resign.tapbeta.com 签名服务风险提示', :red]}"

data/lib/fir-cli-commands/{publish.rb → 11-publish.rb}

@@ -2,11 +2,14 @@
 module Fir
   class Cli
     desc 'publish APP_FILE_PATH', '将应用文件发布至 FIR.im（支持 ipa 文件和 apk 文件）'
-    option :resign, :aliases => '-r', :desc => '进行企业签名', :type => :boolean
-    option :email, :aliases => '-e', :desc => '企业签名所需的邮件地址'
-    option :short, :aliases => '-s', :desc => '自定义短地址'
-    option :token, :aliases => '-t', :desc => '用户 token'
-    option :changelog, :aliases => '-c', :desc => '修改纪录，默认为空字符串', :default => ''
+    def self.publish_options  
+      option :resign, :aliases => '-r', :desc => '设置是否进行企业签名', :type => :boolean
+      option :token, :aliases => '-t', :desc => '用户 token'
+      option :short, :aliases => '-s', :desc => '自定义短地址'
+      option :changelog, :aliases => '-c', :desc => '修改纪录，默认为空字符串', :default => ''
+    end
+    publish_options
+    resign_options
     output_options
     def publish(path)
       if _opt_resign && _is_ipa(path)

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

@@ -0,0 +1,98 @@
+# coding: utf-8
+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
+    end
+    desc 'build_ipa PATH [options] [settings]', '编译 ios app 项目，输出至 ODIR'
+    build_ipa_options
+    publish_options
+    output_options
+    def build_ipa(path, *settings)
+      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]
+
+      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
+      project_dir = (Dir.exist? path) ? path : (File.dirname path)
+      _build_ipa project_dir, settings, vars
+
+      return if !_opt_publish
+      publish ipa_path.to_s
+    end
+
+    private
+    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
+
+      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
+      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"
+        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
+
+          if vars[:app_path]
+            _puts '> 正在复制 app 文件'
+            _exec "mv ./Payload/*.app #{vars[:app_path]}"
+          end
+        end
+        _puts '> 完成'
+      end
+    end
+  end
+end

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

@@ -45,7 +45,7 @@ module Fir
       path = Pathname.new(Dir.pwd).join(path).cleanpath
     end
     no_commands do
-      %w(token email verbose).each do |_m| 
+      %w(token email verbose origin branch).each do |_m| 
         define_method "_opt_#{_m}" do
           unless instance_variable_get("@#{_m}")
             instance_variable_set("@#{_m}", options[_m.to_sym] || @config[_m] )
@@ -54,7 +54,7 @@ module Fir
         end
         private "_opt_#{_m}".to_sym
       end
-      %w(resign quiet color trim).each do |_m|
+      %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}")
@@ -131,6 +131,7 @@ module Fir
         _apk_info path, more
       else
         _puts "! #{Paint['只能支持后缀为 ipa 和 apk 的文件', :red]}"
+        exit 1
       end
     end
     def _apk_info(path, more = false)
@@ -202,5 +203,24 @@ module Fir
         end
       end
     end
+    def _os
+      return 'mac' if /darwin/ =~ RUBY_PLATFORM
+      return 'windows' if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+      return 'linux'
+    end
+    def _exec(cmd, code=1)
+      output = `#{cmd}`
+      if $?.exitstatus != 0
+        puts output
+        exit code
+      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
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - FIR.im
@@ -56,98 +56,98 @@ dependencies:
   name: rest_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: ruby_apk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: FIR.im 命令行工具，支持 ios 和 android
@@ -157,7 +157,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -165,14 +165,16 @@ files:
 - bin/fir
 - fir-cli.gemspec
 - fir-cli.rb
-- lib/fir-cli-commands/config.rb
-- lib/fir-cli-commands/info.rb
-- lib/fir-cli-commands/login.rb
-- lib/fir-cli-commands/profile.rb
-- lib/fir-cli-commands/publish.rb
-- lib/fir-cli-commands/resign.rb
-- lib/fir-cli-commands/upgrade.rb
-- lib/fir-cli-commands/version.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
+- 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/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/version.rb
@@ -187,15 +189,15 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- ./
+- "./"
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []