Skip to content
This repository was archived by the owner on Dec 3, 2019. It is now read-only.

Issue365 add jobs #366

Open
leenyburger wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Issue365 add jobs #366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ada2703
Apiary doc no sematic issues, added jobs controller, model, test, end…
leenyburger Jun 1, 2018
a1ffefe
Added acts_as_taggable to job model
leenyburger Jun 1, 2018
777af57
Fixed database user name issue
leenyburger Jun 1, 2018
8543559
Fixed sytax errors
leenyburger Jun 1, 2018
6f022f0
Removed extraneous comments
leenyburger Jun 1, 2018
e2c5b19
Added test for job acts as taggable, updated admin
leenyburger Jun 4, 2018
a1bcd87
Fixed formatting errors:
leenyburger Jun 4, 2018
b9e40d6
slight modifications
Oct 5, 2018
263375b
fixed test issues with variable change
Oct 5, 2018
75eed14
fix dangling is_open
Oct 5, 2018
2c0596f
Merge pull request #418 from wimo7083/issue365_add_jobs
apex-omontgomery Oct 5, 2018
7656a81
Merge branch 'master' into issue365_add_jobs
apex-omontgomery Oct 5, 2018
8960e38
start adding expiration
Oct 5, 2018
c85f56d
section makefile- its getting large, and update apiary
Oct 5, 2018
f6de002
changed to scoped call with default being active
Oct 5, 2018
ef27d87
re-add phony for target
Oct 5, 2018
d8c8336
wrong location
Oct 5, 2018
9ea4d55
completed scope and added block scope for mocking
Oct 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
start adding expiration
  • Loading branch information
wimo7083
wimo7083 committed Oct 5, 2018
commit 8960e38fb905e0d2c2f2d1621dc3e851b06f8066
86 changes: 36 additions & 50 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,12 @@ include Makefile.in
.PHONY: all
all: run

.PHONY: nuke
nuke:
${DOCKER} system prune -a --volumes

.PHONY: minty-fresh
minty-fresh:
${DOCKER_COMPOSE} down --rmi all --volumes

.PHONY: rmi
rmi:
${DOCKER} images -q | xargs docker rmi -f

.PHONY: rmdi
rmdi:
${DOCKER} images -a --filter=dangling=true -q | xargs ${DOCKER} rmi

.PHONY: rm-exited-containers
rm-exited-containers:
${DOCKER} ps -a -q -f status=exited | xargs ${DOCKER} rm -v

.PHONY: fresh-restart
fresh-restart: minty-fresh setup test run

.PHONY: nuke
nuke:
$(DOCKER) system prune -a --volumes

.PHONY:
minty-fresh:
$(DOCKER_COMPOSE) down --rmi all --volumes

.PHONY: rmi
rmi:
$(DOCKER) images -q | xargs docker rmi -f

.PHONY: rmdi
rmdi:
$(DOCKER) images -a --filter=dangling=true -q | xargs $(DOCKER) rmi

.PHONY: rm-exited-containers
rm-exited-containers:
$(DOCKER) ps -a -q -f status=exited | xargs $(DOCKER) rm -v

.PHONY: fresh-restart
fresh-restart: minty-fresh setup test run
.PHONY: setup
setup: build db_create db_migrate

.PHONY: console-sandbox
console-sandbox:
$(DOCKER_COMPOSE) run $(RAILS_CONTAINER) rails console --sandbox
$(DOCKER_COMPOSE) run $(RAILS_CONTAINER) rails console --sandbox

.PHONY: run
run:
Expand All @@ -77,6 +34,13 @@ console:
routes:
$(DOCKER_COMPOSE) run $(RAILS_CONTAINER) rake routes

.PHONY: bundle
bundle:
$(DOCKER_COMPOSE) run $(RAILS_CONTAINER) bash -c 'cd /app && bundle'



#### Database Targets
.PHONY: db_create
db_create:
$(DOCKER_COMPOSE) run $(RAILS_CONTAINER) rake db:create
Expand All @@ -97,6 +61,7 @@ db_rollback:
db_seed:
$(DOCKER_COMPOSE) run $(RAILS_CONTAINER) rake db:seed

#### Tests and Linting
.PHONY: test
test: bg
$(DOCKER_COMPOSE) run operationcode-psql bash -c "while ! psql --host=operationcode-psql --username=postgres -c 'SELECT 1'; do sleep 5; done;"

@apex-omontgomery apex-omontgomery Oct 5, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm starting to feel odd about this.

As this gets bigger it should really be things in their own target, or in a bash script. Large makefiles with lots of distractions are hard to understand. Plus hiding tests behind a very long bash script means I can't pass in parameters to run test groups.

Expand All @@ -111,12 +76,33 @@ rubocop:
rubocop_auto_correct:
$(DOCKER_COMPOSE) run $(RAILS_CONTAINER) rubocop -a --auto-correct

.PHONY: bundle
bundle:
$(DOCKER_COMPOSE) run $(RAILS_CONTAINER) bash -c 'cd /app && bundle'

setup: build db_create db_migrate
#### Cleanup Targets
.PHONY: nuke
nuke:
$(DOCKER) system prune -a --volumes

.PHONY:
Comment thread
apex-omontgomery marked this conversation as resolved.
Outdated
minty-fresh:
$(DOCKER_COMPOSE) down --rmi all --volumes

.PHONY: rmi
rmi:
$(DOCKER) images -q | xargs docker rmi -f

.PHONY: rmdi
rmdi:
$(DOCKER) images -a --filter=dangling=true -q | xargs $(DOCKER) rmi

.PHONY: rm-exited-containers
rm-exited-containers:
$(DOCKER) ps -a -q -f status=exited | xargs $(DOCKER) rm -v

.PHONY: fresh-restart
fresh-restart: minty-fresh setup test run


#### Deployment targets
publish: build
bin/publish

Expand Down
1 change: 1 addition & 0 deletions app/models/job.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
class Job < ApplicationRecord

@apex-omontgomery apex-omontgomery Oct 6, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does having this in the models section of the code base make it clear enough that this is separate from Sidekiq Jobs?

@robbkidd robbkidd Oct 6, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, yes. Though, it might be helpful to rename the background jobs from Job(s) to Worker(s).

@BRIMIL01 BRIMIL01 Oct 6, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure you don't want JobJobs?

@robbkidd robbkidd Oct 6, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that you mention it, maybe WorkJobber.

acts_as_taggable

scope :is_available, -> { where(is_open: true) }
def self.with_tags(*args)
tagged_with(args, any: true)
end
Expand Down
2 changes: 1 addition & 1 deletion db/schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20180531004341) do
ActiveRecord::Schema.define(version: 20180711212702) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
Expand Down