Merge lp:~lazypower/charm-tools/chef-charm-template-rev2 into lp:charm-tools/1.4

[Charles Butler]

Adds chef template, without symlinks - and a proper deployment.

This branch has a known deficiency - when you try to do something clever - such as:

charm create -t chef /tmp/foobar - it reads '/tmp/foobar' as the charm string and breaks in all kinds of interesting ways. Not sure if this is isolated to just the chef-template generator or others as well - but this is a known deficiency.

Generates a boilerplate chef-solo powered charm, and passes deploy tests after a base initialization. This is pre-req. work for the chef-charm-developer story - and should be treated as a guideline for future chef-charm based development.

[lp:~lazypower/charm-tools/chef-charm-template-rev2]

351. By Charles Butler on 2014-11-18

Adds amulet deployment tests to chef template

[Tim Van Steenburgh (tvansteenburgh)]

Awesome, +1 LGTM, thanks Chuck!

review: Approve

=== added directory 'charmtools/templates/chef'
=== added file 'charmtools/templates/chef/__init__.py'
--- charmtools/templates/chef/__init__.py	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/__init__.py	2014-11-18 19:19:34 +0000
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+#
+#    Copyright (C) 2014  Canonical Ltd.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from .template import ChefCharmTemplate  # noqa

=== added directory 'charmtools/templates/chef/files'
=== added file 'charmtools/templates/chef/files/README.ex'
--- charmtools/templates/chef/files/README.ex	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/README.ex	2014-11-18 19:19:34 +0000
@@ -0,0 +1,44 @@
+# Overview
+
+Describe the intended usage of this charm and anything unique about how this charm relates to others here.
+
+This README will be displayed in the Charm Store, it should be either Markdown or RST. Ideal READMEs include instructions on how to use the charm, expected usage, and charm features that your audience might be interested in. For an example of a well written README check out Hadoop: http://jujucharms.com/charms/precise/hadoop
+
+Use this as a Markdown reference if you need help with the formatting of this README: http://askubuntu.com/editing-help
+
+This charm provides [service](http://example.com). Add a description here of what the service itself actually does.
+
+Also remember to check the [icon guidelines](https://juju.ubuntu.com/docs/authors-charm-icon.html) so that your charm looks good in the Juju GUI.
+
+# Usage
+
+Step by step instructions on using the charm:
+
+    juju deploy servicename
+
+and so on. If you're providing a web service or something that the end user needs to go to, tell them here, especially if you're deploying a service that might listen to a non-default port.
+
+You can then browse to http://ip-address to configure the service.
+
+## Scale out Usage
+
+If the charm has any recommendations for running at scale, outline them in examples here. For example if you have a memcached relation that improves performance, mention it here.
+
+## Known Limitations and Issues
+
+This not only helps users but gives people a place to start if they want to help you add features to your charm.
+
+# Configuration
+
+The configuration options will be listed on the charm store, however If you're making assumptions or opinionated decisions in the charm (like setting a default administrator password), you should detail that here so the user knows how to change it immediately, etc.
+
+# Contact Information
+
+Though this will be listed in the charm store itself don't assume a user will know that, so include that information here:
+
+## Upstream Project Name
+
+- Upstream website
+- Upstream bug tracker
+- Upstream mailing list or contact information
+- Feel free to add things if it's useful for users

=== added file 'charmtools/templates/chef/files/config.yaml'
--- charmtools/templates/chef/files/config.yaml	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/config.yaml	2014-11-18 19:19:34 +0000
@@ -0,0 +1,14 @@
+options:
+  string-option:
+    type: string
+    default: "Default Value"
+    description: "A short description of the configuration option"
+  boolean-option:
+    type: boolean
+    default: False
+    description: "A short description of the configuration option"
+  int-option:
+    type: int
+    default: 9001
+    description: "A short description of the configuration option"
+

=== added directory 'charmtools/templates/chef/files/hooks'
=== added file 'charmtools/templates/chef/files/hooks/Gemfile'
--- charmtools/templates/chef/files/hooks/Gemfile	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/Gemfile	2014-11-18 19:19:34 +0000
@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem 'chef', '~> 11.6.0'
+gem 'activesupport', '~> 4.0.0'
\ No newline at end of file

=== added file 'charmtools/templates/chef/files/hooks/Gemfile.lock'
--- charmtools/templates/chef/files/hooks/Gemfile.lock	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/Gemfile.lock	2014-11-18 19:19:34 +0000
@@ -0,0 +1,64 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.0.10)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    chef (11.6.0)
+      erubis
+      highline (>= 1.6.9)
+      json (>= 1.4.4, <= 1.7.7)
+      mixlib-authentication (>= 1.3.0)
+      mixlib-cli (~> 1.3.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.3.0)
+      mixlib-shellout
+      net-ssh (~> 2.6)
+      net-ssh-multi (~> 1.1.0)
+      ohai (>= 0.6.0)
+      rest-client (>= 1.0.4, < 1.7.0)
+      yajl-ruby (~> 1.1)
+    erubis (2.7.0)
+    highline (1.6.19)
+    i18n (0.6.11)
+    ipaddress (0.8.0)
+    json (1.7.7)
+    mime-types (1.23)
+    minitest (4.7.5)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-cli (1.3.0)
+    mixlib-config (1.1.2)
+    mixlib-log (1.6.0)
+    mixlib-shellout (1.2.0)
+    multi_json (1.10.1)
+    net-ssh (2.6.8)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.1)
+      net-ssh (>= 2.1.4)
+      net-ssh-gateway (>= 0.99.0)
+    ohai (6.18.0)
+      ipaddress
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      mixlib-shellout
+      systemu
+      yajl-ruby
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    systemu (2.5.2)
+    thread_safe (0.3.4)
+    tzinfo (0.3.41)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 4.0.0)
+  chef (~> 11.6.0)

