crossplane 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 492102caded205241d78bb8a169380028a87911b
-  data.tar.gz: 00d44b96973da433ef2da9e60ed56103c9141243
+  metadata.gz: a5e3cfc8a0a240947d5fee9cf432b5aa59b30690
+  data.tar.gz: 72dc06ed300e36fcedd7b1262a658062e24ef066
 SHA512:
-  metadata.gz: a6e6b680360d3c230d53343319b9de228bf7ce2cf87e7c9c818877b44848e386592dad2419463b9ea1faa9b2316160419f5e58c74a7bae9b4391538412f6d0ca
-  data.tar.gz: b1308eb3b09ad3fc67526479f219347e4a1852adfe50160819354e895f8a86f6ea51e687b3de5fdfcb36a19518f6ca1e39f6c79cb788e7ec317a4aa6dfc45b6a
+  metadata.gz: 9dde69e2919e9be55269d198e3135ac4cbaf071db7e7e1b225ff1976b03e9e6a64ff1210e7fd1b42efbf8d938d810f0076801bcd3fc925f544e9d9fd0c1e9e72
+  data.tar.gz: 85bc44fba437dd5aaafb7ed8619a32302c81bede34de85238d6f9b35baec1bc4b7e69fd748e40da15e44bd552c20f481be7d9275166482903e3f97793c388952

data/lib/crossplane/builder.rb

@@ -60,9 +60,7 @@ module CrossPlane
 			end
 
 			lines += _build_lines(payload)
-			puts lines.join('')
-			exit
-			return lines.join('')
+			lines.join('')
 		end
 
 		private
@@ -106,7 +104,7 @@ module CrossPlane
 
 					if directive == 'if'
 						line = format('if (%s)', args.join(' '))
-					elsif args
+					elsif args and args.length > 0
 						line = format('%s %s', directive, args.join(' '))
 					else
 						line = directive
@@ -117,7 +115,7 @@ module CrossPlane
 					else
 						y.yield(_put_line(line + ' {', obj))
 
-						# set prev_obj to propper indentation in block
+						# set prev_obj to proper indentation in block
 						self.state['prev_obj'] = obj
 						_build_lines(obj['block']).each do |line|
 							y.yield(line)
@@ -131,6 +129,14 @@ module CrossPlane
 			lines.to_a
 		end
 
+		def _enquote(arg)
+			if _needs_quotes(arg)
+				arg = arg.inspect
+				arg = arg.gsub('\\\\', '\\')
+			end
+			arg
+		end
+
 		def _escape(string)
 			chars = Enumerator.new do |y|
 				prev, char = '', ''
@@ -168,36 +174,29 @@ module CrossPlane
 			# lexer should throw an error when variable expansion syntax
 			# is messed up, but just wrap it in quotes for now I guess
 			chars = _escape(string)
+			char = chars.next
+
+			if CrossPlane.utils.isspace(char) or ['{', ';', '"', "'", '${'].include?(char)
+				return true
+			end
+
+			expanding = false
 
 			begin
 				while char = chars.next
+					if CrossPlane.utils.isspace(char) or ['{', ';', '"', "'"].include?(char)
+						return true
 
-
-					# arguments can't start with variable expansion syntax
-					if CrossPlane.utils.isspace(char) or ['{', ';', '"', "'", '${'].include?(char)
+					elsif char == (expanding ? '${' : '}')
 						return true
-					end
 
-					expanding = false
-					#chars.each do |char|
-					#	if CrossPlane.utils.isspace(char) or ['{', ';', '"', "'"].include(char)
-					#		return true
-					#	elsif char == 
-					# char in ('\\', '$') or expanding
-					return expanding
+					elsif char == (expanding ? '}' : '${')
+						expanding = !expanding
+					end
 				end
+				return ['\\', '$'].include?(char) ? ['\\', '$'].include?(char) : expanding
 			rescue StopIteration
 			end
 		end
-
-		def _enquote(arg)
-			if _needs_quotes(arg)
-				#arg = repr(codecs.decode(arg, 'raw_unicode_escape'))
-				arg = arg.gsub('\\\\', '\\')
-			end
-			return arg
-		end
-
-
 	end
 end

data/lib/crossplane/version.rb

@@ -1,3 +1,3 @@
 module Crossplane
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crossplane
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Gary Danko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-30 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler