barthes 0.0.3 → 0.0.4

data/README.md

@@ -1,5 +1,7 @@
 # Barthes
 
+![](600px-Roland_Barthes_signature.svg.png)
+
 TODO: Write a gem description
 
 ## Installation

data/TODO.md

@@ -0,0 +1,9 @@
+* embed strftime format or date command format datetime to json
+* embed or in json expectations
+* json schema
+* サブコマンドではなくする
+* global Barthes.config object
+
+--------------------------
+compare -> method, feature, scenario, action
+xpath change (describe security groups)

data/bin/barthes

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 require 'barthes/cli'
 Barthes::CLI.start

data/lib/barthes/action.rb

@@ -0,0 +1,71 @@
+require 'barthes/cache'
+
+module Barthes
+	class Action
+		def initialize(env, options)
+			@options = options
+			@env = env.dup
+			client_class = Object.const_get(@env['client_class'])
+			@client = client_class.new(env)
+		end
+
+		def indent(size, string)
+			string.split("\n").map {|line| "\t" * size + "#{line}\n" }
+		end
+
+		def action(action)
+			@env.update(action['environment']) if action['environment']
+			params = evaluate_params(action['params'])
+
+			if action['expectations']
+				if action['max_loop']
+					action['max_loop'].to_i.times do
+						sleep action['sleep'].to_i/1000 if action['sleep']	
+
+						response = @client.action(params)
+						action['expectations'].each do |expectation|
+							result = @client.compare(response, evaluate_params(expectation))
+							expectation.update(result)
+						end
+						if action['expectations'].all? {|e| e['result'] == true }
+							break
+						end
+					end
+				end
+			end
+
+			sleep action['sleep'].to_i/1000 if action['sleep']	
+
+			action['request'] = params
+			action['response'] = response = @client.action(params)
+
+			if action['expectations']
+				action['expectations'].each do |expectation|
+					result = @client.compare(response, evaluate_params(expectation))
+					expectation.update(result)
+				end
+			end
+
+			if cache_config = action['cache']
+				value = @client.extract(cache_config, response)
+				action['cache']['value'] = value
+				Barthes::Cache.set(cache_config['key'], value)
+			end
+			action
+		end
+
+		def evaluate_params(params)
+			new_params = {}
+			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) }
+				else
+					new_v = v
+				end
+				new_params[k] = new_v
+			end
+			new_params
+		end
+	end
+end

data/lib/barthes/cache.rb

@@ -0,0 +1,28 @@
+
+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
+end

data/lib/barthes/cli.rb

@@ -1,48 +1,20 @@
-require 'barthes/converter'
+require 'barthes/runner'
+require 'barthes/reporter/default'
 require 'json'
 require 'thor'
-require 'rspec'
 
 module Barthes
 	class CLI < Thor
-		desc 'convert', 'convert json into rspec'
-		def convert(*paths)
-			files = expand_paths(paths, '.json')
-			files.each do |file|
-				json = JSON.parse File.read(file)
-				converter = Barthes::Converter.new(file, json)
-				spec = converter.convert(json)
-				File.write("#{file.gsub(/.json$/, '')}_spec.rb", spec)
-			end
-		end
-
-		desc 'exec', 'execute tests from json files'
-		option :rspec, :type => :string, :aliases => :r
+		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)
-			ENV['BARTHES_ENV_PATH'] = options[:environment] if options[:environment]
-			convert(*paths)
-			paths = expand_paths(paths, '.json').map {|path| "#{path.gsub(/.json$/, '')}_spec.rb" }
-			paths += options[:rspec].split(/\s/) if options[:rspec]
-			RSpec::Core::Runner.run(paths)
-		end
-
-		no_commands do
-			def expand_paths(paths, suffix)
-				files = []
-				if paths.empty?
-					files += Dir["./**/*#{suffix}"]
-				else
-					paths.each do |path|
-						if FileTest.directory?(path)
-							files += Dir["#{path}/**/*#{suffix}"]
-						elsif FileTest.file?(path)
-							files << path
-						end
-					end
-				end
-				files
-			end
+			Runner.new(options).run(paths)
 		end
 	end
 end

