fir-cli 0.2.3.1 → 1.0.0

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

@@ -1,15 +0,0 @@
-# coding: utf-8
-module Fir
-  class Cli
-    desc 'upgrade', '更新 fir-cli 的所有组件'
-    output_options
-    def upgrade
-      _puts '> gem update fir-cli'
-      `gem update fir-cli`
-      _extends.each do |gem|
-        _puts "> gem update #{gem}"
-        `gem update #{gem}`
-      end
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-# coding: utf-8
-module Fir
-  class Cli
-    desc 'version', '当前版本'
-    output_options
-    def version
-      _puts "FIR Cli #{VERSION}"
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-# coding: utf-8
-module Fir
-  class Cli
-    desc 'config', '配置全局设置'
-    option :token, :aliases => '-t', :desc => '用户 token'
-    option :email, :aliases => '-e', :desc => '邮件地址'
-    # option :resign, :aliases => '-r', :desc => '是否以企业签名发布 ios 应用', :type => :boolean
-    option :private_key, :desc => '私密通道'
-    option :publish, :aliases => '-p', :desc => '编译打包自动发布至 FIR.im', :type => :boolean
-    output_options
-    def config(*args)
-      _set_config options.merge _convert_settings *args
-      _puts '> 设置完成，您现在使用的设置是'
-      @config.each { |conf| _puts "> #{Paint[conf[0].to_s.rjust(10), :blue]} => #{conf[1]}" }
-    end
-  end
-end

data/lib/fir-cli-commands/100-resign_codesign.rb

@@ -1,59 +0,0 @@
-# # coding: utf-8
-# module Fir
-#   class Cli
-#     def self.resign_local_options
-#       option :mobile_provision,
-#              :aliases => '-m'
-#       option :sign,
-#              :aliases => '-s'
-#     end
-#     desc 'resign_codesign IPA_FILE_PATH OUTPUT_PATH', '使用 codesign 指令进行签名'
-#     resign_local_options
-#     output_options
-#     def resign_codesign(ipath, opath)
-#       _chk_os! 'mac'
-#       _chk_opt! :mobile_provision, :sign
-#       mp_path, sign_name = _opt :mobile_provision, :sign
-#       mp_path = _path mp_path
-#       ipath = _path ipath
-#       opath = _path opath
-#       opath += '.ipa' if !opath.to_s.end_with? '.ipa'
-#       _edit(ipath, opath) do |_d|
-#         Dir.chdir(_d) do
-#           apps = Dir['Payload/*.app']
-#           if apps.length != 1
-#             _puts "! #{Paint['输入文件不是一个合法的 ipa 文件', :red]}"
-#             _exit
-#           end
-#           app = apps[0]
-#           _puts "> 替换 mobile provision"
-#           mp_dest_path = "#{app}/embedded.mobileprovision"
-#           File.unlink mp_dest_path if File.file? mp_dest_path
-#           FileUtils.cp mp_path, mp_dest_path
-#           frmwrk_dir = "#{app}/Frameworks"
-#           if File.directory? frmwrk_dir
-#             _puts "> 重签名 dylibs"
-#             Dir["#{frmwrk_dir}/*.dylib"].each do |_dylib|
-#               _exec "codesign -f -s \"#{sign_name}\" \"#{_dylib}\""
-#             end
-#             _puts "> 重签名 frameworks"
-#             Dir["#{frmwrk_dir}/*.framework"].each do |_framework|
-#               _exec "codesign -f -s \"#{sign_name}\" \"#{_framework}\""
-#             end
-#           end
-
-#           plugin_dir = "#{app}/PlugIns"
-#           if File.directory? plugin_dir
-#             _puts "> 重签名 plugins"
-#             Dir["#{plugin_dir}/*"].each do |_plugin|
-#               _exec "codesign -f -s \"#{sign_name}\" \"#{_plugin}\""
-#             end
-#           end
-#           _puts "> 重签名 #{app}"
-#           _exec "codesign -f -s \"#{sign_name}\" \"#{app}\" --deep"
-#         end
-#       end
-#     end
-#   end
-# end
-

data/lib/fir-cli-commands/100-resign_tapbeta.rb

@@ -1,85 +0,0 @@
-# # coding: utf-8
-# module Fir
-#   class Cli
-#     def self.resign_tapbeta_options
-#       option :email, :aliases => '-e', :desc => '邮件地址'
-#       option :private_key, :desc => '私密通道'
-#     end
-#     desc 'resign_tapbeta IPA_FILE_PATH OUTPUT_PATH', '使用 resign.tapbeta.com 进行企业签名'
-#     resign_tapbeta_options
-#     output_options
-#     def resign_tapbeta(ipath, opath)
-#       _puts "! #{Paint['resign.tapbeta.com 签名服务风险提示', :red]}"
-#       _puts '! tapbeta 无法保证签名证书的长期有效性，苹果随时可'
-#       _puts '! 能封杀他们的企业账号，所有由这个企业账号签发的证'
-#       _puts '! 书都会失效。你如果使用该网站提供的证书进行应用签'
-#       _puts "! 发，请注意：#{Paint['当证书失效后，所有通过已失效证书签名', :red ]}"
-#       _puts "! #{Paint['的应用都会无法正常运行；同时托管在 fir.im 的应用', :red ]}"
-#       _puts "! #{Paint['将无法正常安装。', :red ]}"
-#       if _opt_email == nil
-#         @email = _prompt '请输入你的邮件地址：'
-#         if !@email || @email.length == 0
-#           _puts "! #{Paint['你需要提供邮件地址才能使用 resign.tapbeta.com 的', :red]}"
-#           _puts "! #{Paint['签名服务, 请使用', :red]} fir config --email=EMAIL #{Paint['进行设', :red]}"
-#           _puts "! #{Paint['置', :red]}"
-#           _exit
-#         elsif !_is_email? @email
-#           _puts_invalid_email
-#           _exit
-#         end
-#       end
-#       if !_is_ipa? ipath
-#         _puts "! #{Paint['只能给以 ipa 为扩展名的文件签名', :red]}"
-#         _exit
-#       end
-#       _puts '> 正在申请上传令牌...'
-#       upload_res = RestClient.post 'http://api.resign.tapbeta.com/public/upload',
-#                                    :email => @email,
-#                                    :private_key => _opt_private_key,
-#                                    :file => File.basename(ipath)
-#       form = JSON.parse upload_res.body, :symbolize_names => true
-#       tapbeta = {}
-#       form.each do |f|
-#         if /^tb_/.match f[0]
-#           tapbeta[f[0]] = f[1]
-#           form.delete f[0]
-#         end
-#       end
-#       form[:file] = File.new Pathname.new(Dir.pwd).join(ipath).cleanpath, 'rb'
-#       _puts '> 正在上传...'
-#       res = RestClient.post tapbeta[:tb_upload_url], form
-
-#       # Upyun's notify is fucking, handle it specific
-#       # if tapbeta[:tb_upload_url].include? 'upyun'
-#       #   RestClient.get "#{form[:'notify-url']}?#{URI.encode_www_form JSON.parse res.body}"
-#       # end
-
-
-#       _puts '> 正在排队...'
-#       nped = true
-#       info = {}
-#       loop do
-#         res = RestClient.get "http://api.resign.tapbeta.com/public/#{tapbeta[:tb_upload_key]}",
-#                              :params => { :__mr => 'eyJ1cmwiOiIkKHVybCkiLCAicmVzaWduU3RhdHVzIjogIiQocmVzaWduU3RhdHVzKSIsICJzdGF0dXMiOiAiJChzdGF0dXMpIn0=' }
-#         info = JSON.parse res.body, :symbolize_names => true
-#         if nped && info[:resignStatus] == 'doing'
-#           _puts '> 正在签名...'
-#           nped = false
-#         end
-#         if info[:status] == 'error'
-#           _puts "! #{Paint['签名失败', :red]}"
-#           _exit
-#         elsif info[:status] == 'timeout'
-#           _puts "! #{Paint['签名超时', :red]}"
-#           _exit
-#         end
-#         break if info[:url] != ''
-#         sleep 5
-#       end
-#       opath = Pathname.new(Dir.pwd).join(opath).cleanpath
-#       _puts "> 正在下载到 #{opath}..."
-#       `curl #{info[:url]} -o #{opath} -s`
-#     end
-#   end
-# end
-

data/lib/fir-cli-commands/101-resign.rb

@@ -1,26 +0,0 @@
-# # coding: utf-8
-# module Fir
-#   class Cli
-#     def self.resign_options
-#       option :resign_type,
-#              :desc => '选择使用哪种方式进行重签名，默认使用 tapbeta'
-#       resign_tapbeta_options
-#       resign_local_options
-#     end
-#     desc 'resign ORIGINAL_IPA OUTPUT_IPA [--resign-type=codesign]', '使用指定类型的签名方式'
-#     resign_options
-#     output_options
-#     def resign(ipath, opath)
-#       if !options[:resign_type]
-#         resign_tapbeta ipath, opath
-#       else
-#         begin
-#           method("resign_#{options[:resign_type]}".to_sym).call ipath, opath
-#         rescue NameError => e
-#           _puts "! #{Paint["没有 resign_#{options[:resign_type]} 的重签名方式"]}"
-#         end
-#       end
-#     end
-#   end
-# end
-

data/lib/fir-cli-commands/11-publish.rb

@@ -1,73 +0,0 @@
-# coding: utf-8
-module Fir
-  class Cli
-    desc 'publish APP_FILE_PATH', '将应用文件发布至 FIR.im（支持 ipa 文件和 apk 文件）'
-    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)
-      #   tfile = Tempfile.new ["resign-#{SecureRandom.hex}", '.ipa']
-      #   resign path, tfile.path
-      #   path = tfile.path
-      # end
-      app = _info path, true
-      fir_app = _fir_info app[:identifier], app[:type]
-
-      id = fir_app[:id]
-      bundle_app = fir_app[:bundle][:pkg]
-      bundle_icon = fir_app[:bundle][:icon]
-
-      if app[:icons] != nil && app[:icons].length > 0
-        icon_path = app[:icons][0][:path]
-
-        if _is_ipa? path
-          _puts '> 转换图标...'
-          Pngdefry.defry icon_path, icon_path
-        end
-
-        _puts "> 上传图标..."
-        RestClient.post bundle_icon[:url],
-                        :key => bundle_icon[:key],
-                        :token => bundle_icon[:token],
-                        :file => File.new(icon_path, 'rb')
-
-        _puts '> 上传图标成功'
-      end
-
-      _puts '> 上传应用...'
-      res = RestClient.post bundle_app[:url],
-                            :key => bundle_app[:key],
-                            :token => bundle_app[:token],
-                            :file => File.new(path, 'rb')
-      _puts '> 上传应用成功'
-      upload_res = JSON.parse res.body, :symbolize_names => true
-
-      _fir_put fir_app[:id],
-              :name => app[:display_name] || app[:name],
-              :short => options[:short] || fir_app[:short],
-              # :desc => options[:describe] || fir_app[:desc]
-              # :show => options[:public] || fir_app[:show]
-              :source => 'fir-cli'
-
-      _fir_vput_complete upload_res[:versionOid],
-                         :version => app[:version],
-                         :versionShort => app[:short_version],
-                         :devices => app[:devices],
-                         :release_type => app[:release_type]
-
-      _fir_vput upload_res[:versionOid],
-               :changelog => options[:changelog]
-
-      # Get updated app info
-      fir_app = _fir_info app[:identifier], app[:type]
-      _puts "> #{_fir_url}/#{fir_app[:short]}"
-    end
-  end
-end

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

@@ -1,153 +0,0 @@
-# coding: utf-8
-module Fir
-  class Cli
-    def self.build_ipa_options
-      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 项目'
-    build_ipa_options
-    publish_options
-    output_options
-    def build_ipa(path, *args)
-      _chk_os! 'mac'
-      settings = _convert_settings *args
-
-      path = _path(path).to_s
-      project_dir = (File.directory? path) ? path : (File.dirname path)
-
-      ipa_path = _path(options[:output]).to_s if options[:output]
-      if !ipa_path && !_opt_publish
-        _puts "! #{Paint['如果不发布到 FIR.im，则需要指定 ipa 文件的输出路径', :red]}"
-        _exit
-      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
-      if File.directory? ipa_path
-        _batch_publish ipa_path
-      elsif File.file? 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)
-      ignore_args = %w(:project :workspace :sdk :scheme)
-      ignore_sets = %w(TARGET_BUILD_DIR)
-
-      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
-      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
-          end
-          _spaces[0]
-        else
-          _projs = Dir["#{project_dir}/*.xcodeproj"]
-          if _projs.length == 0
-            _puts "! #{Paint['指定目录中找不到 project 文件，无法编译', :red]}"
-            _exit
-          else
-            _projs[0]
-          end
-        end
-      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
-          end
-          argstr += " -workspace \"#{project}\" -scheme \"#{opts[:scheme]}\""
-        else
-          argstr += " -project \"#{project}\""
-        end
-
-        argstr += " -configuration \"#{opts[:configuration]}\"" if opts[:configuration]
-
-        # _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 File.directory? 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
-            elsif apps.length == 0
-              _puts "! #{Paint['项目编译没有输出 app，无法打包 ipa', :red]}"
-              _exit
-            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.file? 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.chk.rb

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

@@ -1,96 +0,0 @@
-# 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.fir.rb

@@ -1,49 +0,0 @@
-# coding: utf-8
-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!
-      body = { :token => @token, :type => type }
-      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!
-      body[:token] = @token
-      _puts '> 正在更新 fir 的应用信息...'
-      RestClient.put "#{_fir_url}/api/v2/app/#{id}?#{URI.encode_www_form body}", body
-      _puts '> 更新成功'
-    end
-    def _fir_vput_complete(id, body)
-      _chk_login!
-      body[:token] = @token
-      _puts '> 正在更新 fir 的应用版本信息...'
-      RestClient.put "#{_fir_url}/api/v2/appVersion/#{id}/complete?#{URI.encode_www_form body}", body
-      _puts '> 更新成功'
-    end
-    def _fir_vput(id, body)
-      _chk_login!
-      body[:token] = @token
-      RestClient.put "#{_fir_url}/api/v2/appVersion/#{id}?#{URI.encode_www_form body}", body
-    end
-    def _user(token)
-      RestClient.get "#{_fir_url}/api/v2/user/me?token=#{token}" do |res|
-        case res.code
-        when 200
-          JSON.parse res.body, :symbolize_names => true
-        else
-          nil
-        end
-      end
-    end
-  end
-end

data/lib/fir-cli.opt.rb

@@ -1,35 +0,0 @@
-# coding: utf-8
-module Fir
-  class Cli
-    no_commands do
-      # %w(token email verbose origin branch mobile_provision sign entitlements private_key).each do |_m|
-      %w(token email verbose origin branch mobile_provision entitlements private_key).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|
-      %w(publish 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