Merge branch 'master' into elixir

* master: (79 commits)
  Update changelog [skip ci]
  Prepare 0.30.2 release
  Fixes Glavin001#1030. Add support for alpha versions of autopep8
  Fixes Glavin001#1725. Fix version parsing of PHP executable
  Fixes Glavin001#1730. Correctly parse PHPCBF version and improve handling of Executable
  See Glavin001#1708. Re-generate documentation for Fortran file extension changes
  Prepare 0.30.1 release
  Prepare changelog for v0.30.1
  See Glavin001#1725. Update changelog
  Fixes Glavin001#1725. Improve PHP-CS-Fixer support with handling script path
  Update changelog. See Glavin001#1030.
  Fix Glavin001#1030. Autopep8 Executable did not handle older and newer versions
  Prepare 0.30.0 release
  See Glavin001#1687. Update README, remove note about Executables now that it is supported
  See Glavin001#1687. Update Changelog with info about Executables
  Add Greenkeeper badge
  See Glavin001#1687. Update README docs to include details about Executables and Docker support
  Add more dependencies to next-update and greenkeep ignore list
  See Glavin001#1687. Fix typos in Travis CI config
  See Glavin001#1687. Install Sass-convert and Uncrustify beautifiers via Docker for Linux Travis CI build
  ...

# Conflicts:
#	README.md

.travis.yml

@@ -23,6 +23,13 @@ go:
 
 matrix:
   include:
+    - os: linux
+      dist: trusty
+      sudo: required
+      services:
+        - docker
+      env:
+        - ATOM_CHANNEL=stable
     # - os: linux
     #   dist: trusty
     #   sudo: require
@@ -78,7 +85,7 @@ before_install:
       git clone --depth=1 https://github.com/Linuxbrew/brew.git ~/.linuxbrew || true;
     fi
   # Update Homebrew
-  - brew update
+  # - brew update
   - brew tap homebrew/dupes
   - brew tap homebrew/versions
   # Ruby language support
@@ -87,7 +94,11 @@ before_install:
   - gem install htmlbeautifier
   - gem install puppet-lint
   # Sass language support
-  - gem install sass
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      gem install sass;
+    else
+      docker pull unibeautify/sass-convert;
+    fi
   # Python language support
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo chmod 777 -R /opt/python; fi
   - pip install --upgrade pip
@@ -96,10 +107,19 @@ before_install:
   # SQL language support
   - pip install --upgrade sqlparse
   # Java, C, C++, C#, Objective-C, D, Pawn, Vala
-  - brew install uncrustify
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      brew install uncrustify;
+    else
+      docker pull unibeautify/uncrustify;
+    fi
   # R
   - brew tap homebrew/science
-  - brew install r
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      brew install r;
+      rscript --version;
+    else
+      docker pull unibeautify/rscript;
+    fi
   # PHP
   - brew tap homebrew/homebrew-php
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
@@ -122,11 +142,12 @@ before_install:
   # - stack install stylish-haskell
   # Elm
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      curl -L -o /tmp/elm-format.tgz https://github.com/avh4/elm-format/releases/download/0.2.0-alpha/elm-format-0.2.0-alpha-mac-x64.tgz;
+      curl -L -o /tmp/elm-format.tgz
+      https://github.com/avh4/elm-format/releases/download/0.7.0-exp/elm-format-0.17-0.7.0-exp-mac-x64.tgz;
       tar xvzf /tmp/elm-format.tgz -C /usr/local/bin;
     fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      curl -L -o /tmp/elm-format.tgz https://github.com/avh4/elm-format/releases/download/0.2.0-alpha/elm-format-0.2.0-alpha-linux-x64.tgz;
+      curl -L -o /tmp/elm-format.tgz https://github.com/avh4/elm-format/releases/download/0.7.0-exp/elm-format-0.17-0.7.0-exp-linux-x64.tgz;
       tar xvzf /tmp/elm-format.tgz -C $HOME/.linuxbrew/bin;
     fi
   # OCaml

CHANGELOG.md

@@ -1,7 +1,22 @@
 # Next
-- Fix [#1652](https://github.com/Glavin001/atom-beautify/issues/1652) and [#1653](https://github.com/Glavin001/atom-beautify/issues/1653). Add `.rb` to temp files passed in to the `rubocop` executable so they are not excluded.
 - ...
 
+# v0.30.2 (2017-06-20)
+- Fixes [#1030](https://github.com/Glavin001/atom-beautify/issues/1030). Add support for alpha versions of autopep8
+- Fixes [#1725](https://github.com/Glavin001/atom-beautify/issues/1725). Fix version parsing of PHP executable
+- Fixes [#1730](https://github.com/Glavin001/atom-beautify/issues/1730). Correctly parse PHPCBF version and improve handling of Executable
+
+# v0.30.1 (2017-06-19)
+- Fix [#1703](https://github.com/Glavin001/atom-beautify/issues/1703). Now Fortran 2003/2008 file extensions are available for Fortran beautifier.
+- Fix [#1030](https://github.com/Glavin001/atom-beautify/issues/1030). Autopep8 Executable did not handle older and newer versions.
+- Fixes [#1725](https://github.com/Glavin001/atom-beautify/issues/1725). Improve PHP-CS-Fixer support with handling script path
+  Detect if the executable path is either .phar (PHP) or not and
+  run the executable PHP-CS-Fixer differently considering.
+
+# v0.30.0 (2017-06-17)
+- Close [#1687](https://github.com/Glavin001/atom-beautify/issues/1687). Introducing Executables with Docker support! Executables wrap any non-preinstalled application, check if it is installed, and provide additional configuration options, including Docker support! See [#1687](https://github.com/Glavin001/atom-beautify/issues/1687) for more information.
+- Fix [#1652](https://github.com/Glavin001/atom-beautify/issues/1652) and [#1653](https://github.com/Glavin001/atom-beautify/issues/1653). Add `.rb` to temp files passed in to the `rubocop` executable so they are not excluded.
+
 # v0.29.26 (2017-05-28)
 - Fix #116. Switch from setText to setTextViaDiff, preserve folds
 - Add more perl filetypes (#1603)

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

README-template.md

@@ -1,4 +1,5 @@
 # :lipstick: [{{package.name}}](https://github.com/Glavin001/atom-beautify)
+[![Greenkeeper badge](https://badges.greenkeeper.io/Glavin001/atom-beautify.svg)](https://greenkeeper.io/)
 [![GitHub issues](https://img.shields.io/github/issues/Glavin001/atom-beautify.svg?style=flat-square)](https://github.com/Glavin001/atom-beautify/issues)
 [![GitHub stars](https://img.shields.io/github/stars/Glavin001/atom-beautify.svg?style=flat-square)](https://github.com/Glavin001/atom-beautify/stargazers)
 [![Gitter](https://img.shields.io/gitter/room/Glavin001/atom-beautify.svg?style=flat-square)](https://gitter.im/Glavin001/atom-beautify)