Merge pull request #1999 from stephengroat/patch-1

Cleanup build process
2018-01-14 21:21:55 -04:00 · 2018-01-14 21:21:55 -04:00 · d9b71cfe94
parent a51f626cf1 615f4cff78
commit d9b71cfe94
11 changed files with 95 additions and 526 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -11,53 +11,22 @@ notifications:

 script: sh build-package.sh

+cache:
+  timeout: 1000
+
 git:
-  depth: 10
+  depth: 1

-php:
-  - '5.6'
-python:
-  - '2.7'
-go:
-  - release
-
-matrix:
-  include:
-    - os: linux
-      dist: trusty
-      sudo: required
-      services:
-        - docker
-      env:
-        - ATOM_CHANNEL=stable
-    - os: linux
-      dist: trusty
-      sudo: required
-      services:
-        - docker
-      env:
-        - ATOM_CHANNEL=beta
-    # - os: linux
-    #   dist: trusty
-    #   sudo: require
-    #   env:
-    #     - ATOM_CHANNEL=stable
-    # - os: linux
-    #   dist: trusty
-    #   sudo: require
-    #   env:
-    #     - ATOM_CHANNEL=beta
-    - os: osx
-      env:
-        - ATOM_CHANNEL=stable
-    # - os: osx
-    #   env:
-    #     - ATOM_CHANNEL=beta
+os:
+  - linux
+  - osx
+sudo: required

 env:
  global:
-    - APM_TEST_PACKAGES="language-marko language-html-swig language-svg language-d mavensmate-atom language-lua language-puppet fuse"
-    - PATH="/home/travis/gopath/bin:$HOME/.linuxbrew/bin:$PATH"
+  matrix:
+    - ATOM_SCRIPT_NAME=atom-beta APM_SCRIPT_NAME=apm-beta
+    - ATOM_SCRIPT_NAME=atom APM_SCRIPT_NAME=apm

 addons:
  apt:
@ -71,9 +40,7 @@ addons:
    - libgnome-keyring-dev
    - fakeroot
    - crystal
-    - ocaml
    - camlp4
-    - opam
    - php5-cli
    - golang

@ -84,111 +51,38 @@ cache:
    - vendor/bundle # gems are installed here, https://docs.travis-ci.com/user/languages/ruby/#Dependency-Management
    - node_modules
    - $HOME/.atom
-    - $HOME/.stack
+    - $HOME/.opam

 before_install:
-  # Install Homebrew on Linux
+  # linux: Install Nix, Nix packages, upgrade pip, and install python packages
+  # osx: Update Homebrew, remove conflicting cask, brew bundle, symlink elm-format,
+  #      upgrade pip, and install python packages
  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      git clone --depth=1 https://github.com/Linuxbrew/brew.git ~/.linuxbrew || true;
+      curl https://nixos.org/nix/install | sh &&
+      . ~/.nix-profile/etc/profile.d/nix.sh &&
+      nix-env -i uncrustify R elm-format terraform atom atom-beta opam &&
+      pip install --upgrade pip &&
+      pip install --user -r requirements.txt;
+    elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      brew update && brew cask zap oclint && brew bundle &&
+      ln -s /usr/local/bin/elm-format-0.17 /usr/local/bin/elm-format &&
+      pip2 install --upgrade pip &&
+      pip2 install -r requirements.txt;
+    else
+      echo Error:TRAVIS_OS_NAME && exit 1;
    fi
-  # Update Homebrew
-  - brew update
-  - brew tap homebrew/dupes
-  - brew tap homebrew/versions
  # Ruby language support
-  # - gem install ruby-beautify --verbose
-  # - gem install rubocop
-  - gem install htmlbeautifier
-  - gem install puppet-lint
-  # Sass language support
-  - 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;
-      pip install --upgrade pip;
-      pip install --user --upgrade autopep8;
-      pip install --user --upgrade isort;
-    else
-      pip2 install --upgrade pip2;
-      pip2 install --upgrade autopep8;
-      pip2 install --upgrade isort;
-    fi
-  # SQL language support
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      pip install --user --upgrade sqlparse;
-    else
-      pip2 install --upgrade sqlparse;
-    fi
-  # Java, C, C++, C#, Objective-C, D, Pawn, Vala
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew install uncrustify;
-    else
-      docker pull unibeautify/uncrustify;
-    fi
+  - bundle install
  # R
