yk_command 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f2050fb085b1e1eafdde48661196e3aaaf3f93c78876c81491a966ee793bfd4
-  data.tar.gz: 9a969d06122de3eb6fcd57ced3d6de33e842d85a8eb31c198c61969bba1670b4
+  metadata.gz: fd0728897c8ae743e8ff166940e9536c16dbc034e91892e3aebe58d5b975a6c7
+  data.tar.gz: 1c604dc3e126b38a6eb15543a7653005d14059745a402d46d5d3bee53aa7778a
 SHA512:
-  metadata.gz: 5a6f6a5204ee6c8011a37126fab802735ea851aaf08b4e7f90e99e7c369ead873505cc9380e4e9fb2573afe1cb51f4ae2c363258b25142ca02974a200d08698c
-  data.tar.gz: ada630c0b6a70e5d34c45ce49d326c1784281c7870118635b6d97d96807ae0e98587b963edb0ce007a5575784a6a0f270dd91fff015cbb74a829fa4087b9b9e3
+  metadata.gz: 28135d9a0220d008e6fe59b6cd4d932078373304f443b8bf09080d09d0ccad269f6c6358e7a37e4368d588dfd965b41e0f8e84fa1e5807bcd81c80d3f645eac0
+  data.tar.gz: ea371ab70e6918c906249c40b9237017eb37b477e0e4ededcfbc1afc2793af16add2f7d86c8b179f46562051d89178484176d5e1ab4b64a61a7e6d8d9c580e2f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yk_command (0.4.4)
+    yk_command (0.4.5)
       bundler
       colored
       git

data/lib/yk_command/commands.rb

@@ -232,85 +232,101 @@ module YkCommand
 
     def dependency(path = nil)
       say "\ncurrent working folder: #{path}\n"
-      project_path =''
-      project_name =''
+      project_path = ''
+      project_name = ''
       begin
-        g = Git.open(path,)
+        g = Git.open(path)
         project_path = Pathname.new(g.lib.git_work_dir)
         project_name = g.config['remote.origin.url'].split('/').last.split('.')[0]
-      rescue
-        say "No .git folder find  in #{path} ,skip folder ...   ", :yellow
-        say "\n<--\n", :yellow
-      end
-
-      unless project_name.empty?
-        podfiles = Dir.glob("#{path}/**/Podfile")
-        if !podfiles.empty?
-          begin
-            #开始
-            project_path = podfiles[podfiles.length - 1]
-            podfile_dir = "#{Pathname.new(project_path).dirname}"
-            say "start analyze... path contain [Podfile ,Pods/ ,Podfile.lock]  is #{podfile_dir}", :green
-
-            result = Analyzer.new.analyze(podfile_dir)
 
-            if project_name.include?"ios_"
-              project_name =   project_name[4..project_name.length-1]
-            end
-
-            app_info = Request.new.get_project_info(project_name)
-
-            if app_info["id"]
-              say "uploading dependencies for project  #{project_name}  ..."
-              upload_res = Request.new.upload_app_dependency(app_info["id"], result)
-              if upload_res["code"] == 0
-                say "uploaded , Finished ", :green
-                say "\n<-- \n"
+        unless project_name.empty?
+          podfiles = Dir.glob("#{path}/**/Podfile")
+          if !podfiles.empty?
+            begin
+              project_path = podfiles[podfiles.length - 1]
+              podfile_dir = Pathname.new(project_path).dirname.to_s
+              say "start analyze... path contain [Podfile ,Pods/ ,Podfile.lock]  is #{podfile_dir} \n ", :green
+              result = Analyzer.new.analyze(podfile_dir)
+              app_info = Request.new.get_project_info(project_name)
+              if app_info['id']
+                say "uploading dependencies for project  #{project_name}  ..."
+                upload_res = Request.new.upload_app_dependency(app_info['id'], result)
+                if upload_res['code'] == 0
+                  say 'uploaded , finished ', :green
+                  say "\n<-- \n"
+                  { 'code' => '0', 'name' => project_name }
+                else
+                  say "Error :upload dependencies for project #{project_name} -  #{app_info["id"]} failed ", :red
+                  say "\n<-- \n"
+                  { 'code' => '1', 'name' => project_name }
+                end
               else
-                say "Error :upload dependencies for project #{project_name} -  #{app_info["id"]} failed ", :red
+                say "Error :Get App project ID failed , #{project_name}", :red
                 say "\n<-- \n"
+                { 'code' => '1', 'name' => project_name }
               end
 
-            else
-              say "Error :Get App project ID failed , #{project_name}", :red
+            rescue
+              say "Error : #{$!}", :red
+              say "Error : #{ $@}", :red
+              say "Skip folder :  #{podfile_dir}  ", :red
               say "\n<-- \n"
+              { 'code' => '1', 'name' => project_name }
             end
 
-
-          rescue
-            say "Error : #{$!.to_s}", :red
-            say "Error : #{ $@.to_s}", :red
-            say "Skip folder :  #{podfile_dir}  ", :red
+          else
+            say "No podfile find ,Skip folder :  #{project_name}  ", :yellow
             say "\n<-- \n"
-          end #结束
+            { 'code' => '2', 'name' => '' }
+          end
 
-        else
-          say "No podfile find ,Skip folder :  #{project_name}  ", :yellow
-          say "\n<-- \n"
         end
 
+      rescue
+        say "No .git folder find  in #{path} ,skip folder ...   ", :yellow
+        say "\n<--\n", :yellow
+        { 'code' => '2', 'name' => '' }
       end
 
     end
 
-
     desc 'workspace_analyze <AppHost Path>', '遍历项目目录 批量上传项目依赖信息'
     method_option :workspace_analyze, aliases: '-w'
 
     def workspace_analyze(path = nil)
       Dir.chdir(path)
-      subdir_list = Dir["*"].reject { |o| not File.directory?(o) }
+      subdir_list = Dir['*'].reject { |o| not File.directory?(o) }
       say "Start in Workspace : #{path}  ...", :yellow
       subdir_list.each do |project_dir|
         say "\n#{Pathname.new(project_dir).split[1]}  ", :yellow
       end
       say "\n ... start scanning to analyze ...\n\n"
 
+      success_count = 0
+      success_name_list = []
+      failed_count = 0
+      failed_name_list = []
+      skip_count = 0
+
       subdir_list.each { |project_dir|
         project_path = "#{path}/#{project_dir}"
-        dependency project_path
+        res = dependency project_path
+        if res['code'] == '0'
+          success_count += 1
+          success_name_list << res['name']
+        elsif res['code'] == '1'
+          failed_count += 1
+          failed_name_list << res['name']
+        else
+          skip_count += 1
+        end
       }
 
+      say "\nworkspace analyze done ! ..."
+      say "success:#{success_count},#{success_name_list}", :green
+      say "failed :#{failed_count},#{failed_name_list}", :red
+      say "skip   :#{skip_count}", :yellow
+
     end
 
   end

data/lib/yk_command/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yk_command
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Major Tom