yk_command 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a86ae389cad94055cc7b1078c498cf184bb4a3c316c29d75743c63c11f082c5
-  data.tar.gz: 81b2ab46a6e03c45c210ae45b4e261d798779805aa8edccc8388ce240d6916d6
+  metadata.gz: a8d1eb70f1aeb80490615d2daf6d23297c3789629d7889d060466cb6c61c4d2a
+  data.tar.gz: bb5331d9981c1b1f9bcbe2b4b634abfdc07589e92bc3323ec5aa6870c9a74e2a
 SHA512:
-  metadata.gz: 1167e9722bfc122e95aad69fee90af9d6d9965680494d58d9dfa83945d008d5ce596c34430ef8ab69d358fb7a4487d4336743f27ed8f4c02310a84f045d52251
-  data.tar.gz: be9d9504b13ba9f850ee2eabd493b4bf00492dd546df93ac9cc38ceb53d6d306f55a1c050094e28d34e1286b2b308b4ef86cc61c132b12930e064e9b477b5556
+  metadata.gz: bb985042e783621b1cf095559757cda4fc26c669f16862889f897dd31bba59fc400bcaae63db84bbddfb3442d0d9cc54677176515a8e1aeb624482250556d6f5
+  data.tar.gz: 13d82d18acf28d6b07431850a05d6fe8f66c7317757a28900a8b01aa5d4fff3643dfaa386840ab3b5c6ff7dd4b0d1532ba0c09c8a5769a97649eeb2b7f3ad120

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yk_command (0.5.2)
+    yk_command (0.5.3)
       bundler
       cocoapods
       cocoapods-core

data/lib/yk_command/analyze/analyze.rb

@@ -15,9 +15,19 @@ require 'yk_command/config/yk_config'
 module YkCommand
   IGNORE_PROJECT_FILE = '.YKAnalyzeConfig.yml'.freeze
   BOT_CONFIG_FILE = '.YKBotConfig.yml'.freeze
+  SERVER_ENV_CONFIG_FILE = '.YKServerConfig.yml'.freeze
+
   class Analyzer < Thor
+
+
     no_commands do
 
+
+      def initialize(path)
+        config = YkConfig.new.read_config path,SERVER_ENV_CONFIG_FILE
+        @app_server_api = Request.new(config)
+      end
+
       def dependency(path = nil)
         say "\ncurrent working folder: #{path}\n"
         project_path = ''
@@ -35,10 +45,11 @@ module YkCommand
                 podfile_dir = Pathname.new(project_path).dirname.to_s
                 say "start analyze... path contain [Podfile ,Pods/ ,Podfile.lock]  is #{podfile_dir} \n ", :green
                 result = analyze(podfile_dir)
-                app_info = Request.new.get_project_info(project_name)
+
+                app_info = @app_server_api.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)
+                  upload_res = @app_server_api.upload_app_dependency(app_info['id'], result)
                   if upload_res['code'] == 0
                     result(0, project_name, 'uploaded , finished ', :green)
                   else

data/lib/yk_command/analyze/request.rb

@@ -1,17 +1,18 @@
 require 'httparty'
 module YkCommand
   class Request
-    include HTTParty
-    base_uri 'http://127.0.0.1:9988/'
 
-    # base_uri 'http://10.30.106.143:9988/'
-    # base_uri 'http://10.30.80.113:9988'
+  include HTTParty
 
     headers 'Content-Type' => 'application/json'
 
-
+    def initialize(config)
+      @config = config
+      self.class.base_uri @config[:pro]
+    end
 
     def upload_app_dependency(project_id,data)
+
       self.class.post('/dependency/addDependency', query: { "projectId" => project_id },body: data)
     end
 

data/lib/yk_command/commands.rb

@@ -30,14 +30,14 @@ module YkCommand
     method_option :dependency, aliases: '-d'
 
     def dependency(path = nil)
-      Analyzer.new.dependency path
+      Analyzer.new(path).dependency path
     end
 
     desc 'workspace_analyze <AppHost Path>', '遍历项目目录 批量上传项目依赖信息'
     method_option :workspace_analyze, aliases: '-w'
 
     def workspace_analyze(path = nil)
-      Analyzer.new.workspace_analyze path
+      Analyzer.new(path).workspace_analyze path
     end
 
 

data/lib/yk_command/component_manage/component_manage_platform.rb

@@ -2,24 +2,33 @@
 
 require 'yk_command/gitlab/yk_gitlab'
 require 'yk_command/analyze/request'
+require 'yk_command/config/yk_config'
 
 module YkCommand
 
+  GITLAB_CONFIG_FILE = '.YKGitlabConfig.yml'.freeze
+
   class ComponentManagePlatform < Thor
     include Thor::Actions
     no_commands do
+      def initialize
+        path = __dir__
+        @gitlab_srvice =YkGitlab.new(YkConfig.new.read_config path,GITLAB_CONFIG_FILE)
+        @api_service = Request.new(YkConfig.new.read_config path,SERVER_ENV_CONFIG_FILE)
+      end
+
       def update_app_data
-        data = YkGitlab.new.get_all_app
+        data = @gitlab_srvice.get_all_app
         list = data.parsed_response['shared_projects']
 
-        r = Request.new.upload_app(list)
+        r = @api_service.upload_app(list)
         pp r
       end
 
       def update_component_data
-        data = YkGitlab.new.get_all_components
+        data = @gitlab_srvice.get_all_components
         list = data.parsed_response['projects']
-        r = Request.new.upload_component(list)
+        r = @api_service.upload_component(list)
         pp r
       end
     end

data/lib/yk_command/gitlab/yk_gitlab.rb

@@ -2,26 +2,20 @@
 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 initialize(config)
+      @config = config
+      self.class.base_uri @config[:uri]
+      @token = @config[:token]
+    end
 
     def get_all_app
-
       get_group_projects 917,100,0
 
     end
@@ -35,7 +29,7 @@ module YkCommand
 
 
     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 })
+      self.class.get("/groups/#{group_id}", query: { "private_token" => @token,"per_page"=> per_page,"page"=> page })
     end
 
   end

data/lib/yk_command/version.rb

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

metadata

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