ormdev 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dcbd975dcf2f884342e1967c149a2069b6e8b1dcedbccaa82dbcf53237860b0
-  data.tar.gz: 5dc15e05f7e8664faca371cceb5ee5dc5b38e1028d51859cf21057aede9f83e9
+  metadata.gz: 27324a958a9f1f17ed9fb67551d4feec4d1afead11c973c07fde615274a4b656
+  data.tar.gz: 97aa2fbe11290e69ffa83089955c04f1400db87149233c013ebda71a03aae349
 SHA512:
-  metadata.gz: ca1345de733b3d9fe6138c78f943a900504f86a5d0b7148f67edb63bd07bd26e866002cb43ed05037da107d08060dc0a108c8b7a5e607ee7c4d57a931b4c69fb
-  data.tar.gz: ea319e99aea4571e03813bf39dfd6648c48a655d7e9cc12395f20bca30a64a38bc0d1d731b002a65a3972da7f6abe90e9a80d0f2e013eb4954a1c8bdb91cf39d
+  metadata.gz: a8cbcf9a055f8ac0baf8065986dbc231d83aef0418d757191d56627b7824950df2b3e22ed9230d9eab96797e77bf713ea2d9c7ed74278a4fb4a59d67786c34e0
+  data.tar.gz: 77e989221ccba398e69d6b5970b35f77c5ebb852bed5d425395ebf4a7a6de422de32a2fad6dd17b66e70721fd3df48b07d8e8a7b73f08b6c402a9784a8e2c340

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ormdev (0.0.7)
+    ormdev (0.0.8)
       claide (~> 1.0, >= 1.0.2)
       cocoapods (~> 1.5, >= 1.5.3)
       rubyzip (~> 1.2, >= 1.2.2)

data/lib/ormdev/command/create.rb

@@ -42,7 +42,7 @@ module OrmDev
       def run
         create = OrmDev::CreateHelper.new(@name, @fast, @prefix, @template_url)
         create.setup(@skip)
-        OrmDev::LogUtil.info "【create】Success!!! "
+        OrmDev::LogUtil.info "【创建插件工程】Success!!!, `cd #{@name}` \n `ormdev run ` "
       end
     end
   end

data/lib/ormdev/command/lint.rb

@@ -17,12 +17,14 @@ module OrmDev
 
       def self.options
         [
+            ['--source', '依赖库源码更新'],
         ].concat(super)
       end
 
       def initialize(argv)
         @podspec_file = argv.shift_argument
         @podspec_files = Pathname.pwd.children.select { |pn| pn.extname == '.podspec' }
+        @source = argv.flag?('source', false)
         super
       end
 
@@ -42,7 +44,10 @@ module OrmDev
         super
         OrmDev::LogUtil.info '[插件管理] 验证Pod'.green
         @spec = Pod::Specification.from_file(@podspec_path)
-        pod_lint_command = 'pod lib lint --sources=orm,master --allow-warnings --verbose --use-libraries'
+        ORM::SHUtil.run_command("pod cache clean #{@spec.name} --all",'清除Pod缓存',false)
+        pod_lint_command = ''
+        pod_lint_command << "#{@spec.name}_Lib=1" unless @source
+        pod_lint_command << ' pod lib lint --sources=orm,master --allow-warnings --use-libraries --verbose'
         OrmDev::SHUtil.run_command(pod_lint_command,'更验证Pod',false)
       end
     end

data/lib/ormdev/command/publish.rb

@@ -1,6 +1,6 @@
 require 'cocoapods'
 
-require_relative '../source/core/run_helper'
+require_relative '../source/util/http_util'
 
 module OrmDev
   class Command
@@ -17,12 +17,22 @@ module OrmDev
 
       def self.options
         [
+            ['--account=XXX', '发布第三方插件的账户名'],
+            ['--password=XXX', '发布第三方插件的密码'],
+            ['--changelog=xxxx', '更新说明'],
+            ['--zip=xxx', '插件SDK本地地址，当push-type = 0，是必传'],
+            ['--push-type=[0,1,2]', '发布类型：0、替换+push+录入；1、push+录入；2、直接录入'],
         ].concat(super)
       end
 
       def initialize(argv)
         @podspec_file = argv.shift_argument
         @podspec_files = Pathname.pwd.children.select { |pn| pn.extname == '.podspec' }
+        @account = argv.option('account')
+        @password = argv.option('password')
+        @changelog = argv.option('changelog', '')
+        @push_type = argv.option('push-type').to_i
+        @zip = argv.option('zip')
         super
       end
 
@@ -37,14 +47,18 @@ module OrmDev
           raise Pod::Informative, 'Multiple podspec file found, please specify one' unless @podspec_files.length == 1
           @podspec_path = @podspec_files.first
         end
+        help! '发布类型传值错误' if @push_type < 0 || @push_type > 2
+        if @push_type == 0 then
+          help! '插件zip包地址不能为空' if @zip.nil?
+          help! "插件zip包地址（ #{@zip} ）不存在" unless File.exist? @zip
+        end
       end
 
       def run
         super
         OrmDev::LogUtil.info '[插件发布] '.green
-        installer = OrmDev::RunHelper.new(@podspec_path)
-        installer.setup()
-        OrmDev::LogUtil.info "Success!!! Please run command:\n orm ipa \#{platform}"
+        info = OrmDev::HTTPUtil.send_pulish_plugin_http(@account, @password, @push_type, @podspec_path, @zip, @changelog)
+        OrmDev::LogUtil.info "插件发布完成!!! #{info}"
       end
     end
   end

data/lib/ormdev/command/run.rb

@@ -5,10 +5,16 @@ require_relative '../source/core/run_helper'
 module OrmDev
   class Command
     class Run < Command
-      self.summary = '运行插件发布整个流程[检查运行环境、framwork、zip]'
+      self.summary = '运行插件发布整个流程[检查运行环境、打包静态库、归档framework]'
       self.description = <<-DESC
-          运行插件发布整个流程.
           指定'插件名.podspec'的路径`PATH`。
+          运行插件发布整个流程【检查运行环境、打包静态库、归档framework】。
+         【*】在运行前完成版本控制和'插件名.podspec'配置
+         【*】如果暂时未加入版本控制，命令提供临时解决方案：
+            1、启动Mac系统默认Apache `sudo apachectl restart`；
+            2、归档源码`插件名.zip`到本机`/Library/WebServer/Documents/OrmPlugins`目录下；
+            3、配置地址`http://localhost/插件名.zip`。
+          在此期间需要获取系统权限，需要输入开机密码。
       DESC
 
       self.arguments = [
@@ -17,12 +23,14 @@ module OrmDev
 
       def self.options
         [
+            ['--without-version-control', '没有版本控制'],
         ].concat(super)
       end
 
       def initialize(argv)
         @podspec_file = argv.shift_argument
         @podspec_files = Pathname.pwd.children.select { |pn| pn.extname == '.podspec' }
+        @no_version_control = argv.flag?('without-version-control')
         super
       end
 
@@ -43,8 +51,8 @@ module OrmDev
         super
         OrmDev::LogUtil.info '[插件发布] '.green
         installer = OrmDev::RunHelper.new(@podspec_path)
-        installer.setup()
-        OrmDev::LogUtil.info "Success!!! Please run command:\n orm ipa \#{platform}"
+        framework_zip = installer.setup(@no_version_control)
+        OrmDev::LogUtil.info "Success!!! `ormdev publish #{@podspec_path} --zip=#{framework_zip} --push-type=0`"
       end
     end
   end

data/lib/ormdev/source/core/run_helper.rb

@@ -6,32 +6,48 @@ require_relative '../util/sh_util'
 module OrmDev
   class RunHelper
     attr_reader :spec
+    attr_reader :podspec_path
 
     def initialize(path)
+      @podspec_path = path;
       @spec = Pod::Specification.from_file(path)
     end
 
-    def setup()
+    def setup(no_version_control)
       task_start_time = Time.now
       time_info_logs = ["开始运行：#{task_start_time}"]
       start_time = task_start_time
 
-      # check_environment
-      # current_time = Time.new
-      # time_info_logs << "检查运行环境:#{current_time - start_time}秒"
-      # start_time = current_time
-      #
-      # pod_package_framwork
-      # current_time = Time.new
-      # time_info_logs << "打包静态库:#{current_time - start_time}秒"
-      # start_time = current_time
+      check_environment
+      current_time = Time.new
+      time_info_logs << "检查运行环境:#{current_time - start_time}秒"
+      start_time = current_time
+
+      if no_version_control then
+        archive_zip_source
+        current_time = Time.new
+        time_info_logs << "源码没有版本控制，归档到本机WebServer:#{current_time - start_time}秒"
+        start_time = current_time
+      end
 
-      upload_zip_framwork
+      pod_package_framwork
       current_time = Time.new
-      time_info_logs << "上传静态framework:#{current_time - start_time}秒"
+      time_info_logs << "打包静态库:#{current_time - start_time}秒"
+      start_time = current_time
+
+      result = archive_zip_framwork
+      current_time = Time.new
+      time_info_logs << "压缩静态framework:#{current_time - start_time}秒"
+      start_time = current_time
+
+      # lint_zip_framwork
+      # current_time = Time.new
+      # time_info_logs << "验证静态framework:#{current_time - start_time}秒"
+      # start_time = current_time
 
       time_info_logs << "#{@spec.name}总耗时:#{Time.new - task_start_time}秒"
       puts time_info_logs
+      result
     end
 
     private
@@ -40,9 +56,44 @@ module OrmDev
       OrmDev::SHUtil.run_command('bundle install','检测配置运行环境',false)
     end
 
+    # 归档源码
+    def archive_zip_source
+      OrmDev::LogUtil.print_command '启动系统Apache服务,请求获取root权限，请输入root密码：'
+      OrmDev::SHUtil.run_command('sudo apachectl restart','启动系统Apache服务', true)
+      source_path = "#{@spec.name}.zip"
+      FileUtils.rm_rf(source_path) if File::exist?(source_path)
+      Zip::File.open(source_path, Zip::File::CREATE) do |zipfile|
+        [
+            "#{@spec.name}.podspec",
+            'LICENSE',
+            'README.md',
+            'Dependencies',
+            "#{@spec.name}/Assets",
+            "#{@spec.name}/Classes",
+        ].each do |filename|
+          add_file_to_zip(filename, zipfile)
+        end
+      end
+      OrmDev::LogUtil.print_success "归档压缩完成，#{source_path}"
+      zip_root_path = '/Library/WebServer/Documents/OrmPlugins'
+      unless Dir.exist?(zip_root_path) then
+        OrmDev::LogUtil.print_command '创建插件根目录，请输入root密码：'
+        OrmDev::SHUtil.run_command("sudo mkdir -p #{zip_root_path}",'创建插件根目录', true)
+        OrmDev::SHUtil.run_command("sudo chown #{ENV["USER"]} #{zip_root_path}",'初始化插件根目录权限', true)
+      end
+      destination_path = File.join(zip_root_path, "#{@spec.name}.zip")
+      FileUtils.rm_rf(destination_path) if File.exist?(destination_path)
+      FileUtils.cp_r(source_path, destination_path)
+      FileUtils.rm_rf(source_path)
+      zip_http_path = "http://localhost/OrmPlugins/#{@spec.name}.zip"
+      # 替换配置文件
+      version_text = File.read(@podspec_path).sub(/^( )*orm_sdk_source(.*)\n/, "    orm_sdk_source = { :http => '#{zip_http_path}'}\n")
+      File.open(@podspec_path, "w") { |file| file.puts version_text }
+    end
+
     # 静态化
     def pod_package_framwork
-      pod_package_command = "#{@spec.name}_SOURCE=1 pod package #{@spec.name}.podspec --exclude-deps --no-mangle --force --spec-sources=git@gitee.com:mvn/ios.git,https://github.com/CocoaPods/Specs.git"
+      pod_package_command = "pod package #{@spec.name}.podspec --exclude-deps --no-mangle --force --spec-sources=git@gitee.com:mvn/ios.git,https://github.com/CocoaPods/Specs.git --verbose"
       OrmDev::SHUtil.run_command(pod_package_command,'静态化插件')
       destination_path = "#{@spec.name}/lib"
       source_path = "#{@spec.name}-#{@spec.version}"
@@ -58,8 +109,18 @@ module OrmDev
       end
     end
 
+    # 验证静态库
+    # def lint_zip_framwork
+    #   OrmDev::LogUtil.info '[插件管理] 验证Pod'.green
+    #   ORM::SHUtil.run_command("pod cache clean #{@spec.name} --all",'清除Pod缓存',false)
+    #   pod_lint_command = ''
+    #   pod_lint_command << "#{@spec.name}_Lib=1"
+    #   pod_lint_command << ' pod lib lint --sources=orm,master --allow-warnings --use-libraries --verbose'
+    #   OrmDev::SHUtil.run_command(pod_lint_command,'更验证Pod',true)
+    # end
+
     # 压缩上传
-    def upload_zip_framwork
+    def archive_zip_framwork
       zip_path = "#{@spec.name}.zip"
       FileUtils.rm_rf(zip_path) if File::exist?(zip_path)
       Zip::File.open(zip_path, Zip::File::CREATE) do |zipfile|
@@ -73,12 +134,12 @@ module OrmDev
           add_file_to_zip(filename, zipfile)
         end
       end
-      zip_path
       OrmDev::LogUtil.print_success "运行成功，#{zip_path}"
+      zip_path
     end
 
     def add_file_to_zip(file_path, zip)
-      p file_path
+      return unless File::exist?(file_path)
       if File.directory?(file_path)
         Dir.foreach(file_path) do |sub_file_name|
           add_file_to_zip("#{file_path}/#{sub_file_name}", zip) unless sub_file_name == '.' or sub_file_name == '..'

data/lib/ormdev/source/util/http_util.rb

@@ -0,0 +1,74 @@
+require 'faraday'
+require 'faraday_middleware'
+
+module OrmDev
+  class HTTPUtil
+
+    API_THIRD_PLUGIN_PUBLISH = 'http://192.168.2.110:8081/soops/sword/portal?SwordControllerName=uploadPlugin'.freeze #测试地址
+
+    def self.send_pulish_plugin_http(username, password, publish_type, podspec_path, zip_path, changelog = '')
+      @spec = Pod::Specification.from_file(podspec_path)
+      cim_sdk_version = ''
+      @spec.dependencies.each do |dep|
+        if 'CIMSDK'.eql? dep.name
+          cim_sdk_version = plugin_version_from(dep.requirement.requirements.flatten.last.to_s)
+        end
+      end
+
+      # start upload
+      conn_options = {
+          request: {
+              timeout:       1000,
+              open_timeout:  300
+          }
+      }
+      pgyer_client = Faraday.new(nil, conn_options) do |c|
+        c.request :multipart
+        c.request :url_encoded
+        c.response :json, content_type: /\bjson$/
+        c.adapter :net_http
+      end
+
+      params = {
+          'username' => username || ENV['ORMDEV_CLT_USERNAME'],
+          'password' => password || ENV['ORMDEV_CLT_PASSWORD'],
+          'version' => OrmDev::VERSION,
+          'platform' => 1,# 0:android，1:ios
+          'type' => 1,# ios：0,1,2
+          'cipBaseVersion' => cim_sdk_version, #base版本号
+          'desc' => changelog,
+      }
+      unless podspec_path.nil? then
+        params[File.basename(podspec_path)] = Faraday::UploadIO.new(podspec_path, 'application/octet-stream') if File.exist?(podspec_path)
+      end
+      unless zip_path.nil? then
+        params[File.basename(zip_path)] = Faraday::UploadIO.new(zip_path, 'application/octet-stream') if File.exist?(zip_path)
+      end
+      OrmDev::LogUtil.info '【发布第三方插件】Start upload ...'
+
+      api = ENV['ORMDEV_CLT_API_THIRD_PLUGIN_PUBLISH'] || API_THIRD_PLUGIN_PUBLISH
+      response = pgyer_client.post api, params
+
+      info = response.body
+      OrmDev::LogUtil.info "【第三方插件发布】#{api}"
+      OrmDev::LogUtil.info "【第三方插件发布】Upload complate: #{info}"
+      if info && info['status'] && info['status'] == '0000' then
+        OrmDev::LogUtil.info '发布成功'
+      end
+      info
+    end
+
+    private
+
+    def self.plugin_version_from(pod_version)
+      if pod_version.nil? then
+        ''
+      else
+        arr = pod_version.split('.')
+        arr.delete_at(arr.size - 1)
+        arr.join('.')
+      end
+    end
+
+  end
+end

data/lib/ormdev/version.rb

@@ -1,3 +1,3 @@
 module OrmDev
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ormdev
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - devorm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -141,6 +141,7 @@ files:
 - lib/ormdev/command/setup.rb
 - lib/ormdev/source/core/create_helper.rb
 - lib/ormdev/source/core/run_helper.rb
+- lib/ormdev/source/util/http_util.rb
 - lib/ormdev/source/util/log_util.rb
 - lib/ormdev/source/util/sh_util.rb
 - lib/ormdev/version.rb