jobly 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07003ace15aa4c840ba41208aad221fefa13f8aa420e5cada4e4d0211f82115b
-  data.tar.gz: c3d7a471c27da897fde7af6974318dc806d9f925524124d5549a3ce89d70bcfe
+  metadata.gz: bbc38c3493fa50569ff1b574727a9d854d9c64694d8d7d1ece218ee0e78dd6c4
+  data.tar.gz: 518ad55187220df99d35d18b1a9cf9f7e22b0a7eb0455f36dc23c4202b9b7bfa
 SHA512:
-  metadata.gz: f1486a30f826453fb836d7fb615466b1d725f672278a522db287a3f16ee466a1f8adc46d039f1d6d1926c8bc9601746097c4cb2617d7864430dd0f605b510d8d
-  data.tar.gz: 2322d6386a45a024bad898ae693db5bc2048edb2aae418476f73bc3244979096811a4c8f906b135427b0afd3a16139020dd8706e3baa020c776834778a6be68f
+  metadata.gz: e2de8768494317847f01b52519bb2cfc374e30e885ba5a1ffa3cf801c5f966c63c2c1c1dbfe74f0a0e1f4614a14051ce86efbd8e8fead41bf44371a2f12b81bd
+  data.tar.gz: 9ae8b72be0ae7c4f79ed0616e990d9a58031c16bbe6d19db8236a7f600854fe6f605bcfdd46c1d292f753258c398e7f0bc3a608ea28ee9fe672d10b3dfe3a095

data/README.md

@@ -16,8 +16,8 @@ Compact job server with API, CLI, Web UI and a Sidekiq heart.
 ---
 
 <table><tr>
-  <td width='50%'><a target='_screenshot' href='/demo/terminal.gif'><img src='/demo/terminal.gif'/></a></td>
-  <td width='50%'><a target='_screenshot' href='/demo/screen.gif'><img src='/demo/screen.gif'/></a></td>
+  <td width='50%'><a target='_screenshot' href='/assets/terminal.gif'><img src='/assets/terminal.gif'/></a></td>
+  <td width='50%'><a target='_screenshot' href='/assets/screen.gif'><img src='/assets/screen.gif'/></a></td>
 </tr></table>
 
 ---

data/bin/jobly

@@ -1,16 +1,18 @@
 #!/usr/bin/env ruby
 require 'colsole'
-require 'jobly'
-require 'jobly/boot'
-
 include Colsole
 
-router = Jobly::CLI.router
-
 begin
+  require 'jobly'
+  require 'jobly/boot'
+
+  router = Jobly::CLI.router
+
   exit router.run ARGV
+
 rescue => e
   puts e.backtrace.reverse if ENV['DEBUG']
   say! "!txtred!#{e.class}: #{e.message}"
+  say! "Run with !txtpur!DEBUG=1!txtrst! for backtrace details" unless ENV['DEBUG']
   exit 1
 end

data/lib/jobly.rb

@@ -11,4 +11,5 @@ require 'jobly/module_functions'
 require 'jobly/cli'
 require 'jobly/job'
 require 'jobly/jobs'
+require 'jobly/api'
 require 'jobly/server'

data/lib/jobly/api.rb

@@ -0,0 +1,79 @@
+require 'jobly'
+require 'sinatra/base'
+require 'sinatra/reloader'
+require 'sinatra/custom_logger'
+
+module Jobly
+
+  class API < Sinatra::Application
+    helpers Sinatra::CustomLogger
+    using ConvertToTyped
+
+    configure :development, :production do
+      set :server, :puma
+      set :logger, Jobly.logger if Jobly.logger
+    end
+
+    configure :development do
+      register Sinatra::Reloader
+    end
+
+    before do
+      content_type 'application/json'
+    end
+
+    get '/' do
+      {
+        version: VERSION,
+        message: %Q["I'm gonna live till I die" - Frank Sinatra]
+      }.to_json
+    end
+
+    get '/*' do
+      job = params[:splat].first
+      params.delete :splat
+      add_job job, params
+    end
+
+    post '/*' do
+      job = params[:splat].first
+      params.delete :splat
+      add_job job, params
+    end
+
+  private
+
+    def add_job(job, args={})
+      job_class = Jobs.get_class job
+
+      if !job_class
+        response = {
+          status: 'error',
+          message: 'No such job',
+          job: job,
+          params: args
+        }
+
+        status 404
+        logger.debug "[jobly server] No such job (#{job})"
+        return response.to_json
+      end
+
+      args = args.convert_to_typed
+      if args.empty?
+        job_class.perform_async
+      else
+        job_class.perform_async args
+      end
+      
+      response = {
+        status: 'received',
+        job: job,
+        params: args,
+      }
+
+      logger.debug "[jobly server] Job received (#{job})"
+      response.to_json
+    end
+  end
+end

