@atomist/rug - npm Package Compare versions

Comparing version 0.16.0 to 0.17.0

operations/Handlers.js

@@ -62,4 +62,4 @@ "use strict";
     };
-    Message.prototype.withTreeNode = function (node) {
-        this.treeNode = node;
+    Message.prototype.withNode = function (node) {
+        this.node = node;
         return this;
@@ -79,5 +79,7 @@ };
 }());
-MappedParameters.REPO_OWNER = "atomist/owner";
-MappedParameters.REPOSITORY = "atomist/repository";
-MappedParameters.REPO_USER_TOKEN = "atomist/github/user_token=repo";
+MappedParameters.GITHUB_REPO_OWNER = "atomist://github/repository/owner";
+MappedParameters.GITHUB_REPOSITORY = "atomist://github/repository";
+MappedParameters.SLACK_CHANNEL = "atomist://slack/channel";
+MappedParameters.SLACK_TEAM = "atomist://slack/team";
+MappedParameters.SLACK_USER = "atomist://slack/user";
 exports.MappedParameters = MappedParameters;

operations/Handlers.ts

@@ -159,3 +159,3 @@ import {GraphNode, TreeNode, PathExpressionEngine, PathExpression, Match} from "../tree/PathExpression"
 
-  treeNode?: GraphNode;
+  node?: GraphNode;
   correlationId?: string
@@ -168,4 +168,4 @@
 
-  public withTreeNode?(node: GraphNode) : this {
-    this.treeNode = node;
+  public withNode?(node: GraphNode) : this {
+    this.node = node;
     return this;
@@ -192,5 +192,7 @@ }
 abstract class MappedParameters {
-  static readonly REPO_OWNER: string = "atomist/owner"
-  static readonly REPOSITORY: string = "atomist/repository"
-  static readonly REPO_USER_TOKEN: string = "atomist/github/user_token=repo"
+  static readonly GITHUB_REPO_OWNER: string = "atomist://github/repository/owner"
+  static readonly GITHUB_REPOSITORY: string = "atomist://github/repository"
+  static readonly SLACK_CHANNEL: string = "atomist://slack/channel"
+  static readonly SLACK_TEAM: string = "atomist://slack/team"
+  static readonly SLACK_USER: string = "atomist://slack/user"
 }
@@ -197,0 +199,0 @@

operations/ProjectReviewer.ts

@@ -5,6 +5,6 @@ import {RugOperation, ReviewResult} from "./RugOperation"
 
-
 export interface ReviewProject {
   review(project: Project, params?: {}): ReviewResult
 }
+
 /**
@@ -11,0 +11,0 @@ * Review the given project with given parameters

operations/RugOperation.js

@@ -86,4 +86,17 @@ "use strict";
     };
+    /**
+     * Combine the results of the given reviewers
+     * @param results review results to combine
+     */
+    ReviewResult.combine = function (results) {
+        if (results.length == 0)
+            throw new Error("Invalid argument: Need at least one review result");
+        var combinedComments = [];
+        results.forEach(function (r) {
+            return r.comments.forEach(function (c) { return combinedComments.push(c); });
+        });
+        return new ReviewResult(results.map(function (r) { return r.note; }).join(","), combinedComments);
+    };
     return ReviewResult;
 }());
 exports.ReviewResult = ReviewResult;

operations/RugOperation.ts

@@ -105,7 +105,26 @@
 
-  static empty(note: string) {
+  static empty(note: string): ReviewResult {
     return new ReviewResult(note, [])
   }
+
+  /**
+   * Combine the results of the given reviewers
+   * @param results review results to combine
+   */
+  static combine(results: ReviewResult[]): ReviewResult {
+    if (results.length == 0)
+      throw new Error("Invalid argument: Need at least one review result")
+    let combinedComments: ReviewComment[] = []
+    results.forEach(r => 
+      r.comments.forEach(
+        c => combinedComments.push(c)
+      )
+    )
+    return new ReviewResult(
+      results.map(r => r.note).join(","),
+      combinedComments
+    )
+  }
 }
 
 export {RugOperation, Parameter, Pattern, Result, Status, ReviewResult, ReviewComment, Severity, BaseParameter}

package.json

 {
   "name": "@atomist/rug",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "TypeScript model for Atomist editors, generators etc",
@@ -5,0 +5,0 @@ "repository": {

test/handler/Core.ts

@@ -66,7 +66,7 @@ import { ScenarioWorld } from "../ScenarioWorld"
 
-    Given(s: string, f: (Project, HandlerScenarioWorld?) => void): void
+    Given(s: string, f: (Project, HandlerScenarioWorld?, ...args) => void): void
 
-    When(s: string, f: (Project, HandlerScenarioWorld?) => void): void
+    When(s: string, f: (Project, HandlerScenarioWorld?, ...args) => void): void
 
-    Then(s: string, f: (Project, HandlerScenarioWorld?) => Result | boolean): void
+    Then(s: string, f: (Project, HandlerScenarioWorld?, ...args) => Result | boolean): void
 
@@ -78,11 +78,11 @@ }
 
-export function Given(s: string, f: (Project, HandlerScenarioWorld?) => void) {
+export function Given(s: string, f: (Project, HandlerScenarioWorld?, ...args) => void) {
     com_atomist_rug_test_gherkin_GherkinRunner$_definitions.Given(s, f)
 }
 
-export function When(s: string, f: (Project, HandlerScenarioWorld?) => void) {
+export function When(s: string, f: (Project, HandlerScenarioWorld?, ...args) => void) {
     com_atomist_rug_test_gherkin_GherkinRunner$_definitions.When(s, f)
 }
 
-export function Then(s: string, f: (Project, HandlerScenarioWorld?) => Result | boolean) {
+export function Then(s: string, f: (Project, HandlerScenarioWorld?, ...args) => Result | boolean) {
     com_atomist_rug_test_gherkin_GherkinRunner$_definitions.Then(s, f)
@@ -89,0 +89,0 @@ }

test/project/Core.ts

@@ -54,7 +54,7 @@ import { Project } from "../../model/Core"
 
-    Given(s: string, f: (Project, ProjectScenarioWorld?) => void): void
+    Given(s: string, f: (Project, ProjectScenarioWorld?, ...args) => void): void
 
-    When(s: string, f: (Project, ProjectScenarioWorld?) => void): void
+    When(s: string, f: (Project, ProjectScenarioWorld?, ...args) => void): void
 
-    Then(s: string, f: (Project, ProjectScenarioWorld?) => Result | boolean): void
+    Then(s: string, f: (Project, ProjectScenarioWorld?, ...args) => Result | boolean): void
 
@@ -66,11 +66,11 @@ }
 
-export function Given(s: string, f: (Project, ProjectScenarioWorld?) => void) {
+export function Given(s: string, f: (Project, ProjectScenarioWorld?, ...args) => void) {
     com_atomist_rug_test_gherkin_GherkinRunner$_definitions.Given(s, f)
 }
 
-export function When(s: string, f: (Project, ProjectScenarioWorld?) => void) {
+export function When(s: string, f: (Project, ProjectScenarioWorld?, ...args) => void) {
     com_atomist_rug_test_gherkin_GherkinRunner$_definitions.When(s, f)
 }
 
-export function Then(s: string, f: (Project, ProjectScenarioWorld?) => Result | boolean) {
+export function Then(s: string, f: (Project, ProjectScenarioWorld?, ...args) => Result | boolean) {
     com_atomist_rug_test_gherkin_GherkinRunner$_definitions.Then(s, f)
@@ -77,0 +77,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

3423611

increased by0.36%

Lines of code

7679

increased by2.5%

No dependency changes