tycli-public 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbd695f107cca40fe98f67a4cf624722b0c37bcf
-  data.tar.gz: a50cca500aa97781350724c114f6471315c7711e
+  metadata.gz: 1b1f153ef884f03993b0948929fde0e4e9346414
+  data.tar.gz: 97cb015de86c7b8496ba67cdf288bcec2a7040db
 SHA512:
-  metadata.gz: 07560e9235f91991089de5678de8a50477e9cf83506130d25e98f101e3a61c3e3d4283c6546e4dae5c78b046a1b84bf2fc2a605b465be77c10d2d6e4ceb468aa
-  data.tar.gz: 80f30f4077e2f914bd44925fe6a1802b6d1f30b41caa02d92e4e9eb9d67ef3a8ae564836ccf271d5c246ecbf45a8407349507e464459e38f431c2c07754d8ae3
+  metadata.gz: f5de90253725d52f068e2e4d7479745d541ec0606d1eafa421f9bd83618e202e7814521f42ed2c9130f72d474daea0b3067fa08b7c37e5d27ff2337694917b0e
+  data.tar.gz: db974dcb1c334f70fa44e0eab859d7d9b8956903d7a144f3c0a20ba7a53c9b9ac05ff1418e5c66e04a533e3ec0e772632dbe38fecbdaf0da03512e34cfdf7984

data/lib/tycli/command/lib/create.rb

@@ -3,53 +3,34 @@ module Tuya
 		class Lib < Command
 			class Create < Lib
 				self.abstract_command = false
-				self.summary = "create a module"
+				self.summary = "create tuya module"
 				self.command = 'create'
 
 				def self.options
 					[
-						['--name=module_name', '--name to named your module']
-					].concat(super)
-				end
-
-				def validate!
-					help! "name need" unless @name
+					]
 				end
 
 				def initialize(argv)
 					super
-					@name = argv.option('name')
 				end
 
 				def run
-					puts "creating the module named: #{@name}...".yellow
-
-					require 'ruby-progressbar'
+					puts "Start create tuya module...".yellow
 
 					require 'colored'
 
-					file_not_exist = !File.exist?("./#{@name}")
-					puts "#{@name} is alerady exits".red unless file_not_exist
-
-					if file_not_exist
-
-						progressbar = ProgressBar.create
-						15.times { progressbar.increment; sleep 3 }
-
-						t_c = Thread.new {createModule()}
-
-						t_c.join
-						progressbar.finish
+					createModule
 
-						puts "create module: #{@name} successful".green
+					puts "create module successful".green
 
-						puts "\n\n我们默认添加了SDK依赖, 可在Podfile文件中查看\n".green
-						puts "SDK文档及使用请参考:https://github.com/TuyaInc/tuyasmart_home_ios_sdk\n".green
+					puts "\n\n我们默认添加了SDK依赖, 可在Podfile文件中查看, SDK文档及使用请参考:".green
+					puts "https://github.com/TuyaInc/tuyasmart_home_ios_sdk\n".magenta.underline
+					puts "我们的文档地址:".green
+					puts "https://tuyainc.github.io/\n".magenta.underline
 
-						require 'tycli/lib'
-
-						Tuya::TYLib.create_lib @name
-					end
+					require 'tycli/lib'
+					Tuya::TYLib.create_lib @name
 
 			end
 
@@ -60,13 +41,20 @@ module Tuya
 
 				def createModule
 
-					if File.exist? "./#{@name}"
-						puts "#{@name} is alerady exits".red
+
+					require 'tycli/system'
+					system = Tuya::System.instance
+
+					group = system.group
+
+					if group
+						template = TYCiCore::TYTemplate.new(group.name)
+						template.create
+						@name = template.configurator.pod_name
 					else
