dployr 0.0.4 → 0.0.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dployr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tomas Aparicio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -133,6 +133,7 @@ files:
 - lib/dployr/commands/base.rb
 - lib/dployr/commands/config.rb
 - lib/dployr/commands/execute.rb
+- lib/dployr/commands/info.rb
 - lib/dployr/commands/provision_test.rb
 - lib/dployr/commands/ssh.rb
 - lib/dployr/commands/start.rb
@@ -165,10 +166,10 @@ files:
 - spec/fixtures/Dployrfile.yml
 - spec/fixtures/basic/Dployrfile.yml
 - spec/fixtures/german/Dployrfile.yml
-- spec/fixtures/hello/createExecUser.sh
-- spec/fixtures/hello/hello.sh
-- spec/fixtures/hello/jetty
-- spec/fixtures/hello/jetty.sh
+- spec/fixtures/german/hello/hello.sh
+- spec/fixtures/german/real_test.rb
+- spec/fixtures/german/server_aws.info
+- spec/fixtures/german/server_gce.info
 - spec/fog_spec_.rb
 - spec/init_spec.rb
 - spec/spec_helper.rb
@@ -194,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dployr
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Multicloud management and deployment with asteroids made simple
@@ -208,10 +209,10 @@ test_files:
 - spec/fixtures/Dployrfile.yml
 - spec/fixtures/basic/Dployrfile.yml
 - spec/fixtures/german/Dployrfile.yml
-- spec/fixtures/hello/createExecUser.sh
-- spec/fixtures/hello/hello.sh
-- spec/fixtures/hello/jetty
-- spec/fixtures/hello/jetty.sh
+- spec/fixtures/german/hello/hello.sh
+- spec/fixtures/german/real_test.rb
+- spec/fixtures/german/server_aws.info
+- spec/fixtures/german/server_gce.info
 - spec/fog_spec_.rb
 - spec/init_spec.rb
 - spec/spec_helper.rb

data/spec/fixtures/hello/createExecUser.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-createExecUser() {
-	USERNAME=$1
-	shift
-	DIRECTORIES=$@
-
-	NOLOGIN_PATH=$(which nologin)
-	sudo useradd -M -U -s $NOLOGIN_PATH $USERNAME
-	for dir in $DIRECTORIES; do
-		if [ ! -d $dir ]
-		then
-			sudo mkdir $dir
-		fi
-		echo "Change owner to $dir ..."
-		sudo chown -R ${USERNAME}:${USERNAME} $dir
-	done
-}

data/spec/fixtures/hello/jetty

@@ -1,562 +0,0 @@
-#!/usr/bin/env bash  
-#
-# Startup script for jetty under *nix systems (it works under NT/cygwin too).
-
-##################################################
-# Set the name which is used by other variables.
-# Defaults to the file name without extension.
-##################################################
-NAME=$(echo $(basename $0) | sed -e 's/^[SK][0-9]+//' -e 's/\.sh$//')
-
-# To get the service to restart correctly on reboot, uncomment below (3 lines):
-# ========================
-# chkconfig: 3 99 99
-# description: Jetty 9 webserver
-# processname: jetty
-# ========================
-
-# Configuration files
-#
-# /etc/default/$NAME
-#   If it exists, this is read at the start of script. It may perform any 
-#   sequence of shell commands, like setting relevant environment variables.
-#
-# $HOME/.$NAMErc (e.g. $HOME/.jettyrc)
-#   If it exists, this is read at the start of script. It may perform any 
-#   sequence of shell commands, like setting relevant environment variables.
-#
-# /etc/$NAME.conf
-#   If found, and no configurations were given on the command line,
-#   the file will be used as this script's configuration. 
-#   Each line in the file may contain:
-#     - A comment denoted by the pound (#) sign as first non-blank character.
-#     - The path to a regular file, which will be passed to jetty as a 
-#       config.xml file.
-#     - The path to a directory. Each *.xml file in the directory will be
-#       passed to jetty as a config.xml file.
-#     - All other lines will be passed, as-is to the start.jar
-#
-#   The files will be checked for existence before being passed to jetty.
-#
-# Configuration variables
-#
-# JAVA
-#   Command to invoke Java. If not set, java (from the PATH) will be used.
-#
-# JAVA_OPTIONS
-#   Extra options to pass to the JVM
-#
-# JETTY_HOME
-#   Where Jetty is installed. If not set, the script will try go
-#   guess it by first looking at the invocation path for the script,
-#   and then by looking in standard locations as $HOME/opt/jetty
-#   and /opt/jetty. The java system property "jetty.home" will be
-#   set to this value for use by configure.xml files, f.e.:
-#
-#    <Arg><Property name="jetty.home" default="."/>/webapps/jetty.war</Arg>
-#
-# JETTY_BASE
-#   Where your Jetty base directory is.  If not set, the value from
-#   $JETTY_HOME will be used.
-#
-# JETTY_RUN
-#   Where the $NAME.pid file should be stored. It defaults to the
-#   first available of /var/run, /usr/var/run, JETTY_BASE and /tmp
-#   if not set.
-#  
-# JETTY_PID
-#   The Jetty PID file, defaults to $JETTY_RUN/$NAME.pid
-#   
-# JETTY_ARGS
-#   The default arguments to pass to jetty.
-#   For example
-#      JETTY_ARGS=jetty.host=0.0.0.0 jetty.port=8080 jetty.spdy.port=8443 jetty.secure.port=443
-#
-# JETTY_USER
-#   if set, then used as a username to run the server as
-
-JETTY_HOME=/opt/jetty
-JETTY_USER=jetty
-JETTY_PORT=8080
-JETTY_LOGS=/var/log/jetty/
-
-usage()
-{
-    echo "Usage: ${0##*/} [-d] {start|stop|run|restart|check|supervise} [ CONFIGS ... ] "
-    exit 1
-}
-
-[ $# -gt 0 ] || usage
-
-
-##################################################
-# Some utility functions
-##################################################
-findDirectory()
-{
-  local L OP=$1
-  shift
-  for L in "$@"; do
-    [ "$OP" "$L" ] || continue 
-    printf %s "$L"
-    break
-  done 
-}
-
-running()
-{
-  local PID=$(cat "$1" 2>/dev/null) || return 1
-  kill -0 "$PID" 2>/dev/null
-}
-
-started()
-{
-  # wait for 60s to see "STARTED" in PID file, needs jetty-started.xml as argument
-  for T in 1 2 3 4 5 6 7 9 10 11 12 13 14 15 
-  do
-    sleep 4
-    [ -z "$(grep STARTED $1 2>/dev/null)" ] || return 0
-    [ -z "$(grep STOPPED $1 2>/dev/null)" ] || return 1
-    [ -z "$(grep FAILED $1 2>/dev/null)" ] || return 1
-    local PID=$(cat "$2" 2>/dev/null) || return 1
-    kill -0 "$PID" 2>/dev/null || return 1
-    echo -n ". "
-  done
-
-  return 1;
-}
-
-
-readConfig()
-{
-  (( DEBUG )) && echo "Reading $1.."
-  source "$1"
-}
-
-
-
-##################################################
-# Get the action & configs
-##################################################
-CONFIGS=()
-NO_START=0
-DEBUG=0
-
-while [[ $1 = -* ]]; do
-  case $1 in
-    -d) DEBUG=1 ;;
-  esac
-  shift
-done
-ACTION=$1
-shift
-
-##################################################
-# Read any configuration files
-##################################################
-ETC=/etc
-if [ $UID != 0 ]
-then 
-  ETC=$HOME/etc
-fi
-
-for CONFIG in $ETC/default/${NAME}{,9} $HOME/.${NAME}rc; do
-  if [ -f "$CONFIG" ] ; then 
-    readConfig "$CONFIG"
-  fi
-done
-
-
-##################################################
-# Set tmp if not already set.
-##################################################
-TMPDIR=${TMPDIR:-/tmp}
-
-##################################################
-# Jetty's hallmark
-##################################################
-JETTY_INSTALL_TRACE_FILE="start.jar"
-
-
-##################################################
-# Try to determine JETTY_HOME if not set
-##################################################
-if [ -z "$JETTY_HOME" ] 
-then
-  JETTY_SH=$0
-  case "$JETTY_SH" in
-    /*)     JETTY_HOME=${JETTY_SH%/*/*} ;;
-    ./*/*)  JETTY_HOME=${JETTY_SH%/*/*} ;;
-    ./*)    JETTY_HOME=.. ;;
-    */*/*)  JETTY_HOME=./${JETTY_SH%/*/*} ;;
-    */*)    JETTY_HOME=. ;;
-    *)      JETTY_HOME=.. ;;
-  esac
-
-  if [ ! -f "$JETTY_HOME/$JETTY_INSTALL_TRACE_FILE" ]
-  then 
-    JETTY_HOME=
-  fi
-fi
-
-
-##################################################
-# No JETTY_HOME yet? We're out of luck!
-##################################################
-if [ -z "$JETTY_HOME" ]; then
-  echo "** ERROR: JETTY_HOME not set, you need to set it or install in a standard location" 
-  exit 1
-fi
-
-cd "$JETTY_HOME"
-JETTY_HOME=$PWD
-
-
-##################################################
-# Set JETTY_BASE 
-##################################################
-if [ -z "$JETTY_BASE" ]; then
-  JETTY_BASE=$JETTY_HOME
-fi
-
-cd "$JETTY_BASE"
-JETTY_BASE=$PWD
-
-
-#####################################################
-# Check that jetty is where we think it is
-#####################################################
-if [ ! -r "$JETTY_HOME/$JETTY_INSTALL_TRACE_FILE" ] 
-then
-  echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"
-  echo "** ERROR:  $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE is not readable!"
-  exit 1
-fi
-
-##################################################
-# Try to find this script's configuration file,
-# but only if no configurations were given on the
-# command line.
-##################################################
-if [ -z "$JETTY_CONF" ] 
-then
-  if [ -f $ETC/${NAME}.conf ]
-  then
-    JETTY_CONF=$ETC/${NAME}.conf
-  elif [ -f "$JETTY_BASE/etc/jetty.conf" ]
-  then
-    JETTY_CONF=$JETTY_BASE/etc/jetty.conf
-  elif [ -f "$JETTY_HOME/etc/jetty.conf" ]
-  then
-    JETTY_CONF=$JETTY_HOME/etc/jetty.conf
-  fi
-fi
-
-##################################################
-# Get the list of config.xml files from jetty.conf
-##################################################
-if [ -f "$JETTY_CONF" ] && [ -r "$JETTY_CONF" ] 
-then
-  while read -r CONF
-  do
-    if expr "$CONF" : '#' >/dev/null ; then
-      continue
-    fi
-
-    if [ -d "$CONF" ] 
-    then
-      # assume it's a directory with configure.xml files
-      # for example: /etc/jetty.d/
-      # sort the files before adding them to the list of JETTY_ARGS
-      for XMLFILE in "$CONF/"*.xml
-      do
-        if [ -r "$XMLFILE" ] && [ -f "$XMLFILE" ] 
-        then
-          JETTY_ARGS+=("$XMLFILE")
-        else
-          echo "** WARNING: Cannot read '$XMLFILE' specified in '$JETTY_CONF'" 
-        fi
-      done
-    else
-      # assume it's a command line parameter (let start.jar deal with its validity)
-      JETTY_ARGS+=("$CONF")
-    fi
-  done < "$JETTY_CONF"
-fi
-
-#####################################################
-# Find a location for the pid file
-#####################################################
-if [ -z "$JETTY_RUN" ] 
-then
-  JETTY_RUN=$(findDirectory -w /var/run /usr/var/run $JETTY_BASE /tmp)
-fi
-
-#####################################################
-# Find a pid and state file
-#####################################################
-if [ -z "$JETTY_PID" ] 
-then
-  JETTY_PID="$JETTY_RUN/${NAME}.pid"
-fi
-
-if [ -z "$JETTY_STATE" ] 
-then
-  JETTY_STATE=$JETTY_BASE/${NAME}.state
-fi
-JAVA_OPTIONS+=("-Djetty.state=$JETTY_STATE")
-rm -f $JETTY_STATE
-
-##################################################
-# Setup JAVA if unset
-##################################################
-if [ -z "$JAVA" ]
-then
-  JAVA=$(which java)
-fi
-
-if [ -z "$JAVA" ]
-then
-  echo "Cannot find a Java JDK. Please set either set JAVA or put java (>=1.5) in your PATH." 2>&2
-  exit 1
-fi
-
-#####################################################
-# See if JETTY_LOGS is defined
-#####################################################
-if [ -z "$JETTY_LOGS" ] && [ -d $JETTY_BASE/logs ] 
-then
-  JETTY_LOGS=$JETTY_BASE/logs
-fi
-if [ -z "$JETTY_LOGS" ] && [ -d $JETTY_HOME/logs ] 
-then
-  JETTY_LOGS=$JETTY_HOME/logs
-fi
-if [ "$JETTY_LOGS" ]
-then
-  JAVA_OPTIONS+=("-Djetty.logs=$JETTY_LOGS")
-fi
-
-#####################################################
-# Are we running on Windows? Could be, with Cygwin/NT.
-#####################################################
-case "`uname`" in
-CYGWIN*) PATH_SEPARATOR=";";;
-*) PATH_SEPARATOR=":";;
-esac
-
-
-#####################################################
-# Add jetty properties to Java VM options.
-#####################################################
-JAVA_OPTIONS+=("-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR")
-
-#####################################################
-# This is how the Jetty server will be started
-#####################################################
-
-JETTY_START=$JETTY_HOME/start.jar
-START_INI=$JETTY_BASE/start.ini
-if [ ! -f "$START_INI" ]
-then
-  echo "Cannot find a start.ini in your JETTY_BASE directory: $JETTY_BASE" 2>&2
-  exit 1
-fi
-
-RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$JETTY_START" ${JETTY_ARGS[*]})
-RUN_CMD=("$JAVA" ${RUN_ARGS[@]})
-
-#####################################################
-# Comment these out after you're happy with what 
-# the script is doing.
-#####################################################
-if (( DEBUG ))
-then
-  echo "START_INI      =  $START_INI"
-  echo "JETTY_HOME     =  $JETTY_HOME"
-  echo "JETTY_BASE     =  $JETTY_BASE"
-  echo "JETTY_CONF     =  $JETTY_CONF"
-  echo "JETTY_PID      =  $JETTY_PID"
-  echo "JETTY_START    =  $JETTY_START"
-  echo "JETTY_ARGS     =  ${JETTY_ARGS[*]}"
-  echo "JAVA_OPTIONS   =  ${JAVA_OPTIONS[*]}"
-  echo "JAVA           =  $JAVA"
-  echo "RUN_CMD        =  ${RUN_CMD}"
-fi
-
-##################################################
-# Do the action
-##################################################
-case "$ACTION" in
-  start)
-    echo -n "Starting Jetty: "
-
-    if (( NO_START )); then 
-      echo "Not starting ${NAME} - NO_START=1";
-      exit
-    fi
-
-    if [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1 
-    then
-      unset CH_USER
-      if [ -n "$JETTY_USER" ]
-      then
-        CH_USER="-c$JETTY_USER"
-      fi
-
-      start-stop-daemon -S -p"$JETTY_PID" $CH_USER -d"$JETTY_HOME" -b -m -a "$JAVA" -- "${RUN_ARGS[@]}" --daemon
-
-    else
-
-      if [ -f "$JETTY_PID" ]
-      then
-        if running $JETTY_PID
-        then
-          echo "Already Running!"
-          exit 1
-        else
-          # dead pid file - remove
-          rm -f "$JETTY_PID"
-        fi
-      fi
-
-      if [ "$JETTY_USER" ] 
-      then
-        touch "$JETTY_PID"
-        chown "$JETTY_USER" "$JETTY_PID"
-        # FIXME: Broken solution: wordsplitting, pathname expansion, arbitrary command execution, etc.
-        su - "$JETTY_USER" -c "
-          exec ${RUN_CMD[*]} --daemon &
-          disown \$!
-          echo \$! > '$JETTY_PID'"
-      else
-        "${RUN_CMD[@]}" &
-        disown $!
-        echo $! > "$JETTY_PID"
-      fi
-
-    fi
-
-    if expr "${JETTY_ARGS[*]}" : '.*jetty-started.xml.*' >/dev/null
-    then
-      if started "$JETTY_STATE" "$JETTY_PID"
-      then
-        echo "OK `date`"
-      else
-        echo "FAILED `date`"
-      fi
-    else
-      echo "ok `date`"
-    fi
-
-    ;;
-
-  stop)
-    echo -n "Stopping Jetty: "
-    if [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1; then
-      start-stop-daemon -K -p"$JETTY_PID" -d"$JETTY_HOME" -a "$JAVA" -s HUP
-      
-      TIMEOUT=30
-      while running "$JETTY_PID"; do
-        if (( TIMEOUT-- == 0 )); then
-          start-stop-daemon -K -p"$JETTY_PID" -d"$JETTY_HOME" -a "$JAVA" -s KILL
-        fi
-
-        sleep 1
-      done
-
-      rm -f "$JETTY_PID"
-      echo OK
-    else
-      PID=$(cat "$JETTY_PID" 2>/dev/null)
-      kill "$PID" 2>/dev/null
-      
-      TIMEOUT=30
-      while running $JETTY_PID; do
-        if (( TIMEOUT-- == 0 )); then
-          kill -KILL "$PID" 2>/dev/null
-        fi
-
-        sleep 1
-      done
-
-      rm -f "$JETTY_PID"
-      echo OK
-    fi
-
-    ;;
-
-  restart)
-    JETTY_SH=$0
-    if [ ! -f $JETTY_SH ]; then
-      if [ ! -f $JETTY_HOME/bin/jetty.sh ]; then
-        echo "$JETTY_HOME/bin/jetty.sh does not exist."
-        exit 1
-      fi
-      JETTY_SH=$JETTY_HOME/bin/jetty.sh
-    fi
-
-    "$JETTY_SH" stop "$@"
-    "$JETTY_SH" start "$@"
-
-    ;;
-
-  supervise)
-    #
-    # Under control of daemontools supervise monitor which
-    # handles restarts and shutdowns via the svc program.
-    #
-    exec "${RUN_CMD[@]}"
-
-    ;;
-
-  run|demo)
-    echo "Running Jetty: "
-
-    if [ -f "$JETTY_PID" ]
-    then
-      if running "$JETTY_PID"
-      then
-        echo "Already Running!"
-        exit 1
-      else
-        # dead pid file - remove
-        rm -f "$JETTY_PID"
-      fi
-    fi
-
-    exec "${RUN_CMD[@]}"
-    ;;
-
-  check|status)
-    echo "Checking arguments to Jetty: "
-    echo "START_INI      =  $START_INI"
-    echo "JETTY_HOME     =  $JETTY_HOME"
-    echo "JETTY_BASE     =  $JETTY_BASE"
-    echo "JETTY_CONF     =  $JETTY_CONF"
-    echo "JETTY_PID      =  $JETTY_PID"
-    echo "JETTY_START    =  $JETTY_START"
-    echo "JETTY_LOGS     =  $JETTY_LOGS"
-    echo "CLASSPATH      =  $CLASSPATH"
-    echo "JAVA           =  $JAVA"
-    echo "JAVA_OPTIONS   =  ${JAVA_OPTIONS[*]}"
-    echo "JETTY_ARGS     =  ${JETTY_ARGS[*]}"
-    echo "RUN_CMD        =  ${RUN_CMD[*]}"
-    echo
-    
-    if [ -f "$JETTY_PID" ]
-    then
-      echo "Jetty running pid=$(< "$JETTY_PID")"
-      exit 0
-    fi
-    exit 1
-
-    ;;
-
-  *)
-    usage
-
-    ;;
-esac
-
-exit 0

data/spec/fixtures/hello/jetty.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-source /tmp/hello/createExecUser.sh
-
-# Install JRE 1.7
-# sudo yum install java-1.7.0-openjdk.x86_64 -y
-# sudo alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
-
-# Install & Run Jetty
-if [ ! -d /opt/jetty ]
-then
-	#wget http://download.eclipse.org/jetty/9.1.1.v20140108/dist/jetty-distribution-9.1.1.v20140108.tar.gz -O jetty.tar.gz
-	#wget http://cdn.mirror.garr.it/mirror3/mirrors/eclipse//jetty/9.1.0.v20131115/dist/jetty-distribution-9.1.0.v20131115.tar.gz -O jetty.tar.gz
-	wget http://eclipse.mirror.triple-it.nl/jetty/stable-9/dist/jetty-distribution-9.1.4.v20140401.tar.gz -O jetty.tar.gz
-	tar -xf jetty.tar.gz 
-	rm jetty.tar.gz
-	mv jetty-* jetty
-	sudo mv jetty /opt/
-	sudo /usr/sbin/useradd jetty
-	sudo mkdir /var/log/jetty
-	sudo chown -R jetty:jetty /var/log/jetty /opt/jetty
-fi
-	
-sudo cp /tmp/hello/jetty /etc/init.d
-sudo chmod a+x /etc/init.d/jetty
-sudo chkconfig --add jetty
-sudo chkconfig jetty on
-sudo service jetty restart
-