data/lib/jobly/commands/send.rb

@@ -18,19 +18,30 @@ module Jobly
         params = args['PARAMS'].to_params
         url = "#{Jobly.api_url}/#{job}"
 
-        response = if params.empty?
-          HTTP.get url
-        else
-          HTTP.get url, params: params
-        end
+        args = [url]
+        args << { params: params } unless params.empty?
+
+        response = client.get *args
 
-        if response.code != 200
-          say "!txtred!#{response.code}"
+        raise HTTPError, "#{response.code} #{response.reason}" unless response.status.ok?
+
+        say "!txtgrn!#{response.code} #{response.reason}"
+        lp response.parse
+      end
+
+    private
+
+      def client
+        @client ||= client!
+      end
+
+      def client!
+        if Jobly.auth
+          user, pass = Jobly.auth.split ':'
+          HTTP.basic_auth user: user, pass: pass
         else
-          say "!txtgrn!200 OK"
+          HTTP
         end
-        
-        lp response.parse
       end
 
     end

data/lib/jobly/config.ru

@@ -2,9 +2,4 @@ require 'puma'
 require 'jobly'
 require 'jobly/boot'
 
-mounts = {
-  '/'   => Sidekiq::Web, 
-  '/do' => Jobly::Server
-}
-
-run Rack::URLMap.new mounts
+run Jobly::Server

data/lib/jobly/exceptions.rb

@@ -1,4 +1,5 @@
 module Jobly
   class Error < StandardError; end
   class JobNotFound < Error; end
+  class HTTPError < Error; end
 end

data/lib/jobly/module_functions.rb

@@ -18,6 +18,8 @@ module Jobly
       status_expiration: ENV['JOBLY_STATUS_EXPIRATION']&.to_i || 30,
       jobs_namespace: ENV['JOBLY_JOBS_NAMESPACE'],
       log: ENV['JOBLY_LOG'],
+      auth: ENV['JOBLY_AUTH'],
+      mounts: nil,
     }
   end
 

data/lib/jobly/server.rb

@@ -1,79 +1,33 @@
 require 'jobly'
-require 'sinatra/base'
-require 'sinatra/reloader'
-require 'sinatra/custom_logger'
+require 'rack'
 
 module Jobly
-
-  class Server < Sinatra::Application
-    helpers Sinatra::CustomLogger
-    using ConvertToTyped
-
-    configure :development, :production do
-      set :server, :puma
-      set :logger, Jobly.logger if Jobly.logger
+  class Server
+    def self.call(env)
+      app.call env
     end
 
-    configure :development do
-      register Sinatra::Reloader
-    end
-
-    before do
-      content_type 'application/json'
-    end
-
-    get '/' do
-      {
-        version: VERSION,
-        message: %Q["I'm gonna live till I die" - Frank Sinatra]
-      }.to_json
-    end
+    def self.app
+      mounts = {
+        '/'   => Sidekiq::Web, 
+        '/do' => Jobly::API
+      }
+      mounts.merge! Jobly.mounts if Jobly.mounts
 
-    get '/*' do
-      job = params[:splat].first
-      params.delete :splat
-      add_job job, params
-    end
+      Rack::Builder.new do
+        if Jobly.auth
+          user, pass = Jobly.auth.split ':'
+          use Rack::Auth::Basic, "Jobly" do |username, password|
+            username == user && password == pass
+          end
+        end
 
-    post '/*' do
-      job = params[:splat].first
-      params.delete :splat
-      add_job job, params
+        run Rack::URLMap.new mounts
+      end
     end
+  end  
+end
 
-  private
 
-    def add_job(job, args={})
-      job_class = Jobs.get_class job
 
-      if !job_class
-        response = {
-          status: 'error',
-          message: 'No such job',
-          job: job,
-          params: args
-        }
 
-        status 404
-        logger.debug "[jobly server] No such job (#{job})"
-        return response.to_json
-      end
-
-      args = args.convert_to_typed
-      if args.empty?
-        job_class.perform_async
-      else
-        job_class.perform_async args
-      end
-      
-      response = {
-        status: 'received',
-        job: job,
-        params: args,
-      }
-
-      logger.debug "[jobly server] Job received (#{job})"
-      response.to_json
-    end
-  end
-end

data/lib/jobly/version.rb

@@ -1,3 +1,3 @@
 module Jobly
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobly
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mister_bin
@@ -188,6 +188,7 @@ files:
 - README.md
 - bin/jobly
 - lib/jobly.rb
+- lib/jobly/api.rb
 - lib/jobly/boot.rb
 - lib/jobly/cli.rb
 - lib/jobly/commands/base.rb