tuya-ci-core 0.1.2 → 0.2.0

data/lib/tuya/ci/core/spec/release/repo_release.rb

@@ -0,0 +1,67 @@
+module TYCiCore
+
+	class RepoReleaseCIConfig
+		def initialize(module_name, version)
+			@module_name = module_name
+			@version = version
+		end
+
+		def config
+			sdk =  RepoReleaseCIConfigSDK.new
+			is_sdk = sdk.module_sdk? @module_name
+			result = []
+			if is_sdk
+			else
+				result << RepoReleaseConfig.new(@module_name, @version, @module_name, 'master')
+			end
+			result
+		end
+	end
+
+	#
+	# {
+	#     "path": "Spec",
+	#     "project": "tuyasmart_home_ios_sdk",
+	#     "repos": [
+	#         "TuyaSmartBaseKit",
+	#         "TuyaSmartDeviceKit",
+	#         "TuyaSmartFeedbackKit"
+	#     ]
+	# }
+	#
+	class RepoReleaseCIConfigSDK
+		@@path = '~/.ci_release/sdk/config/'
+		def initialize
+		end
+		def module_sdk?(module_name)
+			false
+		end
+	end
+
+	class RepoReleaseConfig
+		attr_accessor :path, :podspec, :project, :version
+		attr_accessor :project_github_name, :project_github_url, :base_branch
+		def initialize(module_name, version, project_github, base_branch)
+
+			@path = "#{ENV['HOME']}/.cocoapods/repos/TYSpecs/Specs/#{module_name}/#{version}/"
+
+			@podspec = "#{path}#{module_name}.podspec"
+			if version.split('.').size == 4
+				@podspec = "#{path}#{module_name}.podspec.json"
+			end
+
+			@project = module_name
+			@version = version
+
+			@project_github_name = project_github
+			@project_github_url = "https://github.com/TuyaInc/#{project_github}.git"
+			@base_branch = base_branch
+		end
+
+		def ready
+			puts "Release #{@project} : #{@version}, path : #{@path}".yellow
+		end
+
+	end
+
+end

data/lib/tuya/ci/core/spec/release/repo_release_git.rb

@@ -0,0 +1,27 @@
+module TYCiCore
+	CI_RELEASE_WORKSPACE = "#{ENV['HOME']}/.jenkins_project_release/"
+	class RepoReleaseGit
+		def prepare(item)
+			local_path = "#{TYCiCore::CI_RELEASE_WORKSPACE}#{item.project_github_name}"
+
+			git_remote_repo_exist = TYCiCore::Git.git_remote_repo_exist? item.project_github_url
+			local_file_exist = File.exist? local_path
+
+			if git_remote_repo_exist
+				if local_file_exist
+					# git is ok?
+					if 1
+						# end
+					else
+						# delete
+					end
+				else
+					# git clone
+				end
+			else
+				TYUtil::TYFile.delete local_path if local_file_exist
+				# create new
+			end
+		end
+	end
+end

data/lib/tuya/ci/core/template/template_configurator.rb

@@ -1,5 +1,5 @@
 module TYCiCore
-	TEMPLATE_CONFIG = '.tuya_project_template'
+	TEMPLATE_CONFIG = '.tuya_project_template_odm'
 	URL = 'https://github.com/TuyaInc/TYProjectTemplate.git'
 	class TemplateConfigurator
 
@@ -69,37 +69,76 @@ module TYCiCore
 
 	class TemplateConfig
 
-		attr_accessor :json
-		attr_accessor :keys
+		attr_accessor :templates_json
+		attr_accessor :last_version
+		attr_accessor :keys, :sub_keys
 		attr_accessor :type, :alias, :project
 
 		def initialize(json)
 			@project = 'PROJECT'
-			@json = json
-			@keys = []
+			@templates_json = json['templates']
+			@last_version = json['last_version']
+
+			@sub_keys = Hash.new
 			@type = ""
 			@alias = ""
 			@desc = ""
+
+			@type_map = Hash.new
+			@templates_json.each do |item|
+				key = item['type'].downcase
+				@type_map[key] = item
+				sub_type_map = Hash.new
+				sub_types = item['sub_types']
+				if sub_types && sub_types.size > 0
+					sub_types.each do |sub_item|
+						sub_type_map[sub_item['type']] = sub_item
+					end
+					item['sub_types_map'] = sub_type_map
+				end
+			end
+			@keys = @type_map.keys
 		end
 
