jobly 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf08c47fecadf75defd8d0a560c3c8e95f5ba559861bfb1eb86044e3a67bd3a6
-  data.tar.gz: 395dfe0c8d754f68ddbf469144b8f37748cd825de226e525c51b07b383858d8b
+  metadata.gz: 3a7926c9fb8795e011f9580a3f56a11cdab1c2107204a93e7b831d6bfa0953a3
+  data.tar.gz: 41e7bc1e01dfeaf5bb20b3aff721585fa4e75cbbd55215eb7b6f6769ea736741
 SHA512:
-  metadata.gz: ae2434f84001134c6763c90f1eef5d0c9b00b8755bcf3a9817f2e588ce3e953e6fa23e97d08f207d95ef35db518164d6a322096f9af4eeac644648410b6c9c8d
-  data.tar.gz: 5c402c8ef8f2cce341ddf70e6630ef8335db8a067f3de3d07f5a0b64f0525d9e755013ed76b8b694db8818ad80089d40e5259759f1178402f7e2c2150f1267e6
+  metadata.gz: afd149cf0b665da6791b77bba10c7a6c72d0510f2c2721b4c383427876b1a00749c7ae472cd476801a5ac8fc74d6f4c1846d7f738983720aced8a1f5a551165c
+  data.tar.gz: d4b4627453c13796d584f759e523fd4f214684ec7d02e2eb205dd87752145b60b30553d3c8ebb5a9a13d308e7f62b0b0a9c254c2a938942b7b57c9e32f2dd21d

data/README.md

@@ -40,14 +40,17 @@ sidekiq backgronud jobs system. It includes the following components:
   and for running jobs.
 - **Web API** - for executing jobs.
 - **Web Dashboard** - including job progress and status.
-
+- **Remote Syslog Support** - send output to Papertrail or remote syslog.
+- **Slack Notifications** - report job progress to Slack.
 
 
 Documentation
 --------------------------------------------------
 
-Visit the [Jobly Documentation][1].
+- Visit the [Jobly documentation][1].
+- Visit the [interactive demo on Katacoda][3].
 
 
 [1]: https://jobly.dannyb.co
-[2]: https://github.com/dannyben/docker-jobly
+[2]: https://github.com/dannyben/docker-jobly
+[3]: https://www.katacoda.com/dannyb/scenarios/jobly

data/lib/jobly/commands/config.rb

@@ -10,6 +10,7 @@ module Jobly
       def run
         line "custom config file", short_config_path, !Jobly.custom_config?
         Jobly.options.each do |key, value|
+          next unless value
           if key.to_s.end_with? '_path'
             line key, value, !Dir.exist?(value)
           else
@@ -21,7 +22,7 @@ module Jobly
     private
 
       def short_config_path
-        Jobly.config_file.sub "#{Dir.pwd}", '.'
+        Jobly.config_file.sub "#{Dir.pwd}/", ''
       end
 
       def line(key, value, attention=false)

data/lib/jobly/job.rb

@@ -5,6 +5,9 @@ module Jobly
     include JobExtensions::OptionAccessors
     include JobExtensions::Actions
     include JobExtensions::Solo
+    include JobExtensions::Slack
+    include JobExtensions::Shell
+
     using KeywordArgs
     using ToSlug
 

data/lib/jobly/job_extensions/shell.rb

@@ -0,0 +1,11 @@
+require 'tty-command'
+
+module Jobly
+  module JobExtensions
+    module Shell
+      def shell
+        @shell ||= TTY::Command.new(output: logger, color: false)
+      end
+    end
+  end
+end

data/lib/jobly/job_extensions/slack.rb

@@ -0,0 +1,45 @@
+require 'slack-notifier'
+
+module Jobly
+  module JobExtensions
+    module Slack
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def slack_channel(channel = nil)
+          if channel
+            @slack_channel = channel
+          else
+            @slack_channel ||= Jobly.slack_channel
+          end
+        end
+
+        def slack_user(user = nil)
+          if user
+            @slack_user = user
+          else
+            @slack_user ||= Jobly.slack_user
+          end
+        end
+      end
+
+      def slack
+        @slack ||= slack!
+      end
+
+    private
+
+      def slack!
+        raise ArgumentError, "Slack webhook is not set" unless Jobly.slack_webhook
+        opts = {
+          channel: self.class.slack_channel,
+          username: self.class.slack_user
+        }
+        ::Slack::Notifier.new Jobly.slack_webhook, opts
+      end
+
+    end
+  end
+end

data/lib/jobly/module_functions.rb

@@ -17,6 +17,9 @@ module Jobly
       redis_url: ENV['JOBLY_REDIS_URL'] || "redis://localhost:6379/0",
       status_expiration: ENV['JOBLY_STATUS_EXPIRATION']&.to_i || 30,
       jobs_namespace: ENV['JOBLY_JOBS_NAMESPACE'],
+      slack_channel: ENV['JOBLY_SLACK_CHANNEL'] || "#general",
+      slack_user: ENV['JOBLY_SLACK_USER'] || "Jobly",
+      slack_webhook: ENV['JOBLY_SLACK_WEBHOOK'],
       log: ENV['JOBLY_LOG'],
       auth: ENV['JOBLY_AUTH'],
       mounts: nil,

data/lib/jobly/version.rb

@@ -1,3 +1,3 @@
 module Jobly
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobly
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mister_bin
@@ -164,6 +164,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: tty-command
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: slack-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: Execute background jobs and build tasks on this sidekiq-based job server
 email: db@dannyben.com
 executables:
@@ -190,6 +218,8 @@ files:
 - lib/jobly/job.rb
 - lib/jobly/job_extensions/actions.rb
 - lib/jobly/job_extensions/option_accessors.rb
+- lib/jobly/job_extensions/shell.rb
+- lib/jobly/job_extensions/slack.rb
 - lib/jobly/job_extensions/solo.rb
 - lib/jobly/jobs.rb
 - lib/jobly/log.rb