yk_command 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7ba207bd464c7157f889962cca513322a4763d409fdc706caf2d8ce49d21e0
-  data.tar.gz: c94c6c49d162b732fd9ef39d6e4cee3d23899dcb9eac8c3a884a0ce07ad675e9
+  metadata.gz: 7a86ae389cad94055cc7b1078c498cf184bb4a3c316c29d75743c63c11f082c5
+  data.tar.gz: 81b2ab46a6e03c45c210ae45b4e261d798779805aa8edccc8388ce240d6916d6
 SHA512:
-  metadata.gz: 415355f8510cd4e83bc60cf03bac2607e2c746d0793f0ec09bc54be45866fab5d3c4c9a786a9b1d731d32dfcd592d4f342ca79fcf931ce2c78a04df4e13c13f6
-  data.tar.gz: 2d7073f479b8d58177b3ea9fda216544521fa914a80caeb4796527558949dac347ad87058274fe13fcc7b51d7ddd284d10fb0c200708ccf8f87bb25410f7dec6
+  metadata.gz: 1167e9722bfc122e95aad69fee90af9d6d9965680494d58d9dfa83945d008d5ce596c34430ef8ab69d358fb7a4487d4336743f27ed8f4c02310a84f045d52251
+  data.tar.gz: be9d9504b13ba9f850ee2eabd493b4bf00492dd546df93ac9cc38ceb53d6d306f55a1c050094e28d34e1286b2b308b4ef86cc61c132b12930e064e9b477b5556

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yk_command (0.5.1)
+    yk_command (0.5.2)
       bundler
       cocoapods
       cocoapods-core
@@ -9,6 +9,7 @@ PATH
       colored2
       git
       httparty
+      rainbow
       rubyzip
       thor
       wechat_work_webhook

data/lib/yk_command/analyze/analyze.rb

@@ -10,6 +10,8 @@ require 'git'
 require 'yk_command/analyze/dependency_result'
 
 require 'yk_command/bot/wx_bot'
+require 'yk_command/config/yk_config'
+
 module YkCommand
   IGNORE_PROJECT_FILE = '.YKAnalyzeConfig.yml'.freeze
   BOT_CONFIG_FILE = '.YKBotConfig.yml'.freeze
@@ -106,12 +108,16 @@ module YkCommand
         say "failed :#{failed_count},#{failed_name_list}", :red
         say "skip   :#{skip_count}", :yellow
 
-        # bot_message path
+        bot_message path ,success_name_list,failed_name_list
+
       end
 
-      def bot_message(path)
-        bot_config_file_path = "#{path}/#{BOT_CONFIG_FILE}"
-        bot_config = File.exist?(bot_config_file_path) ? YAML.load_file(bot_config_file_path) : nil
+      def bot_message(path,success_name_list,failed_name_list)
+
+        # bot_config_file_path = "#{path}/#{BOT_CONFIG_FILE}"
+        # bot_config = File.exist?(bot_config_file_path) ? YAML.load_file(bot_config_file_path) : nil
+
+        bot_config = YkConfig.new.read_config path , BOT_CONFIG_FILE
         if bot_config
           bot = WxBot.new(bot_config)
           bot.send_result_to_group(success_name_list,failed_name_list)

data/lib/yk_command/analyze/request.rb

@@ -2,10 +2,10 @@ require 'httparty'
 module YkCommand
   class Request
     include HTTParty
-    # base_uri 'http://127.0.0.1:9988/'
+    base_uri 'http://127.0.0.1:9988/'
 
     # base_uri 'http://10.30.106.143:9988/'
-    base_uri 'http://10.30.80.113:9988'
+    # base_uri 'http://10.30.80.113:9988'
 
     headers 'Content-Type' => 'application/json'
 
@@ -19,6 +19,13 @@ module YkCommand
       self.class.get('/project/projectByName', query: { "name" => app_project_name } )
     end
 
+    def upload_app(app_list_data)
+      self.class.post('/project/updateAllAppProjects',body: {'data' => app_list_data}.to_json)
+    end
+
+    def upload_component(data)
+      self.class.post('/project/updateAllComponents',body: {'data' => data}.to_json)
+    end
 
   end
 end

data/lib/yk_command/bot/wx_bot.rb

@@ -9,6 +9,7 @@ require 'yaml'
 require 'git'
 require 'yk_command/analyze/dependency_result'
 require 'wechat_work_webhook'
+require 'thor'
 module YkCommand
   class WxBot < Thor
 

data/lib/yk_command/commands.rb

@@ -4,6 +4,8 @@ require 'yk_command/analyze/analyze'
 require 'yk_command/analyze/request'
 require 'yk_command/module/yk_module'
 
+require_relative 'component_manage/component_manage_platform'
+
 module YkCommand
 
   class CLI < Thor
@@ -38,5 +40,17 @@ module YkCommand
       Analyzer.new.workspace_analyze path
     end
 
+
+    desc 'platform_refresh ', '更新平台的app和组件数据'
+    method_option :platform_refresh, aliases: '-pr'
+
+    def platform_refresh
+      p = ComponentManagePlatform.new
+      p.update_app_data
+      p.update_component_data
+
+    end
+
+
   end
 end

data/lib/yk_command/component_manage/component_manage_platform.rb

@@ -0,0 +1,29 @@
+
+
+require 'yk_command/gitlab/yk_gitlab'
+require 'yk_command/analyze/request'
+
+module YkCommand
+
+  class ComponentManagePlatform < Thor
+    include Thor::Actions
+    no_commands do
+      def update_app_data
+        data = YkGitlab.new.get_all_app
+        list = data.parsed_response['shared_projects']
+
+        r = Request.new.upload_app(list)
+        pp r
+      end
+
+      def update_component_data
+        data = YkGitlab.new.get_all_components
+        list = data.parsed_response['projects']
+        r = Request.new.upload_component(list)
+        pp r
+      end
+    end
+
+  end
+
+end

