atp 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cdbd30f66efb6b3795073de37ccdf0623377b7b
-  data.tar.gz: 4b3deec7a4e80eaa56dfd1b14934790a044ab611
+  metadata.gz: 1cae637faa5b243ed37ff8255c7964bc7a02d82a
+  data.tar.gz: 8144fe3263ea7b626c7097156a9014783ceecac3
 SHA512:
-  metadata.gz: 5309d2a1ddef3772ae949e47d3ce750a3eee0236498741cc0d752e3a7973fca9a016186ff17c02d54095055af51676b03eb2af8d6a23ebf695d7273096b5a406
-  data.tar.gz: b391e87fa09e223a717b6f11842ca2af604b33849ade223a657f8acaa5202dc90153070a89c4117b6a99fdb8e36bfa2dbef633b22957032c274aba6332eeffae
+  metadata.gz: 40be54c02cb2b5359587c251ca16efe61fc33b79cf58465919af30aa871fff53f012c801a0317505e35bebdda18cce45b5f2382c272a9826024eb3cbc7e68524
+  data.tar.gz: 60cede7df8662ae64bcff7c46458ab9326b9e500caf2f496fd2ab15bdc79c41ce5ea2f78fe8c89e7b8ac1ea30116d2dcf8def6bc45354a4a60c7e6969955d22f

data/config/version.rb

@@ -1,7 +1,7 @@
 module ATP
   MAJOR = 0
   MINOR = 3
-  BUGFIX = 0
+  BUGFIX = 1
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/atp.rb

@@ -27,6 +27,7 @@ module ATP
     autoload :PostCleaner, 'atp/processors/post_cleaner'
     autoload :Marshal, 'atp/processors/marshal'
     autoload :AddIDs, 'atp/processors/add_ids'
+    autoload :FlowID, 'atp/processors/flow_id'
   end
 
   # Summarizers extract summary data from the given AST

data/lib/atp/ast/builder.rb

@@ -4,7 +4,7 @@ module ATP
       include Factories
 
       attr_reader :context
-      attr_accessor :source_file, :source_line_number
+      attr_accessor :source_file, :source_line_number, :description
 
       def flow
         n0(:flow)
@@ -27,10 +27,6 @@ module ATP
         n(:render, str.to_s)
       end
 
-      def description(str)
-        n(:description, str.to_s)
-      end
-
       def id(symbol)
         n(:id, symbol.to_sym)
       end
@@ -184,8 +180,6 @@ module ATP
         if n = (options[:number] || options[:num] || options[:tnum] || options[:test_number])
           children << number(n)
         end
-        d = options[:description] || options[:desc]
-        children << description(d) if d
         children << id(options[:id].to_s.downcase.to_sym) if options[:id]
 
         children << on_fail(options[:on_fail]) if options[:on_fail]
@@ -203,7 +197,7 @@ module ATP
       def on_fail(options = {})
         children = []
         if options[:bin] || options[:softbin]
-          children << set_result(:fail, bin: options[:bin], softbin: options[:softbin], description: options[:bin_description])
+          children << set_result(:fail, bin: options[:bin], softbin: options[:softbin], bin_description: options[:bin_description])
         end
         children << continue if options[:continue]
         n(:on_fail, *children)
@@ -212,7 +206,7 @@ module ATP
       def on_pass(options = {})
         children = []
         if options[:bin] || options[:softbin]
-          children << set_result(:pass, bin: options[:bin], softbin: options[:softbin], description: options[:bin_description])
+          children << set_result(:pass, bin: options[:bin], softbin: options[:softbin], bin_description: options[:bin_description])
         end
         children << continue if options[:continue]
         n(:on_pass, *children)
@@ -223,7 +217,7 @@ module ATP
         children << type
         children << n(:bin, options[:bin])  if options[:bin]
         children << n(:softbin, options[:softbin])  if options[:softbin]
-        children << n(:description, options[:description])  if options[:description]
+        children << n(:bin_description, options[:bin_description])  if options[:bin_description]
         result = n(:set_result, *children)
 
         if options[:conditions]

data/lib/atp/ast/factories.rb

@@ -5,6 +5,7 @@ module ATP
         options = children.last.is_a?(Hash) ? children.pop : {}
         options[:file] ||= options.delete(:source_file) || try(:source_file)
         options[:line_number] ||= options.delete(:source_line_number) || try(:source_line_number)
+        options[:description] ||= options.delete(:description) || try(:description)
         ATP::AST::Node.new(type, children, options)
       end
 

data/lib/atp/flow.rb

@@ -5,6 +5,7 @@ module ATP
     attr_reader :program, :name
     # Returns the raw AST
     attr_reader :raw
+    attr_accessor :id
 
     def initialize(program, name = nil)
       @program = program
@@ -26,6 +27,9 @@ module ATP
     # used to build and represent the given test flow
     def ast
       ast = Processors::PreCleaner.new.process(raw)
+      # File.open("a1.txt", "w") { |f| f.write(ast) }
+      ast = Processors::FlowID.new.run(ast, id) if id
+      # File.open("a2.txt", "w") { |f| f.write(ast) }
       Validators::DuplicateIDs.new(self).process(ast)
       Validators::MissingIDs.new(self).process(ast)
       ast = Processors::Condition.new.process(ast)
@@ -258,6 +262,7 @@ module ATP
     def extract_meta!(options)
       builder.source_file = options.delete(:source_file) if options[:source_file]
       builder.source_line_number = options.delete(:source_line_number) if options[:source_line_number]
+      builder.description = options.delete(:description) if options[:description]
     end
 
     # For testing

data/lib/atp/processors/flow_id.rb

@@ -0,0 +1,28 @@
+module ATP
+  module Processors
+    # Adds the flow ID to all ids and label names
+    class FlowID < Processor
+      attr_reader :id
+
+      def run(node, id)
+        @id = id
+        process(node)
+      end
+
+      def on_id(node)
+        node.updated(nil, ["#{node.value}_#{id}"])
+      end
+
+      def on_test_result(node)
+        tid, state, nodes = *node
+        if tid.is_a?(Array)
+          tid = tid.map { |tid| "#{tid}_#{id}" }
+        else
+          tid = "#{tid}_#{id}"
+        end
+        node.updated(nil, [tid, state] + [process(nodes)])
+      end
+      alias_method :on_test_executed, :on_test_result
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -77,6 +77,7 @@ files:
 - lib/atp/processors/add_ids.rb
 - lib/atp/processors/condition.rb
 - lib/atp/processors/condition_extractor.rb
+- lib/atp/processors/flow_id.rb
 - lib/atp/processors/marshal.rb
 - lib/atp/processors/post_cleaner.rb
 - lib/atp/processors/pre_cleaner.rb