-		def log_all
+		def sub_types(key)
+			sub_type_map = @type_map[key]['sub_types_map']
+			if sub_type_map
+				sub_type_map.keys
+			else
+				nil
+			end
+		end
 
+		def log_type
 			puts "Here is the module type list".magenta.underline
-
-			@json.each do |item|
+			@templates_json.each do |item|
 				puts "#{item['type']} : #{item['desc']}".green
-				@keys.push item['type']
 			end
 		end
 
-		def setup(type)
-			@json.each do |item|
-				if type == item['type'].downcase
-					@type = type
-					@alias = item['alias']
-					@desc = item['desc']
+		def log_sub_type(type)
+			puts "Here is the #{type} module type list".magenta.underline
+			item = @type_map[type]
+			sub_types = item['sub_types']
+			if sub_types && sub_types.size > 0
+				sub_types.each do |sub_item|
+					puts "  #{sub_item['type']} : #{sub_item['desc']}".yellow
 				end
 			end
 		end
+
+		def setup(type, sub_type)
+			item = @type_map[type]
+			if sub_type
+				item = item['sub_types_map'][sub_type]
+			end
+			setup_item item
+		end
+
+		def setup_item(item)
+			@type = item['type']
+			@alias = item['alias']
+			@desc = item['desc']
+		end
 	end
 end

data/lib/tuya/ci/core/template.rb

@@ -10,11 +10,19 @@ module TYCiCore
 			download_template
 
 			config = TemplateConfigurator.load_config TARGET_PROJECT
-			config.log_all
+			config.log_type
 
 			type = TYAsk.ask_with_answers('Please tell me which module will be create', config.keys)
 			puts "\n"
-			config.setup type
+
+			sub_types = config.sub_types type
+			sub_type = nil
+			if sub_types && sub_types.size > 0
+				config.log_sub_type type
+				sub_type = TYAsk.ask_with_answers("Please tell me which sub type of #{type} module will be create", sub_types)
+			end
+			puts "\n"
+			config.setup type, sub_type
 
 			name = TYAsk.ask'Please enter your module name'
 			prefix = TYAsk.ask 'Please enter your Prefix'
@@ -57,9 +65,7 @@ module TYCiCore
 				`cp -a ./#{TARGET_PROJECT}/#{@configurator.config.alias}/ #{@configurator.pod_name}`
 				`cp ./#{TARGET_PROJECT}/#{TYCiCore::TEMPLATE_CONFIG} #{@configurator.pod_name}/#{TYCiCore::TEMPLATE_CONFIG}`
 				`rm -rf #{TARGET_PROJECT}`
-
 			end
-
 			!result
 		end
 

data/lib/tuya/ci/core/util/file.rb

@@ -1,9 +1,40 @@
 module TYUtil
 	class TYFile
+		def self.unzip(target, path='./')
+			`unzip #{target} -d #{path}`
+		end
+
+		def self.delete(path)
+			`rm #{path}`
+		end
+
 		def self.read(filepath)
 
 		end
 
