tycli-public 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7389b8d31d240723a43a84599a77b46a09768eab
-  data.tar.gz: ac90133fcac7f3fb12ce8cbb5f1c2fdac13c5efb
+  metadata.gz: c3b7a4f859f04c8d94b57642435824bee59f013e
+  data.tar.gz: 53b8bf1da7fcd9d60509876b2f75c7afd022fe9a
 SHA512:
-  metadata.gz: 9c3575fdbffcd4ff1db8fc4187af295f0ebb360d72204a213d7e813583fc5665181d3d278b84ff33209c658c0015f40ece8719d96a95001ee37ffbab07cef52c
-  data.tar.gz: 0aaf7b5fe4d710a492a7efce3cf90b4dc876d55398476d468bcf5f8784428bba56cb9ab6fb4ee982d2bbf520deeb5680754a850769ed01e17553cdcba29336bd
+  metadata.gz: 5637a49fdcc4789acc6fb5ce040fa5c6973baed4883e5e1c5a999db44986aa15a0129c181dec79f58fcf3604faeab63cab01e82668f218a1db7969bd8159e6ad
+  data.tar.gz: d250e5df5a7480228df20a953056231eff3fe1b27cc1a46fb31b5426ef74c29b116f6a4aea35eada8d8044e9deb6dc27c8c738b66bdd88212372b10173fdf4ac

data/lib/tycli/command/group/status.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/ruby -w
+
 module Tuya
 	class Command
 		class Group < Command

data/lib/tycli/command/repo/push.rb

@@ -1,3 +1,6 @@
+require 'tycli/repo/spec'
+require 'tycli/spec_repo'
+
 module Tuya
 	class Command
 		class Repo < Command
@@ -6,15 +9,13 @@ module Tuya
 				self.summary = "push a module to tuya specs(your spec)"
 				self.command = 'push'
 
-				def self.options
-					[
-						['--name=group_name', '--name the name for your group']
-					].concat(super)
-				end
-
 				def validate!
-					help! "use --version assign your verion " unless @version
-					help! "podspec can not be nil" unless  @podspec
+
+					@podspec = Tuya::PodSpec.ask_pod_spec unless  @podspec
+					help! "\npodspec can not be nil" unless  @podspec
+
+					@version = Tuya::PodSpec.pod_spec_version @podspec unless  @version
+					help! "\nuse --version assign your verion " unless @version
 				end
 
 				def initialize(argv)
@@ -26,14 +27,11 @@ module Tuya
 					# @version = '0.0.1' unless @version
 					@podspec = argv.shift_argument
 
-					# p ("we will push version is #{@version} and before #{@is_commit}")
 				end
 
 				def run
 					puts "Pushing the podspec: #{@podspec} to version: #{@version}".green
 
-					require 'tycli/spec_repo'
-
 					Tuya::SpecRepo.push(@version, @is_commit, @podspec)
 				end
 			end

data/lib/tycli/repo/spec.rb

@@ -1,5 +1,34 @@
 module Tuya
 	class PodSpec
+
+		def self.ask_pod_spec
+
+			files = podspec_files(nil)
+
+			answer = ""
+
+			if files.size == 1
+				answer = files[0]
+			elsif files.size > 1
+				require 'tycli/util/ask'
+
+				podspecs = Array.new
+				files.each do |podspec_path|
+					podspecs.push File.basename(podspec_path)
+				end
+				answer = Tuya::TYAsk.ask_with_answers("which podspec will be pushed", podspecs)
+			end
+
+			answer
+
+		end
+
+		def self.pod_spec_version(podspec)
+			content = File.read("./#{podspec}")
+			version = (content.match(/s.version[\s]*=[\s]*'([\d]+.){2}[\d]+'/)[0]).match(/([\d]+.){2}[\d]+/)[0]
+			version.gsub(/(\d+)$/, ((version.split(".")[-1]).to_i + 1).to_s)
+		end
+
 		def self.update(podspec, version)
 
 			result = Array.new
@@ -51,7 +80,8 @@ module Tuya
 				[path]
 			else
 				files = Pathname.glob('*.podspec{,.json}')
-				raise Informative, "Couldn't find any podspec files in current directory" if files.empty?
+				# raise Informative, "Couldn't find any podspec files in current directory" if files.empty?
+				puts "Couldn't find any podspec files in current directory".red if files.empty?
 				files
 			end
 		end

data/lib/tycli/util/ask.rb

@@ -0,0 +1,60 @@
+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

data/lib/tycli/version.rb

@@ -1,3 +1,3 @@
 module Tycli
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tycli-public
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - fangdong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,7 +59,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -73,7 +73,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.10.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -87,7 +87,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -101,7 +101,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -142,6 +142,7 @@ files:
 - lib/tycli/repo/spec.rb
 - lib/tycli/spec_repo.rb
 - lib/tycli/system.rb
+- lib/tycli/util/ask.rb
 - lib/tycli/util/puts_util.rb
 - lib/tycli/version.rb
 homepage: https://docs.tuya.com/cn/