data/lib/barthes/reporter.rb

@@ -0,0 +1,32 @@
+
+module Barthes
+	class Reporter
+		def initialize(options)
+			@reporters = []
+			if options[:reporter]
+				reporter_classes = options[:reporter].split(',')
+				reporter_classes.each do |klass_name|
+					klass = Object.get_const(klass_name)
+					@reporters << klass.new
+				end
+			else
+				@reporters = [Reporter::Default.new(options)]
+			end
+		end
+
+		def report(event, *args, &block)
+			@reporters.each do |r|
+				m = :"before_#{event.to_s}"
+				r.send(m, *args) if r.respond_to?(m)
+			end
+	
+			result = yield
+
+			@reporters.each do |r|
+				m = :"after_#{event.to_s}"
+				args << result
+				r.send(m, *args) if r.respond_to?(m)
+			end
+		end
+	end
+end

data/lib/barthes/reporter/default.rb

@@ -0,0 +1,52 @@
+
+module Barthes
+	class Reporter
+		class Default
+			def initialize(options)
+				@options = options
+			end
+
+			def before_feature(num, name)
+				puts "#{name} (##{num})"
+			end
+
+			def before_scenario(num, name, scenario, scenarios)
+				puts ("\t" * scenarios.size) + "#{name} (##{num})"
+			end
+
+			def before_action(num, name, action, scenarios)
+				print ("\t" * scenarios.size) + "#{name} (##{num})"
+			end
+
+			def after_action(num, name, action, scenarios, result)
+				if @options[:verbose]
+					puts
+					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.each do |expectation|
+					if expectation['result'] == false
+						puts indent scenarios.size + 1, "failed expectation:"
+						puts indent scenarios.size + 2, JSON.pretty_generate(expectation)
+					end
+				end
+				flag = ''
+				if expectations.empty? || expectations.all? {|r| r['result'] == true }
+					flag = 'success'
+				else
+					flag = 'failure'
+				end
+				puts indent(scenarios.size, " -> #{flag}")
+			end
+
+			def indent(num, string)
+				string.split("\n").map do |line|
+					("\t" * num) + line
+				end.join("\n")
+			end
+		end
+	end
+end

data/lib/barthes/reporter/junit_xml.rb

@@ -0,0 +1,25 @@
+
+module Barthes
+	class Reporter
+		class JunitXml
+			def after_run(features)
+				features.each do |feature|
+				end
+			end
+
+			def walk_feature
+			end
+
+			def render_testcase(xml, action)
+				xml.testcase do
+					xml.stdout
+					xml.failure
+					xml.skipped
+					xml.error
+				end
+			end
+		end
+	end
+end
+
+__END__

data/lib/barthes/runner.rb