=== added file 'charmtools/templates/chef/files/hooks/bootstrap'
--- charmtools/templates/chef/files/hooks/bootstrap	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/bootstrap	2014-11-18 19:19:34 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+export HOOKS_DIR=$( cd "$( dirname "$0" )" && pwd)
+
+apt-get update
+
+sudo apt-get install -y ruby1.9.1 ruby1.9.1-dev \
+  rubygems1.9.1 irb1.9.1 ri1.9.1 rdoc1.9.1 \
+  build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev
+
+gem install bundler --no-rdoc --no-ri
+
+cd "$(dirname $0)" && bundle install
+
+mkdir -p /etc/chef
+
+cat > /etc/chef/solo.rb <<EOF
+cookbook_path '$HOOKS_DIR/cookbooks'
+EOF
\ No newline at end of file

=== added file 'charmtools/templates/chef/files/hooks/config-changed'
--- charmtools/templates/chef/files/hooks/config-changed	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/config-changed	2014-11-18 19:19:34 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/stub

=== added directory 'charmtools/templates/chef/files/hooks/cookbooks'
=== added directory 'charmtools/templates/chef/files/hooks/cookbooks/charm-name'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/charm-name/metadata.rb'
--- charmtools/templates/chef/files/hooks/cookbooks/charm-name/metadata.rb	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/cookbooks/charm-name/metadata.rb	2014-11-18 19:19:34 +0000
@@ -0,0 +1,8 @@
+maintainer       "$metadata.maintainer"
+maintainer_email "$metadata.maintainer"
+license          "GPL-3"
+description      "$metadata.summary"
+
+version          "0.1"
+name             "$metadata.package"
+depends          "juju-helpers"

=== added directory 'charmtools/templates/chef/files/hooks/cookbooks/charm-name/recipes'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/charm-name/recipes/config-changed.rb'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/charm-name/recipes/install.rb'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/charm-name/recipes/start.rb'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/charm-name/recipes/stop.rb'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/charm-name/recipes/upgrade-charm.rb'
=== added directory 'charmtools/templates/chef/files/hooks/cookbooks/juju-helpers'
=== added directory 'charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/definitions'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/definitions/juju_port.rb'
--- charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/definitions/juju_port.rb	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/definitions/juju_port.rb	2014-11-18 19:19:34 +0000
@@ -0,0 +1,11 @@
+define :juju_port, action: :nothing do
+  if params[:action] == :open
+    execute "open-port #{params[:name]}" do
+      action :run
+    end
+  elsif params[:action] == :close
+    execute "close-port #{params[:name]}" do
+      action :run
+    end
+  end
+end
\ No newline at end of file

=== added file 'charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/definitions/relation_set.rb'
--- charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/definitions/relation_set.rb	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/definitions/relation_set.rb	2014-11-18 19:19:34 +0000
@@ -0,0 +1,10 @@
+define :relation_set do
+  args_string = params[:variables].map { |key, value| "#{key}=\"#{value}\"" }.join(' ')
+
+  command = "relation-set #{args_string}"
+  command += " -r #{params[:relation_id]}" if params[:relation_id]
+
+  execute command do
+    action :run
+  end
+end
\ No newline at end of file

=== added directory 'charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries'
=== added directory 'charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries/juju'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries/juju.rb'
--- charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries/juju.rb	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries/juju.rb	2014-11-18 19:19:34 +0000
@@ -0,0 +1,28 @@
+$: << File.expand_path('..', __FILE__)
+
+require 'active_support/all'
+require 'juju/juju_helpers'
+require 'juju/juju_helpers_dev'
+
+class Chef
+  class Resource
+    include JujuHelpers
+    if ENV['JUJU_ENV'] == 'development'
+      include JujuHelpersDev
+    end
+  end
+
+  class Recipe
+    include JujuHelpers
+    if ENV['JUJU_ENV'] == 'development'
+      include JujuHelpersDev
+    end
+  end
+
+  class Provider
+    include JujuHelpers
+    if ENV['JUJU_ENV'] == 'development'
+      include JujuHelpersDev
+    end
+  end
+end
\ No newline at end of file

=== added file 'charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries/juju/juju_helpers.rb'
--- charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries/juju/juju_helpers.rb	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries/juju/juju_helpers.rb	2014-11-18 19:19:34 +0000
@@ -0,0 +1,48 @@
+module JujuHelpers
+  HOOK_ENVIRONMENT = %w(juju_unit_name juju_relation juju_remote_unit)
+  COMMANDS = ''
+
+  HOOK_ENVIRONMENT.each do |method|
+    define_method method do
+      ENV[method.upcase]
+    end
+  end
+
+  def relation_ids(relation_name = nil)
+    commands = ['relation-ids --fromat=json']
+    commands << relation_name if relation_name
+    run(commands.join(' ')).try { |relations| JSON.load(relations) }
+  end
+
+  def relation_list(relation_id = nil)
+    commands = ['relation-list --format=json']
+    commands << "-r #{relation_id}" if relation_id
+    run(commands.join(' ')).try { |relations| JSON.load(relations) }
+  end
+
+  def relation_get(unit_name = nil, relation_id = nil)
+    commands = ['relation-get --format=json']
+    commands << "-r #{relation_id}" if relation_id
+    commands << '-'
+    commands << unit_name if unit_name
+    run(commands.join(' ')).try { |relation| JSON.load(relation) }
+  end
+
+  def config_get
+    run("config-get --format=json").try { |relation| JSON.load(relation) }
+  end
+
+  def unit_get(key)
+    run("unit-get #{key}")
+  end
+
+  def juju_log(text)
+    run("juju-log #{text}")
+  end
+
+private
+  def run(command)
+    value = %x{ #{command} 2>&1 }.strip
+    value.empty? ? nil : value
+  end
+end
\ No newline at end of file

=== added file 'charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries/juju/juju_helpers_dev.rb'
--- charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries/juju/juju_helpers_dev.rb	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/libraries/juju/juju_helpers_dev.rb	2014-11-18 19:19:34 +0000
@@ -0,0 +1,25 @@
+module JujuHelpersDev
+  def relation_ids(relation_name = nil)
+    []
+  end
+
+  def relation_list(relation_id = nil)
+    {}
+  end
+
+  def relation_get(unit_name = nil, relation_id = nil)
+    {}
+  end
+
+  def config_get
+    {}
+  end
+
+  def unit_get(key)
+    nil
+  end
+
+  def juju_log(text)
+    puts text
+  end
+end
\ No newline at end of file

=== added file 'charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/metadata.rb'
--- charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/metadata.rb	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/cookbooks/juju-helpers/metadata.rb	2014-11-18 19:19:34 +0000
@@ -0,0 +1,7 @@
+maintainer       "Charles Butler"
+maintainer_email "[e-mail]"
+license          "GPL-3"
+description      "JuJu Helpers"
+
+version          "0.2"
+name             "juju-helpers"

=== added directory 'charmtools/templates/chef/files/hooks/cookbooks/relation-name-relation'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/relation-name-relation/metadata.rb'
--- charmtools/templates/chef/files/hooks/cookbooks/relation-name-relation/metadata.rb	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/cookbooks/relation-name-relation/metadata.rb	2014-11-18 19:19:34 +0000
@@ -0,0 +1,8 @@
+maintainer       "$metadata.maintainer"
+maintainer_email "$metadata.maintainer"
+license          "GPL-3"
+description      "$metadata.summary"
+
+version          "0.1"
+name             "relation-name-relation"
+depends          "juju-helpers"

=== added directory 'charmtools/templates/chef/files/hooks/cookbooks/relation-name-relation/recipes'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/relation-name-relation/recipes/broken.rb'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/relation-name-relation/recipes/changed.rb'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/relation-name-relation/recipes/departed.rb'
=== added file 'charmtools/templates/chef/files/hooks/cookbooks/relation-name-relation/recipes/joined.rb'
=== added file 'charmtools/templates/chef/files/hooks/install'
--- charmtools/templates/chef/files/hooks/install	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/install	2014-11-18 19:19:34 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/bootstrap
+source $(dirname $0)/stub
\ No newline at end of file

=== added file 'charmtools/templates/chef/files/hooks/relation-name-relation-broken'
--- charmtools/templates/chef/files/hooks/relation-name-relation-broken	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/relation-name-relation-broken	2014-11-18 19:19:34 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/stub

=== added file 'charmtools/templates/chef/files/hooks/relation-name-relation-changed'
--- charmtools/templates/chef/files/hooks/relation-name-relation-changed	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/relation-name-relation-changed	2014-11-18 19:19:34 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/stub

=== added file 'charmtools/templates/chef/files/hooks/relation-name-relation-departed'
--- charmtools/templates/chef/files/hooks/relation-name-relation-departed	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/relation-name-relation-departed	2014-11-18 19:19:34 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/stub

=== added file 'charmtools/templates/chef/files/hooks/relation-name-relation-joined'
--- charmtools/templates/chef/files/hooks/relation-name-relation-joined	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/relation-name-relation-joined	2014-11-18 19:19:34 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/stub

=== added file 'charmtools/templates/chef/files/hooks/start'
--- charmtools/templates/chef/files/hooks/start	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/start	2014-11-18 19:19:34 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/stub

=== added file 'charmtools/templates/chef/files/hooks/stop'
--- charmtools/templates/chef/files/hooks/stop	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/stop	2014-11-18 19:19:34 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/stub

=== added file 'charmtools/templates/chef/files/hooks/stub'
--- charmtools/templates/chef/files/hooks/stub	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/stub	2014-11-18 19:19:34 +0000
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+HOOK_NAME=\$(basename \$0)
+CHARM_NAME=$metadata.package
+
+if [[ "\$HOOK_NAME" == *-relation-* ]]; then
+  COOKBOOK_NAME="\${HOOK_NAME%-relation*}-relation"
+  RECIPE_NAME=\${HOOK_NAME\#*relation-}
+else
+  COOKBOOK_NAME=\$CHARM_NAME
+  RECIPE_NAME=\$HOOK_NAME
+fi
+
+cd "\$(dirname \$0)" && bundle exec chef-solo -o "recipe[\$COOKBOOK_NAME::\$RECIPE_NAME]"

=== added file 'charmtools/templates/chef/files/hooks/upgrade-charm'
--- charmtools/templates/chef/files/hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/hooks/upgrade-charm	2014-11-18 19:19:34 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/stub

=== added file 'charmtools/templates/chef/files/icon.svg'
--- charmtools/templates/chef/files/icon.svg	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/icon.svg	2014-11-18 19:19:34 +0000
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48+devel r12274"
+   sodipodi:docname="Juju_charm_icon_template.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Background"
+       id="linearGradient6461"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="970.29498"
+       x2="144"
+       y2="970.29498"
+       gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" />
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0745362"
+     inkscape:cx="18.514671"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:url(#linearGradient6461);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="PLACE YOUR PICTOGRAM HERE"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="BADGE"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       transform="translate(-340.00001,-581)"
+       id="g4394"
+       clip-path="none">
+      <g
+         id="g855">
+        <g
+           inkscape:groupmode="maskhelper"
+           id="g870"
+           clip-path="url(#clipPath873)"
+           style="opacity:0.6;filter:url(#filter891)">
+          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path844"
+             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g862">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4398"
+             sodipodi:cx="252"
+             sodipodi:cy="552.36218"
+             sodipodi:rx="12"
+             sodipodi:ry="12"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
+          <path
+             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path4400"
+             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="star"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4459"
+             sodipodi:sides="5"
+             sodipodi:cx="666.19574"
+             sodipodi:cy="589.50385"
+             sodipodi:r1="7.2431178"
+             sodipodi:r2="4.3458705"
+             sodipodi:arg1="1.0471976"
+             sodipodi:arg2="1.6755161"
+             inkscape:flatsided="false"
+             inkscape:rounded="0.1"
+             inkscape:randomized="0"
+             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 C 669.9821,591.68426 670.20862,595.55064 669.8173,595.77657 Z"
+             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'charmtools/templates/chef/files/metadata.yaml'
--- charmtools/templates/chef/files/metadata.yaml	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/metadata.yaml	2014-11-18 19:19:34 +0000
@@ -0,0 +1,17 @@
+name: $metadata.package
+summary: $metadata.summary
+maintainer: $metadata.maintainer
+description: |
+  $metadata.description
+tags:
+  - misc
+subordinate: false
+provides:
+  provides-relation:
+    interface: interface-name
+requires:
+  requires-relation:
+    interface: interface-name
+peers:
+  peer-relation:
+    interface: interface-name

=== added directory 'charmtools/templates/chef/files/tests'
=== added file 'charmtools/templates/chef/files/tests/00-setup'
--- charmtools/templates/chef/files/tests/00-setup	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/tests/00-setup	2014-11-18 19:19:34 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo add-apt-repository -y ppa:juju/stable
+sudo apt-get update
+sudo apt-get install -y amulet python-requests 

=== added file 'charmtools/templates/chef/files/tests/99-autogen'
--- charmtools/templates/chef/files/tests/99-autogen	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/files/tests/99-autogen	2014-11-18 19:19:34 +0000
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+
+import amulet
+import requests
+import unittest
+
+
+class TestDeployment(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.deployment = amulet.Deployment(series='trusty')
+
+        cls.deployment.add('$metadata.package')
+        cls.deployment.expose('$metadata.package')
+
+        try:
+            cls.deployment.setup(timeout=900)
+            cls.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+        except:
+            raise
+
+    def test_case(self):
+        # Now you can use self.deployment.sentry.unit[UNIT] to address each of
+        # the units and perform more in-depth steps.  You can also reference
+        # the first unit as self.unit.
+        # There are three test statuses that can be triggered with
+        # amulet.raise_status():
+        #   - amulet.PASS
+        #   - amulet.FAIL
+        #   - amulet.SKIP
+        # Each unit has the following methods:
+        #   - .info - An array of the information of that unit from Juju
+        #   - .file(PATH) - Get the details of a file on that unit
+        #   - .file_contents(PATH) - Get plain text output of PATH file from that unit
+        #   - .directory(PATH) - Get details of directory
+        #   - .directory_contents(PATH) - List files and folders in PATH on that unit
+        #   - .relation(relation, service:rel) - Get relation data from return service
+        #          add tests here to confirm service is up and working properly
+        # For example, to confirm that it has a functioning HTTP server:
+        #     page = requests.get('http://{}'.format(self.unit.info['public-address']))
+        #     page.raise_for_status()
+        # More information on writing Amulet tests can be found at:
+        #     https://juju.ubuntu.com/docs/tools-amulet.html
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()

=== added file 'charmtools/templates/chef/template.py'
--- charmtools/templates/chef/template.py	1970-01-01 00:00:00 +0000
+++ charmtools/templates/chef/template.py	2014-11-18 19:19:34 +0000
@@ -0,0 +1,76 @@
+#!/usr/bin/python
+#
+#    Copyright (C) 2014  Canonical Ltd.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+import os
+import os.path as path
+import time
+import shutil
+import tempfile
+
+from Cheetah.Template import Template
+from stat import ST_MODE
+
+from charmtools.generators import (
+    CharmTemplate,
+)
+
+log = logging.getLogger(__name__)
+
+
+class ChefCharmTemplate(CharmTemplate):
+
+    def create_charm(self, config, output_dir):
+        cb_path = "hooks/cookbooks/{}".format(config['metadata']['package'])
+
+        to_parse = ['metadata.yaml', 'metadata.rb', 'stub', '99-autogen']
+
+        self._copy_files(output_dir, cb_path)
+        for root, dirs, files in os.walk(output_dir):
+            for outfile in files:
+                if outfile in to_parse:
+                    self._template_file(config, path.join(root, outfile))
+
+
+    def _copy_files(self, output_dir, cb_path):
+        here = path.abspath(path.dirname(__file__))
+        template_dir = path.join(here, 'files')
+        if os.path.exists(output_dir):
+            shutil.rmtree(output_dir)
+        shutil.copytree(template_dir, output_dir)
+        self._setup_cookbook(output_dir, cb_path)
+
+    def _setup_cookbook(self, output_dir, cb_path):
+        outpath = "{}/hooks/cookbooks/charm-name".format(output_dir)
+        cb_path = "{}/{}".format(output_dir, cb_path)
+        shutil.move(outpath, cb_path)
+
+    def _template_file(self, config, outfile):
+        if path.islink(outfile):
+            return
+
+        mode = os.stat(outfile)[ST_MODE]
+        t = Template(file=outfile, searchList=(config))
+        o = tempfile.NamedTemporaryFile(
+            dir=path.dirname(outfile), delete=False)
+        os.chmod(o.name, mode)
+        o.write(str(t))
+        o.close()
+        backupname = outfile + str(time.time())
+        os.rename(outfile, backupname)
+        os.rename(o.name, outfile)
+        os.unlink(backupname)

=== modified file 'setup.py'
--- setup.py	2014-11-05 22:36:57 +0000
+++ setup.py	2014-11-18 19:19:34 +0000
@@ -61,6 +61,7 @@
             'python = charmtools.templates.python_services'
             ':PythonServicesCharmTemplate',
             'ansible = charmtools.templates.ansible:AnsibleCharmTemplate',
+            'chef = charmtools.templates.chef:ChefCharmTemplate'
         ]
     },
 )

=== modified file 'tests_functional/create/test.sh'
--- tests_functional/create/test.sh	2014-06-25 16:31:59 +0000
+++ tests_functional/create/test.sh	2014-11-18 19:19:34 +0000
@@ -55,6 +55,10 @@
 echo ===== Testing ansible charm template =====
 $PYTHON $TESTDIR/test_ansible_create.py
 
+echo ===== Testing chef charm template =====
+$PYTHON $TESTDIR/test_chef_create.py
+
+
 echo ===== All tests passed! =====
 echo PASS
 set +e

=== added file 'tests_functional/create/test_chef_create.py'
--- tests_functional/create/test_chef_create.py	1970-01-01 00:00:00 +0000
+++ tests_functional/create/test_chef_create.py	2014-11-18 19:19:34 +0000
@@ -0,0 +1,114 @@
+#!/usr/bin/python
+
+#    Copyright (C) 2014  Canonical Ltd.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import shutil
+import tempfile
+import unittest
+
+from mock import patch
+from os.path import join
+from unittest import TestCase
+
+import yaml
+
+from charmtools.create import (
+    main,
+)
+
+
+def flatten(path):
+    for root, dirs, files in os.walk(path):
+        for f in files:
+            yield join(root[len(path):], f).lstrip('/')
+
+
+class ChefCreateTest(TestCase):
+    maxDiff = None
+
+    def setUp(self):
+        self.tempdir = tempfile.mkdtemp()
+
+    def tearDown(self):
+        shutil.rmtree(self.tempdir)
+
+    def _expected_files(self):
+        static_files = [
+            'hooks/config-changed',
+            'hooks/install',
+            'hooks/start',
+            'hooks/stop',
+            'hooks/stub',
+            'hooks/Gemfile',
+            'hooks/Gemfile.lock',
+            'hooks/bootstrap',
+            'hooks/upgrade-charm',
+            'hooks/relation-name-relation-broken',
+            'hooks/relation-name-relation-changed',
+            'hooks/relation-name-relation-departed',
+            'hooks/relation-name-relation-joined',
+            'hooks/cookbooks/testcharm/metadata.rb',
+            'hooks/cookbooks/testcharm/recipes/config-changed.rb',
+            'hooks/cookbooks/testcharm/recipes/install.rb',
+            'hooks/cookbooks/testcharm/recipes/start.rb',
+            'hooks/cookbooks/testcharm/recipes/stop.rb',
+            'hooks/cookbooks/testcharm/recipes/upgrade-charm.rb',
+            'hooks/cookbooks/juju-helpers/definitions/juju_port.rb',
+            'hooks/cookbooks/juju-helpers/definitions/relation_set.rb',
+            'hooks/cookbooks/juju-helpers/libraries/juju.rb',
+            'hooks/cookbooks/juju-helpers/libraries/juju/juju_helpers_dev.rb',
+            'hooks/cookbooks/juju-helpers/libraries/juju/juju_helpers.rb',
+            'hooks/cookbooks/juju-helpers/metadata.rb',
+            'hooks/cookbooks/relation-name-relation/metadata.rb',
+            'hooks/cookbooks/relation-name-relation/recipes/broken.rb',
+            'hooks/cookbooks/relation-name-relation/recipes/changed.rb',
+            'hooks/cookbooks/relation-name-relation/recipes/departed.rb',
+            'hooks/cookbooks/relation-name-relation/recipes/joined.rb',
+            'tests/00-setup',
+            'tests/99-autogen',
+            'icon.svg',
+            'metadata.yaml',
+            'README.ex',
+            'config.yaml',
+        ]
+        return sorted(static_files)
+
+    @patch('charmtools.create.setup_parser')
+    def test_default(self, setup_parser):
+        """Test of `charm create -t chef testcharm`"""
+        class args(object):
+            charmname = 'testcharm'
+            charmhome = self.tempdir
+            template = 'chef'
+            accept_defaults = True
+            verbose = False
+
+        setup_parser.return_value.parse_args.return_value = args
+
+        main()
+
+        outputdir = join(self.tempdir, args.charmname)
+        actual_files = sorted(flatten(outputdir))
+        expected_files = self._expected_files()
+        metadata = yaml.load(open(join(outputdir, 'metadata.yaml'), 'r'))
+
+        self.assertEqual(expected_files, actual_files)
+        self.assertEqual(metadata['name'], args.charmname)
+
+
+if __name__ == '__main__':
+    unittest.main()