pxg 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjEzYzYzYzkxZjU5MTFiYzA5NzY0YmY4N2JhNWYwMGZmNDY5ZWQ3Nw==
+    MThkNGYyNGY4M2M2OGRlZGRkNThjNmRhYmUyMmE5YzQzOTFkYWE4Zg==
   data.tar.gz: !binary |-
-    ZGZkYTFlMWI2N2Q1OTMzOGIxYzQ1MjBlNDRmODk2YTY0NjJmOTFiMw==
+    NTBlOTUyOWU2YWMwM2JlMzQwZTJjMjQxZjc3MzE5MjgxMzJmZDJhNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2I4YTNhYjI4YjQwY2VjNDVlY2FiMjQwNTU2NjdiY2ZjNWUwNzA1ZjE3MGQ1
-    MTdhMDlhNzMxZDU0Yjc2OTBlMWIyMTkyYWIxZjM2Mzc1MTFiYWYyOTI0ZTA4
-    MzA0MDMwNmI0M2RiYjY2ZDgzOTc3YjU2NDZjZDQ2ODBhNjVjNTQ=
+    YThjZjU0MTk3NDBjN2RlZWI1Y2MxOTZkZWNmN2FiZmI3NWRkZWUyNmY4YTU1
+    NDVmYTNjMDVjMGU5ZDkzNGQ3OTg3M2M3ZTcyMGM5Njg1NDhmMjkyODIwMTdi
+    OTQyMTc0Y2UxNjI0MzA2MzA1NmExYTRmM2Y4MGU3YzZlMzM1NTU=
   data.tar.gz: !binary |-
-    OWQxNGY1MTM5MTAzNTQxZTA3MGZjNTFmY2I4NjhjMmEyZDZmMzE4ODM3YzE4
-    ZjBmZTI5MDkzNmIxY2U2ZTEzZWRiNjczMjBlMDQ5OWUyZjY3MGQ3MmMzOTFl
-    ODJiMjU1Y2M4ODVmNzViNDM2NDgwNjA3NWFjNmUyNWFhOGU3ODY=
+    NTliYjRiNTIyYzIxYjRmYTM2NzkzZjJlNTNkYmM4YTNiMTYyOGZjYzA5ZDU5
+    OWI0ODZiZjlkMDNjNDQ5OGFmNzE2Y2NhMmU0ZmYzNWI3NTg3NGE3ODJiMTc1
+    NzNmN2VhMWE0ZmE3MDUzZWFhZGFjMjYwMTY1ZGQ5NmRiMTJkYjA=

data/bin/pxg

@@ -15,7 +15,8 @@ puts
 puts <<eos
  Commands
  ------------------------------------------------------------------------------
-   pxg compile <dir>  - reads pxg.json from directory and resolves it
+   pxg version          - current interface version
+   pxg compile [<dir>]  - reads pxg.json from directory and resolves it
 eos
 
 end#if

data/lib/pxg.rb

@@ -8,6 +8,8 @@ require 'json'
 
 class Pxg
 
+	VERSION = '1.1.0'
+
 	def find_and_replace(path, search, replace)
 		clean_path = path.sub(/(\/)+$/, '') + '/'
 		Dir.glob "#{clean_path}**/*.php" do |file|
@@ -15,48 +17,165 @@ class Pxg
 			text = File.read file
 			text = text.gsub search, replace
 			File.write file, text
-		end
+		end#glob
+	end#def
+
+	def ensure_copy(rawsrcpath, rawlocalpath, rawthemepath)
+		srcpath = File.expand_path(rawsrcpath) + '/'
+		localpath = File.expand_path(rawlocalpath) + '/'
+		themepath = File.expand_path(rawthemepath) + '/'
+		Dir.glob "#{srcpath}**/*" do |file|
+			next if file == '.' or file == '..'
+			filepath = File.expand_path(file)
+			filesubpath = filepath.sub srcpath, ''
+			localfilepath = localpath + filesubpath
+			if ! File.exists? localfilepath
+				localfilesubpath = localfilepath.sub themepath, ''
+				puts "   - #{localfilesubpath}"
+				text = File.read filepath
+				FileUtils.mkpath File.dirname(localfilepath)
+				File.write localfilepath, text
+			end#if
+		end#glob
+	end#def
+
+	def force_copy(filepaths, rawsrcpath, rawlocalpath, rawthemepath)
+		srcpath = File.expand_path(rawsrcpath) + '/'
+		localpath = File.expand_path(rawlocalpath) + '/'
+		themepath = File.expand_path(rawthemepath) + '/'
+		Dir.glob "#{srcpath}**/*" do |file|
+			next if file == '.' or file == '..'
+			filepath = File.expand_path(file)
+			filesubpath = filepath.sub srcpath, ''
+			if filepaths.include? filesubpath
+
+				localfilepath = localpath + filesubpath
+				localfilesubpath = localfilepath.sub themepath, ''
+				text = File.read filepath
+				updatefile = false
+
+				if File.exists? localfilepath
+					localtext = File.read localfilepath
+					if ! localtext.eql? text
+						updatefile = true
+					end#if
+				else # file does not exist
+					updatefile = true
+				end#if
+
+				if updatefile
+					puts "   - #{localfilesubpath}"
+					FileUtils.mkpath File.dirname(localfilepath)
+					File.write localfilepath, text
+				end#if
+
+			end#if
+		end#glob
 	end#def
 
 	def wp_core(path, conf)
 		Dir.chdir path
