RubyGems - lobot - Versions diffs - 2.0.0pre → 2.1.0 - Mend

lobot 2.0.0pre → 2.1.0

Files changed (297) hide show

data/chef/travis-cookbooks/ci_environment/libxml/recipes/default.rb CHANGED

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: rvm
 # Recipe:: multi
-# Copyright 2011-2012, Travis CI development team
+# Copyright 2011-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/lighttpd/recipes/default.rb CHANGED

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: lighttpd
 # Recipe:: default
-# Copyright 2011, Travis CI development team
+# Copyright 2011-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/maven3/recipes/default.rb CHANGED

@@ -2,7 +2,7 @@
 # Cookbook Name:: maven3
 # Recipe:: default
 #
-# Copyright 2011, 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.
@@ -38,7 +38,10 @@ end
 per_user_settings = File.join(node.travis_build_environment.home, ".m2", "settings.xml")
 cookbook_file(per_user_settings) do
-  mode 0644
+  owner  node.travis_build_environment.user
+  group  node.travis_build_environment.group
+  mode   0644
   action :nothing
 end

data/chef/travis-cookbooks/ci_environment/maven3/recipes/package.rb CHANGED

@@ -2,7 +2,7 @@
 # Cookbook Name:: maven3
 # 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/maven3/recipes/ppa.rb CHANGED

@@ -2,7 +2,7 @@
 # Cookbook Name:: maven3
 # Recipe:: ppa
 #
-# 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/maven3/recipes/tarball.rb CHANGED

@@ -2,7 +2,7 @@
 # Cookbook Name:: maven3
 # Recipe:: tarball
 #
-# 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/memcached/attributes/default.rb CHANGED

@@ -2,4 +2,4 @@ default[:memcached][:memory] = 48
 default[:memcached][:port] = 11211
 default[:memcached][:user] = "nobody"
 default[:memcached][:listen] = "0.0.0.0"
-default[:memcached][:sasl] = true
+default[:memcached][:sasl] = false

data/chef/travis-cookbooks/ci_environment/memcached/attributes/ppa.rb CHANGED

@@ -1,3 +1,3 @@
 include_attribute "memcached::default"
-default[:memcached][:sasl] = true
+default[:memcached][:sasl] = false

data/chef/travis-cookbooks/ci_environment/memcached/recipes/default.rb CHANGED

@@ -3,7 +3,7 @@
 # Recipe:: default
 #
 # Copyright 2009, Opscode, Inc.
-# Copyright 2011, 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/memcached/recipes/ppa.rb CHANGED

@@ -2,7 +2,7 @@
 # Cookbook Name:: memcached
 # Recipe:: ppa
 #
-# Copyright 2012, Travis CI Development Team
+# Copyright 2012-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/mercurial/recipes/default.rb CHANGED

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: mercurial
 # 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/mercurial/recipes/ppa.rb ADDED

@@ -0,0 +1,36 @@
+#
+# Cookbook Name:: mercurial
+# Recipe:: default
+# 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+include_recipe "python::package"
+apt_repository "mercurial-ppa" do
+  uri          "http://ppa.launchpad.net/mercurial-ppa/releases/ubuntu"
+  distribution node['lsb']['codename']
+  components   ["main"]
+  key          "323293EE"
+  keyserver    "keyserver.ubuntu.com"
+  action :add
+end
+package "mercurial"

data/chef/travis-cookbooks/ci_environment/mongodb/attributes/mongodb.rb CHANGED

@@ -38,7 +38,7 @@ default[:mongodb][:nssize]      = false
 default[:mongodb][:rest]        = false
 default[:mongodb][:syncdelay]   = 60
+default[:mongodb][:service][:enabled] = false
 ### MMS
 default[:mongodb][:mms]       = false

data/chef/travis-cookbooks/ci_environment/mongodb/files/default/mongodb.sysvinit.sh CHANGED

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # init.d script with LSB support.
 #

data/chef/travis-cookbooks/ci_environment/mongodb/recipes/apt.rb CHANGED

