barthes 0.0.6 → 0.0.7

data/lib/barthes/action.rb

@@ -58,7 +58,7 @@ module Barthes
 			params.each do |k, v|
 				if v.class == String
 					new_v = v.gsub(/\$\{(.+?)\}/) { @env[$1] }
-					new_v = new_v.gsub(/\@\{(.+?)\}/) { p $1; Barthes::Cache[$1] }
+					new_v = new_v.gsub(/\@\{(.+?)\}/) { Barthes::Cache[$1] }
 				else
 					new_v = v
 				end

data/lib/barthes/cli.rb

@@ -1,7 +1,6 @@
 require 'barthes/runner'
 require 'barthes/reporter/default'
 require 'json'
-require 'thor'
 require 'slop'
 
 module Barthes

data/lib/barthes/reporter/junit_xml.rb

@@ -18,19 +18,22 @@ module Barthes
 				puts Nokogiri::XML(result).to_xml(indent: 2)
 			end
 
-			def walk_json(json)
+			def walk_json(json, parents=[]) 
 				case json.first
 				when 'feature', 'scenario'
 					if json.last.class == Array
 						@xml.testsuite(name: json[1], tests: json.last.size) do
+							parents.push json[1]
 							json.last.each do |child|
-								walk_json(child)
+								walk_json(child, parents)
 							end
+							parents.pop
 						end
 					end
 				when 'action'
 					@xml.testsuite(name: json[1], tests: 1) do
-						@xml.testcase(name: json[1]) do
+						name = [parents, "##{json.last['number'].to_s} #{json[1]}"].join('.')
+						@xml.testcase(name: name) do
 							case json.last['status']
 							when 'skipped'
 								@xml.skipped

data/lib/barthes/runner.rb

@@ -108,6 +108,7 @@ module Barthes
 			env = @env.dup
 			env.update(content['env']) if content['env']
 			@reporter.report(:action, @num, name, action.last, scenarios) do
+				content['number'] = @num
 				if Barthes::Config[:dryrun] == 0 && !@failed
 					content = Action.new(env).action(content)
 					if content['expectations'] && content['expectations'].any? {|e| e['result'] == false }

data/lib/barthes/version.rb

@@ -1,3 +1,3 @@
 module Barthes
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barthes
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,7 +153,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- TODO.md
 - barthes.gemspec
 - bin/barthes
 - lib/barthes.rb

data/TODO.md

@@ -1,13 +0,0 @@
-* json schema
-* embed strftime format or date command format datetime to json
---------------------------------------------
-* embed or in json expectations
-* あらかじめ番号を最後まで数えるようにする
-* action status
-* make 'to' option work
-* load libraries
-* テストサマリー表示
---------------------------
-compare -> method, feature, scenario, action
-xpath change (describe security groups)
-