inst-jobs-autoscaling 1.0.4 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d2f6a38d87a869c628fcf44743f6f6921cf4eeab7a2f4efb531d884efe8b97
-  data.tar.gz: a3fbda486e7586ec36d539e27bf6be30239c8ac96106553e20ca15cbdf88daff
+  metadata.gz: a07bdbafec7f5069b329b115ed62902cd2f96126cdfccfde21844640b9a0fa05
+  data.tar.gz: ae1ebb85e92176d2472402582aae3ef281603b49c6947f534a5b7fecc9a95dec
 SHA512:
-  metadata.gz: 1f60ef4e60f881b61d1325735884e248dce4a252e9f2d985b451c0bb3b934af0627a4665f78e72de448788cbbaadd9d9cd2d5edd0d4f33fa24c845fc684094f7
-  data.tar.gz: 4a15b8ee2fc114b5f7541f8cde0d0211f471a9634eafb4f37449f47709cc457f3bf4ac7061714796d1c70c1c9bb529734940f216c705ce8e8cb467fcf1305e17
+  metadata.gz: 37b0676e26ed10dd1cc820504c1e52228a1cc62680d75ee7947c48b1a84b9303e21350afe931470c10f6f2cf8bc5c994c408625be807a41b6443953a3d97c31c
+  data.tar.gz: d5aea5d2d1ed01128e53e6e1f72c18360ec832f9a6778fe12f36ddccbf2448ad65650a3bb5fca026c85fd949a3710c2f9056e22ad0fe48bb4911ea45dd6c85e6

data/Dockerfile

@@ -1,11 +1,10 @@
-FROM instructure/ruby:2.4
-
-ADD Gemfile* *.gemspec /usr/src/app/
-ADD lib/jobs_autoscaling/version.rb /usr/src/app/lib/jobs_autoscaling/
-USER root
-RUN bundle install
-ADD . /usr/src/app/
-RUN chown -R docker:docker /usr/src/app
-USER docker
+FROM instructure/ruby:2.6
+
+COPY --chown=docker:docker Gemfile* *.gemspec /usr/src/app/
+COPY --chown=docker:docker lib/jobs_autoscaling/version.rb /usr/src/app/lib/jobs_autoscaling/
+
+RUN bundle install -j 4
+
+COPY --chown=docker:docker . /usr/src/app/
 
 CMD ["rake"]

data/Jenkinsfile

@@ -0,0 +1,18 @@
+#! /usr/bin/env groovy
+
+pipeline {
+  agent { label 'docker' }
+
+  stages {
+    stage('Build') {
+      steps {
+        sh 'docker build -t inst-jobs-autoscaling .'
+      }
+    }
+    stage('Test') {
+      steps {
+        sh 'docker run --rm inst-jobs-autoscaling'
+      }
+    }
+  }
+}

data/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 set -e
 
-docker-compose build
-docker-compose run --rm ci
+docker build -t inst-jobs-autoscaling .
+docker run --rm inst-jobs-autoscaling

data/inst-jobs-autoscaling.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "inst-jobs", ">= 0.13.5"
+  spec.add_dependency "inst-jobs", "> 1.0", "< 4.0"
   spec.add_dependency "aws-sdk-autoscaling"
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "bundler", "> 1.11", "< 3"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec", "~> 3.4.0"
 end

data/lib/jobs_autoscaling/monitor.rb

@@ -6,11 +6,11 @@ module JobsAutoscaling
     BUSY = :busy
 
     def initialize(action: )
-      @action = action
+      @actions = Array(action)
     end
 
     def activate!
-      Delayed::Worker.lifecycle.after(:work_queue_pop, &method(:work_queue_pop))
+      Delayed::Worker.lifecycle.after(:check_for_work, &method(:check_for_work))
       load_preexisting_jobs
       change_state(preexisting_jobs_running? ? BUSY : IDLE)
     end
@@ -34,11 +34,7 @@ module JobsAutoscaling
       @process_mtime_map.any?
     end
 
-    def work_queue_pop(work_queue, _worker_config)
-      unless work_queue.respond_to?(:all_workers_idle?)
-        return
-      end
-
+    def check_for_work(work_queue)
       new_state = work_queue.all_workers_idle? && !preexisting_jobs_running? ? IDLE : BUSY
       if new_state != @worker_state
         change_state(new_state)
@@ -47,7 +43,9 @@ module JobsAutoscaling
 
     def change_state(new_state)
       @worker_state = new_state
-      @action.public_send(new_state)
+      @actions.each do |action|
+        action.public_send(new_state)
+      end
     end
   end
 end

data/lib/jobs_autoscaling/version.rb

@@ -1,3 +1,3 @@
 module JobsAutoscaling
-  VERSION = "1.0.4"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs-autoscaling
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.1.1
 platform: ruby
 authors:
 - Brian Palmer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.5
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.5
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
   requirement: !ruby/object:Gem::Requirement
@@ -42,30 +48,36 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +106,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
-description: 
+description:
 email:
 - brianp@instructure.com
 executables: []
@@ -105,13 +117,13 @@ files:
 - ".rspec"
 - Dockerfile
 - Gemfile
+- Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - build.sh
-- docker-compose.yml
 - inst-jobs-autoscaling.gemspec
 - lib/jobs_autoscaling.rb
 - lib/jobs_autoscaling/aws_action.rb
@@ -122,7 +134,7 @@ homepage: https://github.com/instructure/inst-jobs-autoscaling
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,9 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.2.24
+signing_key:
 specification_version: 4
 summary: AWS ASG autoscaling for inst-jobs
 test_files: []

data/docker-compose.yml

@@ -1,2 +0,0 @@
-ci:
-  build: .