cyclid 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 489faa5033ce922ff61b7ab00b4cd161e7f66ae8
-  data.tar.gz: 2b0c1803c1f1dd3d82c3b906402b8ddbfbdb3c50
+  metadata.gz: a6d5c64f60ead996640a63f571a67236cbcc6185
+  data.tar.gz: 478f7805d7e8153aa1d98a55da62f52d8543f504
 SHA512:
-  metadata.gz: a0158078cf6a1b6da24afd01b2250c8171b5477f87c0cd52fd4b552c76a894dc50ced3c682988040b207fa3439404550ae130596ad3f84144df85e304c632429
-  data.tar.gz: cc3c14a58a141da1e819636f0d7eb1451be01d50549b902b5470f00b126241d06b5ba553bd2c55ab24eaf2c5909043781b75189291b391e9ce4bc9b7caebb960
+  metadata.gz: d9aaeaa77e2f3d9c2c8f0cac5220e4c6a52b95411d8d7123a28b08255d4aa290276da0682c8e12cc6f93bd2c3682be398bb7ef8f5ac7654d5986a18a36bb4bb2
+  data.tar.gz: 31b39a88162dfb9998c65410dae99984bd68b0213484648b5bf2ec699648e5d8f2b17f7cf22dcd0fedb1098fef8444658771d70928732f3ac7b66332f4187fe8

data/app/cyclid/job/evaluator.rb

@@ -23,12 +23,13 @@ module Cyclid
       class EvalException < RuntimeError
       end
 
-      # Evalute an expression for "only_if" & "not_if"
+      # Evalute an expression for "only_if", "not_if" & "fail_if"
       class Evaluator
         class << self
           def only_if(statement, vars)
             evaluate(statement, vars)
           end
+          alias fail_if only_if
 
           def not_if(statement, vars)
             not evaluate(statement, vars) # rubocop:disable Style/Not

data/app/cyclid/job/job.rb

@@ -144,7 +144,7 @@ module Cyclid
                             end
             stage_view.on_success = success_stage
 
-            # Now set the on_failure failure
+            # Now set the on_failure handler
             stage_failure = { stage: job_stage[:on_failure] }
             job_sequence << stage_failure \
               unless job_stage[:on_failure].nil? or \
@@ -154,6 +154,7 @@ module Cyclid
             # Merge in any modifiers
             stage_view.only_if = job_stage[:only_if]
             stage_view.not_if = job_stage[:not_if]
+            stage_view.fail_if = job_stage[:fail_if]
 
             # Store the modified StageView
             stages[stage_view.name.to_sym] = stage_view

data/app/cyclid/job/runner.rb

@@ -156,6 +156,15 @@ module Cyclid
               # rubocop:enable Style/MultilineTernaryOperator
             end
 
+            # Fail the stage if fail_if applies
+            if stage.fail_if && Evaluator.fail_if(stage.fail_if, @ctx)
+              @notifier.write "Stage #{stage.name} v#{stage.version} failed: #{stage.fail_if}\n"
+
+              success = false
+
+              Cyclid.logger.info "stage failed due to #{stage.fail_if}"
+            end
+
             # Decide which stage to run next depending on the outcome of this
             # one
             if success

data/app/cyclid/job/stage.rb

@@ -25,7 +25,7 @@ module Cyclid
       # the database object.
       class StageView
         attr_reader :name, :version, :steps
-        attr_accessor :on_success, :on_failure, :only_if, :not_if
+        attr_accessor :on_success, :on_failure, :only_if, :not_if, :fail_if
 
         def initialize(arg)
           if arg.is_a? Cyclid::API::Stage

data/app/cyclid/plugins/api/github/helpers.rb

@@ -29,6 +29,10 @@ module Cyclid
               @pr ||= @payload['pull_request']
             end
 
+            def pr_number
+              @pr_number ||= pull_request['number']
+            end
+
             def pr_head
               @pr_head ||= pull_request['head']
             end
@@ -112,7 +116,7 @@ module Cyclid
               sha = nil
               type = nil
               tree['tree'].each do |file|
-                match = file['path'].match(/\A\.cyclid\.(json|yml)\z/)
+                match = file['path'].match(/\A\.cyclid\.(json|yml|yaml)\z/)
                 next unless match
 
                 sha = file['sha']
@@ -127,7 +131,7 @@ module Cyclid
               case type
               when 'json'
                 Oj.load(Base64.decode64(blob.content))
-              when 'yml'
+              when 'yml', 'yaml'
                 YAML.load(Base64.decode64(blob.content))
               end
             end

data/app/cyclid/plugins/api/github/pull_request.rb

@@ -117,7 +117,10 @@ module Cyclid
                 ctx = { github_event: 'pull_request',
                         github_user: pull_request['user']['login'],
                         github_ref: pr_ref,
-                        github_comment: pull_request['title'] }
+                        github_comment: pull_request['title'],
+                        github_owner: pr_repository.owner,
+                        github_repository: pr_repository.name,
+                        github_number: pr_number }
 
                 callback = GithubCallback.new(auth_token, pr_repository, pr_sha, linkback_url)
                 job_from_definition(job_definition, callback, ctx)
@@ -154,7 +157,7 @@ module Cyclid
               end
 
               # If we didn't update an existing source definition, insert the new one
-              normalized << new unless updated
+              normalized << new_source unless updated
 
               normalized.compact
             end

data/lib/cyclid/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Cyclid
   module Api
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj