barthes 0.0.4 → 0.0.5

data/TODO.md

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

data/barthes.gemspec

@@ -21,7 +21,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "thor"
   spec.add_dependency "json"
   spec.add_dependency "erubis"
+  spec.add_dependency "slop"
+  spec.add_dependency "term-ansicolor"
+  spec.add_dependency "activesupport"
+  spec.add_dependency "nokogiri"
 end

data/lib/barthes/action.rb

@@ -2,8 +2,7 @@ require 'barthes/cache'
 
 module Barthes
 	class Action
-		def initialize(env, options)
-			@options = options
+		def initialize(env)
 			@env = env.dup
 			client_class = Object.const_get(@env['client_class'])
 			@client = client_class.new(env)
@@ -14,7 +13,7 @@ module Barthes
 		end
 
 		def action(action)
-			@env.update(action['environment']) if action['environment']
+			@env.update(action['env']) if action['env']
 			params = evaluate_params(action['params'])
 
 			if action['expectations']
@@ -49,7 +48,7 @@ module Barthes
 			if cache_config = action['cache']
 				value = @client.extract(cache_config, response)
 				action['cache']['value'] = value
-				Barthes::Cache.set(cache_config['key'], value)
+				Barthes::Cache[cache_config['key']] = value
 			end
 			action
 		end
@@ -59,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.get($1) }
+					new_v = new_v.gsub(/\@\{(.+?)\}/) { p $1; Barthes::Cache[$1] }
 				else
 					new_v = v
 				end

data/lib/barthes/cache.rb

@@ -1,28 +1,3 @@
-
 module Barthes
-	class Cache
-		@cache = {}
-
-		class << self
-			def load(cache)
-                          @cache = cache
-			end
-
-			def reset
-				@cache = {}
-			end
-
-			def get(key)
-				@cache[key]
-			end
-
-			def set(key, value)
-				@cache[key] = value
-			end
-
-			def to_hash
-				@cache
-			end
-		end
-	end
+	Cache = {}
 end

data/lib/barthes/cli.rb

@@ -2,19 +2,29 @@ require 'barthes/runner'
 require 'barthes/reporter/default'
 require 'json'
 require 'thor'
+require 'slop'
 
 module Barthes
-	class CLI < Thor
-		desc 'execute', 'execute tests from json files'
-		option :environment, :type => :string, :aliases => :e 
-		option :verbose, :type => :boolean, :aliases => :v
-		option :dryrun, :type => :boolean, :aliases => :d
-		option :from, :type => :numeric, :aliases => :f, :default => 1
-		option :to, :type => :numeric, :aliases => :t
-		option :config_path, :type => :string, :aliases => :c
-		option :load_path, :type => :string, :aliases => :l
-		def exec(*paths)
-			Runner.new(options).run(paths)
+	class CLI
+		def self.parse_options
+			@opt = Slop.parse!(help: true) do
+			  banner 'Usage: barthes [options] /path/to/some_spec.json'
+			  on 'e', 'env',       'environment file paths',               argument: :optional, as: Array
+			  on 'q', 'quiet',     'not show test details',                argument: :optional, as: :count
+			  on 'f', 'from',      'test number to start from',            argument: :optional, as: Integer, default: 1
+			  on 't', 'to',        'test number to stop to',               argument: :optional
+			  on 'l', 'load',      'An optional password',                 argument: :optional
+			  on 'd', 'dryrun',    'not run test but show just structure', argument: :optional, as: :count
+			  on 'c', 'cache',     'cache path',                           argument: :optional, default: './barthes-cache.json'
+			  on 'r', 'reporters', 'reporters to use',                     argument: :optional, as: Array
+			end
+			@opt.to_hash
+		end
+
+		def self.start
+			options = parse_options
+			abort @opt.help if ARGV.empty?
+			Runner.new(options).run(ARGV)
 		end
 	end
 end

data/lib/barthes/config.rb

@@ -0,0 +1,3 @@
+module Barthes
+	Config = {}
+end

data/lib/barthes/reporter.rb

@@ -1,16 +1,18 @@
+require 'barthes/reporter/default'
+require 'barthes/reporter/junit_xml'
+require 'active_support/inflector'
 
 module Barthes
 	class Reporter
-		def initialize(options)
+		def initialize
 			@reporters = []
-			if options[:reporter]
-				reporter_classes = options[:reporter].split(',')
-				reporter_classes.each do |klass_name|
-					klass = Object.get_const(klass_name)
+			if Barthes::Config[:reporters]
+				Barthes::Config[:reporters].each do |klass_name|
+					klass = klass_name.constantize
 					@reporters << klass.new
 				end
 			else
-				@reporters = [Reporter::Default.new(options)]
+				@reporters = [Reporter::Default.new]
 			end
 		end
 
@@ -24,7 +26,6 @@ module Barthes
 
 			@reporters.each do |r|
 				m = :"after_#{event.to_s}"
-				args << result
 				r.send(m, *args) if r.respond_to?(m)
 			end
 		end

data/lib/barthes/reporter/default.rb

@@ -1,10 +1,9 @@
+require 'term/ansicolor'
 
 module Barthes
 	class Reporter
 		class Default
-			def initialize(options)
-				@options = options
-			end
+			include Term::ANSIColor
 
 			def before_feature(num, name)
 				puts "#{name} (##{num})"
@@ -15,18 +14,17 @@ module Barthes
 			end
 
 			def before_action(num, name, action, scenarios)
-				print ("\t" * scenarios.size) + "#{name} (##{num})"
+				puts ("\t" * scenarios.size) + "#{name} (##{num})"
 			end
 
-			def after_action(num, name, action, scenarios, result)
-				if @options[:verbose]
-					puts
+			def after_action(num, name, action, scenarios)
+				if Barthes::Config[:quiet] == 0 && Barthes::Config[:dryrun] == 0
 					puts indent scenarios.size + 1, "request:"
 					puts indent scenarios.size + 2, JSON.pretty_generate(action['request'])
 					puts indent scenarios.size + 1, "response:"
 					puts indent scenarios.size + 2, JSON.pretty_generate(action['response'])
 				end
-				expectations = result['expectations']
+				expectations = action['expectations']
 				expectations.each do |expectation|
 					if expectation['result'] == false
 						puts indent scenarios.size + 1, "failed expectation:"
@@ -34,12 +32,14 @@ module Barthes
 					end
 				end
 				flag = ''
-				if expectations.empty? || expectations.all? {|r| r['result'] == true }
-					flag = 'success'
+				if Barthes::Config[:dryrun] > 0
+					flag = 'skipped'
+				elsif expectations.empty? || expectations.all? {|r| r['result'] == true }
+					flag = green {'success'}
 				else
-					flag = 'failure'
+					flag = red {'failure'}
 				end
-				puts indent(scenarios.size, " -> #{flag}")
+				puts indent(scenarios.size + 1, "result: #{flag}")
 			end
 
 			def indent(num, string)

data/lib/barthes/reporter/junit_xml.rb

@@ -1,21 +1,58 @@
+require 'builder'
+require 'nokogiri'
 
 module Barthes
 	class Reporter
 		class JunitXml
+			def initialize
+				@xml = Builder::XmlMarkup.new
+				@xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+			end
+
 			def after_run(features)
-				features.each do |feature|
+				result = @xml.testsuites do |xml|
+					features.each do |feature|
+						walk_json(feature)
+					end
 				end
+				puts Nokogiri::XML(result).to_xml(indent: 2)
 			end
 
-			def walk_feature
+			def walk_json(json)
+				case json.first
+				when 'feature', 'scenario'
+					if json.last.class == Array
+						@xml.testsuite(name: json[1], tests: json.last.size) do
+							json.last.each do |child|
+								walk_json(child)
+							end
+						end
+					end
+				when 'action'
+					@xml.testsuite(name: json[1], tests: 1) do
+						@xml.testcase(name: json[1]) do
+							case json.last['status']
+							when 'skipped'
+								@xml.skipped
+							when 'failure'
+							when 'error'
+							end
+							if json.last['status'] != 'skipped' && json.last['request'] && json.last['response']
+								stdout = "request:\n"
+								stdout += "#{JSON.pretty_generate(json.last['request'])}\n"
+								stdout += "response:\n"
+								stdout += "#{JSON.pretty_generate(json.last['response'])}\n"
+								@xml.tag!(:'system-out', stdout)
+							end
+						end
+					end
+				else
+					puts json
+				end
 			end
 
 			def render_testcase(xml, action)
 				xml.testcase do
-					xml.stdout
-					xml.failure
-					xml.skipped
-					xml.error
 				end
 			end
 		end

data/lib/barthes/runner.rb

@@ -2,32 +2,31 @@ require 'json'
 require 'barthes/action'
 require 'barthes/reporter'
 require 'barthes/cache'
+require 'barthes/config'
 
 module Barthes
 	class Runner
 		def initialize(options)
+			Barthes::Config.update(options)
 			load_cache
-			load_config
-			load_environments(options[:environment])
-			@reporter = Reporter.new(options)
-			@options = options
+			load_libraries
+			load_envs(options[:env])
+			@reporter = Reporter.new
 		end
 
 		def load_cache
-			path = Dir.pwd + '/barthes-cache.json'
-			if File.exists?(path)
-				Barthes::Cache.load JSON.parse File.read(path)
+			if File.exists? Barthes::Config[:cache]
+				Barthes::Cache.update JSON.parse File.read Barthes::Config[:cache]
 			end
 		end
 
-		def load_config
+		def load_libraries
 			path = Dir.pwd + '/.barthes'
 			load path if File.exists?(path)
 		end
 
-		def load_environments(environment)
+		def load_envs(env_paths)
 			@env = {}
-			env_paths = environment.split(',')
 			env_paths.each do |path|
 				@env.update JSON.parse File.read(path)
 			end
@@ -51,26 +50,28 @@ module Barthes
 
 		def run(paths)
 			files = expand_paths(paths, '_spec.json')
-			@reporter.report(:run, files) do
+			results = []
+			@reporter.report(:run, results) do
 				@num = 1
-				results = []
 				files.each do |file|
 					json = JSON.parse File.read(file)
 					@reporter.report(:feature, @num, json[1]) do
 						@num += 1
-						#Barthes::Cache.reset ## load config or reset
-						feature_results = walk_json(json.last, [file])
-						results += results
+						walk_json(json.last, [file])
+						results << json
+						json
 					end
 				end
 				results
 			end
-			puts JSON.pretty_generate Barthes::Cache.to_hash
+			if !Barthes::Cache.empty?
+				File.write Barthes::Config[:cache], JSON.pretty_generate(Barthes::Cache) + "\n"
+			end
 		end
 
 		def in_range?
-			flag = @num >= @options[:from]
-			flag = flag && (@num >= @options[:to]) if @options[:to]
+			flag = @num >= Barthes::Config[:from]
+			flag = flag && (@num >= Barthes::Config[:to]) if Barthes::Config[:to]
 			flag
 		end
 	
@@ -97,6 +98,7 @@ module Barthes
 		def handle_scenario(scenario, scenarios)
 			return if @failed
 			@reporter.report(:scenario, @num, scenario[1], scenario.last, scenarios) do
+				scenario.last
 			end
 		end
 	
@@ -104,14 +106,15 @@ module Barthes
 			return if @failed
 			name, content = action[1], action.last
 			env = @env.dup
-			env.update(content['environment']) if content['environment']
+			env.update(content['env']) if content['env']
 			@reporter.report(:action, @num, name, action.last, scenarios) do
-				if !@options[:dryrun] && !@failed
-					content = Action.new(env, @options).action(content)
+				if Barthes::Config[:dryrun] == 0 && !@failed
+					content = Action.new(env).action(content)
 					if content['expectations'] && content['expectations'].any? {|e| e['result'] == false }
 						@failed = true
 					end
 				end
+				content['status'] = 'skipped' if Barthes::Config[:dryrun] > 0
 				content
 			end
 		end

data/lib/barthes/version.rb

@@ -1,3 +1,3 @@
 module Barthes
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barthes
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -112,6 +160,7 @@ files:
 - lib/barthes/action.rb
 - lib/barthes/cache.rb
 - lib/barthes/cli.rb
+- lib/barthes/config.rb
 - lib/barthes/reporter.rb
 - lib/barthes/reporter/default.rb
 - lib/barthes/reporter/junit_xml.rb