yk_command 0.5.5 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec8cc8d382038811076977a5e7894c20fdbed04b52fc649ab0ba9f77d1ebe6b
-  data.tar.gz: eafb0e38eedbceffcf698115d09bcb54ff3c837060b3a72bb161c733c0836872
+  metadata.gz: 5bed07804903e12366b92b0c98fea8a499abfc55aadbf0f14cb3464c09817f7e
+  data.tar.gz: 97807920ca7352478bfa8115e28622d0d7d71a810ff1fd61d6a43b1090120a70
 SHA512:
-  metadata.gz: 90763936644e27cb3ec5b5118d04f84e1713a893c2b7768279995d57f83cf5ee9d5a732774373e4e81d92376c68532114b8ae0a028a7e0db71bc0ceb2f2c0e45
-  data.tar.gz: bd88e48d677e1a2451a2e18bc61b0c35156fe21e8121858b4eb4c9df4fe90512a6953024ac8e6b8ab5ae4d3c1fa9629968aac47b20de8081f1323efccead0055
+  metadata.gz: 340f24db3d9bd760e94750753e5d8582b7142779c26aa9e8b8f8de18e8293ec956040cc30d71c096638d7fd3fb9d86282064bcabce7f810dd374101f4724dee2
+  data.tar.gz: d6d16ade847a43b2d7476ba746040cc015c088e950f30ce85e39da3fbc9133b593212ba03df52fc33d8fed974442a33ac1f5e8689f8909a65169ec1bbf3557a3

data/.idea/sonarlint/issuestore/f/6/f6e109e4c314cef09022792f4b88dd267a682d28

@@ -0,0 +1,3 @@
+
+e
+ruby:S1192e"JDefine a constant instead of duplicating this literal "/PROJECT/" 4 times.(���������

data/.idea/sonarlint/issuestore/index.pb

@@ -0,0 +1,53 @@
+
+8
+Rakefile,4/4/44b7fa1ba50397e71d88bd69389f1ec917165cfb
+[
++lib/yk_command/project/setup/MessageBank.rb,e/e/ee825dc90668e04039ee525c5858c5736562c9f5
+^
+.lib/yk_command/project/setup/ConfigureSwift.rb,a/7/a7f1546c0b6a93fd23b7fc1506b2eb0d13e011c2
+\
+,lib/yk_command/project/setup/ConfigureiOS.rb,c/f/cf949c4c054253d95250aa9644f2b805b2aa0d2a
+b
+2lib/yk_command/project/setup/ProjectManipulator.rb,f/6/f6e109e4c314cef09022792f4b88dd267a682d28
+v
+Flib/yk_command/project/YKProjectTemplate/templates/ios/Example/Podfile,a/d/ad7bffefc6248a8f673a10e668a82bdbbe38a3e3
+x
+Hlib/yk_command/project/YKProjectTemplate/templates/swift/Example/Podfile,7/e/7ed8a0c3d2507e911337de44fdef07f89e35091a
+~
+Nlib/yk_command/project/YKProjectTemplate/templates/macos-swift/Example/Podfile,2/2/2264693887a1513e6c4ed16a6231e00d3045ec4e
+d
+4lib/yk_command/module/template/objc/PrefixHeader.pch,1/9/19beed89439e4bbf29ca633ebffb0979a334a05d
+b
+2lib/yk_command/module/template/objc/RouterDefine.h,a/6/a67e5ecfa13044750ab8599881f66237821a8b38
+a
+1lib/yk_command/module/template/objc/ToolsHeader.h,9/a/9ac8606ab5816ca6769cd53216a107d7d06ca971
+b
+2lib/yk_command/module/template/objc/VendorHeader.h,b/e/be2bfbadd6efe69882507c3a03b1b96c46f3dcbe
+d
+4lib/yk_command/module/template/objc/RouterRegister.h,4/6/460ee6442cf29ef54774da00475d1b5a4bd35a75
+e
+5lib/yk_command/module/template/objc/ServiceProtocol.h,b/a/ba47c112fc95dd748a99abb0290610022df254a7
+e
+5lib/yk_command/module/template/objc/ServiceRegister.h,3/4/3423fb39097dbf652818678b749434eb36867bdf
+e
+5lib/yk_command/module/template/objc/ServiceRegister.m,0/d/0d7a5f844cb7a763c4b02c8788a45a497537e9d4
+�

+Zlib/yk_command/project/YKProjectTemplate/templates/ios/Example/PROJECT/CPDViewController.m,e/5/e5580d669a0c327c5b0897ba7dd8465a3d4db45a
+�

+]lib/yk_command/project/YKProjectTemplate/templates/swift/Example/PROJECT/ViewController.swift,7/1/71fc201a1096db97453882ad1da5120a71f77bb5
+�

+Wlib/yk_command/project/YKProjectTemplate/templates/ios/Example/PROJECT/CPDAppDelegate.m,2/e/2e113f2d3dc9bee6a98073d85966fbd9773c044f
+d
+4lib/yk_command/module/template/objc/CategoryHeader.h,6/e/6e1b71034e8e2f84d8f8236b269fef92a4a51797
+d
+4lib/yk_command/module/template/objc/RouterRegister.m,d/5/d594a688a538c9bebe38deb974bd46055c65a93c
+g
+7lib/yk_command/module/template/swift/RouterDefine.swift,5/1/512554f10221132e2995f116a1bc380edc569ec4
+7
+Gemfile,d/e/de3150c01c3a946a6168173c4116741379fe3579
+i
+9lib/yk_command/project/YKProjectTemplate/NAME-osx.podspec,9/7/97c2c9c7adeb7fa2e6ffbf07cba2418868ac9739
+e
+5lib/yk_command/project/YKProjectTemplate/NAME.podspec,9/5/95a45210972238034e9fed522811176fe20117d3
+b
+2lib/yk_command/project/YKProjectTemplate/README.md,2/4/2461a61a84d866812e64ff95d40bd7836fb136ea

data/.idea/yk_command.iml

@@ -80,21 +80,21 @@
     <option name="myRootTask">
       <RakeTaskImpl id="rake">
         <subtasks>
-          <RakeTaskImpl description="Build yk_command-0.5.0.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl description="Build yk_command-0.5.7.gem into the pkg directory" fullCommand="build" id="build" />
           <RakeTaskImpl id="build">
             <subtasks>
-              <RakeTaskImpl description="Generate SHA512 checksum if yk_command-0.5.0.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
+              <RakeTaskImpl description="Generate SHA512 checksum if yk_command-0.5.7.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.5.0.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl description="Build and install yk_command-0.5.7.gem into system gems" fullCommand="install" id="install" />
           <RakeTaskImpl id="install">
             <subtasks>
-              <RakeTaskImpl description="Build and install yk_command-0.5.0.gem into system gems without network access" fullCommand="install:local" id="local" />
+              <RakeTaskImpl description="Build and install yk_command-0.5.7.gem into system gems without network access" fullCommand="install:local" id="local" />
             </subtasks>
           </RakeTaskImpl>
-          <RakeTaskImpl description="Create tag v0.5.0 and build and push yk_command-0.5.0.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Create tag v0.5.7 and build and push yk_command-0.5.7.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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yk_command (0.5.5)
+    yk_command (0.5.8)
       bundler
       cocoapods
       cocoapods-core

data/lib/yk_command/analyze/analyze.rb

@@ -123,7 +123,7 @@ module YkCommand
         say "failed :#{failed_count},#{failed_name_list}", :red
         say "skip   :#{skip_count}", :yellow
 
-        bot_message path ,success_name_list,failed_name_list
+        # bot_message path ,success_name_list,failed_name_list
 
       end
 

data/lib/yk_command/analyze/request.rb

@@ -2,30 +2,35 @@ require 'httparty'
 module YkCommand
   class Request
 
-  include HTTParty
+    include HTTParty
 
     headers 'Content-Type' => 'application/json'
 
     def initialize(config)
       @config = config
-      self.class.base_uri @config[:pro]
+      self.class.base_uri @config[:local]
+      puts "🍉 #{self.class.base_uri}"
     end
 
-    def upload_app_dependency(project_id,data)
+    def upload_app_dependency(project_id, data)
 
-      self.class.post('/dependency/addDependency', query: { "projectId" => project_id },body: data)
+      self.class.post('/dependency/addDependency', query: { "projectId" => project_id }, body: data)
     end
 
     def get_project_info(app_project_name)
-      self.class.get('/project/projectByName', query: { "name" => app_project_name } )
+      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)
+      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)
+      self.class.post('/project/updateAllComponents', body: { 'data' => data }.to_json)
+    end
+
+    def upload_third_lib_project(data)
+      self.class.post('/project/updateAllComponents', body: { 'data' => data }.to_json)
     end
 
   end

data/lib/yk_command/commands.rb

@@ -23,7 +23,14 @@ module YkCommand
     method_option :create, aliases: '-c'
 
     def create(path = nil)
-      YkModule.new(self .args,self .options ).create(path)
+      YkModule.new(self .args,self .options ).create(path,false )
+    end
+
+    desc 'create_simple_project <Path>', '在某个路径下交互式生成一个简单的demo项目'
+    method_option :create, aliases: '-c'
+
+    def create_simple_project(path = nil)
+      YkModule.new(self .args,self .options ).create(path,true )
     end
 
     desc 'dependency <Podfile.lock Path>', '解析Podfile.lock'
@@ -51,6 +58,29 @@ module YkCommand
 
     end
 
+    desc 'platform_create_component ', '创建新的公共组件'
+    method_option :platform_create_component, aliases: '-pcc'
+
+    def platform_create_component(path = nil,name,desc)
+      p = ComponentManagePlatform.new
+      p.create_new_component(name,desc)
+
+    end
+
+    desc 'platform_delete_component ', '删除YKComponents下的组件'
+    method_option :platform_delete_component, aliases: '-pcc'
+
+    def platform_delete_component(name)
+      p = ComponentManagePlatform.new
+      p.delete_component(name)
+
+    end
+
+
+
+
+
+
 
   end
 end

data/lib/yk_command/component_manage/component_manage_platform.rb

@@ -1,5 +1,3 @@
-
-
 require 'yk_command/gitlab/yk_gitlab'
 require 'yk_command/analyze/request'
 require 'yk_command/config/yk_config'
@@ -14,24 +12,95 @@ module YkCommand
       def initialize
         path = __dir__
         config = YkConfig.new path
-        @gitlab_srvice =YkGitlab.new(config.read_config GITLAB_CONFIG_FILE)
+        @gitlab_srvice = YkGitlab.new(config.read_config GITLAB_CONFIG_FILE)
         @api_service = Request.new(config.read_config SERVER_ENV_CONFIG_FILE)
       end
 
       def update_app_data
         data = @gitlab_srvice.get_all_app
         list = data.parsed_response['shared_projects']
-
+        list.each do |project |
+          committers = [];
+          commits = @gitlab_srvice.get_project_commits(project["id"],0 ,50 )
+          commits.each do |commit|
+            committers.push(commit["committer_name"])
+          end
+          project["committers"] =  committers.uniq
+        end
         r = @api_service.upload_app(list)
         pp r
       end
 
       def update_component_data
         data = @gitlab_srvice.get_all_components
+
         list = data.parsed_response['projects']
+
+
+
+        list.each do |project |
+          committers = [];
+          commits = @gitlab_srvice.get_project_commits(project["id"],0 ,50 )
+
+
+          commits.each do |commit|
+            committers.push(commit["committer_name"])
+          end
+          project["committers"] =  committers.uniq
+        end
+
         r = @api_service.upload_component(list)
         pp r
       end
+
+      def update_third_lib_data
+        data = @gitlab_srvice.get_third_party_lib_projects
+        list = data.parsed_response['projects']
+        r = @api_service.upload_third_lib_project(list)
+        pp r
+      end
+
+      def create_new_component(name, desc)
+        r = @gitlab_srvice.create_project(name, desc)
+        if r.response.code == "201"
+          pp "创建成功"
+          url = r.parsed_response["http_url_to_repo"]
+          pp "repo url :#{url}"
+        else
+          pp "创建失败"
+          pp r.parsed_response['message']
+        end
+
+      end
+
+      def find_project(name)
+        r = @gitlab_srvice.search_project(name)
+      end
+
+      def delete_component(name)
+
+        res = find_project(name)
+        id = 0
+        res.each do |project_hash|
+          if project_hash["namespace"]["id"] == 514 && project_hash["name"] == name
+            id = project_hash['id']
+          end
+        end
+
+        if id == 0
+          pp '未找到相关的工程'
+        end
+        r = @gitlab_srvice.delete_project(id) unless id == 0
+
+        if r != nil
+          if r.code == 200
+            pp "#{name} 成功删除"
+          else
+            pp "#{name} 删除失败,"
+          end
+        end
+      end
+
     end
 
   end

data/lib/yk_command/config/yk_config.rb

@@ -9,7 +9,9 @@ module YkCommand
     no_commands do
 
       def initialize(config_path)
+
         @at_path = config_path
+        FileUtils.remove_dir("#{@at_path+'/configruation-files'}", true)
         hostA = 'yeah'
         hostB = 'ka'
         config_repo_url = "http://gitlab.#{hostA}#{hostB}.com/App/iOS/YKComponents/com-manage-platform-resources/configruation-files.git"

data/lib/yk_command/gitlab/yk_gitlab.rb

@@ -26,15 +26,36 @@ module YkCommand
 
     end
 
-
+    def get_third_party_lib_projects
+      get_group_projects 873,100,0
+    end
 
     def get_group_projects(group_id,per_page,page)
       self.class.get("/groups/#{group_id}", query: { "private_token" => @token,"per_page"=> per_page,"page"=> page })
     end
 
-  end
+    def create_project(name,description)
+      self.class.post("/projects", query: { "private_token" => @token },body:{"name" => name,"namespace_id" => 514,"description" => description}.to_json)
+
+    end
+
+    def get_project_commits(project_id,page,per_page)
 
+      self.class.get("/projects/#{project_id}/repository/commits", query: { "private_token" => @token,"per_page"=> per_page,"page"=> page })
 
+    end
 
+    def search_project(name)
+      self.class.get("/projects", query: { "private_token" => @token,"search":name} )
+    end
+
+    def delete_project(id)
+      self.class.delete("/projects/#{id}", query: { "private_token" => @token })
+
+    end
+
+
+
+  end
 
 end

data/lib/yk_command/module/module_handler.rb

@@ -106,10 +106,7 @@ module YkCommand
           template source, final_file
         end
 
-        Dir.chdir("#{@final_path}/Example") do
-          system 'pod install'
-          system "open './#{@name}.xcworkspace'"
-        end
+
       end
 
     end

data/lib/yk_command/module/yk_module.rb

@@ -1,4 +1,3 @@
-
 require 'colored'
 require 'fileutils'
 require 'psych'
@@ -37,14 +36,12 @@ module YkCommand
         if File.exist?(@final_path.to_s)
           say "#{@final_path} 已存在:", :red
         else
-          construct_project path
-
+          construct_project path, false
 
         end
       end
 
-
-      def read_user_input(desc,ask_prom,now_value,limit)
+      def read_user_input(desc, ask_prom, now_value, limit)
         item = ''
         say "#{desc}:", :green
 
@@ -53,19 +50,18 @@ module YkCommand
         if input != ''
           item = input
         else
-          if now_value!=nil && now_value != ''
+          if now_value != nil && now_value != ''
             item = now_value
           else
-            say "请正确填写#{desc}",:red
-            item = read_user_input(desc,ask_prom,now_value,limit)
+            say "请正确填写#{desc}", :red
+            item = read_user_input(desc, ask_prom, now_value, limit)
           end
 
         end
         item
       end
 
-
-      def create(path = nil)
+      def create(path = nil, simple)
 
         path = Dir.pwd if path.nil?
 
@@ -73,16 +69,16 @@ module YkCommand
 
         config = File.exist?(config_file_path) ? YAML.load_file(config_file_path) : {}
 
-        project = read_user_input('模块名',"Project name",config[:project],nil )
+        project = read_user_input('模块名', "Project name", config[:project], nil)
         config[:project] = project
 
-        language = read_user_input('语言',"Project language",config[:language], ['objc', 'swift', ''] )
+        language = read_user_input('语言', "Project language", config[:language], ['objc', 'swift', ''])
         config[:language] = language
 
-        class_prefix = read_user_input('类名前缀',"Class prefix",config[:class_prefix],nil )
+        class_prefix = read_user_input('类名前缀', "Class prefix", config[:class_prefix], nil)
         config[:class_prefix] = class_prefix
 
-        author = read_user_input('文件作者',"Author",config[:author],nil)
+        author = read_user_input('文件作者', "Author", config[:author], nil)
         config[:author] = author
 
         # Dir.chdir(path)
@@ -98,33 +94,36 @@ module YkCommand
         @date = Time.now.strftime('%d/%m/%y')
         @lang = config[:language]
 
+        construct_project path, simple
 
-        construct_project path
-
-        end
+      end
 
-      def construct_project(path)
+      def construct_project(path, is_simple)
         final_path = "#{path}/#{@name}"
 
         if File.exist?(final_path.to_s)
           say "#{final_path} 已存在:", :red
         else
 
-          YkProject.new.prepare_project(@name,@platform,@class_prefix,@author,path)
+          YkProject.new(is_simple).prepare_project(@name, @lang, @class_prefix, @author, path)
           config = {}
-          config[:final_path]  = final_path
-          config[:name]  = @name
-          config[:project]  = @project
-          config[:prefixed_module]  = @prefixed_module
-          config[:author]  = @author
-          config[:date]  = @date
-
-          file_handler = ModuleHandler.new([] ,[] ,config)
-
-          file_handler.yk_module_folders
-          file_handler.yk_template_files
-
-      end
+          config[:final_path] = final_path
+          config[:name] = @name
+          config[:project] = @project
+          config[:prefixed_module] = @prefixed_module
+          config[:author] = @author
+          config[:date] = @date
+
+          if !is_simple== true
+            file_handler = ModuleHandler.new([], [], config)
+            file_handler.yk_module_folders
+            file_handler.yk_template_files
+          end
+          Dir.chdir("#{final_path}/Example") do
+            system 'pod install'
+            system "open './#{@name}.xcworkspace'"
+          end
+        end
 
         #
         #
@@ -137,29 +136,25 @@ module YkCommand
         #
         # else
 
-
-
-
-          # say '模块名:', :green
-          # input_name = ask("Project name [#{config[:project]}] ?")
-          # if input_name != ''
-          #   config[:project] = input_name if input_name != config[:project]
-          # else
-          #   say '请正确填写模块名',:red
-          # end
-          #
-          # say '语言:', :green
-          # language = ask("Project language [#{config[:language]}] ?", limited_to: ['objc', 'swift', ''])
-          # say '类名前缀:', :green
-          # class_prefix = ask("Class prefix [#{config[:class_prefix]}] ?")
-          # say '文件作者:', :green
-          # author = ask("Author [#{config[:author]}] ?")
-          #
-          # config[:project] = project.empty? ? config[:project] || '' : project
-          # config[:language] = language.empty? ? config[:language] || 'objc' : language
-          # config[:class_prefix] = class_prefix.empty? ? config[:class_prefix] || '' : class_prefix
-          # config[:author] = author.empty? ? config[:author] || '' : author
-
+        # say '模块名:', :green
+        # input_name = ask("Project name [#{config[:project]}] ?")
+        # if input_name != ''
+        #   config[:project] = input_name if input_name != config[:project]
+        # else
+        #   say '请正确填写模块名',:red
+        # end
+        #
+        # say '语言:', :green
+        # language = ask("Project language [#{config[:language]}] ?", limited_to: ['objc', 'swift', ''])
+        # say '类名前缀:', :green
+        # class_prefix = ask("Class prefix [#{config[:class_prefix]}] ?")
+        # say '文件作者:', :green
+        # author = ask("Author [#{config[:author]}] ?")
+        #
+        # config[:project] = project.empty? ? config[:project] || '' : project
+        # config[:language] = language.empty? ? config[:language] || 'objc' : language
+        # config[:class_prefix] = class_prefix.empty? ? config[:class_prefix] || '' : class_prefix
+        # config[:author] = author.empty? ? config[:author] || '' : author
 
         # end
 
@@ -204,17 +199,16 @@ module YkCommand
 
       # def prepare_folder
 
-        # host_a = 'yeah'
-        # host_b = 'ka'
-        # template_repo_url = "http://gitlab.#{host_a}#{host_b}.com/App/iOS/YKComponents/YKProjectTemplate.git"
-        # system("git clone #{template_repo_url} #{@final_path}")
+      # host_a = 'yeah'
+      # host_b = 'ka'
+      # template_repo_url = "http://gitlab.#{host_a}#{host_b}.com/App/iOS/YKComponents/YKProjectTemplate.git"
+      # system("git clone #{template_repo_url} #{@final_path}")
 
-        # FileUtils.remove_dir(@final_path, true)
-        # FileUtils.cp_r('/Users/imacn24/Documents/dev/YKProjectTemplate', @final_path)
-        # FileUtils.remove_dir("#{@final_path}/.git", true)
+      # FileUtils.remove_dir(@final_path, true)
+      # FileUtils.cp_r('/Users/imacn24/Documents/dev/YKProjectTemplate', @final_path)
+      # FileUtils.remove_dir("#{@final_path}/.git", true)
       # end
 
-
     end
   end
 end