.circleci/config.yml

@@ -0,0 +1,65 @@
+defaults: &defaults
+  working_directory: ~/SmartThingsCommunity/SmartThingsPublic
+  docker:
+    - image: smartthings-docker-build.jfrog.io/releng/build-common:latest
+      auth:
+        username: $ARTIFACTORY_USERNAME
+        password: $ARTIFACTORY_PASSWORD
+  shell: /bin/bash --login
+  parallelism: 1
+version: 2
+jobs:
+  build:
+    <<: *defaults
+    steps:
+      - checkout
+      - run: ./gradlew check -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD"
+      - run: ./gradlew compileSmartappsGroovy compileDevicetypesGroovy -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD"
+  deploy-dev:
+    <<: *defaults
+    steps:
+      - checkout
+      - run: ./gradlew deployArchives -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD" -Ps3Buckets="$S3_BUCKETS_DEV" -PawsAccessKey="$S3_IAM_PREPROD_USERNAME" -PawsSecretKey="$S3_IAM_PREPROD_PASSWORD"
+      - run: ./gradlew slackSendMessage -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD" -Pbranch="$CIRCLE_BRANCH" -PslackToken="$SLACK_TOKEN" -PslackWebhookUrl="$SLACK_WEBHOOK_URL" -PslackChannel="$SLACK_CHANNEL" --stacktrace
+  deploy-stage:
+    <<: *defaults
+    steps:
+      - checkout
+      - run: ./gradlew deployArchives -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD" -Ps3Buckets="$S3_BUCKETS_STAGE" -PawsAccessKey="$S3_IAM_PREPROD_USERNAME" -PawsSecretKey="$S3_IAM_PREPROD_PASSWORD"
+      - run: ./gradlew slackSendMessage -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD" -Pbranch="$CIRCLE_BRANCH" -PslackToken="$SLACK_TOKEN" -PslackWebhookUrl="$SLACK_WEBHOOK_URL" -PslackChannel="$SLACK_CHANNEL_STAGE" --stacktrace
+  deploy-accept:
+    <<: *defaults
+    steps:
+      - checkout
+      - run: ./gradlew deployArchives -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD" -Ps3Buckets="$S3_BUCKETS_ACCEPT" -PawsAccessKey="$S3_IAM_ACCEPTANCE_USERNAME" -PawsSecretKey="$S3_IAM_ACCEPTANCE_PASSWORD"
+      - run: ./gradlew slackSendMessage -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD" -Pbranch="$CIRCLE_BRANCH" -PslackToken="$SLACK_TOKEN" -PslackWebhookUrl="$SLACK_WEBHOOK_URL" -PslackChannel="$SLACK_CHANNEL_ACCEPT" --stacktrace
+workflows:
+  version: 2
+  deploy:
+    jobs:
+      - build:
+          filters:
+            branches:
+              only:
+                - master
+                - staging
+                - acceptance
+                - production
+      - deploy-dev:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master
+      - deploy-stage:
+          requires:
+            - build
+          filters:
+            branches:
+              only: staging
+      - deploy-accept:
+          requires:
+            - build
+          filters:
+            branches:
+              only: acceptance

