lita-heroku 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef0b49e0d8ccdd532240cf3dbe0464e757b5323
-  data.tar.gz: 009a8150386caa5324e9f391dc9a24f4a0462cf9
+  metadata.gz: 7ea1479c89addbafb3f848555eecd0ccae6f164d
+  data.tar.gz: b5211f61d5bbae6b64a9b3a38560726b6f9154ca
 SHA512:
-  metadata.gz: 1c99a77aa674c4f7a8fb643c8a73c7ab810589264d938c4778b430040a13d69a0c2e1db6ab20af9f42d90ec61efd25580c03841e1ef845a839d921682ee0d0d5
-  data.tar.gz: 3294b29606614d408918da09cc0cd3dd4bffafd3e3ad33d687f1e7c18a314386f027764db685f6bd6a31f0ff25c9fbd0c0c4ca4f0e5692f02318d8b13a9fafd5
+  metadata.gz: 3a145aac191080e00fc5fbd605c8999fd70143564140bb45305971fde186b2c71625a79153189eb187847d0fcf5c1cdab34686996d168a4809381ea477778914
+  data.tar.gz: 73a357c27064d3cf5e72fc9fc1e18f3a5639858ef0e592af4f907552418d8e8d6a733d7ac182497dd98ca8283f2474417391ac936e3d40e8cb341bee8ff39cce

data/README.md

@@ -10,6 +10,20 @@ Add lita-heroku to your Lita instance's Gemfile:
 gem "lita-heroku"
 ```
 
+Create an oauth token and set it in config:
+
+``` bash
+heroku plugins:install https://github.com/heroku/heroku-oauth
+heroku authorizations:create -d "Lita Bot"
+echo "HEROKU_OAUTH_TOKEN=YOUR_TOKEN" >> .env
+```
+
+In your lita config:
+
+``` ruby
+config.handlers.heroku.oauth_token = ENV.fetch("HEROKU_OAUTH_TOKEN")
+```
+
 ## Configuration
 
 TODO: Describe any configuration attributes the plugin exposes.

data/lib/lita/handlers/heroku.rb

@@ -2,8 +2,8 @@ require "json"
 module Lita
   module Handlers
     class Heroku < Handler
-      config :bearer, required: true
-      config :application_id, required: true
+      config :oauth_token, required: true
+      config :app_prefix
 
       route(/^hk\s+([^ ]+)\s+(.+)/, :heroku_cmd, command: true, help: {
         "hk [app name] [command]" => "example: 'lita hk production ps'"
@@ -15,7 +15,7 @@ module Lita
         if command == "deploy"
           heroku_deploy response
         else
-          response.reply `#{heroku_bin} #{command} -a hats-#{environment}`
+          response.reply `#{heroku_bin} #{command} -a #{config.app_prefix}#{environment}`
         end
       end
 
@@ -32,25 +32,35 @@ module Lita
       end
 
       route(/^hk deploy\s+(.+)/, :heroku_deploy, command: true, help: {
-        "hk deploy [environment]" => "example: 'lita hk production deploy'"
+        "hk [environment] deploy" => "example: 'lita hk production deploy'"
       })
 
       def heroku_deploy(response)
-        app_id = config.application_id
-        bearer = config.bearer
-        branch = "master"
+        bearer = config.oauth_token
+        app_name = "#{config.app_prefix}#{response.matches[0][0]}"
+        branch = response.matches[0][1] || "master"
+
+        apps = JSON.parse `curl -s "https://api.heroku.com/apps" -H "Authorization: Bearer #{bearer}" -H 'Accept: application/vnd.heroku+json; version=3'`
+        app = apps.select{|app| app["name"] == app_name }.first
+        app_id = app["id"]
 
         build_response = `curl -s "https://kolkrabbi.herokuapp.com/apps/#{app_id}/github/push" -H "Authorization: Bearer #{bearer}" -d '{"branch":"#{branch}"}'`
         build_response = JSON.parse build_response
 
         if build_response.key?("build") && build_response["build"]["status"] == "pending"
-          response.reply("Started deploy.")
+          response.reply("Deploying #{branch} to #{app_name}.")
         else
           $stdout.puts build_response
-          response.reply("Deploy could not be started. Check my logs for more information.")
+          response.reply("Deploy could not be started. Response: #{build_response}")
         end
       end
 
+      def api(bearer, uri, data=nil)
+        cmd  = %Q{curl -s "https://kolkrabbi.herokuapp.com#{uri}" -H "Authorization: Bearer #{bearer}" -H 'range: name ..; order=asc, max=1000'}
+        cmd += %Q{-d '#{data}'} if data
+        JSON.parse `#{cmd}`
+      end
+
       Lita.register_handler(self)
     end
   end

data/lita-heroku.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-heroku"
-  spec.version       = "0.1.2"
+  spec.version       = "0.1.3"
   spec.authors       = ["Eric Boehs"]
   spec.email         = ["ericboehs@gmail.com"]
   spec.description   = "Lita handler for interacting with Heroku Apps"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-heroku
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Eric Boehs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita