jobly 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee66973f52902d8ddc90c2b2d6547d05b8dcef25f3639754ce3fb41006b618e
-  data.tar.gz: 07b1a0d259b813db4e7f5ccd36e9f5759ed97c9460f05e49a2a726216a5ed8c2
+  metadata.gz: 8ae475c6e56a6ae45f56aa9443c03310aabdc484ce847a1120e1399813ccc249
+  data.tar.gz: a7121f335d1af02eaee5e2bbbfcc04c578b93e6fdab51579f88f93bb423e69e1
 SHA512:
-  metadata.gz: 0dcbb539e7cafc9ebf44d58b8fe07e8df36d8e4209f431f26051e6db780c79df98ec3b099f66439597d84b0b3a987bcd33670c5f5962afe33545d615ca1ad461
-  data.tar.gz: 44a0d0305abd84288abef22a631cce2927f0df1b2daefa494da0192a6476deaaf35e338019a2d7a7e97fe48f0f806e4dff65f17bf8764abf89cb271d99499f83
+  metadata.gz: 760e95ca01b7b218d88d73722b1bfdeaf4e997783f1795daaa2b466cd9cb33890f002a5cbdd6030b07820d5bc314faa83acedf53b1de3117c1c50aa4fe973ce2
+  data.tar.gz: 01b58bcdbdbbe85bdba0d0a7411125516e4acbc354028d78009730b7321c21ff143c1ab32d47aea590d359fc353f4223489d3259bc80050453c7c067db5b0d0d

data/lib/jobly.rb

@@ -1,6 +1,7 @@
 require 'requires'
 require 'byebug' if ENV['BYEBUG']
 
+requires 'jobly/polyfills'
 requires 'jobly/extensions'
 requires 'jobly/refinements'
 requires 'jobly/job_extensions'

data/lib/jobly/api.rb

@@ -1,4 +1,5 @@
 require 'jobly'
+require 'jobly/version'
 require 'sinatra/base'
 require 'sinatra/reloader'
 require 'sinatra/custom_logger'
@@ -24,9 +25,9 @@ module Jobly
 
     get '/' do
       {
-        version: VERSION,
+        version: Jobly::VERSION,
         message: %Q["I'm gonna live till I die" - Frank Sinatra]
-      }.to_json
+      }.to_json + "\n"
     end
 
     get '/*' do
@@ -73,7 +74,7 @@ module Jobly
       }
 
       logger.debug "[jobly server] Job received (#{job})"
-      response.to_json
+      response.to_json + "\n"
     end
   end
 end

data/lib/jobly/cli.rb

@@ -1,4 +1,5 @@
 require 'mister_bin'
+require 'jobly/version'
 requires 'commands/base', 'commands'
 
 module Jobly
@@ -6,10 +7,11 @@ module Jobly
   # Command line interface router. This is called by bin/jobly.
   class CLI
     def self.router
-      router = MisterBin::Runner.new version: VERSION,
+      router = MisterBin::Runner.new version: Jobly::VERSION,
         header: "Jobly",
         footer: "Run !txtpur!jobly COMMAND --help!txtrst! for more information"
 
+      router.route 'init',      to: Commands::InitCmd
       router.route 'server',    to: Commands::ServerCmd
       router.route 'worker',    to: Commands::WorkerCmd
       router.route 'send',      to: Commands::SendCmd

data/lib/jobly/commands/base.rb

@@ -1,6 +1,6 @@
 require 'mister_bin'
 require 'colsole'
-require 'lp'
+require 'yaml'
 
 module Jobly
   module Commands

data/lib/jobly/commands/init.rb

@@ -0,0 +1,42 @@
+require 'fileutils'
+
+module Jobly
+  module Commands
+    class InitCmd < Base
+      summary "Create an initial jobs workspace"
+      usage "jobly init NAME [--minimal]"
+      usage "jobly init (-h|--help)"
+      param "NAME", "The name of the folder to create"
+      option "-m --minimal", "Create a minimal workspace"
+      example "jobly init test"
+      example "jobly init myjobs --minimal"
+
+      def run
+        raise ArgumentError, "#{target_dir} already exists" if File.exist? target_dir
+
+        FileUtils.copy_entry source_dir, target_dir
+
+        say "Created #{template} workspace in #{target_dir}:"
+        files.each { |file| say "- #{file}" }
+      end
+
+    private
+
+      def template
+        args['--minimal'] ? 'minimal' : 'full'
+      end
+
+      def target_dir
+        args['NAME']
+      end
+
+      def source_dir
+        File.expand_path "../templates/#{template}", __dir__
+      end
+
+      def files
+        Dir["#{target_dir}/**/{*,.*}"].sort.reject { |f| File.directory? f }
+      end
+    end
+  end
+end

data/lib/jobly/commands/run.rb

@@ -7,7 +7,7 @@ module Jobly
       summary "Run a job locally"
       usage "jobly run [--later] JOB [PARAMS...]"
       usage "jobly run (-h|--help)"
-      option "-l, --later", "Schedule the job to be executed later by a worker instead of running it immediately"
+      option "-l --later", "Schedule the job to be executed later by a worker instead of running it immediately"
       param "JOB", "Job name"
       param "PARAMS", "Parameters to pass to the job as key:value"
       example "jobly run Greet name:Bob"

data/lib/jobly/commands/send.rb

@@ -26,7 +26,7 @@ module Jobly
         raise HTTPError, "#{response.code} #{response.reason}" unless response.status.ok?
 
         say "!txtgrn!#{response.code} #{response.reason}"
-        lp response.parse
+        puts response.parse.to_yaml
       end
 
     private

data/lib/jobly/commands/server.rb

@@ -4,7 +4,7 @@ module Jobly
       summary "Start the server"
       usage "jobly server [--port NUMBER]"
       usage "jobly server (-h|--help)"
-      option "-p, --port NUMBER", "Set the port number [default: 3000]"
+      option "-p --port NUMBER", "Set the port number [default: 3000]"
 
       def run
         port = args['--port']

data/lib/jobly/commands/worker.rb

@@ -4,9 +4,9 @@ module Jobly
       summary "Start a job worker"
       usage "jobly worker [-c COUNT -C PATH (-q NAME)...]"
       usage "jobly worker (-h|--help)"
-      option "-c, --concurrency COUNT", "Number of parallel jobs [default: 4]"
-      option "-C, --config PATH", "Specify a path to a YAML config file. The provided path should be relative to the global config_path directory and without the yml extension"
-      option "-q, --queue NAME[,WEIGHT]", "Specify one or more queues that this worker should handle"
+      option "-c --concurrency COUNT", "Number of parallel jobs [default: 4]"
+      option "-C --config PATH", "Specify a path to a YAML config file. The provided path should be relative to the global config_path directory and without the yml extension"
+      option "-q --queue NAME[,WEIGHT]", "Specify one or more queues that this worker should handle"
 
       example "jobly worker --concurrency 10"
       example "jobly worker -q critical -q default -q low"

data/lib/jobly/polyfills/hash.rb

@@ -0,0 +1,19 @@
+# :nocov:
+
+# Required for Ruby < 2.4
+if !{}.respond_to? :transform_values
+  class Hash
+    def transform_values
+      self.each { |k, v| self[k] = yield v }
+    end
+  end
+end
+
+# Required for Ruby < 2.5
+if !{}.respond_to? :transform_keys
+  class Hash
+    def transform_keys
+      self.map { |k, v| [(yield k), v] }.to_h
+    end
+  end
+end

data/lib/jobly/templates/full/app/job.rb

@@ -0,0 +1,3 @@
+class Job < Jobly::Job
+  # Put your common Job methods here
+end

data/lib/jobly/templates/full/config/jobly.rb

@@ -0,0 +1,14 @@
+Jobly.configure do |config|
+  # Configuration can be placed here or by using environment variables
+  # ---
+  # config.environment = 'development'
+  # config.api_url = 'http://localhost:3000/do'
+  # config.app_path = 'app'
+  # config.jobs_path = 'jobs'
+  # config.config_path = 'config'
+  # config.redis_url = 'redis://localhost:6379/0'
+  # config.status_expiration = 30
+  # config.jobs_namespace = 'Jobs'
+  # config.log = 'log/%s.log'
+  # config.auth = 'admin:secret'
+end

data/lib/jobly/templates/full/jobs/hello.rb

@@ -0,0 +1,15 @@
+class Hello < Job
+  def execute(name: 'Bob')
+    total 2
+    
+    at 0, "Initializing"
+    sleep rand 3.0..8.0
+
+    at 1, "Preparing to say Hi"
+    sleep rand 3.0..8.0
+
+    logger.info "Hi #{name}!"
+
+    at 2, "Done"
+  end
+end

data/lib/jobly/templates/full/jobs/ping.rb

@@ -0,0 +1,6 @@
+class Ping < Jobly::Job
+  def execute(response: 'PONG')
+    at 100, response
+    logger.info response
+  end
+end

data/lib/jobly/templates/minimal/jobs/ping.rb

@@ -0,0 +1,6 @@
+class Ping < Jobly::Job
+  def execute(response: 'PONG')
+    at 100, response
+    logger.info response
+  end
+end

data/lib/jobly/version.rb

@@ -1,3 +1,3 @@
 module Jobly
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobly
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mister_bin
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: lp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +179,7 @@ files:
 - lib/jobly/cli.rb
 - lib/jobly/commands/base.rb
 - lib/jobly/commands/config.rb
+- lib/jobly/commands/init.rb
 - lib/jobly/commands/run.rb
 - lib/jobly/commands/send.rb
 - lib/jobly/commands/server.rb
@@ -207,12 +194,18 @@ files:
 - lib/jobly/jobs.rb
 - lib/jobly/log.rb
 - lib/jobly/module_functions.rb
+- lib/jobly/polyfills/hash.rb
 - lib/jobly/refinements/argument_converters.rb
 - lib/jobly/refinements/convert_to_typed.rb
 - lib/jobly/refinements/keyword_args.rb
 - lib/jobly/refinements/to_slug.rb
 - lib/jobly/server.rb
 - lib/jobly/sidekiq.rb
+- lib/jobly/templates/full/app/job.rb
+- lib/jobly/templates/full/config/jobly.rb
+- lib/jobly/templates/full/jobs/hello.rb
+- lib/jobly/templates/full/jobs/ping.rb
+- lib/jobly/templates/minimal/jobs/ping.rb
 - lib/jobly/version.rb
 homepage: https://github.com/dannyben/jobly
 licenses:
@@ -226,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="