bosh-gen 0.6.1 → 0.6.2

data/spec/fixtures/releases/bosh-sample-release/jobs/wordpress/templates/wordpress_ctl

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+JOB=wordpress
+RUN_DIR=/var/vcap/sys/run/apache2
+LOG_DIR=/var/vcap/sys/log/apache2
+PIDFILE=$RUN_DIR/httpd.pid
+CONF_DIR=/var/vcap/jobs/$JOB/config
+APACHECTL=/var/vcap/packages/apache2/bin/apachectl
+APSTART=/var/vcap/sys/log/apache2/start.log
+
+case $1 in
+
+  start)
+    mkdir -p $RUN_DIR
+    mkdir -p $LOG_DIR
+
+    # link libphp into apache
+    if [ ! -f /var/vcap/packages/apache2/modules/libphp5.so ]; then
+      ln -s /var/vcap/packages/php5/modules/libphp5.so \
+        /var/vcap/packages/apache2/modules/libphp5.so
+    fi
+
+    # link wordpress config file into wordpress package
+    if [ ! -f /var/vcap/packages/wordpress/wp-config.php ]; then
+      ln -s /var/vcap/jobs/wordpress/config/wp-config.php \
+        /var/vcap/packages/wordpress/wp-config.php
+    fi
+
+    $APACHECTL -f $CONF_DIR/httpd.conf -k start >> $APSTART 2>&1
+    ;;
+
+  stop)
+    $APACHECTL -f $CONF_DIR/httpd.conf -k stop  >> $APSTART 2>&1
+    ;;
+
+  *)
+  echo "Usage: ${JOB}_ctl {start|stop}" ;;
+esac
+exit 0

data/spec/fixtures/releases/bosh-sample-release/jobs/wordpress/templates/wp-config.php.erb

@@ -0,0 +1,90 @@
+<?php
+/**
+ * The base configurations of the WordPress.
+ *
+ * This file has the following configurations: MySQL settings, Table Prefix,
+ * Secret Keys, WordPress Language, and ABSPATH. You can find more information
+ * by visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing
+ * wp-config.php} Codex page. You can get the MySQL settings from your web host.
+ *
+ * This file is used by the wp-config.php creation script during the
+ * installation. You don't have to use the web site, you can just copy this file
+ * to "wp-config.php" and fill in the values.
+ *
+ * @package WordPress
+ */
+
+// ** MySQL settings - You can get this info from your web host ** //
+/** The name of the database for WordPress */
+define('DB_NAME', '<%= properties.wordpress.db.name %>');
+
+/** MySQL database username */
+define('DB_USER', '<%= properties.wordpress.db.user %>');
+
+/** MySQL database password */
+define('DB_PASSWORD', '<%= properties.wordpress.db.pass %>');
+
+/** MySQL hostname */
+define('DB_HOST', '<%= properties.mysql.address %>');
+
+/** Database Charset to use in creating database tables. */
+define('DB_CHARSET', 'utf8');
+
+/** The Database Collate type. Don't change this if in doubt. */
+define('DB_COLLATE', '');
+
+/**#@+
+ * Authentication Unique Keys and Salts.
+ *
+ * Change these to different unique phrases!
+ * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
+ * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
+ *
+ * @since 2.6.0
+ */
+define('AUTH_KEY',         '<%= properties.wordpress.auth_key %>');
+define('SECURE_AUTH_KEY',  '<%= properties.wordpress.secure_auth_key %>');
+define('LOGGED_IN_KEY',    '<%= properties.wordpress.logged_in_key %>');
+define('NONCE_KEY',        '<%= properties.wordpress.nonce_key %>');
+define('AUTH_SALT',        '<%= properties.wordpress.auth_salt %>');
+define('SECURE_AUTH_SALT', '<%= properties.wordpress.secure_auth_salt %>');
+define('LOGGED_IN_SALT',   '<%= properties.wordpress.logged_in_salt %>');
+define('NONCE_SALT',       '<%= properties.wordpress.nonce_salt %>');
+
+/**#@-*/
+
+/**
+ * WordPress Database Table prefix.
+ *
+ * You can have multiple installations in one database if you give each a unique
+ * prefix. Only numbers, letters, and underscores please!
+ */
+$table_prefix  = 'wp_';
+
+/**
+ * WordPress Localized Language, defaults to English.
+ *
+ * Change this to localize WordPress. A corresponding MO file for the chosen
+ * language must be installed to wp-content/languages. For example, install
+ * de_DE.mo to wp-content/languages and set WPLANG to 'de_DE' to enable German
+ * language support.
+ */
+define('WPLANG', '');
+
+/**
+ * For developers: WordPress debugging mode.
+ *
+ * Change this to true to enable the display of notices during development.
+ * It is strongly recommended that plugin and theme developers use WP_DEBUG
+ * in their development environments.
+ */
+define('WP_DEBUG', false);
+
+/* That's all, stop editing! Happy blogging. */
+
+/** Absolute path to the WordPress directory. */
+if ( !defined('ABSPATH') )
+	define('ABSPATH', dirname(__FILE__) . '/');
+
+/** Sets up WordPress vars and included files. */
+require_once(ABSPATH . 'wp-settings.php');

data/spec/fixtures/releases/bosh-sample-release/packages/apache2/packaging

@@ -0,0 +1,15 @@
+# abort script on any command that exit with a non zero value
+set -e
+
+echo "Extracting apache https..."
+tar xzf apache2/httpd-2.2.21.tar.gz
+
+echo "Building apache https..."
+(
+  cd httpd-2.2.21
+  ./configure \
+    --prefix=${BOSH_INSTALL_TARGET} \
+    --enable-so
+  make
+  make install
+)

data/spec/fixtures/releases/bosh-sample-release/packages/apache2/spec

@@ -0,0 +1,5 @@
+---
+name: apache2
+
+files:
+  - apache2/httpd-2.2.21.tar.gz

data/spec/fixtures/releases/bosh-sample-release/packages/mysql/packaging

@@ -0,0 +1,14 @@
+# abort script on any command that exit with a non zero value
+set -e
+
+# Percona binary Linux build
+tar zxvf mysql/server-5.1.54-rel12.5-188-Linux-x86_64.tar.gz
+(
+  cd server-5.1.54-rel12.5-188-Linux-x86_64
+  for x in bin include lib libexec share; do
+    cp -a ${x} ${BOSH_INSTALL_TARGET}
+  done
+)
+
+# a modified mysql.server script
+cp -v mysql/mysql.server ${BOSH_INSTALL_TARGET}/libexec/mysql.server

data/spec/fixtures/releases/bosh-sample-release/packages/mysql/spec

@@ -0,0 +1,5 @@
+---
+name: mysql
+files:
+- mysql/server-5.1.54-rel12.5-188-Linux-x86_64.tar.gz
+- mysql/mysql.server

data/spec/fixtures/releases/bosh-sample-release/packages/mysqlclient/packaging

@@ -0,0 +1,12 @@
+# abort script on any command that exit with a non zero value
+set -e
+
+# Percona binary Linux build - minor change
+# only extract the client side stuff
+tar zxvf mysql/client-5.1.54-rel12.5-188-Linux-x86_64.tar.gz
+(
+  cd client-5.1.54-rel12.5-188-Linux-x86_64
+  for x in bin include lib; do
+    cp -a ${x} ${BOSH_INSTALL_TARGET}
+  done
+)

data/spec/fixtures/releases/bosh-sample-release/packages/mysqlclient/spec

@@ -0,0 +1,4 @@
+---
+name: mysqlclient
+files:
+- mysql/client-5.1.54-rel12.5-188-Linux-x86_64.tar.gz

data/spec/fixtures/releases/bosh-sample-release/packages/nginx/packaging

@@ -0,0 +1,23 @@
+# abort script on any command that exit with a non zero value
+set -e
+
+echo "Extracting pcre..."
+tar xzf nginx/pcre-8.21.tar.gz
+
+echo "Extracting headers-more module..."
+tar xzf nginx/headers-more-v0.15rc1.tgz
+
+echo "Extracting nginx..."
+tar xzf nginx/nginx-1.0.11.tar.gz
+
+echo "Building nginx..."
+(
+  cd nginx-1.0.11
+  ./configure \
+    --prefix=${BOSH_INSTALL_TARGET} \
+    --with-pcre=../pcre-8.21 \
+    --with-http_ssl_module \
+    --add-module=../headers-more-v0.15rc1
+  make
+  make install
+)

data/spec/fixtures/releases/bosh-sample-release/packages/nginx/spec

@@ -0,0 +1,6 @@
+---
+name: nginx
+files:
+- nginx/headers-more-v0.15rc1.tgz
+- nginx/nginx-1.0.11.tar.gz
+- nginx/pcre-8.21.tar.gz

data/spec/fixtures/releases/bosh-sample-release/packages/php5/packaging

