cocoapods-mars 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 926b0d106af20acd57150a7ac34885111978cc5ff4d58a4e99fcc9cb0746ebc9
-  data.tar.gz: 0e4d7c99e733fc96a6f79688f133b657980c38347adf7079313e100e6c142840
+  metadata.gz: ec365556b257eb08c48b114818d18c061aa6928eb620c997a5d135832de187b1
+  data.tar.gz: a69fc8c96861b24be94bb01fbe360b3f3b1f49d5e1cd088ace14945b595a92d8
 SHA512:
-  metadata.gz: 1e5c51e964a32221d0a5bf297b4d9873d4b7d75aa707aad9589087646810a3c03b86615e3eab9473bca20d5f419dff80ccd413230c6064cf86b38ddb28f2ed67
-  data.tar.gz: baa8e41992af300b0e7f45a11423795af0e37c0dbd428486b79c93207c145c0f7da6736b4522f666ab04d1f43d24f1b2acb6006e95aa8129405ced568c2590a3
+  metadata.gz: 0fb8787bb95ba63924685406916a22f3866f4e1946377bf13cdbf8cc7cd355a2d6c3dbcb707c8c52a930baf8fc99a95143412649fac1fcbe45976fc7db7c7aaf
+  data.tar.gz: 78c31abc76850709d3690f5671dbf1b6202a5c6353d5fc508a6cd38de73ee2877e7c4c078aac20929eefc084137b005a587b8c9e6f2d39ecd787dcab9ad20aa6

data/Gemfile

@@ -11,6 +11,8 @@ gem 'json_pure'
 gem 'cocoapods'
 gem 'rubyzip', '>= 1.0.0'
 gem 'open-uri'
+gem "tty-prompt"
+gem "moneta"
 group :debug do
   gem 'ruby-debug-ide'
   gem 'debase', '0.2.5.beta2'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-mars (0.0.13)
+    cocoapods-mars (0.0.14)
 
 GEM
   remote: https://rubygems.org/
@@ -75,10 +75,13 @@ GEM
     json_pure (2.5.1)
     minitest (5.14.4)
     molinillo (0.6.6)
+    moneta (1.4.2)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     open-uri (0.1.0)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     plist (3.6.0)
     public_suffix (4.0.6)
     rake (13.0.6)
@@ -88,10 +91,21 @@ GEM
     ruby-macho (1.4.0)
     rubyzip (2.3.2)
     thread_safe (0.3.6)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
