Test PR - ABCBot/test12-14T16-34-12

CODEOWNERS → .github/CODEOWNERS

@@ -3,22 +3,21 @@
 # This is managed by GitHub's "code owners" feature https://github.com/blog/2392-introducing-code-owners
 
 # Jekyll and website design
-*           @t0p0lin0 @kenman345 @rawb0t @deadr0ck @joshmcintyre
-_data/* 		@t0p0lin0 @kenman345 @rawb0t @deadr0ck @joshmcintyre
+*           @t0p0lin0 @kenman345 @rawb0t @deadr0ck @joshmcintyre @hegjon
+_data/* 		@t0p0lin0 @kenman345 @rawb0t @deadr0ck @joshmcintyre @hegjon
 _includes/*	@t0p0lin0
 _layouts/*	@t0p0lin0
 _sass/*		  @t0p0lin0
 css/*		    @t0p0lin0
-img/*		    @t0p0lin0 @kenman345 @rawb0t @deadr0ck @joshmcintyre
+img/*		    @t0p0lin0 @kenman345 @rawb0t @deadr0ck @joshmcintyre @hegjon
 js/*		    @t0p0lin0
-notes/*		  @t0p0lin0 @kenman345 @rawb0t @deadr0ck @joshmcintyre
 _config.yml	@t0p0lin0
 
 # Core files
 CNAME		@acceptbitcoincash/core
 LICENSE		@acceptbitcoincash/core
 
 # Miscellaneous files
-data.json	@carlgo11
-verify.rb	@stephengroat
-Rakefile	@stephengroat
+data.json	@kenman345
+verify.rb	@kenman345
+Rakefile	@kenman345

.gitignore

@@ -11,3 +11,8 @@ Gemfile.lock
 *.suo
 *.pyproj
 scripts/python/output/
+.bundle
+vendor/
+.jekyll-metadata
+vendor/bundle/
+vendor/*

.travis.yml

@@ -1,31 +1,85 @@
-sudo: required
-language: ruby
-rvm: 2.4.0
-python:
-  - "3.4"
-services:
-  - docker
+dist: trusty
+rvm: 2.4.1
 cache:
   bundler: true
-  directories: $TRAVIS_BUILD_DIR/tmp/.htmlproofer
+  directories:
+  - vendor/bundle
+  - $TRAVIS_BUILD_DIR/tmp/.htmlproofer
 addons:
   apt:
     packages:
     - libcurl4-openssl-dev
     - ca-certificates
-before_install: 
-    - gem update --system --no-doc
-    - bundle install --gemfile=Gemfile
-    - pip install --user pathlib
-matrix:
+stages:
+  - name: Test
+    if: sender != svenfuchs AND sender != imgbot[bot]
+  - name: imgbot
+    if: sender IN (svenfuchs, imgbot[bot])
+  - name: Run build
+    if: type IN (push, cron) AND (branch = master OR tag IS present)
+jobs:
   include:
-    - os: linux
-      dist: trusty
-      gemfile: Gemfile
-      env: NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+    - &test-baseline
+      stage: Test
       script:
-      - rake docker:build
+        bundle exec rake
+
+    - <<: *test-baseline
+      script:
+        bundle exec rake proof_external
+      if: type IN (pull_request, cron) OR (type = push AND branch = master)
+
+    - stage: imgbot
+      script:
+        bundle exec rake verify
+
+    - stage: Run build
+      sudo: true
+      env: 
+        NEXT_BUILD_TAG=latest
+      script:
+      - if [ "$TRAVIS_TAG" != "" ]; then 
+          NEXT_BUILD_TAG=`date +"%m-%d-%Y"`;
+        fi
+      - if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then 
+          NEXT_BUILD_TAG=`date +"%m-%d-%Y"`;
+        fi
+      - echo ".git" > .dockerignore
+      - echo $NEXT_BUILD_TAG
+      - bundle exec rake docker:build
+      - docker tag kenman345/acceptbitcoincashdocker kenman345/acceptbitcoincashdocker:"$NEXT_BUILD_TAG"
+      - cp ./_site/js/main.js ./js/main.js
+      deploy:
+      - provider: script
+        skip-cleanup: true
+        script:
+        # - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; docker push kenman345/acceptbitcoincashdocker
+          docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"; docker push kenman345/acceptbitcoincashdocker
+        on:
+          all_branches: true # <== new!
+          condition: $NEXT_BUILD_TAG != "latest"
+      # - provider: pages
+        # skip-cleanup: true
+        # github-token: $GITHUB_TOKEN  # Set in travis-ci.org dashboard, marked secure
+        # fqdn: kenman345.github.io
+        # keep-history: true
+        # repo: kenman345/kenman345.github.io
+        # target_branch: gh-pages
+        # on:
+          # all_branches: true # <== new!
   allow_failures:
-    - script: 
-      - bundle exec rake proof_external
-      - bundle exec rake
+    - stage: Test
+      script:
+        bundle exec rake proof_external
+      if: type IN (pull_request, cron) OR (type = push AND branch = master)
+notifications:
+  webhooks: 
+    urls: https://www.travisbuddy.com/
+    on_failure: always
+    on_success: never
+  slack:
+    rooms:
+      - secure: "vIMiDIutWLX4xPWK4+HRh39MdAaNLl+UcK7UjNlehHIuopZPbnH+TmqFg5726ZDhkQ6QN/lHYVuHTvW9Kp+f7uiuRX2QLJH4vZZrcvsXeRccWbVx7MlMW9hbOnvB73nUmezaHploSpMINKWRD51PhLlONbztLCzYmOoBfLRDvrmEY7kzoiMFCCZwPIzIiyB1LrEhSQD3YELgZ+ZDipFUeVA2yrBKZSZZoM7ubcpqNZHhx+3uAJrpQ66k36eprrXM7IC8Qy8u2AcV1hNnczNM+jUts/PKyCjH4vIjh4JEVNN/gBLY30oDOR6d95szme/4BWEPCcP2Sz3MQTtkN5tXaAmRRKqwYUv+lB0lTB5EB28SD9Sa3Q6HJhIQ5BVuO0Lmdwe8CVBTy7lmwcyuUqW5y0MHQF6HAZj2lSN8pktInFD40o+FQgC03YEiXWJbCYzny7LmE0T6ZgycvFzr/S28cDXiPemPMg4333aDjHj02631gRZtMG9dh7u35UnjuWU1Qs2ke2Irx2GJadp5LHp7++ssHWdmZKVJlKSvh679QCNvlG5CvWD/VinBvibTR61Py+b0Zk+k3++fz3YcJZ89ZCAyQ4yWCsGB7nNjpaMYcBHgHwgNBF6Gk3x71A2N3NfQrm2pcoB3+KM3QMVFmZrUD74Ni8TLXOdK2GHmYaqMI9A="
+    on_success: change
+    on_failure: always
+    on_pull_requests: change 

CONTRIBUTING.md

@@ -7,13 +7,15 @@ First off, **thanks for your interest in contributing!** Your help will foster g
 
 ### _A quick note..._
 
-The site maintainers do not endorse nor confirm the legitimacy of any of the merchants linked to on this site. While we try our best to verify the merchant information submitted, it's possible that we may miss something, or a service may change/information becomes outdated. If you notice anything, please [raise a new issue](https://github.com/acceptbitcoincash/acceptbitcoincash/issues/new).
+The site maintainers do not endorse nor confirm the legitimacy of any of the listings linked to on this site. While we try our best to verify the information submitted, it's possible that we may miss something, or a service may change/information becomes outdated. If you notice anything, please [raise a new issue](https://github.com/acceptbitcoincash/acceptbitcoincash/issues/new).
 
 Adding a site is easy. Read below for the basics, and if you're more technically-inclined, detailed instructions are further down this document. Regardless, the only thing **you need** is **a Github account**.
 
 ## Submitting a site _the easy way_
 
-[Open a new issue](https://github.com/acceptbitcoincash/acceptbitcoincash/issues/new) and fill out the template that's provided as a placeholder. Try to fill out all of the fields as accurately as possible. We are looking for the following:
+We offer two easy ways to submit a new site to be listed.
+1. Use the [Merchant/Website Addition Request](https://AcceptBitcoin.Cash/add) form to the best of your ability.
+2. [Open a new issue](https://github.com/acceptbitcoincash/acceptbitcoincash/issues/new) and fill out the template that's provided as a placeholder. Try to fill out all of the fields as accurately as possible. We are looking for the following:
 
 - `name` -- Name of merchant/site
 - `url` -- URL of merchant/site (http*s* preferred)
@@ -28,6 +30,8 @@ Adding a site is easy. Read below for the basics, and if you're more technically
 - `othercrypto` -- Accepting Other Crypto (yes/no)
 - `doc` -- Documentation/Help Guides (URL)
 - _(Optional)_ `exceptions/text` Exceptions/General Notes
+- _(Optional)_ `lang` -- two letter abbreviation of language the site uses if not `en`
+- _(Optional)_ `keywords/-` -- words that can be useful for users that are trying to search for something that relates to this listing.
 
 For 2-letter _country_ codes, use [ISO_3166-1_alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) codes.
 
@@ -107,21 +111,33 @@ View the complete list in the [EXCLUSION.md file][exclude].
 
 ## New Categories
 
-To add a new category, modify the `sections` value in [sections.yml](_data/sections.yml)
+When adding a new category, you will need to select an icon from the [SemanticUI Icon set](https://semantic-ui.com/elements/icon.html). Once you have identified the icon to use, you can use any of the following means to add a new category:
+
+### 1) To add a new category, modify the `sections` value in [sections.yml](_data/sections.yml)
 and follow the template below:
 
 ```yml
 - id: category-id
   title: Category Name
   icon: icon-class
+  page: page the category shall belong to
 ```
 
 Then create a new file in the `_data` directory with the same name as your section's
 id, using the `.yml` extension.
 
+### 2) Follow the following steps:
+1) From the command line, run:
+   ```bash
+   $ bundle exec rake add:category
+   ```
+2) Answer ALL the questions it asks
+
+When you are finished, it will add in the new category to the [sections.yml](_data/sections.yml) file and create a new file in the following format: `[<section id>].yml` in the `_data` folder for you to add listings to.
+
 ## New Sites
 
-If you are adding multiple sites to the AcceptBitcoinCash list, please create a new
+If you are adding multiple sites to the [AcceptBitcoin.Cash](https://AcceptBitcoin.Cash) list, please create a new
 git branch for each website, and submit a separate pull request for each branch.
 More information regarding how to create new git branches can be found on
 [GitHub's Help Page](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/)
@@ -142,9 +158,8 @@ websites:
     othercrypto: no
 ```
 
-The fields `name:`, `url:`, `img:`, `bch:` are required for all entries.
-If the site supports Bitcoin (Legacy) or other cryptocurrencies, `btc` and `othercrypto` should be
-entered as well.
+The fields `name:`, `url:`, `bch:` are required for all entries.
+If the site supports Bitcoin (Legacy) or other cryptocurrencies, `btc` and `othercrypto` should be entered as well.
 
 #### Adding a site that *supports* BCH
 
@@ -163,6 +178,9 @@ The following is an example of a website that *supports* BCH:
       btc: No
       othercrypto: Yes
       doc: https://rocketr.net/blog/2017/07/30/bitcoin-cash-coming-rocketr/
+      keywords:
+        - shops
+        - payments
 ```
 
 #### Adding a site that *does not* support BCH
@@ -216,27 +234,27 @@ website. There are 4 ways to customize how it is displayed:
       bch: Yes
       btc: No
       exceptions:
-          text: "Specific text goes here."
+        text: "Specific text goes here."
       doc: <link to site BCH documentation>
    ```
 
 ### Pro Tips
 
-- You can use a <a href="https://codebeautify.org/yaml-validator" target="_blank">YAML validator</a>
-  to ensure that you've used the correct syntax.
+- You can use a <a href="https://codebeautify.org/yaml-validator" target="_blank">YAML validator</a> to ensure that you've used the correct syntax.
+
+- To validate a submission before committing the change you can run the following script to verify your work is done properly:
+
+   ```bash
+   $ bundle exec rake verify
+   ```
 
-- See Guideline #2 about icons. The png file should go in the corresponding
-  `img/section` folder.
+- See Guideline #2 about icons. The png file should go in the corresponding `img/section` folder.
 
-- For the sake of organization and readability, it is appreciated if you insert
-  new sites alphabetically and that your site chunk follows the same order as the
-  example above.
+- For the sake of organization and readability, it is appreciated if you insert new sites alphabetically and that your site chunk follows the same order as the example above.
 
-- If a site supports BCH, their Twitter and Facebook handles as well as their email address
-  are not needed and can be left out for cleanliness.
+- If a site supports BCH, their Twitter and Facebook handles as well as their email address are not needed and can be left out for cleanliness.
 
-- If a site does not yet support BCH but there is documentation that they are adding
-  it, then use:
+- If a site does not yet support BCH but there is documentation that they are adding it, then use:
 
   ```yml
   status: <url to documentation>

Gemfile

@@ -1,12 +1,27 @@
 source 'https://rubygems.org'
 
 # Dependencies are bundled with the github-pages gem
-gem 'github-pages', group: :jekyll_plugins
+group :jekyll_plugins do
+  gem 'github-pages'
+  gem 'jekyll-minifier'
+  gem 'jekyll-seo-tag'
+end
 
 group :test do
+  gem 'diff-lcs'
+  gem 'diffy'
   gem 'fastimage'
+  gem 'highline'
   gem 'html-proofer'
   gem 'kwalify'
   gem 'rake'
   gem 'rubocop'
 end
+
+# rubocop:disable SymbolArray
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+# rubocop:enable SymbolArray
+
+# Performance-booster for watching directories on Windows
+gem 'wdm', '~> 0.1.0' if Gem.win_platform?

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2017 Josh Davis
+Copyright (c) 2014-2018 Josh Davis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -5,6 +5,7 @@ A community-curated list of sites/merchants that accept [**Bitcoin Cash**](https
 
 Add a site that's not listed, or provide any updates/corrections by submitting a pull request, or [creating an issue](https://github.com/acceptbitcoincash/acceptbitcoincash/issues). Learn how to do either by reading [our contribution guidelines](CONTRIBUTING.md).
 
+[![Build Status](https://travis-ci.org/acceptbitcoincash/acceptbitcoincash.svg?branch=master)](https://travis-ci.org/acceptbitcoincash/acceptbitcoincash)
 [![GitHub pull-requests](https://img.shields.io/github/issues-pr/acceptbitcoincash/acceptbitcoincash.svg)](https://github.com/acceptbitcoincash/acceptbitcoincash/pulls/)
 [![GitHub issues-closed](https://img.shields.io/github/issues-closed/acceptbitcoincash/acceptbitcoincash.svg)](https://github.com/acceptbitcoincash/acceptbitcoincash/issues?q=is%3Aissue+is%3Aclosed)
 [![Twitter](https://img.shields.io/badge/[email protected])](https://twitter.com/useBitcoinCash)
@@ -16,7 +17,7 @@ The goal is to build a website ([https://acceptBitcoin.cash](https://acceptBitco
 
 Our hope is to connect consumers and merchants, while spreading awareness and promoting global adoption of [Bitcoin Cash](https://www.bitcoincash.org).
 
-The site maintainers do not endorse nor confirm the legitimacy of any of the merchants linked to on this site. This is an open source project which accepts submissions from the general community. While we try our best to verify the merchant information submitted, it's possible that we may miss something.
+The site maintainers do not endorse nor confirm the legitimacy of any of the listings linked to on this site. This is an open source project which accepts submissions from the general community. While we try our best to verify the information submitted, it's possible that we may miss something.
 
 ## Contributing
 
@@ -56,7 +57,7 @@ If you are doing development, and want to launch a jekyll server which can track
 
 ```
 cd ~/acceptbitcoincash
-docker run --rm --label=jekyll --volume=$(pwd):/srv/jekyll \
+docker run --rm --label=jekyll --volume=$(pwd):/srv/jekyll:z \
   -it -p 127.0.0.1:4000:4000 jekyll/jekyll:latest jekyll s
 ```