.githooks/pre-commit

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+ERROR_COUNT=0
+while IFS= read -r DTH; do
+  echo "Verifying $DTH"
+  ERRORS=$(groovyc $DTH 2>&1 | grep ".groovy:")
+  # echo $ERRORS
+  IMPORTANT_ERRORS=$(echo $ERRORS | grep -v "unable")
+  if [[ ${#IMPORTANT_ERRORS} -eq 0 ]]; then
+    echo "No disqualifying compilation errors found"
+  else
+    echo "$DTH failed to compile, run groovyc on your source file for the full error: $ERRORS"
+    ERROR_COUNT=$((ERROR_COUNT + 1))
+  fi
+  echo "======================================================================="
+done < <(git diff --cached --name-only | grep .*.groovy)
+
+if [[ $ERROR_COUNT -gt 0 ]]; then
+  echo "rejected" && exit 1
+else
+  exit 0
+fi

README.md

@@ -1,15 +1,12 @@
-# SmartThings Public GitHub Repo
+# Welcome to the SmartThings Public GitHub Repo
 
-An official list of SmartApps and Device Types from SmartThings.
+This repo contains development code for SmartApps and Groovy DTHs (Dynamic Type Handlers).
 
-Here are some links to help you get started coding right away:
+Here are some links to help you get started:
 
-* [GitHub-specific Documentation](http://docs.smartthings.com/en/latest/tools-and-ide/github-integration.html)
-* [Full Documentation](http://docs.smartthings.com)
-* [IDE & Simulator](http://ide.smartthings.com)
+* [Developer Documentation](https://developer-preview.smartthings.com)
+* [Developer Workspace](https://smartthings.developer.samsung.com/workspace)
 * [Community Forums](http://community.smartthings.com)
 
-Follow us on the web:
-
-* Twitter: http://twitter.com/smartthingsdev
-* Facebook: http://facebook.com/smartthingsdevelopers
+> SmartThings Edge Device Drivers are the new method for integrating Hub Connected Devices into the SmartThings Platform. With the launch of SmartThings Edge, we are taking some events that would have happened in the Cloud and moving them to the SmartThings Hub. SmartThings Edge uses Lua-based device drivers and our Rules API to control and automate devices connected directly to a SmartThings Hub. This includes Zigbee, Z-Wave, and LAN devices as well as automations triggered by timers and other Hub Connected devices using drivers. In the future, this will expand to include more protocols and features, like the new Matter standard.
+> To learn more about SmartThings Edge, visit [Get Started with SmartThings Edge](https://developer-preview.smartthings.com/docs/devices/hub-connected/get-started).

build.gradle

@@ -9,30 +9,28 @@ apply plugin: 'smartthings-slack'
 
 buildscript {
     dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.8"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.12"
     }
     repositories {
         mavenLocal()
-        jcenter()
         maven {
             credentials {
                 username smartThingsArtifactoryUserName
                 password smartThingsArtifactoryPassword
             }
-            url "https://artifactory.smartthings.com/libs-release-local"
+            url "https://smartthings.jfrog.io/smartthings/libs-release"
         }
     }
 }
 
 repositories {
     mavenLocal()
-    jcenter()
     maven {
         credentials {
             username smartThingsArtifactoryUserName
             password smartThingsArtifactoryPassword
         }
-        url "https://artifactory.smartthings.com/libs-release-local"
+        url "https://smartthings.jfrog.io/smartthings/libs-release"
     }
 }
 
@@ -51,10 +49,10 @@ sourceSets {
 
 dependencies {
     devicetypesCompile 'org.codehaus.groovy:groovy-all:2.4.7'
-    devicetypesCompile 'smartthings:appengine-z-wave:0.1.2'
-    devicetypesCompile 'smartthings:appengine-zigbee:0.1.11'
+    devicetypesCompile 'smartthings:appengine-z-wave:0.1.3'
+    devicetypesCompile 'smartthings:appengine-zigbee:0.1.12'
     smartappsCompile 'org.codehaus.groovy:groovy-all:2.4.7'
-    smartappsCompile 'smartthings:appengine-common:0.1.8'
+    smartappsCompile 'smartthings:appengine-common:0.1.9'
     smartappsCompile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
     smartappsCompile 'org.grails:grails-web:2.3.11'
     smartappsCompile 'org.json:json:20140107'
@@ -65,28 +63,35 @@ slackSendMessage {
     String token = project.hasProperty('slackToken') ? project.property('slackToken') : null
     String webhookUrl = project.hasProperty('slackWebhookUrl') ? project.property('slackWebhookUrl') : null
     String channel = project.hasProperty('slackChannel') ? project.property('slackChannel') : null
-    String drinks = 'https://dl.dropboxusercontent.com/s/m1z5mpd3c83lwev/minion_beer.jpeg?dl=0'
-    String wolverine = 'https://dl.dropboxusercontent.com/s/4lbjqzvm2v033u9/minion_wolverine.jpg?dl=0'
-    String beach = 'https://dl.dropboxusercontent.com/s/rqrfgxk53gfng69/minion_beach.png?dl=0'
+    String drinks = 'https://d2j2zbtzrapq2t.cloudfront.net/minion_beer.jpeg'
+    String wolverine = 'https://d2j2zbtzrapq2t.cloudfront.net/minion_wolverine.jpg'
+    String beach = 'https://d2j2zbtzrapq2t.cloudfront.net/minion_beach.png'
+    String captain = 'https://d2j2zbtzrapq2t.cloudfront.net/minion_captain.jpeg'
     String iconUrl
     String color
     String messageText
     String username
     switch (branch) {
         case 'master':
-            username = 'Hickory'
+            username = 'DEV'
             iconUrl = wolverine
             color = '#35D0F2'
             messageText = 'Began deployment of _SmartThingsPublic[master]_ branch to the _Dev_ environments.'
             break
         case 'staging':
-            username = 'Dickory'
+            username = 'STG'
             iconUrl = beach
             color = '#FFDE20'
             messageText = 'Began deployment of _SmartThingsPublic[staging]_ branch to the _Staging_ environments.'
             break
+         case 'acceptance':
+            username = 'ACC'
+            iconUrl = captain
+            color = '#FFDE20'
+            messageText = 'Began deployment of _SmartThingsPublic[acceptance]_ branch to the _Acceptance_ environments.'
+            break
         case 'production':
-            username = 'Dock'
+            username = 'PRD'
             iconUrl = drinks
             color = '#FF1D23'
             messageText = 'Began deployment of _SmartThingsPublic[production]_ branch to the _Prod_ environments.'
@@ -131,3 +136,17 @@ slackSendMessage {
         text: messageText
     )
 }
+
+task configure(type: Exec) {
+    description "Configures automatic spaces->tabs conversion on merge and a commit hook to detect syntax errors"
+    File attributeFile = new File("${projectDir}/.git/info/attributes")
+    attributeFile.write("*.groovy filter=tabspace\n")
+    commandLine "git", "config", "filter.tabspace.clean", "unexpand -t 2"
+    commandLine "git", "config", "core.hooksPath", ".githooks"
+}
+
+task unconfigure(type: Exec) {
+    description "Undoes configuration put in place by configure"
+    commandLine "git", "config", "--unset-all", "filter.tabspace.clean"
+    commandLine "git", "config", "core.hooksPath", "${projectDir}/.git/hooks"
+}