automatically generate release on merge into master (#85)

* automatically generate release on merge into master

* Update README.md

* Update .travis.yml

* Delete .DS_Store

Author: gitseti

.travis.yml

@@ -1,33 +1,26 @@
 dist: trusty
-
 language: java
-
 jdk:
   - oraclejdk8
   - oraclejdk9
 
 stages:
   - test
   - name: release
-    if: branch = master && type != pull_request
-
-script: ./gradlew check javadoc
+    if: type != pull_request && branch = master
 
 jobs:
   include:
     - stage: release
       install: true
-      script: ./gradlew bintrayUpload -x test
-
-addons:
-  apt:
-    packages:
-      - perl
+      script: "./gradlew githubRelease"
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
 cache:
   directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
+    - "$HOME/.gradle/caches/"
+    - "$HOME/.gradle/wrapper/"
+

README.md

@@ -2,7 +2,7 @@
 
 <img src="01-mqtt-cli.svg" width="500"> 
 
-[![Build Status](https://travis-ci.org/hivemq/01-mqtt-cli.svg?branch=develop)](https://travis-ci.org/hivemq/hivemq-cli) 
+[![Build Status](https://travis-ci.org/hivemq/01-mqtt-cli.svg?branch=develop)](https://travis-ci.org/hivemq/mqtt-cli) 
 
 MQTT 5.0 and 3.1.1 compatible and feature-rich MQTT Command Line Interface
 

build.gradle

@@ -19,6 +19,7 @@ plugins {
     id 'edu.sc.seis.launch4j' version '2.4.6'
     id 'com.palantir.graal' version '0.6.0'
     id 'de.thetaphi.forbiddenapis' version '2.6' apply false
+    id "com.github.breadmoirai.github-release" version "2.2.9"
 }
 
 apply plugin: 'de.thetaphi.forbiddenapis'
@@ -50,7 +51,7 @@ compileTestJava {
 
 group = 'com.hivemq'
 version = '1.0.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
-description = 'HiveMQ CLI is a tool that provides a feature rich command line interface for connecting, ' +
+description = 'MQTT CLI is a tool that provides a feature rich command line interface for connecting, ' +
         'publishing, subscribing, unsubscribing and disconnecting ' +
         'various MQTT clients simultaneously and supports  MQTT 5.0 and MQTT 3.1.1 '
 
@@ -77,7 +78,7 @@ ext {
     readableName = 'mqtt-cli'
     appName = 'MQTT CLI'
     githubOrg = 'hivemq'
-    githubRepo = 'hivemq-cli'
+    githubRepo = 'mqtt-cli'
     githubUrl = 'https://github.com/' + githubOrg + '/' + githubRepo
     scmConnection = 'scm:git:git://github.com/' + githubOrg + '/' + githubRepo + '.git'
     scmDeveloperConnection = 'scm:git:ssh://git@github.com/' + githubOrg + '/' + githubRepo + '.git'
@@ -329,15 +330,15 @@ graal {
 task buildPackageBrew(type: Zip) {
     dependsOn shadowJar
 
-    archiveFileName = project.readableName + '-' + project.version + '-distribution.zip'
+    archiveFileName = project.readableName + '-' + project.version + '-brew.zip'
     destinationDirectory = file(project.buildBrewDir)
 
     from shadowJar.archiveFile
-    from "$brewDir/mqtt-cli"
+    from "$brewDir/mqtt"
 
     into('brew') {
         from shadowJar.archiveFile
-        from "$brewDir/mqtt-cli"
+        from "$brewDir/mqtt"
     }
 
     from(projectDir) {
@@ -355,6 +356,7 @@ task buildBrewFormula(type: Copy) {
 
     doLast {
         ant.replace(file: "$buildBrewDir/mqtt-cli.rb", token: "@@description@@", value: project.description)
+        ant.replace(file: "$buildBrewDir/mqtt-cli.rb", token: "@@version@@", value: project.version)
         ant.replace(file: "$buildBrewDir/mqtt-cli.rb", token: "@@filename@@", value: buildPackageBrew.archiveFileName.get())
         ant.replace(file: "$buildBrewDir/mqtt-cli.rb", token: "@@shasum@@", value: checkSum(buildPackageBrew.archiveFile.get().getAsFile()))
     }
@@ -395,15 +397,15 @@ ospackage {
         fileType LICENSE
     }
     from(debDir) {
-        include 'mqtt-cli'
+        include 'mqtt'
         fileMode 0755
         filter {
             it.replaceAll("@@jarPath@@", "/opt/${packageName}/${shadowJar.archiveFileName.get()}")
         }
     }
 
 
-    link('/usr/bin/mqtt-cli', "/opt/$packageName/mqtt-cli", 0755)
+    link('/usr/bin/mqtt', "/opt/$packageName/mqtt", 0755)
 
 }
 
@@ -419,11 +421,13 @@ buildRpm {
 task buildDebianPackage(type: Copy) {
     from buildDeb
     into project.buildDebDir
+    include "*.deb"
 }
 
 task buildRpmPackage(type: Copy) {
     from buildRpm
     into project.buildRpmDir
+    include "*.rpm"
 }
 
 // Windows
@@ -446,7 +450,7 @@ launch4j {
 task buildWindowsZip(type: Zip) {
     dependsOn createExe
 
-    archiveFileName = "${project.readableName}-${project.version}-distribution.zip"
+    archiveFileName = "${project.readableName}-${project.version}-win.zip"
     destinationDirectory = file(project.buildWinDir)
 
     from ("${project.winDir}") {
@@ -465,6 +469,23 @@ task buildPackageAll {
     dependsOn buildBrewFormula, buildDebianPackage, buildRpmPackage, buildWindowsZip
 }
 
+githubRelease {
+    token "" + System.getenv("GITHUB_API_TOKEN")
+    owner = project.githubOrg
+    targetCommitish "develop"
+    body ""
+    draft false
+    prerelease false
+    releaseAssets file("${project.buildRpmDir}/${project.readableName}-${project.version}.noarch.rpm"),
+            file("${project.buildDebDir}/${project.readableName}_${project.version}_all.deb"),
+            file("${project.buildBrewDir}/${project.readableName}-${project.version}-brew.zip"),
+            buildWindowsZip
+    overwrite true
+}
+
+
+tasks.githubRelease.dependsOn tasks.buildPackageAll
+
 // Helpers
 import java.security.DigestInputStream
 import java.security.MessageDigest

graal/native-image/.DS_Store

@@ -0,0 +1,3 @@
+#!/bin/bash
+# Runs Mqtt CLI
+exec java -jar ##PREFIX## "$@"

packages/debian/mqtt-cli renamed to packages/debian/mqtt

@@ -1,14 +1,14 @@
-class HivemqCli < Formula
+class MqttCli < Formula
   desc "@@description@@"
   homepage "https://www.hivemq.com"
-  url "https://www.hivemq.com/tests/@@filename@@"
+  url "https://github.com/hivemq/mqtt-cli/releases/download/v@@version@@/@@filename@@"
   sha256 "@@shasum@@"
   depends_on :java => "1.8+"
 
   def install
-    inreplace "brew/mqtt-cli", "##PREFIX##", "#{prefix}"
-    prefix.install "mqtt-cli.jar"
-    bin.install "brew/mqtt-cli"
+    inreplace "brew/mqtt", "##PREFIX##", "#{prefix}/mqtt-cli-@@version@@.jar"
+    prefix.install "mqtt-cli-@@version@@.jar"
+    bin.install "brew/mqtt"
   end
 
   test do

packages/homebrew/mqtt

@@ -0,0 +1,4 @@
+To execute MQTT CLI simply open the Windows Command Prompt with ⊞Win + R and execute cmd.
+Navigate into the extracted MQTT CLI folder and execute the mqtt-cli.exe command.
+
+To quick start a MQTT CLI shell simply double-click the mqtt-cli-shell.cmd file.