+    wisper (2.0.1)
     xcodeproj (1.21.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -110,12 +124,14 @@ DEPENDENCIES
   concurrent-ruby
   debase (= 0.2.5.beta2)
   json_pure
+  moneta
   open-uri
   plist (~> 3.2)
   rake
   rexml
   ruby-debug-ide
   rubyzip (>= 1.0.0)
+  tty-prompt
   xcodeproj
 
 BUNDLED WITH

data/lib/cocoapods-vemars/command/project.rb

@@ -28,6 +28,7 @@ module Pod
       @language = language
       @basicInfo = BasicInfo.new(app_key, bundle_id, name, version)
       @git_url = git_url
+      config_json.strip!
       @config_json = config_json
       @selected_components = components | (language == 'swift' ? %w[OneKit SwiftOneKit] : ['OneKit'])
       @components_details = []
@@ -59,6 +60,8 @@ module Pod
     def patch(podfile_dir)
       puts "patching project..."
       collect_components
+      podfile_dir.strip!
+      podfile_dir.delete_suffix!("Podfile")
       Dir.chdir(podfile_dir) do
         construct_plist
         patcher = Patcher.new(podfile_dir, @basicInfo.version, @components_details, @sources, @git_url, @demo_tag)

data/lib/cocoapods-vemars/command/vemars/prompt.rb

@@ -0,0 +1,179 @@
+# require 'json'
+require 'plist'
+require_relative '../project'
+require "tty-prompt"
+require_relative '../../services/baselines_api'
+require_relative '../../services/components_api'
+require "moneta"
+
+module Pod
+  class Command
+    class Vemars
+      class Prompt < Vemars
+        self.summary = 'Inteactive CLI'
+        self.description = <<-DESC
+          Inteactive CLI
+        DESC
+
+        self.arguments = [
+        ]
+
+        def self.options
+          options = [
+          ]
+          options.concat(super.reject { |option, _| option == '--silent' })
+        end
+
+        def initialize(argv)
+          store = Moneta.new(:File, dir: 'moneta')
+
+          api = Baselines_api.new(@service_url)
+          api.getBaselines(true)
+          if api.result.length() == 0
+            help! "获取基线失败，检查网络连接"
+          end
+          baselines = api.result
+
+          prompt = TTY::Prompt.new(prefix: "[MARS] ")
+          # types = [  {name: "创建新工程", value: 1},{name:"既有工程接入", value: 2},{name:"查询基线", value: 3,disable:true},{name:"查询组件", value: 4,disable:true}]
+          types = [  {name: "创建新工程", value: 1},{name:"既有工程接入", value: 2}]
+          @prompt_type = prompt.select("选择操作类型:", types)
+          if @prompt_type == 1
+            @name = prompt.ask("请输入工程名:", default: "MarsDemo")
+          elsif @prompt_type == 2
+            if store.key?('podfile-path')
+              @path = prompt.ask("请输入Podfile所在的工程目录",default:store["podfile-path"])
+            elsif
+              @path = prompt.ask("请输入Podfile所在的工程目录")
+            end
+          end
+          languages = [  {name: "Objective-C", value: "objc"},{name:"Swift", value: "swift"}]
+          @language = prompt.select("选择开发语言:", languages)
+
+          if store.key?('config-path')
+            @config_json = prompt.ask("请输入config.json配置文件路径",default:store["config-path"])
+          elsif
+            @config_json = prompt.ask("请输入config.json配置文件路径")
+          end
+          @version = prompt.select("选择基线:", baselines)
+
+          comp_api = Components_api.new(@version,@service_url)
+          components = comp_api.getComponents().select do |components|
+            components.name != "ve_Template_iOS"
+          end
+          components = components.map {|c| c.name}.select {|c| c.length > 0}
+          components.insert(0, components.delete('RangersAPM'))
+          components.insert(0, components.delete('RangersAppLog'))
+          components.insert(0, components.delete('VEAppUpdateHelper'))
+          components.insert(0, components.delete('VERemoteConfig'))
+          components.insert(0, components.delete('BDHotfix'))
+          components.insert(0, components.delete('VEH5Kit'))
+          @selected_components = prompt.multi_select("选择组件:",components,per_page: 10)
+
+
+          
+          #toDO
+          # private_configs = prompt.ask("是否进行私有化配置？",convert:boolean,default:"no")
+          # if private_configs
+          git_url = argv.option('git', 'https://github.com/volcengine/ve_Template_iOS.git')
+          @repo_no_update = argv.flag?('pod_repo_no_update',false)
+          service_url = argv.option('service_url',nil)
+          sources = argv.option('sources','https://github.com/volcengine/volcengine-specs.git,https://cdn.cocoapods.org/')
+          @silent = argv.flag?('silent', false)
+          @appkey = argv.option('appkey', '')
+          @bundle_id = argv.option('bundle_id', nil)
+
+          #save Configs
+          store['config-path'] = @config_json
+          if !@path.nil? && @path.length > 0
+            store['podfile-path'] = @path
+          end
+          store.close
+
+          super
+          @additional_args = argv.remainder!
+
+                    
+          if @prompt_type == 1
+            @project = VemarsProject.new(@appkey, @selected_components, @config_json, @version, @bundle_id, @name, @language, git_url,service_url,sources)
+          elsif @prompt_type == 2
+            @project = VemarsProject.new(@appkey, @selected_components, @config_json, @baseline, git_url, service_url,sources)
+          end
+
+        end
+
+        def run
+          puts('[MARS] Hi, welcome to vemars!')
+          if @prompt_type == 1
+            @project.generate
+            podInstallInCreateProcess
+            openXcodeWorkSpacelInCreateProcess
+          elsif @prompt_type == 2
+            @project.patch @path
+            podInstallInPatchProcess
+            openXcodeWorkSpaceInPatchProcess
+          end
+        end
+
+        def podInstallInCreateProcess
+          puts "Current dir: #{Dir.pwd}"
+          project_dir = File.join(Dir.pwd, [@project.basicInfo.name, "Project"])
+          puts "Pod install directory: #{project_dir}"
+          if @silent
+            puts "Pod install skipped!"
+            puts "You can run Pod install in '#{project_dir}' later!"
+            puts "You can run Pod install in '#{project_dir}' later!"
+            puts "You can run Pod install in '#{project_dir}' later!"
+            return
+          end
+
+          Dir.chdir(project_dir) do
+            # system('bundle install')
+            # system('bundle exec pod install --repo-update')
+            if @repo_no_update
+              puts "pod install with no repo update"
+              system('pod install --no-repo-update')
+            else
+              system('pod install --repo-update')
+            end
+          end
+        end
+
+        def podInstallInPatchProcess
+          puts "Current dir: #{Dir.pwd}"
+          project_dir = @path
+          puts "Pod install directory: #{project_dir}"
+          if @silent
+            puts "Pod install skipped!"
+            puts "You can run Pod install in '#{project_dir}' later!"
+            return
+          end
+
+          Dir.chdir(project_dir) do
+            # system('bundle install')
+            # system('bundle exec pod install --repo-update')
+            if @repo_no_update
+              puts "pod install with no repo update"
+              system('pod install --no-repo-update')
+            else
+              system('pod install --repo-update')
+            end
+          end
+        end
+
+
+        def openXcodeWorkSpacelInCreateProcess
+          workspace_dir = File.join(Dir.pwd, [@project.basicInfo.name, "Project","'#{@project.basicInfo.name}'.xcworkspace"])
+          system("open -a /Applications/Xcode.app '#{workspace_dir}'")
+        end
+
+        def openXcodeWorkSpaceInPatchProcess
+          workspaces = Dir.entries(@path).select { |e| e.end_with?(".xcworkspace") }
+          full_path = File.join(@path, workspaces.first)
+          system("open -a /Applications/Xcode.app '#{full_path}'")
+        end
+        
+      end
+    end
+  end
+end

data/lib/cocoapods-vemars/command/vemars.rb

@@ -5,6 +5,7 @@ module Pod
       require_relative 'vemars/baselines'
       require_relative 'vemars/components'
       require_relative 'vemars/patch'
+      require_relative 'vemars/prompt'
 
       self.summary = 'vemars iOS project generation tool'
       self.description = <<-DESC
@@ -12,7 +13,7 @@ module Pod
       DESC
 
       self.abstract_command = true
-      # self.default_subcommand = 'create'
+      self.default_subcommand = 'prompt'
       self.command = 'mars'
 
       # 解析命令别名

data/lib/cocoapods-vemars/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsVemars
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/cocoapods-vemars/services/baselines_api.rb

@@ -11,7 +11,7 @@ module Pod
       @baseline_url = (url.blank? ? BASELINES_URL : url + "mpaas/baseline/baselines")
     end
 
-    def getBaselines
+    def getBaselines(silent=false)
       body= "{\"technology_stack\": \"iOS\"}"
       header = {"ContentType" => 'application/json'}
       response = REST.post(@baseline_url, body, header)
@@ -21,7 +21,9 @@ module Pod
         if error_code == 0
           @result = json["data"]['baselines']
           @result = @result.sort.reverse
-          puts "Version list: #{@result}"
+          if !silent
+            puts "Version list: #{@result}"
+          end
         else
           puts "Error #{error_code}(#{json["error_msg"]}): #{json["err_detail"]}}"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mars
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - huangbomao@bytedance.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - lib/cocoapods-vemars/command/vemars/components.rb
 - lib/cocoapods-vemars/command/vemars/create.rb
 - lib/cocoapods-vemars/command/vemars/patch.rb
+- lib/cocoapods-vemars/command/vemars/prompt.rb
 - lib/cocoapods-vemars/gem_version.rb
 - lib/cocoapods-vemars/hook/podfile.rb
 - lib/cocoapods-vemars/hook/podfile_template.rb