Skip to content

Commit

Permalink
Sync development.
Browse files Browse the repository at this point in the history
  • Loading branch information
envygeeks committed Oct 31, 2018
1 parent 6fa7986 commit 209bd68
Show file tree
Hide file tree
Showing 15 changed files with 160 additions and 118 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ indent_style = space
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
indent_size = 2
indent_size = 2
30 changes: 23 additions & 7 deletions .github/issue_template.md → .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,33 @@
---
name: Bug Report
about: Report an Issue!
---

<!--
If this is a security related bug, please email the maintainer of this
repository (found via `CODEOWNERS`) and let them know in private... all
security issues are handled promptly and quickly, however an early
release could severely impact people.
If this is a security related bug, please email the maintainer of
this repository (found via `security`) and let them know in private...
all security issues are handled promptly, and quickly, however an
early release could severely impact people.
-->

- [ ] I tried updating to the latest version.
- [ ] I can't, there is an issue.
- [ ] I tried updating to the latest version
- [ ] I can't, there is an issue
- [ ] This is about an < latest
- [ ] I understand older versions may be unsupported
- [ ] I Am on Windows
- [ ] Ubuntu Bash on Windows
- [ ] Fedora Bash on Windows
- [ ] Other Bash on Windows
- [ ] I Am on Linux
- [ ] I Am on macOS
- [ ] Ubuntu
- [ ] Fedora
- [ ] CentOS
- [ ] Redhat
- [ ] Debian
- [ ] I am on macOS 10.13
- [ ] I am on macOS 10.14
- [ ] I'm on Docker
- [ ] I understand Docker may be unsupported

## Description

Expand Down
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Feature Request
about: Suggest an Idea!
---

- [ ] This feature is not on the latest version

## Request

<!--
Replace this with a description of what you would like,
make sure to include as much detail as you can so that your
feature can be implemented quickly if accepted.
-->

## Examples

```sh
# Your example
# Maybe multiple
# Examples?
```
44 changes: 0 additions & 44 deletions .github/issues_template.md

This file was deleted.

4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- [ ] I have added or updated the specs.
- [ ] I have verified that the specs pass on my computer.
- [ ] I have added or updated the specs/tests.
- [ ] I have verified that the specs/tests pass on my computer.
- [ ] I have not attempted to bump, or alter versions.
- [ ] This is a documentation change.
- [ ] This is a source change.
Expand Down
1 change: 1 addition & 0 deletions .github/security
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @envygeeks
53 changes: 49 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,50 @@
/.bundle
/.DS_Store
/Gemfile.lock
/vendor
# --
# OS Level
# --
.DS_Store

# --
# Ruby
# --
vendor/
coverage/
Gemfile.lock
spec/fixture/site/
spec/fixture/result/
spec/fixture/out/
.bundle/
*.gem

# --
# CodeClimate
# --
cctr

# --
# Jekyll
# --
_site/
.jekyll-cache/
.jekyll-metadata
.asset-cache/
site/

