probedock-ruby 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eeabd5167fcbd88cb6ae710a161bb434d0e7989
-  data.tar.gz: 20fc72d098d88d19195db9c3e07eaf11e9401774
+  metadata.gz: 30bec889e68d731bcf7b79db7770994cb1fa3778
+  data.tar.gz: ee91a1b9033170aaccfe37c4eb94dd97e004ef51
 SHA512:
-  metadata.gz: 76aadb55f22794db3a5d90dfb56a4104c74385e55d948d765f37df0d35274d134b646864bf04da30a30c2e7bb67890bd337371a0b903f11a0210b2fbf0357661
-  data.tar.gz: 0f9fc466acfe5fbc85785cd267371609e1e25318335626801f248ba5624ee7d76fe151a1cdcfa0e6a4f3b2307d10e45e056fa3503cbb9bdb67322252815074ba
+  metadata.gz: d34a3fc3b26926bf1d13849b066b49f24bd817210b7bc98de5180d304a27597448e6705d486d7c59be59822083b94f5859c8c2f7836bbc496a6fa6281fe78153
+  data.tar.gz: 1a4a2a778672e65fd8349a0cc45928b8d3fc755f0ac87077cc1b52c002b379de39f7f7d1d4cb84bf8313ab1f004173a3528e40906e7274da97f5e2e1e2d6c1ab

data/README.md

@@ -17,7 +17,7 @@
 Add it to your Gemfile:
 
 ```rb
-gem 'probedock-ruby', '~> 0.1.4'
+gem 'probedock-ruby', '~> 0.1.5'
 ```
 
 Run `bundle install`.

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/probe_dock_ruby.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 module ProbeDockProbe
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
   class Error < StandardError; end
   class PayloadError < Error; end

data/lib/probe_dock_ruby/annotation.rb

@@ -0,0 +1,86 @@
+module ProbeDockProbe
+  class Annotation
+    BASE_REGEXP_STRING = '@probedock\(([^\(\)]*)\)'
+    ANNOTATION_REGEXP = /#{BASE_REGEXP_STRING}/
+    STRIP_ANNOTATION_REGEXP = /\s*#{BASE_REGEXP_STRING}/
+
+    attr_reader :key, :category, :tags, :tickets, :active
+
+    def initialize(str)
+      parse(str)
+    end
+
+    def merge!(annotation)
+      @key = annotation.key if annotation.key
+      @category = annotation.category if annotation.category
+      @active = annotation.active unless annotation.active.nil?
+      @tags = (@tags + annotation.tags).compact.collect(&:to_s).uniq
+      @tickets = (@tickets + annotation.tickets).compact.collect(&:to_s).uniq
+      self
+    end
+
+    def self.strip_annotations(test_name)
+      test_name.gsub(STRIP_ANNOTATION_REGEXP, '')
+    end
+
+    private
+
+    def parse(str)
+      @key = nil
+      @category = nil
+      @tags = []
+      @tickets = []
+      @active = nil
+
+      loop do
+        match = str.match(ANNOTATION_REGEXP)
+
+        if match
+          text = match[1]
+
+          if text.match(/^[a-z0-9]+$/)
+            @key = text
+          else
+            @key = parse_annotation_value(text, 'key')
+            @category = parse_annotation_value(text, 'category')
+            parse_annotation_list(text, 'tag', @tags)
+            parse_annotation_list(text, 'ticket', @tickets)
+
+            active = text.match(/active=["']?(1|0|true|false|yes|no|t|f|y|n)["']?/i)
+            if active
+              @active = !active[1].match(/^(1|y|yes|t|true)$/i).nil?
+            end
+          end
+
+          str = str.sub(ANNOTATION_REGEXP, '')
+        else
+          break
+        end
+      end
+    end
+
+    def keyword_regexp(keyword)
+      /#{keyword}=(?:(?<#{keyword}>[^"'\s]+)|["']?(?<#{keyword}>[^"']+)["']?)/
+    end
+
+    def parse_annotation_value(text, keyword)
+      match = text.match(keyword_regexp(keyword))
+      match ? match[keyword] : nil
+    end
+
+    def parse_annotation_list(text, keyword, values)
+      regexp = keyword_regexp(keyword)
+
+      loop do
+        match = text.match(regexp)
+
+        if match
+          values.push(match[keyword]) unless values.include?(match[keyword])
+          text = text.sub(regexp, '')
+        end
+
+        break unless match
+      end
+    end
+  end
+end

data/lib/probe_dock_ruby/config.rb

@@ -1,15 +1,6 @@
 require 'yaml'
 
 module ProbeDockProbe
-
-  def self.config
-    @config ||= Config.new
-  end
-
-  def self.config= config
-    @config = config
-  end
-
   class Config
     # TODO: add silent/verbose option(s)
     class Error < ProbeDockProbe::Error; end

data/lib/probe_dock_ruby/test_result.rb

@@ -1,6 +1,6 @@
 module ProbeDockProbe
   class TestResult
-    attr_reader :key, :fingerprint, :name, :category, :tags, :tickets, :data, :duration, :message
+    attr_reader :key, :fingerprint, :name, :category, :active, :tags, :tickets, :data, :duration, :message
 
     def initialize project, options = {}
 
@@ -14,15 +14,34 @@ module ProbeDockProbe
         raise Error, "The :duration options is required (indicates how long it took to run the test)"
       end
 
-      @key = options[:key]
       @fingerprint = options[:fingerprint]
+
       @name = options[:name].to_s
 
-      @category = options[:category] || project.category
-      @tags = (wrap(options[:tags]) + wrap(project.tags)).compact.collect(&:to_s).uniq
-      @tickets = (wrap(options[:tickets]) + wrap(project.tickets)).compact.collect(&:to_s).uniq
+      annotation = Annotation.new('')
+
+      if @name.match(Annotation::ANNOTATION_REGEXP)
+        annotation.merge!(Annotation.new(@name))
+        @name = Annotation.strip_annotations(@name)
+      end
+
+      options_annotation = options[:annotation]
+      options_annotation = Annotation.new(options_annotation) if options_annotation.kind_of?(String)
+      annotation.merge!(options_annotation) if options_annotation
+
+      @key = options[:key] || annotation.key
+      @category = options[:category] || annotation.category || project.category
+      @tags = (wrap(options[:tags]) + wrap(annotation.tags) + wrap(project.tags)).compact.collect(&:to_s).uniq
+      @tickets = (wrap(options[:tickets]) + wrap(annotation.tickets) + wrap(project.tickets)).compact.collect(&:to_s).uniq
 
       @passed = !!options[:passed]
+
+      if !options[:active].nil?
+        @active = options[:active]
+      elsif !annotation.active.nil?
+        @active = annotation.active
+      end
+
       @duration = options[:duration]
       @message = options[:message]
 
@@ -44,6 +63,7 @@ module ProbeDockProbe
         h['m'] = @message if @message
         h['n'] = @name.length > 255 ? "#{@name[0, 252]}..." : @name
         h['c'] = @category
+        h['v'] = @active unless @active.nil?
         h['g'] = @tags
         h['t'] = @tickets
         h['a'] = @data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: probedock-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Simon Oulevay (Alpha Hydrae)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -193,6 +193,7 @@ files:
 - README.md
 - VERSION
 - lib/probe_dock_ruby.rb
+- lib/probe_dock_ruby/annotation.rb
 - lib/probe_dock_ruby/client.rb
 - lib/probe_dock_ruby/config.rb
 - lib/probe_dock_ruby/project.rb
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby library to develop new probes for Probe Dock.