@@ -0,0 +1,119 @@
+require 'json'
+require 'barthes/action'
+require 'barthes/reporter'
+require 'barthes/cache'
+
+module Barthes
+	class Runner
+		def initialize(options)
+			load_cache
+			load_config
+			load_environments(options[:environment])
+			@reporter = Reporter.new(options)
+			@options = options
+		end
+
+		def load_cache
+			path = Dir.pwd + '/barthes-cache.json'
+			if File.exists?(path)
+				Barthes::Cache.load JSON.parse File.read(path)
+			end
+		end
+
+		def load_config
+			path = Dir.pwd + '/.barthes'
+			load path if File.exists?(path)
+		end
+
+		def load_environments(environment)
+			@env = {}
+			env_paths = environment.split(',')
+			env_paths.each do |path|
+				@env.update JSON.parse File.read(path)
+			end
+		end
+
+		def expand_paths(paths, suffix)
+			files = []
+			if paths.empty?
+				files += Dir["./**/*#{suffix}"]
+			else
+				paths.each do |path|
+					if FileTest.directory?(path)
+						files += Dir["#{path}/**/*#{suffix}"]
+					elsif FileTest.file?(path)
+						files << path
+					end
+				end
+			end
+			files
+		end
+
+		def run(paths)
+			files = expand_paths(paths, '_spec.json')
+			@reporter.report(:run, files) 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
+					end
+				end
+				results
+			end
+			puts JSON.pretty_generate Barthes::Cache.to_hash
+		end
+
+		def in_range?
+			flag = @num >= @options[:from]
+			flag = flag && (@num >= @options[:to]) if @options[:to]
+			flag
+		end
+	
+		def walk_json(json, scenarios)
+			if json.class == Array
+				case json.first
+				when 'scenario'
+					handle_scenario(json, scenarios)
+					@num += 1
+					scenarios.push(json.first)
+					walk_json(json.last, scenarios)
+					scenarios.pop
+				when 'action'
+					handle_action(json, scenarios) if in_range?
+					@num += 1
+				else
+					json.each do |element|
+						walk_json(element, scenarios)
+					end
+				end
+			end
+		end
+	
+		def handle_scenario(scenario, scenarios)
+			return if @failed
+			@reporter.report(:scenario, @num, scenario[1], scenario.last, scenarios) do
+			end
+		end
+	
+		def handle_action(action, scenarios)
+			return if @failed
+			name, content = action[1], action.last
+			env = @env.dup
+			env.update(content['environment']) if content['environment']
+			@reporter.report(:action, @num, name, action.last, scenarios) do
+				if !@options[:dryrun] && !@failed
+					content = Action.new(env, @options).action(content)
+					if content['expectations'] && content['expectations'].any? {|e| e['result'] == false }
+						@failed = true
+					end
+				end
+				content
+			end
+		end
+	end
+end

data/lib/barthes/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barthes
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,19 +100,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- 600px-Roland_Barthes_signature.svg.png
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - barthes.gemspec
 - bin/barthes
 - lib/barthes.rb
+- lib/barthes/action.rb
+- lib/barthes/cache.rb
 - lib/barthes/cli.rb
-- lib/barthes/converter.rb
-- lib/barthes/templates/context.erb
-- lib/barthes/templates/describe.erb
-- lib/barthes/templates/expectations/xpath_value.erb
-- lib/barthes/templates/it.erb
+- lib/barthes/reporter.rb
+- lib/barthes/reporter/default.rb
+- lib/barthes/reporter/junit_xml.rb
+- lib/barthes/runner.rb
 - lib/barthes/version.rb
 homepage: ''
 licenses:

data/lib/barthes/converter.rb