+		def self.add_to_line(target, line_content, line_number)
+			line_number_temp = 0
+			target.each_line do |line|
+				if (line_number_temp += 1) == line_number
+					target.gsub!(/#{line}/, "#{line}#{line_content}\n")
+				end
+			end
+			target
+		end
+
+		def self.line_contain_content(target, content, lastMatch=true)
+			line_number = 0
+			exist_num = 0
+			if !(content.nil? || content.empty?)
+				target.each_line do |line|
+					line_number += 1
+					exist_num = line_number if line.include?(content)
+					break unless lastMatch
+				end
+			end
+			exist_num
+		end
+
 		def self.folder_copy(from, to, is_need_delete=true )
 
 			target = to + '/' << from.split('/')[-1]
@@ -21,6 +52,14 @@ module TYUtil
 			target
 		end
 
+		# def self.copy(from, to, is_need_delete=true)
+		# 	if File.exist? from
+		# 		TYCiCore::EXE.exe('cp', %W(-a #{from} #{to}))
+		# 		TYCiCore::EXE.exe('rm', %W(-rf #{to})) if is_needend_delete
+		# 	end
+		# 	to
+		# end
+
 		def self.podspec_files(podspec)
 			if podspec
 				path = Pathname(podspec)

data/lib/tuya/ci/core/version.rb

@@ -1,7 +1,7 @@
 module Tuya
   module Ci
     module Core
-      VERSION = "0.1.2"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/tuya/ci/core.rb

@@ -5,23 +5,49 @@ require "tuya/ci/core/version"
 module TYCiCore
 
 	require 'colored'
-
+	require 'json'
+	require 'json/pure'
 	require 'fileutils'
 
+	require 'tuya/ci/core/executable'
+
 	require 'tuya/ci/core/util/file'
 	require 'tuya/ci/core/util/dir'
 	require 'tuya/ci/core/util/ask'
 
+	require 'tuya/ci/core/config'
+
+	require 'tuya/ci/core/download'
+
 	require 'tuya/ci/core/spec/ty_repo'
+	require 'tuya/ci/core/spec/odm/spec_odm'
+
 	require 'tuya/ci/core/git'
 	require 'tuya/ci/core/git/git_tuya_ci'
-	require 'tuya/ci/core/executable'
+
+	require 'tuya/ci/core/git/gitlab/gitlab_odm'
+
 	require 'tuya/ci/core/lib/lib'
 	require 'tuya/ci/core/lib/lib_tuya_ci'
+
 	require 'tuya/ci/core/podspec'
 	require 'tuya/ci/core/podfile'
 
 	require 'tuya/ci/core/template'
 	require 'tuya/ci/core/template/template_configurator'
 	require 'tuya/ci/core/template/template_project'
+
+	require 'tuya/ci/core/dependencies'
+	require 'tuya/ci/core/dependencies/podfile_lock'
+	require 'tuya/ci/core/dependencies/node/podfile_lock_analyse'
+	require 'tuya/ci/core/dependencies/node/podfile_lock_node'
+
+	require 'tuya/ci/core/spec/release/repo_release'
+	require 'tuya/ci/core/repo_release_ci'
+	require 'tuya/ci/core/spec/release/repo_release_git'
+
+	require 'tuya/ci/core/language_update'
+
+	require 'tuya/ci/core/config/odm_config_modules'
+	require 'tuya/ci/core/odm_build'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tuya-ci-core
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - fangdong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
@@ -109,13 +123,29 @@ files:
 - lib/tuya/ci/core/command.rb
 - lib/tuya/ci/core/command/lib.rb
 - lib/tuya/ci/core/command/lib/create_branch.rb
+- lib/tuya/ci/core/config.rb
+- lib/tuya/ci/core/config/config_gitlab.rb
+- lib/tuya/ci/core/config/config_modules.rb
+- lib/tuya/ci/core/config/odm_config_modules.rb
+- lib/tuya/ci/core/dependencies.rb
+- lib/tuya/ci/core/dependencies/node/podfile_lock_analyse.rb
+- lib/tuya/ci/core/dependencies/node/podfile_lock_node.rb
+- lib/tuya/ci/core/dependencies/podfile_lock.rb
+- lib/tuya/ci/core/download.rb
 - lib/tuya/ci/core/executable.rb
 - lib/tuya/ci/core/git.rb
 - lib/tuya/ci/core/git/git_tuya_ci.rb
+- lib/tuya/ci/core/git/gitlab/gitlab_odm.rb
+- lib/tuya/ci/core/language_update.rb
 - lib/tuya/ci/core/lib/lib.rb
 - lib/tuya/ci/core/lib/lib_tuya_ci.rb
+- lib/tuya/ci/core/odm_build.rb
 - lib/tuya/ci/core/podfile.rb
 - lib/tuya/ci/core/podspec.rb
+- lib/tuya/ci/core/repo_release_ci.rb
+- lib/tuya/ci/core/spec/odm/spec_odm.rb
+- lib/tuya/ci/core/spec/release/repo_release.rb
+- lib/tuya/ci/core/spec/release/repo_release_git.rb
 - lib/tuya/ci/core/spec/ty_repo.rb
 - lib/tuya/ci/core/template.rb
 - lib/tuya/ci/core/template/template_configurator.rb