# --
# Rails
# --
/db/*.sqlite3
/npm-error.log
.byebug_history
/db/*.sqlite3-journal
/config/application.yml
/config/master.key
/yarn-error.log
/node_modules
.pry_history
/log
/tmp

# --
# Yarn
# --
yarn.lock
7 changes: 6 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ I tend to test on more than one version, and more than one back version of any g
* **Node.js:** Latest LTS + Latest Release + 1 Back
* **Go:** Latest + 1 Back

***It should be noted that if I wish to have a feature of a language before I can make a major release, I may, or may not go ahead and enforce a newer version of a language in a point release (exp: 3.x) so that I can update my code and clean it up.***


## Bugs/Features

Expand Down Expand Up @@ -72,10 +74,12 @@ Code updates should follow the formatting of the given repository, formatting in
##### Good

```ruby
# --
# @param hello [String] your greeting
# Allows you to send a greeting back to the user
# @raise if the given object is not a string
# @return [String] the greeting
# --
def greet(hello)
raise ArgumentError, "needs string" unless hello.is_a?(String)
alert hello, {
Expand All @@ -87,9 +91,11 @@ end
##### Bad

```ruby
# --
# @param hello [String] your greeting
# Allows you to send a greeting back to the user
# @return [String] the greeting
# --
def greet(hello)
# @raise if the given object is not a string
raise ArgumentError, "needs string" unless hello.is_a?(String)
Expand Down Expand Up @@ -122,4 +128,3 @@ Documentation updates should follow the formatting of the given repository. You
* Requests for language changes if the author feels it's ambiguous.
* Requests for formatting changes.
* Requests for `git squash`

5 changes: 4 additions & 1 deletion script/build
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash -l
set -e
# Copyright: 2017 - 2018 - MIT License
# Source: https://github.com/envygeeks/devfiles
# Author: Jordon Bedwell
script/install

bundle exec docker-template build $DOCKER_REPO \
--no-push --force --squash || \
Expand Down
17 changes: 0 additions & 17 deletions script/debug

This file was deleted.

3 changes: 3 additions & 0 deletions script/deploy
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash -l
# Copyright: 2017 - 2018 - MIT License
# Source: https://github.com/envygeeks/devfiles
# Author: Jordon Bedwell
set -e

if [ "$TRAVIS_PULL_REQUEST" = "false" ]
Expand Down
76 changes: 45 additions & 31 deletions script/install
Original file line number Diff line number Diff line change
@@ -1,36 +1,50 @@
#!/bin/bash -l
#!/bin/bash
# Copyright: 2017 - 2018 - MIT License
# Source: https://github.com/envygeeks/devfiles
# Author: Jordon Bedwell
[ "$DEBUG" = "true" ] && set -x
set -e

# --
# Update Docker
# This is for the CI only.
# @private
# --
update-docker() {
# Only update our Docker sources, that's it.
sudo apt-get update -o Dir::Etc::sourceparts="-" \
-o Dir::Etc::sourcelist="/etc/apt/sources.list.d/docker.list" \
-o APT::Get::List-Cleanup="0"
}
f=script/script.d/install
if [ "$SKIP_SCRIPTD" != "true" ] && [ -x $f ]; then
exec $f "$@"
else
if [[ "$CI" != "true" ]]; then
bundle check 1>/dev/null 2>&1 && bundle update ||
bundle install --path vendor/bundle
bundle clean
else

# --
# Install Docker
# This is for the CI only.
# @private
# --
upgrade-docker() {
# Only upgrade Docker, nothing else, if we update.
sudo apt-get install --assume-yes --only-upgrade \
-o Dpkg::Options::="--force-confdef" \
-o Dpkg::Options::="--force-confold" \
docker-ce
}
# --
# Update Docker
# This is for the CI only.
# @private
# --
update-docker() {
# Only update our Docker sources, that's it.
sudo apt-get update -o Dir::Etc::sourceparts="-" \
-o Dir::Etc::sourcelist="/etc/apt/sources.list.d/docker.list" \
-o APT::Get::List-Cleanup="0"
}

# --
if [ "$CI" = "true" ]; then
sudo mkdir -p /etc/docker
update-docker && upgrade-docker
json="{\n \"experimental\": true\n}\n"
printf "$json" | sudo tee /etc/docker/daemon.json
sudo service docker restart
# --
# Install Docker
# This is for the CI only.
# @private
# --
upgrade-docker() {
# Only upgrade Docker, nothing else, if we update.
sudo apt-get install --assume-yes --only-upgrade \
-o Dpkg::Options::="--force-confdef" \
-o Dpkg::Options::="--force-confold" \
docker-ce
}

# --
sudo mkdir -p /etc/docker
update-docker && upgrade-docker
json="{\n \"experimental\": true\n}\n"
printf "$json" | sudo tee /etc/docker/daemon.json
sudo service docker restart
fi
fi
4 changes: 2 additions & 2 deletions script/sync
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ trim() {
# Determine what we are working with.
# --

skip_if_exists=(Gemfile)
skip_if_exists=(Gemfile .travis.yml)
sync_language=$(git config envygeeks.language || echo "")
skip_if_external=(CONTRIBUTING.md CODE_OF_CONDUCT.md .github/codeowners)
skip_if_external+=(.github/issue_template.md .github/pull_request_template.md)
Expand Down Expand Up @@ -66,7 +66,7 @@ for d in $(trim global $sync_language); do
fi

if [ "$skip" != "true" ]; then
bash -xc "cp '$f' '$copy_to/$to'"
bash -xc "cp -L '$f' '$copy_to/$to'"
fi
done
done
Expand Down
6 changes: 0 additions & 6 deletions script/test

This file was deleted.

4 changes: 2 additions & 2 deletions script/travis
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash -l
#!/bin/bash
set -e

# What we want to run on the CI.
for v in install test build deploy; do
for v in install build deploy; do
script/$v
done

0 comments on commit 209bd68

Please sign in to comment.