@@ -0,0 +1,24 @@
+# abort script on any command that exit with a non zero value
+set -e
+
+echo "Extracting php5..."
+tar xzf php5/php-5.3.10.tar.gz
+
+export APACHE2=/var/vcap/packages/apache2
+
+echo "Building php5..."
+cd php-5.3.10
+  ./configure \
+  --prefix=${BOSH_INSTALL_TARGET} \
+  --with-apxs2=${APACHE2}/bin/apxs \
+  --with-config-file-path=/var/vcap/jobs/wordpress/config/php.ini \
+  --with-mysql=/var/vcap/packages/mysqlclient
+
+# redirecting stdout to /dev/null as the output becomes too large for nats
+make > /dev/null
+make install > /dev/null
+
+# php installs the shared object in the apache module dir, so we need to
+# copy it back to the php package dir
+mkdir -p ${BOSH_INSTALL_TARGET}/modules
+cp ${APACHE2}/modules/libphp5.so ${BOSH_INSTALL_TARGET}/modules

data/spec/fixtures/releases/bosh-sample-release/packages/php5/spec

@@ -0,0 +1,7 @@
+---
+name: php5
+dependencies:
+  - apache2
+  - mysqlclient
+files:
+  - php5/php-5.3.10.tar.gz

data/spec/fixtures/releases/bosh-sample-release/packages/wordpress/packaging

@@ -0,0 +1,14 @@
+# abort script on any command that exit with a non zero value
+set -e
+
+echo "Extracting wordpress..."
+tar xzf wordpress/wordpress-3.3.1.tgz
+
+cd wordpress
+cp -a . ${BOSH_INSTALL_TARGET}
+
+# remove sample as we populate it with a real config from the job
+rm ${BOSH_INSTALL_TARGET}/wp-config-sample.php
+
+# clean up tar ball
+rm ${BOSH_INSTALL_TARGET}/wordpress-3.3.1.tgz

data/spec/fixtures/releases/bosh-sample-release/packages/wordpress/spec

@@ -0,0 +1,5 @@
+---
+name: wordpress
+
+files:
+  - wordpress/wordpress-3.3.1.tgz

data/spec/models/deployment_manifest_spec.rb

@@ -1,17 +1,27 @@
-require "minitest/spec"
-require "minitest-colorize"
+require "spec_helper"
 require "bosh/gen/models"
 
 class DeploymentManifestSpec < MiniTest::Spec
-  it "creates 'defaults' manifest document with 2 jobs" do
+  it "creates manifest document with 2 jobs, no disk" do
     manifest = Bosh::Gen::Models::DeploymentManifest.new("myproj", "UUID", 
       {"name" => "myrelease", "version" => 2},
-      {"instance_type" => "m1.small"})
+      {"instance_type" => "m1.small", "static_ips" => ['1.2.3.4', '6.7.8.9']})
     manifest.jobs = [
-      { "name" => "job-with-ips",  "static_ips" => ['1.2.3.4']},
+      { "name" => "job-with-ips"},
       { "name" => "misc"}
     ]
-    manifest.to_yaml.must_equal fixture_manifest("defaults")
+    manifest.to_yaml.must_equal fixture_manifest("2_jobs_2_ips_no_disk")
+  end
+
+  it "creates manifest document with 2 jobs, with disk" do
+    manifest = Bosh::Gen::Models::DeploymentManifest.new("myproj", "UUID", 
+      {"name" => "myrelease", "version" => 2},
+      {"instance_type" => "m1.small", "persistent_disk" => "8196",  "static_ips" => ['1.2.3.4']})
+    manifest.jobs = [
+      { "name" => "job-with-ips"},
+      { "name" => "misc"}
+    ]
+    manifest.to_yaml.must_equal fixture_manifest("2_jobs_1_ip_8196_disk")
   end
   
   def fixture_manifest(name)

data/spec/models/extract_spec.rb

@@ -0,0 +1,10 @@
+require "spec_helper"
+require "bosh/gen/models"
+
+class ExtractSpec < MiniTest::Spec
+  it "finds the files to copy from a job with nested dependencies" do
+  end
+  
+  it "finds to files to copy from a package with nested dependencies" do
+  end
+end

data/spec/models/release_detection_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/spec"
-require "minitest-colorize"
+require "spec_helper"
 require "bosh/gen/models"
 
 class ReleaseDetectionSpec < MiniTest::Spec
@@ -21,8 +20,4 @@ class ReleaseDetectionSpec < MiniTest::Spec
     detector = Bosh::Gen::Models::ReleaseDetection.new(fixture_release_path('some_dev_releases'))
     detector.latest_dev_release_job_names.must_equal %w[redis]
   end
-  
-  def fixture_release_path(name)
-    File.expand_path("../../fixtures/releases/#{name}/", __FILE__)
-  end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require "minitest/spec"
+require "minitest-colorize"
+
+module FixtureHelpers
+  def fixture_release_path(name)
+    File.expand_path("../fixtures/releases/#{name}/", __FILE__)
+  end
+end
+
+MiniTest::Spec.send(:include, FixtureHelpers)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -149,14 +149,51 @@ files:
 - lib/bosh/gen/models/deployment_manifest.rb
 - lib/bosh/gen/models/release_detection.rb
 - lib/bosh/gen/version.rb
-- spec/fixtures/deployment_manifests/defaults.yml
+- spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk.yml
+- spec/fixtures/deployment_manifests/2_jobs_2_ips_no_disk.yml
+- spec/fixtures/releases/bosh-sample-release/.gitignore
+- spec/fixtures/releases/bosh-sample-release/LICENSE
+- spec/fixtures/releases/bosh-sample-release/NOTICE
+- spec/fixtures/releases/bosh-sample-release/README
+- spec/fixtures/releases/bosh-sample-release/config/final.yml
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/monit
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/spec
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/templates/my.bootstrap.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/templates/my.cnf.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/templates/my.shutdown.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/templates/mysql_ctl.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/nginx/monit
+- spec/fixtures/releases/bosh-sample-release/jobs/nginx/spec
+- spec/fixtures/releases/bosh-sample-release/jobs/nginx/templates/mime.types
+- spec/fixtures/releases/bosh-sample-release/jobs/nginx/templates/nginx.conf.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/nginx/templates/nginx_ctl
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/monit
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/spec
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/templates/httpd.conf.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/templates/php.ini.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/templates/wordpress_ctl
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/templates/wp-config.php.erb
+- spec/fixtures/releases/bosh-sample-release/packages/apache2/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/apache2/spec
+- spec/fixtures/releases/bosh-sample-release/packages/mysql/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/mysql/spec
+- spec/fixtures/releases/bosh-sample-release/packages/mysqlclient/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/mysqlclient/spec
+- spec/fixtures/releases/bosh-sample-release/packages/nginx/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/nginx/spec
+- spec/fixtures/releases/bosh-sample-release/packages/php5/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/php5/spec
+- spec/fixtures/releases/bosh-sample-release/packages/wordpress/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/wordpress/spec
 - spec/fixtures/releases/some_dev_releases/config/dev.yml
 - spec/fixtures/releases/some_dev_releases/dev_releases/index.yml
 - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-1.yml
 - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-10.yml
 - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-2.yml
 - spec/models/deployment_manifest_spec.rb
+- spec/models/extract_spec.rb
 - spec/models/release_detection_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/drnic/bosh-gen
 licenses: []
 post_install_message: 
@@ -171,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1124430667404549095
+      hash: -3864668292302149746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1124430667404549095
+      hash: -3864668292302149746
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -188,11 +225,48 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files:
-- spec/fixtures/deployment_manifests/defaults.yml
+- spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk.yml
+- spec/fixtures/deployment_manifests/2_jobs_2_ips_no_disk.yml
+- spec/fixtures/releases/bosh-sample-release/.gitignore
+- spec/fixtures/releases/bosh-sample-release/LICENSE
+- spec/fixtures/releases/bosh-sample-release/NOTICE
+- spec/fixtures/releases/bosh-sample-release/README
+- spec/fixtures/releases/bosh-sample-release/config/final.yml
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/monit
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/spec
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/templates/my.bootstrap.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/templates/my.cnf.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/templates/my.shutdown.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/mysql/templates/mysql_ctl.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/nginx/monit
+- spec/fixtures/releases/bosh-sample-release/jobs/nginx/spec
+- spec/fixtures/releases/bosh-sample-release/jobs/nginx/templates/mime.types
+- spec/fixtures/releases/bosh-sample-release/jobs/nginx/templates/nginx.conf.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/nginx/templates/nginx_ctl
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/monit
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/spec
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/templates/httpd.conf.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/templates/php.ini.erb
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/templates/wordpress_ctl
+- spec/fixtures/releases/bosh-sample-release/jobs/wordpress/templates/wp-config.php.erb
+- spec/fixtures/releases/bosh-sample-release/packages/apache2/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/apache2/spec
+- spec/fixtures/releases/bosh-sample-release/packages/mysql/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/mysql/spec
+- spec/fixtures/releases/bosh-sample-release/packages/mysqlclient/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/mysqlclient/spec
+- spec/fixtures/releases/bosh-sample-release/packages/nginx/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/nginx/spec
+- spec/fixtures/releases/bosh-sample-release/packages/php5/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/php5/spec
+- spec/fixtures/releases/bosh-sample-release/packages/wordpress/packaging
+- spec/fixtures/releases/bosh-sample-release/packages/wordpress/spec
 - spec/fixtures/releases/some_dev_releases/config/dev.yml
 - spec/fixtures/releases/some_dev_releases/dev_releases/index.yml
 - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-1.yml
 - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-10.yml
 - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-2.yml
 - spec/models/deployment_manifest_spec.rb
+- spec/models/extract_spec.rb
 - spec/models/release_detection_spec.rb
+- spec/spec_helper.rb