data/lib/yk_command/config/yk_config.rb

@@ -0,0 +1,25 @@
+
+module YkCommand
+
+  class YkConfig < Thor
+
+
+
+    include Thor::Actions
+    no_commands do
+      def read_config(at_path,file_name)
+        hostA = 'yeah'
+        hostB = 'ka'
+        config_repo_url = "http://gitlab.#{hostA}#{hostB}.com/App/iOS/YKComponents/com-manage-platform-resources/configruation-files.git"
+        system("git clone #{config_repo_url} #{at_path+'/configruation-files'}")
+
+        config_file_path = "#{at_path}/#{file_name}"
+        FileUtils.copy_file "#{at_path+'/configruation-files/'+file_name}", config_file_path
+        FileUtils.remove_dir("#{at_path+'/configruation-files'}", true)
+
+        File.exist?(config_file_path) ? YAML.load_file(config_file_path) : {}
+      end
+    end
+
+  end
+end

data/lib/yk_command/gitlab/yk_gitlab.rb

@@ -0,0 +1,46 @@
+
+require 'httparty'
+
+module YkCommand
+  GITLAB_TOKEN = 'oPvxMkmDhVjhhzixBAiJ'
+
+  class YkGitlab
+
+    include HTTParty
+
+
+    # http://gitlab.yeahka.com/api/v3/groups/917?private_token=oPvxMkmDhVjhhzixBAiJ
+
+    base_uri 'http://gitlab.yeahka.com/api/v3'
+
+
+
+    headers 'Content-Type' => 'application/json'
+
+
+
+
+    def get_all_app
+
+      get_group_projects 917,100,0
+
+    end
+
+    def get_all_components
+
+      get_group_projects 514,100,0
+
+    end
+
+
+
+    def get_group_projects(group_id,per_page,page)
+      self.class.get("/groups/#{group_id}", query: { "private_token" => GITLAB_TOKEN,"per_page"=> per_page,"page"=> page })
+    end
+
+  end
+
+
+
+
+end

data/lib/yk_command/project/yk_project.rb

@@ -3,11 +3,11 @@ require 'fileutils'
 require 'psych'
 require 'thor/actions'
 require_relative 'setup/TemplateConfigurator'
+require 'yk_command/config/yk_config'
 
 require 'pathname'
 
 module YkCommand
-
   PROJECT_CONFIG_FILE = '.YKProjectConfig.yml'.freeze
 
   class YkProject < Thor
@@ -29,7 +29,7 @@ module YkCommand
 
         FileUtils.copy_entry "#{current_class_path.to_s + '/YKProjectTemplate'}", "#{current_class_path.to_s + '/temp'}"
 
-        prepare_template(read_config(at_path))
+        prepare_template(YkConfig.new.read_config at_path,PROJECT_CONFIG_FILE)
 
         Pod::TemplateConfigurator.new(pod_name, framework, prefix, author, "#{current_class_path.to_s + '/temp'}").run
         #move temp folder to destination
@@ -67,18 +67,18 @@ module YkCommand
         end
       end
 
-      def read_config(at_path)
-        hostA = 'yeah'
-        hostB = 'ka'
-        config_repo_url = "http://gitlab.#{hostA}#{hostB}.com/App/iOS/YKComponents/com-manage-platform-resources/configruation-files.git"
-        system("git clone #{config_repo_url} #{at_path+'/configruation-files'}")
-
-        config_file_path = "#{at_path}/#{PROJECT_CONFIG_FILE}"
-        FileUtils.copy_file "#{at_path+'/configruation-files/'+PROJECT_CONFIG_FILE}", config_file_path
-        FileUtils.remove_dir("#{at_path+'/configruation-files'}", true)
-
-        File.exist?(config_file_path) ? YAML.load_file(config_file_path) : {}
-      end
+      # def read_config(at_path)
+      #   hostA = 'yeah'
+      #   hostB = 'ka'
+      #   config_repo_url = "http://gitlab.#{hostA}#{hostB}.com/App/iOS/YKComponents/com-manage-platform-resources/configruation-files.git"
+      #   system("git clone #{config_repo_url} #{at_path+'/configruation-files'}")
+      #
+      #   config_file_path = "#{at_path}/#{PROJECT_CONFIG_FILE}"
+      #   FileUtils.copy_file "#{at_path+'/configruation-files/'+PROJECT_CONFIG_FILE}", config_file_path
+      #   FileUtils.remove_dir("#{at_path+'/configruation-files'}", true)
+      #
+      #   File.exist?(config_file_path) ? YAML.load_file(config_file_path) : {}
+      # end
 
     end
 

data/lib/yk_command/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module YkCommand
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.5.2'.freeze
 end

data/yk_command.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'colored2'
   spec.add_dependency 'httparty'
   spec.add_dependency 'wechat_work_webhook'
-
+  spec.add_dependency 'rainbow'
   spec.add_dependency 'rubyzip'
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yk_command
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Major Tom
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +253,9 @@ files:
 - lib/yk_command/analyze/request.rb
 - lib/yk_command/bot/wx_bot.rb
 - lib/yk_command/commands.rb
+- lib/yk_command/component_manage/component_manage_platform.rb
+- lib/yk_command/config/yk_config.rb
+- lib/yk_command/gitlab/yk_gitlab.rb
 - lib/yk_command/module/module_handler.rb
 - lib/yk_command/module/template/objc/CategoryHeader.h
 - lib/yk_command/module/template/objc/PrefixHeader.pch