rmk-ruby 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3493f1bf596eaa8ded4e0fa5fedf9dfb2466225e56d905e6a39110f403d024e3
-  data.tar.gz: 6b367be611ddf7a97ff77a9c3f7d4a128c82cc538edee17e5083f8fda9390bcc
+  metadata.gz: d0860631aa3de30455ccdba853f9903ceed06434c1f8d1821eacbf9c73d0ceb2
+  data.tar.gz: b3d0657268c1ee001489f6c9668b41b87b6e35cb787f5a4372b1606b4981f3e9
 SHA512:
-  metadata.gz: f92c924b833147271a64d082f955957bd0c58e58fa0de3f0151a852e4280d6c4cfdb4d2a37cb4d20a41b7ece6d1d1962c0f61b3402e8758c5aaf7d494ac8fe45
-  data.tar.gz: 85771986004ab0d4f42a8f4889d27d4382d53c8319e32e92fd77f730e5f2990c34cc2d29404b1025a8988ad48abaf8a0bf0d3efaae1cb7ebad17604508994fb0
+  metadata.gz: b92087e0b8fa7eb22dd7e8bfc3b214959f679add45004564faddc6ad9d78e1682939af46e56ee123447cca73487e8e5eff85bc9d5fd236424ed4f937e335e71d
+  data.tar.gz: 56c1fa207caec58c36d71b5e5c47047a4f23d98afa547525a90dffb6532d0c17afb889e76b94a6988ce2c6875b0a76c3d6b01b1cb49ac5343d12cfad6e215f15

data/exe/rmk

@@ -23,11 +23,10 @@ parser = OptionParser.new{ |opts|
 	opts.on '--link-outdir=dir', 'symbol link outdir to this dir, default <system temp dir>/<repository name>, set / to disable' do |dir|
 		cache_options[:link] = dir
 	end
-	opts.on '--name=name', "repository name, default repository root dir's name" do |name| cache_options[:name] = name end
 
 	opts.separator 'variant options:'
-	opts.on '-V', '--variant x,y,z', Array, 'variant list to build' do |list|
-		options[:variants] = list
+	opts.on '-V', '--variant [x,y,z]', Array, 'variant list to build, empty for build all variants' do |list|
+		options[:variants] = list || []
 	end
 
 	opts.separator 'info options:'
@@ -42,6 +41,7 @@ parser = OptionParser.new{ |opts|
 }
 targets = parser.parse(ARGV)
 Dir.chdir options[:prjroot] if options[:prjroot]
+clean = options.empty? && cache_options.empty? && targets[0] == 'clean'
 options_file = '.rmk/options'
 loaded_options = File.exist?(options_file) ? Marshal.load(IO.binread options_file) : {}
 if cache_options.empty?
@@ -50,9 +50,37 @@ elsif cache_options.any?{|k, v| v != loaded_options[k]}
 	Dir.mkdir '.rmk' unless Dir.exist? '.rmk'
 	IO.binwrite options_file, Marshal.dump(cache_options)
 end
-srcroot = cache_options[:srcroot] || '..'
-outroot = cache_options[:outroot] || '_Build'
-link = cache_options[:link] || File.join(ENV['TMP'], cache_options[:name] || File.basename(Dir.pwd))
+def default_options
+	return @options if @options
+	file = 'root.rmk'
+	@options = {}
+	return @options unless File.exist? file
+	Rmk::VDir.parse_file file do |line|
+		match = line.match /^(\w+)\s*=\s*(.*)$/
+		raise "syntax error, 'root.rmk' only support raw var define" unless match
+		@options[match[1].to_sym] = match[2].sub(/(?<!\$)(?:\$\$)*\K\s+$/,'').gsub(/\$([$\s])/){$1}
+	end
+	@options
+end
+srcroot = cache_options[:srcroot] || default_options[:srcroot] || '..'
+outroot = cache_options[:outroot] || default_options[:outroot] || '_Build'
+link = cache_options[:link] || File.join(ENV['TMP'], default_options[:name] || File.basename(Dir.pwd))
+if clean
+	raise 'outdir not exist for clean' unless Dir.exist? outroot
+	if Dir.exist? File.join outroot, '.rmk'
+		dir = File.symlink?(outroot) ? File.readlink(outroot) : outroot
+		FileUtils.rmtree dir
+		puts "dir '#{dir}' rmoved"
+	else
+		Dir[File.join outroot, '*/'].each do |dir|
+			next unless Dir.exist? File.join dir, '.rmk'
+			FileUtils.rmtree dir
+			puts "dir '#{dir}' rmoved"
+		end
+	end
+	puts 'clean done'
+	exit
+end
 if link && link != '/'
 	require 'fileutils'
 	link = link.gsub(/\$(?:(\$)|{(.*?)})/){$1 || ENV[$2]}.gsub! ?\\, ?\/
@@ -73,6 +101,8 @@ else
 end
 variants = options[:variants]
 if variants
+	variants = default_options[:variants]&.split /\s*,\s*/ if variants.empty?
+	raise "can't find variants list for build all variants" unless variants && !variants.empty?
 	if variants.size == 1
 		variants = variants[0]
 		outroot = File.join outroot, variants

data/lib/rmk/vdir.rb

@@ -269,11 +269,9 @@ class Rmk::VDir
 	def parse
 		raise "dir '#{@abs_src_path}' has been parsed" if @state
 		@state = []
-		file = join_abs_src_path 'default.rmk'
+		file = join_abs_src_path 'template.rmk'
 		@defaultfile = file if ::File.exist? file
-		file = join_abs_out_path 'config.rmk'
-		parse_file file if ::File.exist? file
-		file = join_abs_src_path 'dir.rmk'
+		file = join_abs_src_path 'rmk.rmk'
 		if ::File.exist? file
 			parse_file file
 		elsif @defaultfile
@@ -285,6 +283,14 @@ class Rmk::VDir
 
 	def parse_file(file)
 		last_state, @state = @state, [{indent:0, type:nil, condition:nil, vars:@vars}]
+		Rmk::VDir.parse_file file, &method(:parse_line)
+		@state = last_state
+	rescue
+		$!.backtrace[-1] << (@virtual_path ? " in vpath '#{@virtual_path}'" : "in vpath '<root>'")
+		raise
+	end
+
+	def self.parse_file(file, &parse_line)
 		lines = IO.readlines file
 		markid = lid = 0
 		while lid < lines.size
@@ -296,16 +302,21 @@ class Rmk::VDir
 				lid += 1
 				lines[lid]&.lstrip!
 			end
-			parse_line lid < lines.size ? line + lines[lid] : line, markid
+			parse_line.call lid < lines.size ? line + lines[lid] : line
 			lid += 1
 		end
-		@state = last_state
 	rescue
-		$!.set_backtrace $!.backtrace.push "#{file}:#{markid + 1}:vpath'#{@virtual_path}'"
+		markid = "#{file}:#{markid + 1}:"
+		if $!.respond_to? :rmk_mark
+			$!.set_backtrace $!.backtrace.push markid
+		else
+			$!.define_singleton_method(:rmk_mark){}
+			$!.set_backtrace [markid]
+		end
 		raise
 	end
 
-	def parse_line(line, lid)
+	def parse_line(line)
 		match = /^(?<indent> *|\t*)(?:(?<firstword>\w+)\s*(?<content>.+)?)?$/.match line
 		raise 'syntax error' unless match
 		indent, firstword, line = match[:indent].size, match[:firstword], match[:content]

data/lib/rmk/version.rb

@@ -1,3 +1,3 @@
 class Rmk
-	VERSION = "0.2.0"
+	VERSION = "0.3.0"
 end

data/rmk.gemspec

@@ -28,6 +28,4 @@ Gem::Specification.new do |spec|
 	spec.bindir = 'exe'
 	spec.executables = spec.files.grep(%r{^exe/}) {|f| File.basename(f)}
 	spec.require_paths = ['lib']
-
-	spec.add_development_dependency 'rake', '>= 12.3.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rmk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - pbl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.0
+date: 2018-01-08 00:00:00.000000000 Z
+dependencies: []
 description: build tool like make, tup, ninja...
 email:
 - a@pbl.pw
@@ -37,7 +23,6 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - bin/console
 - bin/setup
 - exe/rmk

data/Rakefile

@@ -1,10 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-	t.libs << "test"
-	t.libs << "lib"
-	t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task :default => :test