-  - brew tap homebrew/science
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew install r;
-      rscript --version;
-    else
-      docker pull unibeautify/rscript;
-    fi
+  - Rscript --version
  # PHP
-  - brew tap homebrew/homebrew-php
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew install php56 || true;
-      brew gist-logs php56 || true;
-      echo -e "\n[Phar]\nphar.readonly = Off\n" >> /usr/local/etc/php/5.6/php.ini;
-      brew install php-cs-fixer || true;
-      brew gist-logs php-cs-fixer || true;
-    fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      wget http://get.sensiolabs.org/php-cs-fixer.phar -O php-cs-fixer;
-      chmod a+x php-cs-fixer;
-      mv php-cs-fixer $HOME/.linuxbrew/bin/php-cs-fixer;
-    fi
+  - composer install
  # CoffeeScript
  - npm install coffee-formatter
-  # Haskell
-  # - brew install haskell-stack
-  # - stack setup
-  # - 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.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.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
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew install ocaml;
-      brew install opam;
-    fi
  - opam init --auto-setup
  # Init environment variables for opam
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
      eval `opam config env`;
    fi
  - opam install --yes ocp-indent
-  # Crystal
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install crystal-lang; fi
-  # Bash
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      pip install --user beautysh;
-    else
-      pip2 install beautysh;
-    fi
-  # terraform
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew install terraform;
-    else
-      docker pull hashicorp/terraform;
-    fi
--- a/12
+++ b/12
@ -0,0 +1,12 @@
+tap 'homebrew/science'
+tap 'homebrew/php'
+tap 'caskroom/versions'
+brew 'uncrustify'
+brew 'r'
+brew 'composer'
+brew 'opam'
+brew 'crystal-lang'
+brew 'terraform'
+brew 'elm-format'
+cask 'atom'
+cask 'atom-beta'
--- a/6
+++ b/6
@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rubocop"
+gem "htmlbeautifier"
+gem "puppet-lint"
+gem "sass"
--- a/appveyor.yml
+++ b/appveyor.yml
@ -10,136 +10,35 @@ environment:
    # /E:ON and /V:ON options are not enabled in the batch script intepreter
    # See: http://stackoverflow.com/a/13751649/163740
    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
-
-  matrix:
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.8"
-      PYTHON_ARCH: "32"
-      RUBY_VERSION: 23
-
-    # - PYTHON: "C:\\Python27-x64"
-    #   PYTHON_VERSION: "2.7.8"
-    #   PYTHON_ARCH: "64"
-    #
-    # - PYTHON: "C:\\Python33"
-    #   PYTHON_VERSION: "3.3.5"
-    #   PYTHON_ARCH: "32"
-    #
-    # - PYTHON: "C:\\Python33-x64"
-    #   PYTHON_VERSION: "3.3.5"
-    #   PYTHON_ARCH: "64"
-    #
-    # - PYTHON: "C:\\Python34"
-    #   PYTHON_VERSION: "3.4.1"
-    #   PYTHON_ARCH: "32"
-    #
-    # - PYTHON: "C:\\Python34-x64"
-    #   PYTHON_VERSION: "3.4.1"
-    #   PYTHON_ARCH: "64"
+    PATH: C:\Ruby23\bin;C:\Ruby23-x64\DevKit\mingw\bin;C:\Python27;C:\Python27\Scripts;%PATH%

 init:
  - cmd: rd /s /q %CHOCOLATEYINSTALL%
  - ps: iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))

 install:
-
-  - ECHO "Filesystem root:"
-  - ps: "ls \"C:/\""
-
-  - cinst atom -y
-  - cd %APPVEYOR_BUILD_FOLDER%
-  # Add Atom's bin (apm, etc) to PATH
-  - SET PATH=%LOCALAPPDATA%\atom\bin;%PATH%
+  - cinst packages.config -y
+  - refreshenv
  - apm install

-  # Install CLI beautifiers
+  # https://packaging.python.org/guides/supporting-windows-using-appveyor/
+  - pip install -r requirements.txt

-  # Install Python (from the official .msi of http://python.org) and pip when
-  # not already installed.
-  - "powershell ./appveyor/install.ps1"
+  # Gemfile Install
+  - bundle install

-  # Prepend newly installed Python to the PATH of this build (this cannot be
-  # done from inside the powershell script as it would require to restart
-  # the parent CMD process).
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-
-  # Check that we have the expected version and architecture for Python
-  - "python --version"
-  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-
-  # Install the build dependencies of the project. If some dependencies contain
-  # compiled extensions and are not provided as pre-built wheel packages,
-  # pip will build them from source using the MSVC compiler matching the
-  # target Python version and architecture
-  - "%CMD_IN_ENV% pip install --upgrade autopep8"
-  - where autopep8
-
-  - "%CMD_IN_ENV% pip install --upgrade isort"
-  - where isort
-
-  - "%CMD_IN_ENV% pip install --upgrade sqlparse"
-
-  # Ruby & Gem
-  - SET PATH=C:\Ruby%RUBY_VERSION%\bin;C:\Ruby23-x64\DevKit\mingw\bin;%PATH%
-  # Rubocop
-  - gem install rubocop
-  - where rubocop
-  # HTMLBeautifier
-  - gem install htmlbeautifier
-  - where htmlbeautifier
-  # Puppet-Lint
-  - gem install puppet-lint
-  - where puppet-lint
-  # Sass
-  - gem install sass
-  - where sass-convert
-
-  # emacs
-  - cinst emacs -y
-  - where emacs
-
-  # terraform
-  - cinst terraform -y
-  - where terraform
-
-  # FIXME: Enable allowEmptyChecksums, until someone fixes the checksum issue of php
-  - choco feature enable -n allowEmptyChecksums
  # PHP
  - ps: Set-Service wuauserv -StartupType Manual
-  - cinst php -y
-  - ps: "ls \"C:\\tools\\php72\""
-  - "SET PATH=C:\\tools\\php72;%PATH%"
-  - where php
  # PHP-CS-Fixer
-  - cinst curl -y # Use cURL to download file from URL
-  - curl http://get.sensiolabs.org/php-cs-fixer.phar -o php-cs-fixer
-  - "SET PATH=%cd%;%PATH%" # Add current working directory to PATH
-  - where php-cs-fixer
-
-  # Uncrustify
-  - curl -k -L https://sourceforge.net/projects/uncrustify/files/uncrustify/uncrustify-0.65/uncrustify-0.65-win32.zip/download -o uncrustify.zip
-  - cinst 7zip.commandline -y
-  - 7za e uncrustify.zip -ouncrustify-d
-  - "SET PATH=%cd%\\uncrustify-d;%PATH%"
-  - where uncrustify
+  - composer install

  # elm-format
-  - curl -k -L https://github.com/avh4/elm-format/releases/download/0.7.0-exp/elm-format-0.18-0.7.0-exp-win-i386.zip -o elm-format.zip
-  - 7za e elm-format.zip -oelm-format-d
-  - "SET PATH=%cd%\\elm-format-d;%PATH%"
-  - where elm-format
-
-  # Beautysh
-  - pip install beautysh
-  - where beautysh
+  - npm install -g elm-format@exp
  
 build_script:

-  - cd %APPVEYOR_BUILD_FOLDER%
  # Install languages to Atom
-  - apm install language-marko language-html-swig language-svg language-elm language-d mavensmate-atom language-lua language-puppet fuse
-  # Show current PATH
-  - echo %PATH%
+  - apm install --packages-file atom-packages.txt
  # Run tests on package
  #- "%LOCALAPPDATA%\\atom\\bin\\atom.cmd --test spec"
  - apm test --path %LOCALAPPDATA%/atom/bin/atom.cmd
--- a/appveyor/install.ps1
+++ b/appveyor/install.ps1
@ -1,180 +0,0 @@
-# Sample script to install Python and pip under Windows
-# Authors: Olivier Grisel, Jonathan Helmus and Kyle Kastner
-# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
-
-$MINICONDA_URL = "http://repo.continuum.io/miniconda/"
-$BASE_URL = "https://www.python.org/ftp/python/"
-$GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py"
-$GET_PIP_PATH = "C:\get-pip.py"
-
-
-function DownloadPython ($python_version, $platform_suffix) {
-    $webclient = New-Object System.Net.WebClient
-    $filename = "python-" + $python_version + $platform_suffix + ".msi"
-    $url = $BASE_URL + $python_version + "/" + $filename
-
-    $basedir = $pwd.Path + "\"
-    $filepath = $basedir + $filename
-    if (Test-Path $filename) {
-        Write-Host "Reusing" $filepath
-        return $filepath
-    }
-
-    # Download and retry up to 3 times in case of network transient errors.
-    Write-Host "Downloading" $filename "from" $url
-    $retry_attempts = 2
-    for($i=0; $i -lt $retry_attempts; $i++){
-        try {
-            $webclient.DownloadFile($url, $filepath)
-            break
-        }
-        Catch [Exception]{
-            Start-Sleep 1
-        }
-   }
-   if (Test-Path $filepath) {
-       Write-Host "File saved at" $filepath
-   } else {
-       # Retry once to get the error message if any at the last try
-       $webclient.DownloadFile($url, $filepath)
-   }
-   return $filepath
-}
-
-
-function InstallPython ($python_version, $architecture, $python_home) {
-    Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home
-    if (Test-Path $python_home) {
-        Write-Host $python_home "already exists, skipping."
-        return $false
-    }
-    if ($architecture -eq "32") {
-        $platform_suffix = ""
-    } else {
-        $platform_suffix = ".amd64"
-    }
-    $msipath = DownloadPython $python_version $platform_suffix
-    Write-Host "Installing" $msipath "to" $python_home
-    $install_log = $python_home + ".log"
-    $install_args = "/qn /log $install_log /i $msipath TARGETDIR=$python_home"
-    $uninstall_args = "/qn /x $msipath"
-    RunCommand "msiexec.exe" $install_args
-    if (-not(Test-Path $python_home)) {
-        Write-Host "Python seems to be installed else-where, reinstalling."
-        RunCommand "msiexec.exe" $uninstall_args
-        RunCommand "msiexec.exe" $install_args
-    }
-    if (Test-Path $python_home) {
-        Write-Host "Python $python_version ($architecture) installation complete"
-    } else {
-        Write-Host "Failed to install Python in $python_home"
-        Get-Content -Path $install_log
-        Exit 1
-    }
-}
-
-function RunCommand ($command, $command_args) {
-    Write-Host $command $command_args
-    Start-Process -FilePath $command -ArgumentList $command_args -Wait -Passthru
-}
-
-
-function InstallPip ($python_home) {
-    $pip_path = $python_home + "\Scripts\pip.exe"
-    $python_path = $python_home + "\python.exe"
-    if (-not(Test-Path $pip_path)) {
-        Write-Host "Installing pip..."
-        $webclient = New-Object System.Net.WebClient
-        $webclient.DownloadFile($GET_PIP_URL, $GET_PIP_PATH)
-        Write-Host "Executing:" $python_path $GET_PIP_PATH
-        Start-Process -FilePath "$python_path" -ArgumentList "$GET_PIP_PATH" -Wait -Passthru
-    } else {
-        Write-Host "pip already installed."
-    }
-}
-
-
-function DownloadMiniconda ($python_version, $platform_suffix) {
-    $webclient = New-Object System.Net.WebClient
-    if ($python_version -eq "3.4") {
-        $filename = "Miniconda3-3.5.5-Windows-" + $platform_suffix + ".exe"
-    } else {
-        $filename = "Miniconda-3.5.5-Windows-" + $platform_suffix + ".exe"
-    }
-    $url = $MINICONDA_URL + $filename
-
-    $basedir = $pwd.Path + "\"
-    $filepath = $basedir + $filename
-    if (Test-Path $filename) {
-        Write-Host "Reusing" $filepath
-        return $filepath
-    }
-
-    # Download and retry up to 3 times in case of network transient errors.
-    Write-Host "Downloading" $filename "from" $url
-    $retry_attempts = 2
-    for($i=0; $i -lt $retry_attempts; $i++){
-        try {
-            $webclient.DownloadFile($url, $filepath)
-            break
-        }
-        Catch [Exception]{
-            Start-Sleep 1
-        }
-   }
-   if (Test-Path $filepath) {
-       Write-Host "File saved at" $filepath
-   } else {
-       # Retry once to get the error message if any at the last try
-       $webclient.DownloadFile($url, $filepath)
-   }
-   return $filepath
-}
-
-
-function InstallMiniconda ($python_version, $architecture, $python_home) {
-    Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home
-    if (Test-Path $python_home) {
-        Write-Host $python_home "already exists, skipping."
-        return $false
-    }
-    if ($architecture -eq "32") {
-        $platform_suffix = "x86"
-    } else {
-        $platform_suffix = "x86_64"
-    }
-    $filepath = DownloadMiniconda $python_version $platform_suffix
-    Write-Host "Installing" $filepath "to" $python_home
-    $install_log = $python_home + ".log"
-    $args = "/S /D=$python_home"
-    Write-Host $filepath $args
-    Start-Process -FilePath $filepath -ArgumentList $args -Wait -Passthru
-    if (Test-Path $python_home) {
-        Write-Host "Python $python_version ($architecture) installation complete"
-    } else {
-        Write-Host "Failed to install Python in $python_home"
-        Get-Content -Path $install_log
-        Exit 1
-    }
-}
-
-
-function InstallMinicondaPip ($python_home) {
-    $pip_path = $python_home + "\Scripts\pip.exe"
-    $conda_path = $python_home + "\Scripts\conda.exe"
-    if (-not(Test-Path $pip_path)) {
-        Write-Host "Installing pip..."
-        $args = "install --yes pip"
-        Write-Host $conda_path $args
-        Start-Process -FilePath "$conda_path" -ArgumentList $args -Wait -Passthru
-    } else {
-        Write-Host "pip already installed."
-    }
-}
-
-function main () {
-    InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
-    InstallPip $env:PYTHON
-}
-
-main
--- a/appveyor/run_with_env.cmd
+++ b/appveyor/run_with_env.cmd
@ -1,47 +0,0 @@
-:: To build extensions for 64 bit Python 3, we need to configure environment
-:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
-::
-:: To build extensions for 64 bit Python 2, we need to configure environment
-:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
-::
-:: 32 bit builds do not require specific environment configurations.
-::
-:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
-:: cmd interpreter, at least for (SDK v7.0)
-::
-:: More details at:
-:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
-:: http://stackoverflow.com/a/13751649/163740
-::
-:: Author: Olivier Grisel
-:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
-@ECHO OFF
-
-SET COMMAND_TO_RUN=%*
-SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
-
-SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
-IF %MAJOR_PYTHON_VERSION% == "2" (
-    SET WINDOWS_SDK_VERSION="v7.0"
-) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
-    SET WINDOWS_SDK_VERSION="v7.1"
-) ELSE (
-    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
-    EXIT 1
-)
-
-IF "%PYTHON_ARCH%"=="64" (
-    ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
-    SET DISTUTILS_USE_SDK=1
-    SET MSSdk=1
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-) ELSE (
-    ECHO Using default MSVC build environment for 32 bit architecture
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-)
--- a/atom-packages.txt
+++ b/atom-packages.txt
@ -0,0 +1,9 @@
+language-marko
+language-html-swig
+language-svg
+language-d
+mavensmate-atom
+language-lua
+language-elm
+language-puppet
+fuse
--- a/build-package.sh
+++ b/build-package.sh
@ -1,63 +1,21 @@
 #!/bin/sh

-echo "Downloading latest Atom release..."
-ATOM_CHANNEL="${ATOM_CHANNEL:=stable}"
-
-if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    curl -s -L "https://atom.io/download/mac?channel=$ATOM_CHANNEL" \
-      -H 'Accept: application/octet-stream' \
-      -o "atom.zip"
-    mkdir atom
-    unzip -q atom.zip -d atom
-    if [ "$ATOM_CHANNEL" = "stable" ]; then
-      export ATOM_APP_NAME="Atom.app"
-      export ATOM_SCRIPT_NAME="atom.sh"
-      export ATOM_SCRIPT_PATH="./atom/${ATOM_APP_NAME}/Contents/Resources/app/atom.sh"
-    else
-      export ATOM_APP_NAME="Atom ${ATOM_CHANNEL}.app"
-      export ATOM_SCRIPT_NAME="atom-${ATOM_CHANNEL}"
-      export ATOM_SCRIPT_PATH="./atom-${ATOM_CHANNEL}"
-      ln -s "./atom/${ATOM_APP_NAME}/Contents/Resources/app/atom.sh" "${ATOM_SCRIPT_PATH}"
-    fi
-    export PATH="$PWD/atom/${ATOM_APP_NAME}/Contents/Resources/app/apm/bin:$PATH"
-    export ATOM_PATH="./atom"
-    export APM_SCRIPT_PATH="./atom/${ATOM_APP_NAME}/Contents/Resources/app/apm/node_modules/.bin/apm"
-else
-    curl -s -L "https://atom.io/download/deb?channel=$ATOM_CHANNEL" \
-      -H 'Accept: application/octet-stream' \
-      -o "atom.deb"
+if [ "$TRAVIS_OS_NAME" != "osx" ]; then
    /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16
    export DISPLAY=":99"
-    dpkg-deb -x atom.deb "$HOME/atom"
-    if [ "$ATOM_CHANNEL" = "stable" ]; then
-      export ATOM_SCRIPT_NAME="atom"
-      export APM_SCRIPT_NAME="apm"
-    else
-      export ATOM_SCRIPT_NAME="atom-$ATOM_CHANNEL"
-      export APM_SCRIPT_NAME="apm-$ATOM_CHANNEL"
-    fi
-    export ATOM_SCRIPT_PATH="$HOME/atom/usr/bin/$ATOM_SCRIPT_NAME"
-    export APM_SCRIPT_PATH="$HOME/atom/usr/bin/$APM_SCRIPT_NAME"
 fi

-
 echo "Using Atom version:"
-"$ATOM_SCRIPT_PATH" -v
+"$ATOM_SCRIPT_NAME" -v
 echo "Using APM version:"
-"$APM_SCRIPT_PATH" -v
+"$APM_SCRIPT_NAME" -v

 echo "Downloading package dependencies..."
-"$APM_SCRIPT_PATH" clean
-"$APM_SCRIPT_PATH" install
+"$APM_SCRIPT_NAME" clean
+"$APM_SCRIPT_NAME" install

-TEST_PACKAGES="${APM_TEST_PACKAGES:=none}"
-
-if [ "$TEST_PACKAGES" != "none" ]; then
-  echo "Installing atom package dependencies..."
-  for pack in $TEST_PACKAGES ; do
-    "$APM_SCRIPT_PATH" install $pack
-  done
-fi
+echo "Installing atom package dependencies..."
+"$APM_SCRIPT_NAME" install --packages-file atom-packages.txt

 if [ -f ./node_modules/.bin/coffeelint ]; then
  if [ -d ./src ]; then
@ -100,7 +58,7 @@ fi

 if [ -d ./spec ]; then
  echo "Running specs..."
-  "$ATOM_SCRIPT_PATH" --test spec
+  "$ATOM_SCRIPT_NAME" --test spec
 else
  echo "Missing spec folder! Please consider adding a test suite in `./spec`"
  exit 1
--- a/composer.json
+++ b/composer.json
@ -0,0 +1,5 @@
+{
+    "require": {
+        "friendsofphp/php-cs-fixer": ">0"
+    }
+}
--- a/packages.config
+++ b/packages.config
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+  <packages>
+    <package id="atom" />
+    <package id="emacs" />
+    <package id="terraform" />
+    <package id="composer" />
+    <!--package id="uncrustify" /-->
+  </packages>
+</xml>
--- a/requirements.txt
+++ b/requirements.txt
@ -0,0 +1,4 @@
+autopep8
+isort
+sqlparse
+beautysh