+		themepath = path.sub(/(\/)+$/, '') + '/'
 		core_path = conf['path'].sub(/(\/)+$/, '')
-		puts "processing #{core_path}"
+
+		puts "  processing #{core_path}"
 		# remove the core if it exists
 		FileUtils.rm_rf core_path
 		# clone a fresh copy
-		puts "cloning #{conf['repo']} -> #{conf['version']}"
+		puts "  cloning #{conf['repo']} -> #{conf['version']}"
 		g = Git.clone conf['repo'], core_path
 		g.checkout conf['version']
 		FileUtils.rm_rf core_path+'/.git'
+
 		# refactor name space
-		ns_src = conf['namespace']['src']
-		ns_target = conf['namespace']['target']
-		puts "refactoring #{core_path}"
-		self.find_and_replace core_path, ns_src, ns_target
-		self.find_and_replace core_path, ns_src.capitalize, ns_target.capitalize
+		if conf.has_key? 'namespace'
+			ns_src = conf['namespace']['src']
+			ns_target = conf['namespace']['target']
+			puts "  refactoring #{core_path}"
+			self.find_and_replace core_path, ns_src, ns_target
+			self.find_and_replace core_path, ns_src.capitalize, ns_target.capitalize
+		end#if
+
+		# ensure partials
+		if conf.has_key? 'partials'
+			partials_src = core_path + '/' + conf['partials']['src']
+			partials_local = themepath + conf['partials']['local']
+			puts "  ensuring copy of system partials"
+			self.ensure_copy partials_src, partials_local, themepath
+		end#if
+
+		# ensure behavior tests
+		if conf.has_key? 'features'
+			features_src = core_path + '/' + conf['features']['src']
+			features_local = themepath + conf['features']['local']
+			if conf['features'].has_key? 'ensure'
+				rawfilenames = conf['features']['ensure']
+				filenames = []
+				rawfilenames.each do |file|
+					filenames.push (file + '.feature')
+				end#each
+				puts "  ensuring latest copy of active feature tests"
+				self.force_copy filenames, features_src, features_local, themepath
+			end#if
+		end#if
+
 	end#def
 
 	def compile(args)
-		dirpath = args[0].sub(/(\/)+$/,'')+'/';
+		if args.length != 0
+			dirpath = args[0].sub(/(\/)+$/,'')+'/'
+		else # no parameters, assume .
+			dirpath = './'
+		end
+
 		if ! File.exist? dirpath
-			puts 'Err: target directory does not exist.'
+			puts '  Err: target directory does not exist.'
 			return;
 		end
 
-		jsonconfigfile = dirpath+'pxg.json';
+		jsonconfigfile = dirpath+'pxg.json'
 		if ! File.exist? jsonconfigfile
-			puts 'Err: Missing pxg.json file in target directory.'
+			puts '  Err: Missing pxg.json file in target directory.'
 			return;
 		end
 
-		conf = JSON.parse(open(jsonconfigfile).read);
+		conf = JSON.parse(open(jsonconfigfile).read)
+
+		# interface was introduced after 1.0.0
+		if conf.has_key? 'interface'
+			conf['interface'] = "1.0.0"
+		end#if
+
+		# ensure pxg.json interface isn't newer
+		pxgi = Pxg::VERSION.split '.'
+		jsoni = conf['interface'].split '.'
+
+		if jsoni[0] != pxgi[0]
+			self.failed_version_check conf['interface']
+		else # major versions are equal
+			if jsoni[1] > pxgi[1]
+				# ie. json requires extra features
+				self.failed_version_check conf['interface']
+			elsif jsoni[1] == pxgi[1] && jsoni[2] > pxgi[2]
+				# ie. potential problems with bugfix'es
+				self.failed_version_check conf['interface']
+			end#if
+		end#if
 
 		conf['wp-cores'].each do |wpcoreconf|
 			self.wp_core dirpath, wpcoreconf
 		end#each
 
-		puts 'fin'
+		puts ""
+		puts "  fin"
+	end#def
+
+	def version(args)
+		puts "  #{Pxg::VERSION}"
+	end#def
+
+	def failed_version_check(interface)
+		puts "  Err: Incompatible versions: pxg.json @ #{interface} but pxg.gem @ #{Pxg::VERSION}"
 	end#def
 
 end#class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pxg
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - srcspider