Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some more fixes to make it work on the Raspi again #7

Merged
merged 11 commits into from Jun 29, 2018
Merged

Some more fixes to make it work on the Raspi again #7

merged 11 commits into from Jun 29, 2018

Conversation

ChrisBr
Copy link
Collaborator

@ChrisBr ChrisBr commented Jun 22, 2018

No description provided.

@ChrisBr
Pin angular assets to v 1.4.5
9ddad02 
there is a bug in latest angular which breaks the routes for Photobooth.
@ChrisBr
Do not bind to port 3000
a835cb4 
because otherwise it is not possible to start rails s with a different
port which we do in the service file.
@ChrisBr
Add picture_set rake task
e3a7db3 
to copy images in one directory and create a combined image.
@ChrisBr
Copy link
Collaborator Author

ChrisBr commented Jun 22, 2018

Note that the rake file is quick and dirty but wanted to push it somewhere for the next time ;)

@coveralls
Copy link

coveralls commented Jun 22, 2018 •
edited

Coverage Status

Coverage remained the same at 96.407% when pulling b43c5a7 on fixes into e6ab008 on master.

digitaltom
digitaltom reviewed Jun 28, 2018
View reviewed changes
lib/tasks/picture_set.rake Outdated
def combine_images(date, path)
dir = File.join(path, date)
begin
Syscall.execute("time montage -geometry '25%x25%+25+25<' -background '#{OPTS.background_color}' " \
Copy link
Owner

Choose a reason for hiding this comment

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

Better only do it when #{date}#{COMBINED_SUFFIX} does not exist yet.

@ChrisBr
Copy link
Collaborator Author

ChrisBr commented Jun 29, 2018

@digitaltom added the skip for combined image tasks

@ChrisBr
Copy link
Collaborator Author

ChrisBr commented Jun 29, 2018

Rubcop is acting weird 🤔 No idea how this one line introduced

Offenses:
lib/tasks/picture_set.rake:3:1: W: Lint/UnneededCopDisableDirective: Unnecessary disabling of Metrics/BlockLength.
# rubocop:disable Metrics/BlockLength
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/tasks/picture_set.rake:57:5: E: Lint/Syntax: unexpected token kBEGIN
(Using Ruby 2.1 parser; configure using TargetRubyVersion parameter, under AllCops)
    begin
    ^^^^^

@ChrisBr
Skip combine image if it already exists
b43c5a7 
because otherwise it would include the combined image into the new combined ;)
It is needed to run the picture_set:clean_combine_images task before.
@ChrisBr
Copy link
Collaborator Author

ChrisBr commented Jun 29, 2018

Rubcop is acting weird thinking No idea how this one line introduced

Ok, there was a ) missing but the error message was really strange :/

@digitaltom digitaltom merged commit 04f3024 into master Jun 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@digitaltom digitaltom digitaltom left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ChrisBr @coveralls @digitaltom