yk_command 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4e0f782818c147f0402b8b7139842c8030065818391319fb53c0ae57d544c67
-  data.tar.gz: f5f010db87a2ba242658d18728cbb9575e3a9f0d027a21b9c67e3ac006eb1f09
+  metadata.gz: 0270360ed964ef12d21ff5a0d2687a78243877286d62e503fc3d9ac4b5378440
+  data.tar.gz: e34b5d101303ed14d2e1094ba4c2f3ecb49874b38fcd02334738659578bc3f52
 SHA512:
-  metadata.gz: cda7886d0ae837cab8f503bd3c58f1390c5cd96d4d62feeb94bb744c266e11674ae28740f27a95b0ff24253189428f6f2d42a1fdb1053f5b552c145341b302cd
-  data.tar.gz: 86533c9b168b527136667553289b170feaf23b049699ab7035f32b08e68b8186cb8ee1708f2982141b93e01eba897be11285c293fa76523e28b19a3069152eaf
+  metadata.gz: 94df888ee6a59310135cc4f7a04e7c68c42daf597ba3c2ef52bd1ea4e7fea81d1d5e5aed1bae7f627991e57b401ae76ca25a507998858adf3f53c0fc44e77fd0
+  data.tar.gz: 3a5f3a628a8c726affc50d657b72da0a6b7f46b6b8826349493f0a5f90f822641071814723f8479d48cf2e58ace4d93be5ac376901371f83bee9dc6df997d044

data/.idea/yk_command.iml

@@ -41,7 +41,7 @@
     <orderEntry type="library" scope="PROVIDED" name="httparty (v0.20.0, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="httpclient (v2.8.3, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v1.10.0, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v2.6.1, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v2.6.2, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.4.1, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2022.0105, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.15.0, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
@@ -72,6 +72,7 @@
     <orderEntry type="library" scope="PROVIDED" name="typhoeus (v1.4.0, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="tzinfo (v2.0.4, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.1.0, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="wechat_work_webhook (v0.1.0, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="xcodeproj (v1.21.0, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.5.4, RVM: ruby-2.7.2 [tom]) [gem]" level="application" />
   </component>
@@ -79,21 +80,21 @@
     <option name="myRootTask">
       <RakeTaskImpl id="rake">
         <subtasks>
-          <RakeTaskImpl description="Build yk_command-0.4.5.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl description="Build yk_command-0.4.9.gem into the pkg directory" fullCommand="build" id="build" />
           <RakeTaskImpl id="build">
             <subtasks>
-              <RakeTaskImpl description="Generate SHA512 checksum if yk_command-0.4.5.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
+              <RakeTaskImpl description="Generate SHA512 checksum if yk_command-0.4.9.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
             </subtasks>
           </RakeTaskImpl>
           <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
           <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
-          <RakeTaskImpl description="Build and install yk_command-0.4.5.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl description="Build and install yk_command-0.4.9.gem into system gems" fullCommand="install" id="install" />
           <RakeTaskImpl id="install">
             <subtasks>
-              <RakeTaskImpl description="Build and install yk_command-0.4.5.gem into system gems without network access" fullCommand="install:local" id="local" />
+              <RakeTaskImpl description="Build and install yk_command-0.4.9.gem into system gems without network access" fullCommand="install:local" id="local" />
             </subtasks>
           </RakeTaskImpl>
-          <RakeTaskImpl description="Create tag v0.4.5 and build and push yk_command-0.4.5.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Create tag v0.4.9 and build and push yk_command-0.4.9.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
           <RakeTaskImpl description="" fullCommand="default" id="default" />
           <RakeTaskImpl description="" fullCommand="release" id="release" />
           <RakeTaskImpl id="release">

data/Gemfile.lock

@@ -1,14 +1,17 @@
 PATH
   remote: .
   specs:
-    yk_command (0.4.7)
+    yk_command (0.5.0)
       bundler
+      cocoapods
+      cocoapods-core
       colored
       colored2
       git
       httparty
       pathname (= 0.1.0)
       thor
+      wechat_work_webhook
       xcodeproj
 
 GEM
@@ -86,7 +89,7 @@ GEM
     httpclient (2.8.3)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.1)
+    json (2.6.2)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
@@ -138,6 +141,8 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
+    wechat_work_webhook (0.1.0)
+      httparty
     xcodeproj (1.21.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -151,16 +156,10 @@ PLATFORMS
   x86_64-darwin-21
 
 DEPENDENCIES
-  bundler (~> 2.2.5)
-  cocoapods
-  cocoapods-core
-  colored
-  colored2
-  httparty
+  bundler
   rake (~> 13.0)
   rspec (~> 3.2)
   rubocop
-  thor
   xcodeproj
   yk_command!
 

data/lib/yk_command/analyze/analyze.rb

@@ -9,9 +9,10 @@ require 'yaml'
 require 'git'
 require 'yk_command/analyze/dependency_result'
 
+require 'yk_command/bot/wx_bot'
 module YkCommand
   IGNORE_PROJECT_FILE = '.YKAnalyzeConfig.yml'.freeze
-
+  BOT_CONFIG_FILE = '.YKBotConfig.yml'.freeze
   class Analyzer < Thor
     no_commands do
 
@@ -105,6 +106,14 @@ module YkCommand
         say "failed :#{failed_count},#{failed_name_list}", :red
         say "skip   :#{skip_count}", :yellow
 
+        bot_config_file_path = "#{path}/#{BOT_CONFIG_FILE}"
+        bot_config = File.exist?(bot_config_file_path) ? YAML.load_file(bot_config_file_path) : nil
+        if bot_config
+          bot = WxBot.new(bot_config)
+          bot.send_result_to_group(success_name_list,failed_name_list)
+          bot.send_news_to_group
+        end
+
       end
 
       def ignore_file(path = nil)
@@ -142,7 +151,7 @@ module YkCommand
           @podLock
         )
 
-        specifications = analyzer.analyze(:outdated ).specifications.map(&:root).uniq
+        specifications = analyzer.analyze.specifications.map(&:root).uniq
         array = []
         dependency_result = DependencyResult.new(specifications, @podLock)
         dependency_result.result_json

data/lib/yk_command/analyze/dependency_result.rb

@@ -23,6 +23,28 @@ module YkCommand
       @specifications = specifications
       @pod_lock = pod_lock
       @result = []
+
+      @local_pods = []
+      @yk_git_source_pods = []
+      @other_git_source_pods = []
+      @pod_lock.dependencies.each do |dep|
+
+        next unless  !dep.external_source.nil?
+
+        if dep.external_source.include?(:path)
+          @local_pods.push dep.name
+        end
+
+        if dep.external_source.include?(:git)
+          if dep.external_source[:git].include?(YK)
+            @yk_git_source_pods.push dep.name
+          else
+            @other_git_source_pods.push dep.name
+          end
+        end
+
+      end
+
     end
 
     def find_info_in_lokfile
@@ -37,16 +59,14 @@ module YkCommand
         map = {}
         version = @pod_lock.version(pod_name).version
         spec_repo_name = @pod_lock.spec_repo(pod_name)
-        is_local_dependency = is_pod_from_local pod_name
-        is_yk_dependency = is_yk_dependency pod_name
-        is_install_from_git_commit = !@pod_lock.checkout_options_for_pod_named(pod_name).nil?
+        is_local_dependency = @local_pods.include? pod_name
+        is_install_from_git_commit = @yk_git_source_pods.include? pod_name
         dep_attribute_in_pod_file = find_info_in_specifications pod_name
-        pp "#{pod_name} #{spec_repo_name} #{version} local:#{is_local_dependency} ,yeahka:#{is_yk_dependency},git_commit: #{is_install_from_git_commit}"
+        # pp "#{pod_name} #{spec_repo_name} #{version} local:#{is_local_dependency} ,git_commit: #{is_install_from_git_commit}"
         map["name"] = pod_name
         map["version"] = version
-        map["is_local_dependency"] = is_local_dependency
-        map["is_yk_dependency"] = is_yk_dependency
-        map["is_install_from_git_commit"] = is_install_from_git_commit.nil?
+        map["is_local_dependency"] =  is_local_dependency
+        map["is_install_from_git_commit"] = is_install_from_git_commit
         dep_attribute_in_pod_file.each do |k, v|
           if SPECIFICATION_FILTER_KEYS.include?(k)
             map[k] = v
@@ -64,29 +84,20 @@ module YkCommand
       @result.to_json
     end
 
-    def is_yk_dependency(name)
-      tag = false
-
-      @pod_lock.dependencies.each do |dep|
-        next unless dep.name == name && !dep.external_source.nil?
-
-        dep.external_source.each do |k, v|
-          tag = if dep.external_source.include?(:git)
-                  dep.external_source[:git].include?(YK)
-                end
-        end
-      end
-      tag
-    end
 
-    def is_pod_from_local(name)
-      tag = false
-      @pod_lock.dependencies.each do |dep|
-        next unless dep.name == name && !dep.external_source.nil?
-        tag = dep.external_source.include?(:path)
-      end
-    tag
-  end
+  #
+  #
+  #   def is_pod_from_local(name)
+  #     local_pods = []
+  #     @pod_lock.dependencies.each do |dep|
+  #       next unless dep.name == name && !dep.external_source.nil?
+  #       if dep.external_source.include?(:path)
+  #         local_pods.push dep.name
+  #       end
+  #
+  #     end
+  #     local_pods.include? name
+  # end
 
   def find_info_in_specifications(name)
     map = {}

data/lib/yk_command/analyze/request.rb

@@ -4,7 +4,9 @@ module YkCommand
     include HTTParty
     # base_uri 'http://127.0.0.1:9988/'
 
-    base_uri 'http://10.30.106.143:9988/'
+    # base_uri 'http://10.30.106.143:9988/'
+    base_uri 'http://10.30.80.113:9988'
+
     headers 'Content-Type' => 'application/json'
 
 
@@ -17,5 +19,6 @@ module YkCommand
       self.class.get('/project/projectByName', query: { "name" => app_project_name } )
     end
 
+
   end
 end

data/lib/yk_command/bot/wx_bot.rb

@@ -0,0 +1,75 @@
+require 'cocoapods'
+require 'pathname'
+require 'pp'
+require 'tmpdir'
+require 'json'
+
+require 'rainbow'
+require 'yaml'
+require 'git'
+require 'yk_command/analyze/dependency_result'
+require 'wechat_work_webhook'
+module YkCommand
+  class WxBot < Thor
+
+
+
+    no_commands do
+
+      def initialize(config)
+
+        webhook_url = config[:webhook_url]
+        @project_url = config[:project_url]
+        @project_cover_image_url = config[:project_cover_image_url]
+
+        @wechat = WechatWorkWebhook.new(webhook_url)
+      end
+
+      def send_result_to_group(success_list, failed_list)
+        time = Time.new
+        time_s = "#{time.year}-#{time.month}-#{time.day} "
+        @wechat.markdown("## #{time_s} 分析结果\n### 成功 #{success_list.length} 个 #{result_item_list_string(success_list, 'success')}\n### 失败 #{failed_list.length} 个 #{result_item_list_string(failed_list, 'failed')}")
+
+      end
+
+      def send_news_to_group
+        require 'wechat_work_webhook'
+
+        # wechat.text('test', ['@all'])
+        #
+
+        # <font color=\"DodgerBlue\"></font>
+        time = Time.new
+        time_s = "#{time.year}-#{time.month}-#{time.day} "
+
+        @wechat.news([{
+                        "title" => "#{time_s}  依赖分析已完成",
+                        "description" => "点击进入组件管理平台",
+                        "url" => @project_url,
+                        "picurl" => @project_cover_image_url
+                      }])
+
+        # wechat.image('test.png')
+        #
+        # wechat.media(wechat.upload_media('test.csv')['media_id'])
+        #
+        # wechat.file('test.csv')
+
+      end
+
+      def result_item_list_string(list, level)
+        result = ''
+        list.each do |name|
+          if level == 'success'
+            result += "\n- <font color=\"#0099ff\">#{name}</font> "
+          else
+            result += "\n- <font color=\"#DC143C\">#{name}</font> "
+          end
+        end
+        result
+      end
+    end
+
+  end
+
+end

data/lib/yk_command/version.rb

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

data/yk_command.gemspec

@@ -32,24 +32,21 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
 
-  spec.add_development_dependency 'bundler', '~> 2.2.5'
-  spec.add_development_dependency 'thor'
-  spec.add_development_dependency 'colored'
-  spec.add_development_dependency 'colored2'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'xcodeproj'
-  spec.add_development_dependency 'cocoapods'
-  spec.add_development_dependency 'cocoapods-core'
-  spec.add_development_dependency 'httparty'
 
   spec.add_dependency 'git'
   spec.add_dependency 'bundler'
-  spec.add_dependency 'thor'
+  spec.add_dependency 'cocoapods'
+  spec.add_dependency 'cocoapods-core'
   spec.add_dependency 'xcodeproj'
+  spec.add_dependency 'thor'
   spec.add_dependency 'colored'
   spec.add_dependency 'colored2'
   spec.add_dependency 'pathname','0.1.0'
   spec.add_dependency 'httparty'
+  spec.add_dependency 'wechat_work_webhook'
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,59 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: yk_command
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Major Tom
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.5
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: colored2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cocoapods
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cocoapods-core
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -123,13 +81,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -137,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: cocoapods-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xcodeproj
+  name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: colored2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,35 +165,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colored2
+  name: pathname
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: pathname
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: wechat_work_webhook
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -262,6 +220,7 @@ files:
 - ".idea/.gitignore"
 - ".idea/misc.xml"
 - ".idea/modules.xml"
+- ".idea/sonarlint/issuestore/index.pb"
 - ".idea/vcs.xml"
 - ".idea/yk_command.iml"
 - Gemfile
@@ -277,9 +236,9 @@ files:
 - images/Xnip2022-04-26_17-30-36.jpg
 - lib/yk_command.rb
 - lib/yk_command/analyze/analyze.rb
-- lib/yk_command/analyze/dependency_handler.rb
 - lib/yk_command/analyze/dependency_result.rb
 - lib/yk_command/analyze/request.rb
+- lib/yk_command/bot/wx_bot.rb
 - lib/yk_command/commands.rb
 - lib/yk_command/module/template/objc/CategoryHeader.h
 - lib/yk_command/module/template/objc/PrefixHeader.pch

data/lib/yk_command/analyze/dependency_handler.rb

@@ -1,6 +0,0 @@
-require 'colored2'
-require 'thor'
-require 'fileutils'
-require 'psych'
-require 'yaml'
-