-						command = %W(lib create #{@name} --template-url=https://github.com/TuyaInc/pod-template.git)
-						require 'tycli/executable'
-						EXE.exe("pod", command, true )
+						puts "\nCan not find your Tuya Group, please use 'tuya group create --name=group_name'".red
 					end
+
 				end
 			end
 		end

data/lib/tycli/command/lib.rb

@@ -14,7 +14,7 @@ module Tuya
 			self.summary = 'create tuya module'
 			self.command = 'lib'
 
-			self.description = "tuya cli tools"
+			self.description = "tuya module tools"
 
 			def run
 				super

data/lib/tycli/executable.rb

@@ -1,13 +1,18 @@
 module Tuya
 	class EXE
-		def self.exe(executable, command, raise_if_need = false)
+		def self.exe(executable, command, raise_if_need = false, puts_filter = true )
 			require 'cocoapods'
 			require 'cocoapods/executable'
 			require 'tycli/util/puts_util'
 
 			result = Pod::Executable.execute_command(executable, command, raise_if_need)
 
-			TYUtil::TYPuts.filter(result, TYUtil::TYPuts::ERROR_KEYS)
+			# puts "##########"
+			# puts command
+			# puts "##########"
+
+
+			TYUtil::TYPuts.filter(result, TYUtil::TYPuts::ERROR_KEYS) if puts_filter
 			
 			result
 		end

data/lib/tycli/lib.rb

@@ -13,7 +13,7 @@ module Tuya
 			if remote_lib_exist? config.url
 				puts "remote #{config.name} exist".yellow
 			else
-				puts "\n pushing #{name} to remote...".yellow
+				puts "\npushing #{name} to remote...".yellow
 				push_lib config
 			end
 
@@ -43,6 +43,10 @@ module Tuya
 
 				repair_podspec(target_path, "#{config.name}.podspec", config)
 
+				FileUtils.cd "Example"
+				repair_podfile_source
+				FileUtils.cd ".."
+
 				git_commands = [
 					%W(init),
 					%W(add -A),
@@ -56,6 +60,19 @@ module Tuya
 			FileUtils.cd origin_path
 		end
 
+		def self.repair_podfile_source
+
+			require 'tuya/ci/core'
+			require 'tycli/system'
+
+			system = Tuya::System.instance
+
+			group = system.group
+			podfile = TYCiCore::Podfile.new
+			podfile.source_replace("# source '@{GROUP_SPEC}'", "source '#{group.url}'")
+			podfile.save
+		end
+
 		def self.repair_podspec(path, file, config)
 			require 'tycli/repo/spec'
 			Tuya::PodSpec.repair_lib_spec(path, file, config)
@@ -65,7 +82,7 @@ module Tuya
 
 			require 'tycli/executable'
 
-			result = Tuya::EXE.exe('git', %W(ls-remote #{url}))
+			result = Tuya::EXE.exe('git', %W(ls-remote #{url}), false , false )
 
 			result.include? "refs/heads/master"
 		end

data/lib/tycli/repo/spec.rb

@@ -26,7 +26,9 @@ module Tuya
 				files.each do |podspec_path|
 					podspecs.push File.basename(podspec_path)
 				end
-				answer = Tuya::TYAsk.ask_with_answers("which podspec will be pushed", podspecs)
+
+				require 'tuya/ci/core'
+				answer = TYCiCore::TYAsk.ask_with_answers("which podspec will be pushed", podspecs)
 			end
 
 			answer

data/lib/tycli/version.rb

@@ -1,3 +1,3 @@
 module Tycli
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/tycli.rb

@@ -1 +1,2 @@
 require 'tycli/command'
+require 'tuya/ci/core'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tycli-public
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - fangdong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: claide
+  name: tuya-ci-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,6 @@ files:
 - lib/tycli/repo/spec.rb
 - lib/tycli/spec_repo.rb
 - lib/tycli/system.rb
-- lib/tycli/util/ask.rb
 - lib/tycli/util/file_util.rb
 - lib/tycli/util/puts_util.rb
 - lib/tycli/version.rb

data/lib/tycli/util/ask.rb

@@ -1,60 +0,0 @@
-module Tuya
-	class TYAsk
-
-		def self.ask(question)
-			answer = ""
-			loop do
-				puts "\n#{question}?"
-
-				# @message_bank.show_prompt
-				print ">".green
-				answer = STDIN.gets.chomp
-
-				break if answer.length > 0
-
-				print "\nYou need to provide an answer."
-			end
-			answer
-		end
-
-		def self.ask_with_answers(question, possible_answers)
-
-			print "\n#{question}? ["
-
-			print_info = Proc.new {
-
-				possible_answers_string = possible_answers.each_with_index do |answer, i|
-					_answer = (i == 0) ? answer.underline : answer
-					print " " + _answer
-					print(" /") if i != possible_answers.length-1
-				end
-				print " ]\n"
-			}
-			print_info.call
-
-			answer = ""
-
-			loop do
-				# @message_bank.show_prompt
-				print ">".green
-				answer = STDIN.gets.downcase.chomp
-
-				answer = "yes" if answer == "y"
-				answer = "no" if answer == "n"
-
-				# default to first answer
-				if answer == ""
-					answer = possible_answers[0].downcase
-					print answer.yellow
-				end
-
-				break if possible_answers.map { |a| a.downcase }.include? answer
-
-				print "\nPossible answers are ["
-				print_info.call
-			end
-
-			answer
-		end
-	end
-end