Add tests to confirm PR environment behavior.

.gitignore

@@ -1,6 +1,4 @@
-
-# devshop repos
-source
-
-# Local config
-.vagrant
+; Ignore modules from make file.
+modules/contrib
+modules/aegir
+themes/contrib

.travis.yml

@@ -1,21 +1,85 @@
----
-##
+language: php
 
-language: python
-python: "2.7"
-install:
+sudo: required
 
-  # Install DevShop with the standalone installer, using local playbooks.
-  # Run as actual root?  Testing to see if this is a problem.
-  - sudo su - root -c "wget http://getdevshop.com/install && bash install"
+# Only run test when committing to 1.x branch.
+branches:
+  only:
+    - 7.x-1.x
 
-script:
+env:
+  global:
+    - DEVSHOP_VERSION=1.x
+    - SITE_HOSTS='dev.drup.devshop.travis dev.projectname.devshop.travis live.projectname.devshop.travis testenv.drpl8.devshop.travis'
+
+  matrix:
+  - test="Upgrade"
+    COMMAND="robo up --test-upgrade"
+    UPGRADE_FROM_VERSION="1.0.0-beta10"
+
+  - test="Install with Docker"
+    COMMAND="robo up --test"
+
+  - test="Install with Ansible on Ubuntu 14.04 with Apache"
+    COMMAND="robo up --mode=install.sh --test"
+
+#  - test="Install with Ansible on Ubuntu 14.04 with NGINX"
+#    COMMAND="robo up --mode=install.sh --test --install-sh-options='--server-webserver=nginx'"
+
+  - test="Install with Ansible on CentOS 7"
+    COMMAND="robo up --mode=install.sh --install-sh-image=geerlingguy/docker-centos7-ansible --test"
+
+
+services:
+  - docker
 
-  # Test for DevShop
-  - sudo su - aegir -c "drush @hostmaster status"
-  - sudo su -c "cd /usr/share/devshop/tests && composer update"
-  - sudo su aegir -c "cd /usr/share/devshop/tests && bin/behat --profile travis"
+before_install:
+  - pwd
+  - env
+
+  # Install Robo
+  - wget https://github.com/consolidation/Robo/releases/download/1.0.5/robo.phar
+  - sudo mv robo.phar /usr/local/bin/robo
+  - sudo chmod +x /usr/local/bin/robo
+
+  # Install Drush
+  - wget https://github.com/drush-ops/drush/releases/download/8.1.9/drush.phar
+  - sudo mv drush.phar /usr/local/bin/drush
+  - sudo chmod +x /usr/local/bin/drush
+
+  # Clone devshop
+  - cd ..
+  - git clone http://github.com/opendevshop/devshop
+  - cd devshop
+  - git checkout -qf ${DEVSHOP_VERSION}
+  - git status
+  - pwd
+  - cp build-devmaster-travis-forks.make.yml build-devmaster-dev.make.yml
+  - cat build-devmaster-dev.make.yml
+
+  # Prepare devshop CLI.
+  - composer install
+
+script:
+  - ${COMMAND} -n --no-dev
 
-# Notify devshop IRC chatroom.
-notifications:
-  irc: "chat.freenode.net#devshop"
+#  - container_id=$(mktemp)
+#    # Run container in detached state
+#  - 'sudo docker run --detach --name devshop_container --volume="${PWD}/devshop":/usr/share/devshop:rw --volume="${PWD}":/usr/share/devshop/devmaster:rw ${run_opts} -h devshop.travis --add-host "${SITE_HOSTS}":127.0.0.1 ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+#
+#  # Install script.
+#  - 'sudo docker exec devshop_container env TRAVIS=true TERM=xterm TRAVIS_BRANCH=$TRAVIS_BRANCH TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG DEVSHOP_UPGRADE_TO_VERSION=$DEVSHOP_UPGRADE_TO_VERSION TRAVIS_PULL_REQUEST_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH ${install_command} --makefile=/usr/share/devshop/devmaster/build-devmaster-test.make'
+#
+#  # Hostmaster Status
+#  - 'sudo docker exec devshop_container env TERM=xterm sudo su - aegir -c "drush @hostmaster status"'
+#
+#  # Turn off hosting queued, and the hosting task queue.
+#  - 'sudo docker exec devshop_container env sudo su - aegir -c "drush @hostmaster dis hosting_queued -y -v"'
+#  - 'sudo docker exec devshop_container env sudo su - aegir -c "drush @hostmaster vset hosting_queue_tasks_enabled 0 -y"'
+#
+#  # Build and Run Tests
+#  - 'sudo docker exec devshop_container env TERM=xterm sudo su - -c "cd /usr/share/devshop/tests && composer update"'
+#  - 'sudo docker exec devshop_container env TERM=xterm sudo su - aegir -c "devshop devmaster:test"'
+#
+#  # Stop container.
+#  - 'sudo docker stop devshop_container'

API.txt

@@ -0,0 +1,13 @@
+DevShop Provision API
+=====================
+
+Document in Progress.
+
+Drush Hooks
+-----------
+
+You can add drush hooks to act before or after devshop tasks.
+
+An example of a post-deploy hook is in the file deploy_hooks_examples/devshop.drush.inc
+
+Copy this file to sites/all/drush and use it for your specific site.

README.md

@@ -1,75 +1,17 @@
-DevShop
-=======
+DevShop DevMaster
+=================
 
-Welcome to the DevShop Source code.
+This is the DevShop web-based front-end, called Devmaster.
 
-[![Build Status](https://travis-ci.org/drupalprojects/devshop.svg?branch=6.x-1.x)](https://travis-ci.org/drupalprojects/devshop)
+It is a Drupal Install Profile and Makefile, otherwise known as a "Distribution".
 
-Contents
---------
+Please fork this repo if you wish to contribute to the Drupal based front-end of DevShop.
 
-This project contains four important components to DevShop
+More information about DevShop can be found in the [main project repository](https://github.com/opendevshop/devshop).
 
-1. install.sh
-  A bash script to go from zero to DevShop.  All you need is a new server and this script.
-  This script is designed to work all by itself, and is not dependent on the other files in this repo to run.
+Issues & Development
+====================
 
-2. build-devshop.make
-  The makefile used to build the DevShop front-end.
+All issues for any DevShop repository are located in the main project: [https://github.com/opendevshop/devshop/issues](https://github.com/opendevshop/devshop/issues)
 
-3. devshop.profile
-  The Drupal installation profile for DevShop.  Used to setup the front end.
-
-4. Vagrantfile
-  Allows devshop to be launched with Vagrant. Used for testing and development. See README.vagrant.md for more info.
-
-Installation
-------------
-
-1. Pick a domain and server name to use for DevShop, for example "devshop.thinkdrop.net"
-2. Fire up a linux server somewhere, using that domain name as the server's hostname. (Ubuntu 12.04 is the most tested.)
-  - Rackspace and DigitalOcean use the name of the server to automatically set the hostname, so use your domain name 
-    as the server name when creating it.
-  - On Amazon Web Services you must [change the hostname manually](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/set-hostname.html).
-  - On Linode, you must also [set the hostname manually](https://www.linode.com/docs/getting-started#setting-the-hostname).
-3. Add a DNS record that points your domain name (devshop.thinkdrop.net) to your server's IP address.
-4. Add a second DNS record that points a wildcard subdomain of your domain (*.devshop.thinkdrop.net) to your server's IP 
-   address. This allows you to setup new sites without having to mess with DNS every time.
-5. Login to your server as root, and retrieve and run the install script:
-  ```
-  root@devshop:~# wget http://getdevshop.com/install
-  root@devshop:~# bash install
-  ```
-
-*NOTE:* http://getdevshop.com/install simply redirects to the dev version of install.sh: http://drupalcode.org/project/devshop.git/blob_plain/refs/heads/6.x-1.x:...
-
-
-Usage
------
-
-Using devshop is a lot like using aegir.
-
-Visit http://devshop.thinkdrop.net in the browser to view the front-end.
-
-SSH into your server as the `aegir` user to access the back-end.
-
-Use drush to access any of your sites.  Use `drush sa` to see the list of available aliases.
-
-Vagrant
--------
-
-There is now a vagrantfile for DevShop that makes for an easy way to test it out and to contribute to the development of DevShop.
-
-It is included in this package. To use, clone this repo and vagrant up:
-
-See README.vagrant.md for more information.
-
-Testing
--------
-
-Very rudimentary testing is happening on TravisCI at http://travisci.org/drupalprojects/devshop
-
-The install script has been tested on:
-
-  - ubuntu 12.04
-  - centos 7.0
+To contribute to development, please see the [Development](https://docs.opendevshop.com/development.html) section of the documentation.

VERSION.txt

@@ -0,0 +1 @@
+1.x

build-devmaster.make

@@ -0,0 +1,13 @@
+;
+; Loads the DevMaster install profile from drupal.org.
+;
+; This makefile is used by the DevShop standalone installer to build devmaster.
+;
+
+core = 7.x
+api = 2
+
+includes[] = drupal-org-core.make
+projects[devmaster][type] = profile
+projects[devmaster][download][type] = git
+projects[devmaster][download][branch] = 7.x-1.x

composer.json

@@ -0,0 +1,6 @@
+{
+  "require": {
+    "symfony/process": "^2.7",
+    "cpliakas/git-wrapper": "~1.0"
+  }
+}