@@ -20,12 +20,12 @@
 # limitations under the License.
 #
-node[:mongodb][:installed_from] = "apt"
+node.set[:mongodb][:installed_from] = "apt"
 # default settings from apt repo
-node[:mongodb][:datadir]     = "/var/lib/mongodb"
-node[:mongodb][:config]      = "/etc/mongodb.conf"
-node[:mongodb][:logfile]     = "/var/log/mongodb/mongodb.log"
-node[:mongodb][:pidfile]     = "/var/run/mongodb.pid"
+node.set[:mongodb][:datadir]     = "/var/lib/mongodb"
+node.set[:mongodb][:config]      = "/etc/mongodb.conf"
+node.set[:mongodb][:logfile]     = "/var/log/mongodb/mongodb.log"
+node.set[:mongodb][:pidfile]     = "/var/run/mongodb.pid"
 execute "apt-get update" do

data/chef/travis-cookbooks/ci_environment/mongodb/recipes/server.rb CHANGED

@@ -36,8 +36,11 @@ end
 service "mongodb" do
   supports :start => true, :stop => true, "force-stop" => true, :restart => true, "force-reload" => true, :status => true
-  # intentionally disabled on boot. MK.
-  action [:disable, :start]
+  if node.mongodb.service.enabled
+    action [:enable, :start]
+  else
+    action [:disable, :start]
+  end
   subscribes :restart, resources(:template => node[:mongodb][:config])
   subscribes :restart, resources(:template => "/etc/init.d/mongodb") if node[:mongodb][:installed_from] == "src"
 end

data/chef/travis-cookbooks/ci_environment/mysql/attributes/default.rb CHANGED

@@ -1,3 +1 @@
-default[:mysql] = {
-  :arch => (kernel['machine'] =~ /x86_64/ ? "amd64" : "i386")
-}
+default[:mysql][:arch] = (kernel['machine'] =~ /x86_64/ ? "amd64" : "i386")

data/chef/travis-cookbooks/ci_environment/mysql/recipes/server_on_ramfs.rb CHANGED

@@ -2,7 +2,7 @@
 # Cookbook Name:: mysql
 # Recipe:: server_on_ramfs
 #
-# Copyright 2011, 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.
@@ -48,6 +48,11 @@ include_recipe "mysql::server"
 log "['mysql']['data_dir'] = #{node['mysql']['data_dir']}"
 log "[:mysql][:data_dir] = #{node[:mysql][:data_dir]}"
+# stop mysql before copying the files over
+service "mysql" do
+  action :stop
+end
 bash "cp -R #{node['mysql']['data_dir']} #{node[:ramfs][:dir]}/mysql" do
   code "cp -R #{node['mysql']['data_dir']} #{node[:ramfs][:dir]}/mysql && chown -R mysql:mysql #{node[:ramfs][:dir]}/mysql"

data/chef/travis-cookbooks/ci_environment/mysql/templates/default/my.cnf.erb CHANGED

@@ -59,8 +59,6 @@ bind-address            = <%= node['mysql']['bind_address'] %>
 collation_server       = utf8_unicode_ci
 character_set_server   = utf8
-sql-mode               = STRICT_ALL_TABLES
 #
 # * Fine Tuning

data/chef/travis-cookbooks/ci_environment/mysql/templates/default/ramfs/my.cnf.erb CHANGED

@@ -53,8 +53,6 @@ bind-address            = <%= node['mysql']['bind_address'] %>
 collation_server       = utf8_unicode_ci
 character_set_server   = utf8
-sql-mode               = STRICT_ALL_TABLES
 #
 # * Fine Tuning
 #

data/chef/travis-cookbooks/ci_environment/neo4j-server/attributes/tarball.rb CHANGED

@@ -1,11 +1,11 @@
-neo4j_version = "1.8.RC1"
+neo4j_version = "1.8"
 default[:neo4j][:server] = {
   :version => neo4j_version,
   :installation_dir => "/usr/local/neo4j-server",
   :tarball => {
     :url => "http://dist.neo4j.org/neo4j-community-#{neo4j_version}-unix.tar.gz",
-    :md5 => "4b35de2d7d5291f4f6f51a1320e64393"
+    :md5 => "7a76a75bac1a32c5291e8e7b238f7ca2"
   },
   :user => "neo4j",
   :jvm  => {
@@ -28,5 +28,16 @@ default[:neo4j][:server] = {
   },
   :https => {
     :enabled => true
+  },
+  :plugins => {
+    :spatial => {
+      :enabled => true,
+      :url => "https://github.com/downloads/goodwink/neo4j-server-chef-cookbook/neo4j-spatial-0.9-SNAPSHOT-server-plugin.zip",
+      :version => "0.9-SNAPSHOT",
+      :md5 => "65e6d30e856f191a20f3f6e78eaaf5a7"
+    }
+  },
+  :service => {
+    :enabled => false
   }
 }

data/chef/travis-cookbooks/ci_environment/neo4j-server/recipes/tarball.rb CHANGED

@@ -45,6 +45,7 @@ require "tmpdir"
 td          = Dir.tmpdir
 tmp         = File.join(td, "neo4j-community-#{node.neo4j.server.version}.tar.gz")
+tmp_spatial = File.join(td, "neo4j-spatial-#{node.neo4j.server.plugins.spatial.version}-server-plugin.zip")
 remote_file(tmp) do
   source node.neo4j.server.tarball.url
@@ -52,6 +53,12 @@ remote_file(tmp) do
   not_if "which neo4j"
 end
+if node.neo4j.server.plugins.spatial.enabled
+  remote_file(tmp_spatial) do
+    source node.neo4j.server.plugins.spatial.url
+  end
+end
 # 2. Extract it
 # 3. Copy to /usr/local/neo4j-server, update permissions
 bash "extract #{tmp}, move it to #{node.neo4j.server.installation_dir}" do
@@ -67,6 +74,19 @@ bash "extract #{tmp}, move it to #{node.neo4j.server.installation_dir}" do
   creates "#{node.neo4j.server.installation_dir}/bin/neo4j"
 end
+if node.neo4j.server.plugins.spatial.enabled
+  bash "extract #{tmp_spatial}, move it to #{node.neo4j.server.installation_dir}/plugins" do
+    user "root"
+    cwd "/tmp"
+    code <<-EOS
+      unzip #{tmp_spatial} -d #{node.neo4j.server.installation_dir}/plugins
+    EOS
+    creates "#{node.neo4j.server.installation_dir}/plugins/neo4j-spatial-#{node.neo4j.server.plugins.spatial.version}.jar"
+  end
+end
 [node.neo4j.server.conf_dir, node.neo4j.server.data_dir, File.join(node.neo4j.server.data_dir, "log")].each do |dir|
   directory dir do
     owner     node.neo4j.server.user
@@ -80,6 +100,7 @@ end
  node.neo4j.server.data_dir,
  File.join(node.neo4j.server.installation_dir, "data"),
  File.join(node.neo4j.server.installation_dir, "system"),
+ File.join(node.neo4j.server.installation_dir, "plugins"),
  node.neo4j.server.installation_dir].each do |dir|
   # Chef sets permissions only to leaf nodes, so we have to use a Bash script. MK.
   bash "chown -R #{node.neo4j.server.user}:#{node.neo4j.server.user} #{dir}" do
@@ -135,6 +156,9 @@ end
 service "neo4j" do
   supports :start => true, :stop => true, :restart => true
-  # disable on boot, intentionally. MK.
-  action [:disable]
+  if node.neo4j.server.service.enabled
+    action [:enable]
+  else
+    action [:disable]
+  end
 end

data/chef/travis-cookbooks/ci_environment/networking_basic/recipes/default.rb CHANGED

@@ -2,7 +2,7 @@
 # Cookbook Name:: networking_basic
 # Recipe:: default
 #
-# 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.
@@ -25,6 +25,9 @@ when "debian", "ubuntu"
               'curl',
               'wget',
               'rsync',
+              # libldap resolves dependency hell around libcurl4-openssl-dev. MK.
+              "libldap-2.4.2",
+              "libldap2-dev",
               "libcurl4-openssl-dev"
              ]

data/chef/travis-cookbooks/ci_environment/nodejs/attributes/multi.rb CHANGED

@@ -1,3 +1,3 @@
-default[:nodejs][:versions] = ["0.6.21"]
-default[:nodejs][:aliases]  = { "0.6.21" => "0.6" }
-default[:nodejs][:default]  = "0.6.21"
+default[:nodejs][:versions] = ["0.8.18"]
+default[:nodejs][:aliases]  = { "0.8.18" => "0.8" }
+default[:nodejs][:default]  = "0.8.18"

data/chef/travis-cookbooks/ci_environment/nodejs/recipes/multi.rb CHANGED

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: node.js
 # Recipe:: multi
-# Copyright 2011-2012, Travis CI development team
+# Copyright 2011-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/openssh/recipes/default.rb CHANGED

@@ -2,7 +2,7 @@
 # Cookbook Name:: openssh
 # Recipe:: default
 #
-# Copyright 2012, Travis CI Development Team
+# Copyright 2012-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/perlbrew/attributes/multi.rb CHANGED

@@ -3,5 +3,5 @@ default[:perlbrew] = {
                { :name => "5.14", :version => "perl-5.14.2" },
                { :name => "5.12", :version => "perl-5.12.4" },
                { :name => "5.10", :version => "perl-5.10.1" }],
-  :modules => %w(Dist::Zilla Moose Test::Pod Test::Pod::Coverage Test::Exception Test::Kwalitee Dist::Zilla::Plugin::Bootstrap::lib Catalyst LWP Module::Install Test::Most)
+  :modules => %w(Dist::Zilla Moose Test::Pod Test::Pod::Coverage Test::Exception Test::Kwalitee Dist::Zilla::Plugin::Bootstrap::lib LWP Module::Install Test::Most)
 }

data/chef/travis-cookbooks/ci_environment/phantomjs/attributes/default.rb CHANGED

@@ -1,10 +1,10 @@
-version = "1.6.1"
+version = "1.8.1"
 arch    = kernel['machine'] =~ /x86_64/ ? "x86_64" : "i686"
 default[:phantomjs] = {
   :version => version,
   :arch    => arch,
   :tarball => {
-    :url  => "http://phantomjs.googlecode.com/files/phantomjs-#{version}-linux-#{arch}-dynamic.tar.bz2"
+    :url  => "http://phantomjs.googlecode.com/files/phantomjs-#{version}-linux-#{arch}.tar.bz2"
   }
 }

data/chef/travis-cookbooks/ci_environment/phantomjs/metadata.rb ADDED

@@ -0,0 +1,3 @@
+maintainer       "Travis CI Development Team"
+license          "Apache v2.0'"
+description      "Installs/Configures phantomjs"

data/chef/travis-cookbooks/ci_environment/phantomjs/recipes/default.rb CHANGED

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: phantomjs
 # 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
@@ -21,4 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
+package "libfontconfig1"
 include_recipe "phantomjs::tarball"

data/chef/travis-cookbooks/ci_environment/phantomjs/recipes/tarball.rb CHANGED

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: phantomjs
 # 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,13 +22,14 @@
 # THE SOFTWARE.
 # This recipe provides Phantom.js using official tarball for Linux.
+package "libfontconfig1"
 # 1. Download the tarball
 require "tmpdir"
 td          = Dir.tmpdir
 tmp         = File.join(td, "phantomjs-#{node.phantomjs.version}.tar.gz")
-tarball_dir = File.join(td, "phantomjs-#{node.phantomjs.version}-linux-#{node.phantomjs.arch}-dynamic")
+tarball_dir = File.join(td, "phantomjs-#{node.phantomjs.version}-linux-#{node.phantomjs.arch}")
 remote_file(tmp) do
   source node.phantomjs.tarball.url