Initial commit

Author: jacovdbosch

.gitignore

@@ -0,0 +1,2 @@
+dialogflow-merged/
+vendor/

LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Jaco van den Bosch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -0,0 +1,11 @@
+# Dialogflow Agent Merger
+
+This command helps you merge two dialogflow agents together. If you have multiple agents you are working one and you are actively training on one of them, it can be hard to get the trained agent into the development agent. With this command you can keep your training that you did on the production version, but also keep the new/modified intents that you were working on.
+
+## Usage
+
+```
+dfmerger merge <path-to-production-zip> <path-to-development-zip>
+```
+
+This will create a new zip in your directory called `dialogflow-merged`

composer.json

@@ -0,0 +1,24 @@
+{
+	"name": "Rosterbuster/dialogflow-conversion",
+	"description": "Merge a production (with training) and development agent (with older training/no training) together",
+	"keywords": ["Dialogflow", "Merge", "Agents"],
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Jaco van den Bosch",
+			"email": "[email protected]"
+		}
+	],
+	"require": {
+		"ext-zip": "*",
+        "symfony/console": "~3.0|~4.0"
+    },
+    "autoload": {
+    	"psr-4": {
+    		"Rosterbuster\\Dialogflow\\": "src/"
+    	}
+    },
+    "bin": [
+    	"dfmerger"
+    ]
+}

composer.lock

@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+
+use Rosterbuster\Dialogflow\MergeCommand;
+use Symfony\Component\Console\Application;
+
+if (file_exists(__DIR__.'/../../autoload.php')) {
+    require __DIR__ . '/../../autoload.php';
+} else {
+    require __DIR__ . '/vendor/autoload.php';
+}
+
+$app = new Application();
+
+$app->add(new MergeCommand());
+
+$app->run();