atp 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56626a1f7ba78ee3873728c72bc7a8cd59a133a9
-  data.tar.gz: 12daab882fdeb97053df85297ba999d873d7be9c
+  metadata.gz: f62f7363f60de549fcdd62079d15f1a2a15d1080
+  data.tar.gz: f8c1f9056501a2df6d68726081a2d6a214150e77
 SHA512:
-  metadata.gz: ac147bd76ea5f0e7a6a37cec31ac4991127f785de57c18bc30fb7219c7759ca2e0cb67d7d97d0f32d137e12e4be92cd8b9c8babd5aa3e023989507034f986a71
-  data.tar.gz: 57b65dcd2e9473142443bbb230b50b4b9b49b8b74dfec85e240a5d762d47980a46d393cd86b2c4eb65c16f2e142eb98bf71009df2ed90fe9b84259009d7a83fa
+  metadata.gz: ecb5cc42b0edf32d97e331a98ec302f145e98e48eddf292161916c79ee00e8bfc0b50c3e8eadbed7868fc326aed95c83e1ea63cbbc83036f0ef74dd1622197cd
+  data.tar.gz: b5efe45ab648a39ce0e785fff92d11203aee8f351907f5ae4ecd9aacd6c7b02e4dcc9ecd67b9746900cee8d23cf96443549f4ac04d3785405a48de7c83f85273

data/config/version.rb

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

data/lib/atp/ast/builder.rb

@@ -230,7 +230,10 @@ module ATP
       def on_fail(options = {})
         children = []
         if options[:bin] || options[:softbin]
-          children << set_result(:fail, bin: options[:bin], softbin: options[:softbin], bin_description: options[:bin_description])
+          fail_opts = { bin: options[:bin], softbin: options[:softbin] }
+          fail_opts[:bin_description] = options[:bin_description] if options[:bin_description]
+          fail_opts[:softbin_description] = options[:softbin_description] if options[:softbin_description]
+          children << set_result(:fail, fail_opts)
         end
         if options[:set_run_flag] || options[:set_flag]
           children << set_run_flag(options[:set_run_flag] || options[:set_flag])
@@ -243,7 +246,10 @@ module ATP
       def on_pass(options = {})
         children = []
         if options[:bin] || options[:softbin]
-          children << set_result(:pass, bin: options[:bin], softbin: options[:softbin], bin_description: options[:bin_description])
+          pass_opts = { bin: options[:bin], softbin: options[:softbin] }
+          pass_opts[:bin_description] = options[:bin_description] if options[:bin_description]
+          pass_opts[:softbin_description] = options[:softbin_description] if options[:softbin_description]
+          children << set_result(:pass, pass_opts)
         end
         if options[:set_run_flag] || options[:set_flag]
           children << set_run_flag(options[:set_run_flag] || options[:set_flag])
@@ -256,9 +262,16 @@ module ATP
       def set_result(type, options = {})
         children = []
         children << type
-        children << n(:bin, options[:bin])  if options[:bin]
-        children << n(:softbin, options[:softbin])  if options[:softbin]
-        children << n(:bin_description, options[:bin_description])  if options[:bin_description]
+        if options[:bin] && options[:bin_description]
+          children << n(:bin, options[:bin], options[:bin_description])
+        else
+          children << n(:bin, options[:bin]) if options[:bin]
+        end
+        if options[:softbin] && options[:softbin_description]
+          children << n(:softbin, options[:softbin], options[:softbin_description])
+        else
+          children << n(:softbin, options[:softbin]) if options[:softbin]
+        end
         result = n(:set_result, *children)
 
         if options[:conditions]

data/lib/atp/flow.rb

@@ -74,10 +74,18 @@ module ATP
           options[:on_fail] ||= {}
           options[:on_fail][:bin] = b
         end
+        if b = options.delete(:bin_description)
+          options[:on_fail] ||= {}
+          options[:on_fail][:bin_description] = b
+        end
         if b = options.delete(:softbin) || b = options.delete(:sbin) || b = options.delete(:soft_bin)
           options[:on_fail] ||= {}
           options[:on_fail][:softbin] = b
         end
+        if b = options.delete(:softbin_description) || options.delete(:sbin_description) || options.delete(:soft_bin_description)
+          options[:on_fail] ||= {}
+          options[:on_fail][:softbin_description] = b
+        end
         if options.delete(:continue)
           options[:on_fail] ||= {}
           options[:on_fail][:continue] = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atp
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen