lobot 2.0.0pre → 2.1.0

data/chef/cookbooks/pivotal_ci/test/kitchen/cookbooks/pivotal_ci_test/recipes/default.rb

@@ -1,41 +1 @@
-bash "bootstrap" do
-  cwd "/home/vagrant"
-  code <<-BOOTSTRAP
-#!/bin/bash
-
-set -e
-
-sudo apt-get update > /dev/null
-
-packages="git build-essential openssl libreadline6 libreadline6-dev libreadline5 curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev autoconf libc6-dev libncurses5-dev automake libtool bison subversion pkg-config"
-selections=`dpkg --get-selections`
-
-for package in $packages
-do
-  if ! echo "$selections" | grep "^$package\s" > /dev/null
-  then
-    to_install="$to_install $package"
-  fi
-done
-
-if [ ! -z "$to_install" ]
-then
-  sudo apt-get install -y $to_install
-fi
-
-test -d /usr/local/rvm || curl -L https://get.rvm.io | sudo bash -s stable
-
-sudo tee /etc/profile.d/rvm.sh > /dev/null <<RVMSH_CONTENT
-[[ -s "/usr/local/rvm/scripts/rvm" ]] && source "/usr/local/rvm/scripts/rvm"
-RVMSH_CONTENT
-
-sudo tee /etc/rvmrc > /dev/null <<RVMRC_CONTENTS
-rvm_install_on_use_flag=1
-rvm_trust_rvmrcs_flag=1
-rvm_gemset_create_on_use_flag=1
-RVMRC_CONTENTS
-
-sudo usermod vagrant -a -G rvm
-
-BOOTSTRAP
-end
+include_recipe "pivotal_ci_test::bootstrap"

data/chef/travis-cookbooks/ci_environment/apt/recipes/default.rb

@@ -17,6 +17,13 @@
 # limitations under the License.
 #
 
+execute "apt-get update" do
+  action :run
+end
+execute "apt-get -y clean autoremove" do
+  action :nothing
+end
+
 # for recipes that require preseeding, e.g. java::oraclejdk7, to work. MK.
 package "debconf-utils" do
   action :install
@@ -27,12 +34,6 @@ package "python-software-properties" do
   action :install
 end
 
-execute "apt-get update" do
-  action :run
-end
-execute "apt-get -y autoclean autoremove" do
-  action :nothing
-end
 template "/etc/apt/sources.list" do
   source "sources.list.erb"
 
@@ -41,7 +42,7 @@ template "/etc/apt/sources.list" do
   notifies :run, resources(:execute => "apt-get update"), :immediately
 
   # cleans up at the end of Chef run
-  notifies :run, resources(:execute => "apt-get -y autoclean autoremove")
+  notifies :run, resources(:execute => "apt-get -y clean autoremove")
 end
 
 %w{/var/cache/local /var/cache/local/preseeding}.each do |dirname|

data/chef/travis-cookbooks/ci_environment/bazaar/recipes/default.rb

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: bazaar
 # Recipe:: default
-# Copyright 2012, Travis CI Development Team <contact@travis-ci.org>
+# Copyright 2012-2013, Travis CI Development Team <contact@travis-ci.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/chef/travis-cookbooks/ci_environment/cassandra/attributes/default.rb

@@ -1,10 +1,10 @@
-cassandra_version = "1.1.5"
+cassandra_version = "1.2.0"
 
 default[:cassandra] = {
   :version => cassandra_version,
   :tarball => {
     :url => "http://www.eu.apache.org/dist/cassandra/#{cassandra_version}/apache-cassandra-#{cassandra_version}-bin.tar.gz",
-    :md5 => "ba4da3782923b8018023e9ae26111e4e"
+    :md5 => "94b7ac630034d8eb6bc9febbefb2bd3d"
   },
   :user => "cassandra",
   :jvm  => {
@@ -21,5 +21,8 @@ default[:cassandra] = {
   :conf_dir         => "/etc/cassandra/",
   # commit log, data directory, saved caches and so on are all stored under the data root. MK.
   :data_root_dir    => "/var/lib/cassandra/",
-  :log_dir          => "/var/log/cassandra/"
+  :log_dir          => "/var/log/cassandra/",
+  :service          => {
+    :enabled => false
+  }
 }

data/chef/travis-cookbooks/ci_environment/cassandra/recipes/datastax.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: cassandra
 # Recipe:: datastax
 #
-# Copyright 2011-2012, Travis CI Development Team
+# Copyright 2011-2013, Travis CI Development Team <contact@travis-ci.org>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/chef/travis-cookbooks/ci_environment/cassandra/recipes/package.rb

@@ -2,7 +2,7 @@ n#
 # Cookbook Name:: cassandra
 # Recipe:: package
 #
-# Copyright 2011-2012, Travis CI Development Team
+# Copyright 2011-2013, Travis CI Development Team <contact@travis-ci.org>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/chef/travis-cookbooks/ci_environment/cassandra/recipes/tarball.rb

@@ -149,6 +149,10 @@ end
 
 service "cassandra" do
   supports :start => true, :stop => true, :restart => true
-  # intentionally disabled on boot. MK.
-  action [:disable, :start]
+
+  if node.cassandra.service.enabled
+    action [:enable, :start]
+  else
+    action [:disable, :start]
+  end
 end

data/chef/travis-cookbooks/ci_environment/cassandra/templates/default/cassandra.init.erb

@@ -1,4 +1,5 @@
 #! /bin/sh
+
 ### BEGIN INIT INFO
 # Provides:          cassandra
 # Required-Start:    $remote_fs $network $named $time
@@ -12,64 +13,24 @@
 #                    the management and storage of structured data.
 ### END INIT INFO
 
-# Author: Eric Evans <eevans@racklabs.com>
-
 DESC="Cassandra"
 NAME=cassandra
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
-CONFDIR=/etc/cassandra
-JSVC=/usr/bin/jsvc
+CASSANDRA_HOME=<%= node.cassandra.installation_dir %>
+CASSANDRA_CONF=<%= node.cassandra.conf_dir %>
+USER=<%= node.cassandra.user %>
+GROUP=<%= node.cassandra.user %>
 WAIT_FOR_START=10
-CASSANDRA_HOME=/usr/local/cassandra
 FD_LIMIT=100000
 
-# The first existing directory is used for JAVA_HOME if needed.
-JVM_SEARCH_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-oracle"
-
-[ -e <%= node.cassandra.installation_dir || '/usr/local/cassandra' %>/lib/apache-cassandra-<%= node.cassandra.version %>.jar ] || exit 0
-[ -e /etc/cassandra/cassandra.yaml ] || exit 0
-[ -e /etc/cassandra/cassandra-env.sh ] || exit 0
+[ -e $CASSANDRA_HOME/lib/apache-cassandra-<%= node.cassandra.version %>.jar ] || exit 0
+[ -e $CASSANDRA_CONF/cassandra.yaml ] || exit 0
+[ -e $CASSANDRA_CONF/cassandra-env.sh ] || exit 0
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
-# If JAVA_HOME has not been set, try to determine it.
-if [ -z "$JAVA_HOME" ]; then
-    # If java is in PATH, use a JAVA_HOME that corresponds to that. This is
-    # both consistent with how the upstream startup script works, and how
-    # Debian works (read: the use of alternatives to set a system JVM).
-    if [ -n "`which java`" ]; then
-        java=`which java`
-        # Dereference symlink(s)
-        while true; do
-            if [ -h "$java" ]; then
-                java=`readlink "$java"`
-                continue
-            fi
-            break
-        done
-        JAVA_HOME="`dirname $java`/../"
-    # No JAVA_HOME set and no java found in PATH, search for a JVM.
-    else
-        for jdir in $JVM_SEARCH_DIRS; do
-            if [ -x "$jdir/bin/java" ]; then
-                JAVA_HOME="$jdir"
-                break
-            fi
-        done
-    fi
-fi
-JAVA="$JAVA_HOME/bin/java"
-
-# Read Cassandra environment file.
-. /etc/cassandra/cassandra-env.sh
-
-if [ -z "$JVM_OPTS" ]; then
-    echo "Initialization failed; \$JVM_OPTS not set!" >&2
-    exit 3
-fi
-
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 
@@ -77,103 +38,70 @@ fi
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
 
-#
-# Function that returns the applications classpath
-#
-classpath()
-{
-    cp="$EXTRA_CLASSPATH"
-    for j in <%= node.cassandra.lib_dir %>/*.jar; do
-        [ "x$cp" = "x" ] && cp=$j || cp=$cp:$j
-    done
-    for j in /usr/share/$NAME/*.jar; do
-        [ "x$cp" = "x" ] && cp=$j || cp=$cp:$j
-    done
-
-    # use JNA if installed in standard location
-    [ -r /usr/share/java/jna.jar ] && cp="$cp:/usr/share/java/jna.jar"
-
-    # Include the conf directory for purposes of log4j-server.properties, and
-    # commons-daemon in support of the daemonization class.
-    printf "$cp:$CONFDIR:/usr/share/java/commons-daemon.jar"
-}
-
-#
-# Function that returns 0 if process is running, or nonzero if not.
-#
-# The nonzero value is 3 if the process is simply not running, and 1 if the
-# process is not running but the pidfile exists (to match the exit codes for
-# the "status" command; see LSB core spec 3.1, section 20.2)
-#
-CMD_PATT="-user.cassandra.+CassandraDaemon"
+# Return
+#   0 if daemon is running
+#   1 if daemon is not running
 is_running()
 {
-    if [ -f $PIDFILE ]; then
-        pid=`cat $PIDFILE`
-        grep -Eq "$CMD_PATT" "/proc/$pid/cmdline" 2>/dev/null && return 0
-        return 1
-    fi
-    return 3
+    [ -f $PIDFILE -a -d /proc/$(cat $PIDFILE) ] && return 0
+    return 1
 }
 
-#
-# Function that starts the daemon/service
-#
+# Return
+#   0 if daemon has been started
+#   1 if daemon was already running
+#   2 if daemon could not be started
 do_start()
 {
-    # Return
-    #   0 if daemon has been started
-    #   1 if daemon was already running
-    #   2 if daemon could not be started
     is_running && return 1
 
     ulimit -l unlimited
     ulimit -n "$FD_LIMIT"
 
-    cp=`classpath`
-    cassandra_home=`getent passwd cassandra | awk -F ':' '{ print $6; }'`
-    cd /    # jsvc doesn't chdir() for us
-
-    # echo "Classpath is $cp"
-    $JSVC \
-        -user cassandra \
-        -home $JAVA_HOME \
-        -pidfile $PIDFILE \
-        -errfile "&1" \
-        -outfile /var/log/$NAME/output.log \
-        -cp $cp \
-        -Dlog4j.configuration=log4j-server.properties \
-        -XX:HeapDumpPath="$cassandra_home/java_`date +%s`.hprof" \
-        -XX:ErrorFile="$cassandra_home/hs_err_`date +%s`.log" \
-        $JVM_OPTS \
-        org.apache.cassandra.thrift.CassandraDaemon
+    touch $PIDFILE
+    chown $USER:$GROUP $PIDFILE
+
+    start-stop-daemon --start \
+        --quiet \
+        --oknodo \
+        --chdir / \
+        --oknodo \
+        --chuid $USER:$GROUP \
+        --exec /bin/bash \
+        --pidfile $PIDFILE \
+        -- -c "$CASSANDRA_HOME/bin/cassandra -p $PIDFILE > /dev/null 2>&1"
 
     is_running && return 0
+
     for tries in `seq $WAIT_FOR_START`; do
         sleep 1
         is_running && return 0
     done
+
     return 2
 }
 
-#
-# Function that stops the daemon/service
-#
+# Returns
+#   0 if daemon has been stopped
+#   1 if daemon was already stopped
+#   2 if daemon could not be stopped
+#   other if a failure occurred
 do_stop()
 {
-        # Return
-        #   0 if daemon has been stopped
-        #   1 if daemon was already stopped
-        #   2 if daemon could not be stopped
-        #   other if a failure occurred
     is_running || return 1
-    $JSVC -stop -home $JAVA_HOME -pidfile $PIDFILE \
-            org.apache.cassandra.thrift.CassandraDaemon
-    is_running && return 2 || return 0
+
+    start-stop-daemon --stop \
+        --pidfile $PIDFILE \
+        --user $USER \
+        --retry TERM/30/KILL/5
+
+    is_running && return 2
+
+    return 0
 }
 
 case "$1" in
-  start)
+    start)
         echo "Starting $DESC"
         [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
         do_start
@@ -182,7 +110,7 @@ case "$1" in
                 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
         esac
         ;;
-  stop)
+    stop)
         echo "Stopping $DESC"
         [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
         do_stop
@@ -191,7 +119,7 @@ case "$1" in
                 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
         esac
         ;;
-  restart|force-reload)
+    restart|force-reload)
         echo "Restarting $DESC"
         log_daemon_msg "Restarting $DESC" "$NAME"
         do_stop
@@ -210,17 +138,16 @@ case "$1" in
                 ;;
         esac
         ;;
-  status)
-    is_running
-    stat=$?
-    case "$stat" in
-      0) log_success_msg "$DESC is running" ;;
-      1) log_failure_msg "could not access pidfile for $DESC" ;;
-      *) log_success_msg "$DESC is not running" ;;
-    esac
-    exit "$stat"
-    ;;
-  *)
+    status)
+        is_running
+        stat=$?
+        case "$stat" in
+            0) log_success_msg "$DESC is running" ;;
+            *) log_success_msg "$DESC is not running" ;;
+        esac
+        exit "$stat"
+        ;;
+    *)
         echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
         exit 3
         ;;

data/chef/travis-cookbooks/ci_environment/chromium/recipes/default.rb

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: Chromium
 # Recipe:: default
-# Copyright 2012, Travis CI development team
+# Copyright 2012-2013, Travis CI Development Team <contact@travis-ci.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/chef/travis-cookbooks/ci_environment/clang/attributes/tarball.rb

@@ -1,11 +1,6 @@
-version = "3.1"
+version = "3.2"
 
 default[:clang] = {
   :version => version,
-  :arch    => case version
-              when "3.1" then
-                kernel['machine'] =~ /x86_64/ ? "x86_64" : "x86"
-              else
-                kernel['machine'] =~ /x86_64/ ? "x86_64" : "i386"
-              end
+  :arch    => (kernel['machine'] =~ /x86_64/ ? "x86_64" : "x86")
 }

data/chef/travis-cookbooks/ci_environment/clang/recipes/default.rb

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: clang
 # Recipe:: default
-# Copyright 2012, Travis CI development team
+# Copyright 2012-2013, Travis CI Development Team <contact@travis-ci.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/chef/travis-cookbooks/ci_environment/clang/recipes/tarball.rb

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: clang
 # Recipe:: tarball
-# Copyright 2012, Travis CI development team
+# Copyright 2012-2013, Travis CI Development Team <contact@travis-ci.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,10 +22,8 @@
 # THE SOFTWARE.
 
 platform_name, ext = case [node.platform, node.platform_version]
-                     when ["ubuntu", "11.10"]
-                       ["#{node.platform}-#{node.platform_version}", "tar.bz2"]
                      when ["ubuntu", "12.04"]
-                       ["#{node.platform}_#{node.platform_version}", "tar.gz"]
+                       ["#{node.platform}-#{node.platform_version.gsub(/_/, '-')}", "tar.gz"]
                      end
 
 filename = "clang+llvm-#{node.clang.version}-#{node.clang.arch}-linux-#{platform_name}"