compose-hook 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3491bcf7a0049e4ff7bfa1ba0db224ed10f40050c3bede86d09b770fad954da
-  data.tar.gz: fc05d1cc28ac4cacb2d1df76587fc915fa4074bc2798153f81628fc9e8e78d53
+  metadata.gz: d427520abbe59d4d4aa9b24270c7d54a2c5e286062c29710333f7ff55c32880b
+  data.tar.gz: 4300439a695628b7741d9b52fa3de99d4d48f766e5c6821415966763b71a6fdf
 SHA512:
-  metadata.gz: 0bd14948077b984c891ffe561a640902b0d05cebc671edeb841cd5d78b02043deeeb03da02fd019c3dfae6357784c44780f0701e26d55d92e90896d7fc8e8fcd
-  data.tar.gz: f81395406a042fbe05dd04d8c80a8a5b98d2ab7cbff321bece6968d2a4820f37494ebea4c2fabb70da287c3e80ccb924359f7e6f5c4722ced8bbe4060b1330ff
+  metadata.gz: 6a460dd5dd9a6c3d1e543c895089a2a994e7ea0256e5773d8578009996fee3c28f33471ee984d2d28d105107eab06408ebe14df7465d81e3f24f96997d64fba0
+  data.tar.gz: 56b536867cf8a10d78d0b89e7c9b42263e8de99842376e9281baa4e39fdd116b108e60d8c05599d540f5585b95ac8f41c9f8a71dfa0293c77865d817adbcff79

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    compose-hook (0.1.1)
+    compose-hook (0.1.2)
       faraday
       jwt (~> 2.2)
       puma

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/compose-hook

@@ -4,6 +4,9 @@
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), "../lib")
 
-require 'compose-hook'
+require "compose-hook"
 
-run ComposeHook::WebHook.run!
+port = ENV["COMPOSE_HOOK_PORT"] || 1337
+host = ENV["COMPOSE_HOOK_HOST"] || "0.0.0.0"
+
+run ComposeHook::WebHook.run!(port: port, bind: host)

data/bin/compose-payload

@@ -4,13 +4,13 @@
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), "../lib")
 
-require 'faraday'
-require 'compose-hook'
+require "faraday"
+require "compose-hook"
 
-abort 'Usage: payload *service* *image* *url*' unless ARGV.length == 3
+abort "Usage: payload *service* *image* *url*" unless ARGV.length == 3
 
-secret = ENV['WEBHOOK_JWT_SECRET']
-abort 'WEBHOOK_JWT_SECRET not set' if secret.to_s.empty?
+secret = ENV["WEBHOOK_JWT_SECRET"]
+abort "WEBHOOK_JWT_SECRET not set" if secret.to_s.empty?
 coder = ComposeHook::Payload.new(secret: secret)
 
 jwt = coder.generate!(service: ARGV[0], image: ARGV[1])
@@ -22,4 +22,4 @@ end
 
 pp response.body
 
-fail unless response.status == 200
+raise unless response.status == 200

data/lib/compose_hook/webhook.rb

@@ -6,16 +6,15 @@ class ComposeHook::WebHook < Sinatra::Base
 
   attr_accessor :config, :secret, :decoder
 
-  CONFIG_PATH = "compose/docker-compose.yml"
-  STAGES_PATH = "/home/deploy/webhook/stages.yml"
-
   set :show_exceptions, false
 
-  def initialize
+  def initialize(app=nil)
     super
 
     @secret = ENV["WEBHOOK_JWT_SECRET"]
-    raise "WEBHOOK_JWT_SECRET is not set" if @secret.to_s.empty?
+    raise "WEBHOOK_JWT_SECRET is not set" if secret.to_s.empty?
+    raise "CONFIG_PATH is not set" if ENV["CONFIG_PATH"].to_s.empty?
+    raise "File #{ENV['CONFIG_PATH']} not found" unless File.exist?(ENV["CONFIG_PATH"])
 
     @config = YAML.load_file(ENV["CONFIG_PATH"])
     raise "The config file is empty or non-existent" if @config.empty?
@@ -60,7 +59,7 @@ class ComposeHook::WebHook < Sinatra::Base
       service = decoded["service"]
       image = decoded["image"]
       hostname = request.host
-      deployment = config.find { |d| d["domain"] == hostname }
+      deployment = config.find {|d| d["domain"] == hostname }
       service_file = find_service(service, File.join(deployment["path"], deployment["subpath"]))
 
       return answer(400, "service is not specified") unless service

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compose-hook
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Danylo P.
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday