cloudtasker 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac6e1474db922e6509a54912fb42d5522c066c7926c0bb0c45e4eec80335c83c
-  data.tar.gz: af4b423e1ed2d17fdd9c1228f34a965ac8d17078f96331d01b64bc3766f3fbef
+  metadata.gz: 18e57cdddeab550d4ec1bacf9be3fedb298bc54b115a6d47675e9989a68062a0
+  data.tar.gz: 37dbae4384a908554ad9b20de3265a360b5389227a3384b3e9557b8ed5434961
 SHA512:
-  metadata.gz: 669d907248880e4de8f8a1d0ab83aad96540d93bf3b70dec804184b5a0507244a891e5d66f03593163d6e581a85ad1686e348ac3413b4c250512a5ec877c9209
-  data.tar.gz: 2b6a09ff60f5105f167c818dcf284881afbbd96a4818a9e1fc432c8fd8ee19014127e6292bb5749c09f4a10458cbecd94c48b0f8486e4f8fed91dbf7d3f36772
+  metadata.gz: 9dfc4bef540a4e9a2c9c508295ba70acf18b4b08ada13d991d6f0327511d6f8af9e572c6e46bd68126755e3b756ae6f7fe8ad46caf6cd51248583c482fdc2083
+  data.tar.gz: fafbb8f13932eefc1e56e26fd820276f9003d9654ed4092b0286a1e66f5e903076557a7e3999e322a8fe4deab1af76bc73e1a75f8cc97a20e865ff04fecb9841

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    cloudtasker (0.1.0)
+    cloudtasker (0.2.0)
+      activesupport
       fugit
       google-cloud-tasks
       jwt
@@ -70,6 +71,8 @@ GEM
     ast (2.4.0)
     builder (3.2.3)
     concurrent-ruby (1.1.5)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     crass (1.0.5)
     diff-lcs (1.3)
     erubi (1.9.0)
@@ -112,6 +115,7 @@ GEM
     grpc-google-iam-v1 (0.6.9)
       googleapis-common-protos (>= 1.3.1, < 2.0)
       grpc (~> 1.0)
+    hashdiff (1.0.0)
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
@@ -204,6 +208,7 @@ GEM
     rubocop-rspec (1.36.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
+    safe_yaml (1.0.5)
     signet (0.12.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
@@ -223,6 +228,10 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
+    webmock (3.7.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
@@ -242,6 +251,7 @@ DEPENDENCIES
   rubocop-rspec
   sqlite3
   timecop
+  webmock
 
 BUNDLED WITH
    2.0.2

data/cloudtasker.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Arnaud Lachaume']
   spec.email         = ['arnaud.lachaume@keypup.io']
 
-  spec.summary       = 'Manage GCP Cloud Tasks in your app.'
-  spec.description   = 'Manage GCP Cloud Tasks in your app.'
+  spec.summary       = 'Manage GCP Cloud Tasks in your app. (under development)'
+  spec.description   = 'Manage GCP Cloud Tasks in your app. (under development)'
   spec.homepage      = 'https://github.com/keypup-io/cloudtasker'
   spec.license       = 'MIT'
 
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'activesupport'
   spec.add_dependency 'fugit'
   spec.add_dependency 'google-cloud-tasks'
   spec.add_dependency 'jwt'
@@ -41,6 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '0.76.0'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'timecop'
+  spec.add_development_dependency 'webmock'
 
   spec.add_development_dependency 'rails'
   spec.add_development_dependency 'rspec-rails'

data/lib/cloudtasker.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/string/inflections'
+
 require 'cloudtasker/version'
 require 'cloudtasker/config'
 

data/lib/cloudtasker/batch/job.rb

@@ -6,6 +6,9 @@ module Cloudtasker
     class Job
       attr_reader :worker
 
+      # Key Namespace used for object saved under this class
+      SUB_NAMESPACE = 'job'
+
       #
       # Return the cloudtasker redis client
       #
@@ -44,7 +47,7 @@ module Cloudtasker
       def self.key(val)
         return nil if val.nil?
 
-        [Config::KEY_NAMESPACE, val.to_s].join('/')
+        [to_s.underscore, val.to_s].join('/')
       end
 
       #

data/lib/cloudtasker/batch/middleware.rb

@@ -3,7 +3,6 @@
 require 'cloudtasker/redis_client'
 
 require_relative 'extension/worker'
-require_relative 'config'
 require_relative 'batch_progress'
 require_relative 'job'
 

data/lib/cloudtasker/cron/job.rb

@@ -10,6 +10,9 @@ module Cloudtasker
     class Job
       attr_reader :worker
 
+      # Key Namespace used for object saved under this class
+      SUB_NAMESPACE = 'job'
+
       #
       # Build a new instance of the class
       #
@@ -29,7 +32,7 @@ module Cloudtasker
       def key(val)
         return nil if val.nil?
 
-        [Config::KEY_NAMESPACE, val.to_s].join('/')
+        [self.class.to_s.underscore, val.to_s].join('/')
       end
 
       #

data/lib/cloudtasker/cron/middleware.rb

@@ -2,7 +2,6 @@
 
 require 'cloudtasker/redis_client'
 
-require_relative 'config'
 require_relative 'schedule'
 require_relative 'job'
 require_relative 'middleware/server'

data/lib/cloudtasker/cron/schedule.rb

@@ -8,6 +8,9 @@ module Cloudtasker
     class Schedule
       attr_accessor :id, :cron, :worker, :task_id, :job_id
 
+      # Key Namespace used for object saved under this class
+      SUB_NAMESPACE = 'schedule'
+
       #
       # Return the redis client.
       #
@@ -17,6 +20,50 @@ module Cloudtasker
         RedisClient
       end
 
+      #
+      # Return a namespaced key.
+      #
+      # @param [String, Symbol] val The key to namespace
+      #
+      # @return [String] The namespaced key.
+      #
+      def self.key(val)
+        return nil if val.nil?
+
+        [to_s.underscore, val.to_s].join('/')
+      end
+
+      #
+      # Return all schedules
+      #
+      # @return [Array<Cloudtasker::Batch::Schedule>] The list of stored schedules.
+      #
+      def self.all
+        redis.search(key('*')).map do |gid|
+          find(gid.sub(key(''), ''))
+        end
+      end
+
+      #
+      # Synchronize list of cron schedules from a Hash. Schedules
+      # not listed in this hash will be removed.
+      #
+      # @example
+      #   Cloudtasker::Cron::Schedule.load_from_hash!(
+      #     my_job: { cron: '0 0 * * *', worker: 'MyWorker' }
+      #     my_other_job: { cron: '0 10 * * *', worker: 'MyOtherWorker' }
+      #   )
+      #
+      def self.load_from_hash!(hash)
+        schedules = hash.map do |id, config|
+          schedule_config = JSON.parse(config.to_json, symbolize_names: true).merge(id: id)
+          create(schedule_config)
+        end
+
+        # Remove existing schedules which are not part of the list
+        all.reject { |e| schedules.include?(e) }.each { |e| delete(e.id) }
+      end
+
       #
       # Create a new cron schedule (or update an existing one).
       #
@@ -37,8 +84,7 @@ module Cloudtasker
       # @return [Cloudtasker::Cron::Schedule] The schedule instance.
       #
       def self.find(id)
-        gid = [Config::KEY_NAMESPACE, id].join('/')
-        return nil unless (schedule_config = redis.fetch(gid))
+        return nil unless (schedule_config = redis.fetch(key(id)))
 
         new(schedule_config)
       end
@@ -89,7 +135,7 @@ module Cloudtasker
       # @return [String] The namespaced schedule id.
       #
       def gid
-        [Config::KEY_NAMESPACE, id].join('/')
+        self.class.key(id)
       end
 
       #

data/lib/cloudtasker/redis_client.rb

@@ -83,6 +83,28 @@ module Cloudtasker
       del(*all_keys)
     end
 
+    #
+    # Return all keys matching the provided patterns.
+    #
+    # @param [String] pattern A redis compatible pattern.
+    #
+    # @return [Array<String>] The list of matching keys
+    #
+    def search(pattern)
+      # Initialize loop variables
+      cursor = nil
+      list = []
+
+      # Scan and capture matching keys
+      while cursor != 0
+        scan = client.scan(cursor || 0, match: pattern)
+        list += scan[1]
+        cursor = scan[0].to_i
+      end
+
+      list
+    end
+
     #
     # Delegate all methods to the redis client.
     #

data/lib/cloudtasker/unique_job/job.rb

@@ -10,6 +10,9 @@ module Cloudtasker
       # The default lock strategy to use. Defaults to "no lock".
       DEFAULT_LOCK = UniqueJob::Lock::NoOp
 
+      # Key Namespace used for object saved under this class
+      SUB_NAMESPACE = 'job'
+
       #
       # Build a new instance of the class.
       #
@@ -91,7 +94,7 @@ module Cloudtasker
       # @return [String] The global ID of the job
       #
       def unique_gid
-        [Config::KEY_NAMESPACE, unique_id].join('/')
+        [self.class.to_s.underscore, unique_id].join('/')
       end
 
       #

data/lib/cloudtasker/unique_job/middleware.rb

@@ -3,7 +3,6 @@
 require 'cloudtasker/redis_client'
 
 require_relative 'lock_error'
-require_relative 'config'
 
 require_relative 'conflict_strategy/base_strategy'
 require_relative 'conflict_strategy/raise'

data/lib/cloudtasker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cloudtasker
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cloudtasker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fugit
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +220,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Manage GCP Cloud Tasks in your app.
+description: Manage GCP Cloud Tasks in your app. (under development)
 email:
 - arnaud.lachaume@keypup.io
 executables: []
@@ -220,14 +248,12 @@ files:
 - lib/cloudtasker/authenticator.rb
 - lib/cloudtasker/batch.rb
 - lib/cloudtasker/batch/batch_progress.rb
-- lib/cloudtasker/batch/config.rb
 - lib/cloudtasker/batch/extension/worker.rb
 - lib/cloudtasker/batch/job.rb
 - lib/cloudtasker/batch/middleware.rb
 - lib/cloudtasker/batch/middleware/server.rb
 - lib/cloudtasker/config.rb
 - lib/cloudtasker/cron.rb
-- lib/cloudtasker/cron/config.rb
 - lib/cloudtasker/cron/job.rb
 - lib/cloudtasker/cron/middleware.rb
 - lib/cloudtasker/cron/middleware/server.rb
@@ -239,7 +265,6 @@ files:
 - lib/cloudtasker/redis_client.rb
 - lib/cloudtasker/task.rb
 - lib/cloudtasker/unique_job.rb
-- lib/cloudtasker/unique_job/config.rb
 - lib/cloudtasker/unique_job/conflict_strategy/base_strategy.rb
 - lib/cloudtasker/unique_job/conflict_strategy/raise.rb
 - lib/cloudtasker/unique_job/conflict_strategy/reject.rb
@@ -282,5 +307,5 @@ rubyforge_project:
 rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
-summary: Manage GCP Cloud Tasks in your app.
+summary: Manage GCP Cloud Tasks in your app. (under development)
 test_files: []

data/lib/cloudtasker/batch/config.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'fugit'
-
-module Cloudtasker
-  module Batch
-    class Config
-      KEY_NAMESPACE = 'cloudtasker-batch'
-    end
-  end
-end

data/lib/cloudtasker/cron/config.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'fugit'
-
-module Cloudtasker
-  module Cron
-    class Config
-      KEY_NAMESPACE = 'cloudtasker-cron'
-    end
-  end
-end

data/lib/cloudtasker/unique_job/config.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Cloudtasker
-  module UniqueJob
-    # Manage UniqueJob configuration
-    class Config
-      KEY_NAMESPACE = 'cloudtasker-unique_job'
-    end
-  end
-end