talk 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a961d23df0572382861cd34abb8d8faca663dccf
-  data.tar.gz: 49ea322b27a7a7196a8b5e84dae44030ecfb5b16
+  metadata.gz: d7fc025a61346588f9645f6ecd1bb9450f092bf1
+  data.tar.gz: f6e49406e45c550e9a4492936af318650133be43
 SHA512:
-  metadata.gz: 5d4b2bb25cd179fd2f96e23c1e14fce9aa0fd0307085f0f7cd809dc1fb997f2544401e3cc19cd06b1c96bfadb300716264698c2931c64784c046ea0449fbd237
-  data.tar.gz: 314cfc96f37d88afafa2b19a8e1992181172b389f8752464c07fcba66a9be419bb6f1e79e70d71156c3cb715093ca682eee773406c0af5eb6a288b213f2313d8
+  metadata.gz: f3e3c0f6acff21efb2bbe29249489b7db50183ba5745cbccf5a6cc4c9f62b79576796942451784ae8c083e6017764a4281806f2b4172a2e0cf2b459dad3ac1a9
+  data.tar.gz: 5dc5c0994dba93d32f4699ec1e5c14935e6babd945cd09b093e5205ac233a45e7b20410ee31f926801c0802ad285f254cf652561fa8db9f5a8c3a2c9d1dba6e5

data/bin/talk

@@ -5,8 +5,30 @@ lib = File.join(basepath, 'lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'talk'
-require 'pp'
 require 'json'
+require 'trollop'
+require 'pp'
+
+$opts = Trollop::options do
+  version "Talk 2.0 (c) 2013 Jonas Acres"
+  banner <<-EOS
+Talk is a compile-to-source protocol specification language.
+
+Usage:
+       talk [options] [source directories]
+where [options] are:
+EOS
+
+  opt :target, "Generate output based on specified target name", :type => :string, :multi => true
+  opt :targets, "List valid targets"
+  opt :omit, "Strip a top-level tag", :type => :string, :multi => true
+  opt :include, "Limit to a top-level tag", :type => :string, :multi => true
+  opt :no, "Do not render specified tag type at any level", :type => :string, :multi => true
+  opt :json, "Dump raw JSON to console"
+  opt :upgrade, "Upgrade old-style protocols to new-style"
+end
+
+Trollop::die :omit, "cannot be combined with include" if $opts[:omit].length > 0 and $opts[:include].length > 0
 
 $parser = Talk::Parser.new
 
@@ -17,6 +39,7 @@ def process_file(file)
 	end
 
 	if File.directory?(file) then
+		$parser.basepath = file
 		Dir.glob(File.join(file, "/**/*.talk")).each do |subfile|
 			process_file(subfile)
 		end
@@ -25,12 +48,87 @@ def process_file(file)
 	end
 end
 
-begin
-	ARGV.each do |file|
-		process_file(file)
+def find_target_named(results, target_name)
+	return nil if results[:target].nil?
+	idx = results[:target].find_index { |target| target[:name] == target_name }
+	return results[:target][idx] unless idx.nil?
+	nil
+end
+
+def render_target(results, target_name)
+		target = find_target_named(results, target_name)
+		if target.nil? then
+			puts "Unknown target #{target_name}"
+			exit 1
+		end
+
+		lang = Talk::Language.language_named(target[:language])
+		if lang.nil? then
+			puts "Target #{target[:name]} has unsupported language #{target[:language]}"
+			exit 1
+		else
+			lang.render(results, target)
+		end
+end
+
+def render_targets(results)
+	$opts[:target].each { |target_name| render_target(results, target_name) }
+end
+
+def list_targets(results)
+	results[:target].each { |target| puts "\t#{target[:name]} (#{target[:language]})" }
+end
+
+def process_files
+	ARGV.each { |file| process_file(file) }
+	$parser.results
+end
+
+def strip_tag(container, tag)
+	if container.is_a? Array then
+		return container.map! { |v| strip_tag(v, tag) }
+	elsif not container.is_a? Hash then
+		return container
+	end
+
+	container.delete(tag)
+	container.each { |k, v| container[k] = strip_tag(v, tag) }
+end
+
+def strip_tags(container, tags)
+	tags.each { |tag| container = strip_tag(container, tag.to_sym) }
+	container
+end
+
+def strip_omitted(results, omitted)
+	omitted.each { |tag| results.delete(tag.to_sym) }
+end
+
+def strip_nonincluded(results, included)
+	included.map! { |key| key.to_sym }
+	trimmed = {}
+	(results.keys.select { |key| included.include? key }).each { |key| trimmed[key] = results[key] }
+	trimmed
+end
+
+def upgrade_protocols(results)
+	methods = {}
+	results[:method].each { |method| methods[method[:name].to_sym] = method }
+	results[:protocol].each do |proto|
+		proto[:method].map! { |method| methods[method.to_sym] }
 	end
+	results.delete(:method)
+end
 
-	puts JSON.generate($parser.results)
+begin
+	results = process_files
+	results = strip_tags(results, $opts[:no])
+	results = strip_omitted(results, $opts[:omit]) unless $opts[:omit].empty?
+	results = strip_nonincluded(results, $opts[:include]) unless $opts[:include].empty?
+	upgrade_protocols(results) if $opts[:upgrade]
+	puts JSON.generate(results) if $opts[:json]
+	list_targets(results) if $opts[:targets]
+	render_targets(results)
 rescue Talk::ParseError => e
 	puts e
 	exit 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: talk
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jonas Acres
@@ -39,7 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Compile-to-source protocol contract specification language