@@ -1,79 +0,0 @@
-# TODO: json includesion
-require 'erubis'
-require 'ostruct'
-
-module Barthes
-	class Converter
-		module Helpers
-			def resolve_value(value)
-				value = value.gsub(/\@\{(.+?)\}/) { '#{' + "$store['#{$1}']" + '}' }
-				value = value.gsub(/\$\{(.+?)\}/) { '#{' + "@env['#{$1}']" + '}' }
-				"%Q{#{value}}"
-			end
-		end
-
-		def initialize(name, json)
-			@name = name
-			@json = json
-		end
-
-		def template(name)
-			here = File.dirname(__FILE__)
-			File.read(here + "/templates/#{name.to_s}.erb")
-		end
-
-		def render(template_name, indent, opts={}, &block)
-			opts[:block] = block
-			code = Erubis::Eruby.new(template(template_name)).result(
-			  OpenStruct.new(opts).instance_eval { extend Helpers; binding }
-			)
-		 	code = code.split(/\n/).join("\n" + ("\t" * indent)) if indent
-			code
-		end
-
-		def convert(json)
-			render(:describe, 0, :name => @name) do
-				walk_json(json)
-			end
-		end
-
-		def walk_json(arr)
-			return if arr.class != Array
-			rendered = []
-			case arr.first
-			when 'it'
-				arr.last['_sleep'] = arr.last['sleep']
-				arr.last['name'] = arr[1]
-				rendered << render(:it, 1, arr.last) do
-					walk_expectations(arr.last['expectations'], false).join(" && ")
-				end
-			when 'context'
-				rendered << render(:context, 1, :name => arr[1]) do
-					walk_json(arr.last)
-				end
-			else
-				arr.each do |elem|
-					rendered << walk_json(elem)
-				end
-			end
-			rendered.join("\n\t")
-		end
-
-		# TODO: timeout
-		def walk_expectations(arr, in_or)
-			return if arr.nil?
-			rendered = []
-			arr.each do |elem|
-				if elem.class == Array
-					rendered << walk_expectations(elem, in_or).join(" && ")
-				elsif elem.keys.first == 'Or'
-					rendered << walk_expectations(elem.values, true).join(' || ')
-				elsif elem['type'] == 'Value' || elem['type'] == 'StringComarison'
-					rendered << render(:'expectations/xpath_value', 2, elem)
-				end
-			end
-			rendered
-		end
-
-	end
-end

data/lib/barthes/templates/context.erb

@@ -1,3 +0,0 @@
-context '<%= name %>' do
-	<%= block.call %>
-end

data/lib/barthes/templates/describe.erb

@@ -1,17 +0,0 @@
-# coding: utf-8
-require 'json'
-
-describe '<%= name %>' do
-	before(:all) do
-		$store = {}
-		@env = JSON.parse File.read(ENV['BARTHES_ENV_PATH'])
-		client_klass = Object.const_get(@env['client_class'])
-		@client = client_klass.new(@env)
-	end
-
-	<%= block.call %>
-
-	after(:all) do
-		File.write('.store', JSON.pretty_generate($store))
-	end
-end

data/lib/barthes/templates/expectations/xpath_value.erb

@@ -1,6 +0,0 @@
-lambda {
-	doc = response.response.body.gsub(/xmlns=\"(.+?)\"/, '')
-	<% if respond_to?(:value) %>
-	doc.xpath('<%= xpath %>').text == <%= resolve_value(value) %>
-	<% end %>
-}.call

data/lib/barthes/templates/it.erb

@@ -1,39 +0,0 @@
-it '<%= name %>' do
-	<% if respond_to?(:client) %>
-	client_klass = Object.const_get('<%= client['class'] %>')
-	client = client_klass.new(@env)
-	<% end %>
-	<% if respond_to?(:max_loop) && max_loop && respond_to?(:expectations) && expectations.size > 0 %>
-	<%= max_loop %>.times do
-		response = client.execute({
-			<%- params.each do |k, v| %>
-			<% next if v.nil? %>
-			'<%= k %>' => <%= resolve_value(v) %>,
-			<%- end %>
-		})
-		<% if respond_to?(:expectations) && expectations.size > 0 %>
-		break if (<%= block.call %>)
-		<% end %>
-		<% if _sleep %>
-		sleep <%= _sleep %> / 1000
-		<% end %>
-	end
-	<% end %>
-	response = client.execute({
-	<% params.each do |k, v| next if v.nil? # TODO %>
-		<% next if v.nil? %>
-		'<%= k %>' => <%= resolve_value(v) %>,
-	<% end %>
-        })
-	<% if respond_to?(:expectations) && expectations.size > 0 %>
-	expect(
-		<%= block.call %>
-	).to be_true
-	<% end %>
-	<% if _sleep %>
-	sleep <%= _sleep %> / 1000
-	<% end %>
-	<% if respond_to?(:store) %>
-	$store['<%= store['Key'] %>'] = doc.xpath('<%= store['Xpath'] %>').first.text
-	<% end %>
-end