kitchen_hooks 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b0ac3ae55aa7859adfdc6be8f29a6c417158c96
-  data.tar.gz: bf85a50a43051952e62cd1d3fb4d4ddabeb734b6
+  metadata.gz: 3d67d86082ea4febb73e0ad4aaed12aedb0f65d9
+  data.tar.gz: 22a9ea6b945b504861da5f7cd8a46a9c253b6165
 SHA512:
-  metadata.gz: dfc2412306dea44afb63c7e5f46d9da747df1dda322d7e71e4078a0d696a34531b7a44a6239988eac1669d5d3f774834cc7d145bc8bb76353e3d496925fb1ebf
-  data.tar.gz: 54b6287f4a956149db97ab804d0513fb52cde1b49c75ef78575697550ef83b70b4448e18871fc8f9330946ef6fb49b84c18f8cff166b9ed7893a7d01800d33a0
+  metadata.gz: 91ffbb5eae7d78774041e0e026ab32a712b8f88f9c4e77af7ee703f574912588b233aefbbbfa77393d736e07260bafdb8a6d042e8e0dbc33c98f0b81ba2b64ca
+  data.tar.gz: cc824c2924c0cc38b03f88c025981d3ce3c21bdf450d7d50a049a31470b86ef9d2b9322d1e37459ab50b7942e080cc218f23e0d5cc6f3f9042d1c34fcf8e9f9d

data/.gitignore

@@ -14,4 +14,9 @@
 doc
 pkg
 tmp
-Gemfile.lock
+Gemfile.lock
+.vagrant
+vendor
+artifacts
+reports
+coverage

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
+  gem 'fpm'
   gem 'pry'
   gem 'rake'
   gem 'yard'
@@ -13,4 +14,8 @@ end
 
 group :test do
   gem 'minitest'
+  gem 'ci_reporter'
+  gem 'ci_reporter_minitest'
+  gem 'simplecov', require: false
+  gem 'simplecov-cobertura', github: 'sczizzo/simplecov-cobertura'
 end

data/Rakefile

@@ -1,5 +1,5 @@
+require 'ci/reporter/rake/minitest'
 require 'shellwords'
-require 'rubygems'
 require 'bundler'
 require 'rake'
 
@@ -12,7 +12,17 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test
+
+task minitest: %w[ ci:setup:minitest test ]
+
+task :report do
+  %W[ minitest yard ].each do |task_name|
+    sh "bundle exec rake #{task_name}" do
+      # Ignore errors
+    end
+  end
+end
 
 
 # "rake yard"

data/VERSION

@@ -1 +1 @@
-1.8.5
+1.8.6

data/Vagrantfile

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+Vagrant.configure('2') do |config|
+  config.vm.provider :virtualbox do |vbox|
+    vbox.customize [ 'modifyvm', :id, '--memory', 4096 ]
+    vbox.customize [ 'modifyvm', :id, '--cpus', 4 ]
+  end
+
+  config.vm.define 'precise-test' do |node|
+    node.vm.box = 'bento/ubuntu-12.04'
+    node.vm.hostname = 'test'
+    node.vm.network :private_network, ip: '10.10.10.10'
+    node.vm.provision :shell, inline: <<-END
+      set -x
+      set -e
+      RUBY_VERSION=2.2
+
+      if ! hash ruby >/dev/null 2>&1 ; then
+        apt-get update
+        apt-get install -y make build-essential autoconf
+        apt-get install -y vim htop curl git
+        apt-get install -y libxml2-dev libxslt1-dev
+        apt-get install -y software-properties-common python-software-properties
+        apt-add-repository -y ppa:brightbox/ruby-ng
+        apt-get update
+        apt-get install -y "ruby${RUBY_VERSION}" "ruby${RUBY_VERSION}-dev"
+        apt-get install -y ruby-switch
+        ruby-switch --set "ruby${RUBY_VERSION}"
+      fi
+
+      dpkg -i /vagrant/tasks/package/artifacts/*.deb
+      kitchen_hooks art
+    END
+  end
+
+  config.vm.define 'trusty-test' do |node|
+    node.vm.box = 'bento/ubuntu-14.04'
+    node.vm.hostname = 'test'
+    node.vm.network :private_network, ip: '10.10.10.11'
+    node.vm.provision :shell, inline: <<-END
+      set -x
+      set -e
+      RUBY_VERSION=2.2
+
+      if ! hash ruby >/dev/null 2>&1 ; then
+        apt-get update
+        apt-get install -y make build-essential autoconf
+        apt-get install -y vim htop curl git
+        apt-get install -y libxml2-dev libxslt1-dev
+        apt-get install -y software-properties-common
+        apt-add-repository -y ppa:brightbox/ruby-ng
+        apt-get update
+        apt-get install -y "ruby${RUBY_VERSION}" "ruby${RUBY_VERSION}-dev"
+        apt-get install -y ruby-switch
+        ruby-switch --set "ruby${RUBY_VERSION}"
+      fi
+
+      dpkg -i /vagrant/tasks/package/artifacts/*.deb
+      kitchen_hooks art
+    END
+  end
+end

data/etc/commit-constraint.json

@@ -1,7 +1,7 @@
 {
   "before": "08f20548e398f634979047d0c8114260bcc2949a",
   "after": "0835e7c74314cfe2aa9f98fe47338031b637ef95",
-  "ref": "refs/tags/bjn_catalyst_pilot",
+  "ref": "refs/tags/bjn_catalyst_bogus",
   "user_id": 645,
   "user_name": "Sean Clemmer",
   "repository": {

data/kitchen_hooks.gemspec

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path(File.join('..', 'lib'), __FILE__)
 require 'kitchen_hooks/metadata'
+require 'find'
 
 Gem::Specification.new do |s|
   s.name        = 'kitchen_hooks'

data/lib/kitchen_hooks/helpers/sync_servers.rb

@@ -45,8 +45,8 @@ private
       end
 
       nodes.map do |n|
-        c = clients.select { |c| c.name == n.name }.shift
-        @clients[n.name] = c unless c.nil?
+        client = clients.select { |c| c.name == n.name }.shift
+        @clients[n.name] = client unless client.nil?
         n
       end
     end.flatten

data/lib/kitchen_hooks/helpers.rb

@@ -65,6 +65,13 @@ module KitchenHooks
           $stdout.puts 'Applying constraints'
           constraints = lockfile_constraints 'Berksfile.lock'
           environment = tag_name event
+
+          environments = Dir['environments/*.json'].map { |f| File.basename f, '.json' }
+          unless environments.include?(environment)
+            $stderr.puts 'WARNING: No local environment: %s' % environment
+            next
+          end
+
           knives.peach do |k|
             apply_constraints constraints, environment, k
             verify_constraints constraints, environment, k
@@ -83,6 +90,10 @@ module KitchenHooks
 
       $stdout.puts "finished perform_constraint_application: #{event['after']}"
       return # no error
+
+    rescue Git::GitExecuteError
+      $stderr.puts 'WARNING: Could not check out tagged commit'
+      return false
     end
 
 
@@ -451,7 +462,7 @@ module KitchenHooks
 
 
     def self.cookbook_name event
-      repo_name(event).sub /^(app|base|realm|fork)_/, 'bjn_'
+      repo_name(event).sub(/^(app|base|realm|fork)_/, 'bjn_')
     end
 
 

data/tasks/package/Dockerfile

@@ -0,0 +1,9 @@
+FROM sczizzo/trusty-tool:latest
+MAINTAINER Sean Clemmer <sczizzo@gmail.com>
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY . /build
+
+RUN cd /build && /build/tasks/package/_package.sh /artifacts
+
+VOLUME /artifacts

data/tasks/package/_package.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+set -x
+set -e
+
+ARTIFACTS="${1:-artifacts}"
+
+ruby=ruby2.2
+version=$(cat VERSION)
+
+rm -rf doc
+rm -rf etc
+rm -rf tmp
+rm -rf .bundle
+rm -rf .vagrant
+rm -rf vendor
+rm -rf pkg
+mkdir -p pkg
+
+bundle update
+bundle package --all
+
+bundle exec fpm -n kitchen_hooks \
+  --after-install tasks/package/post-install.sh \
+  --after-upgrade tasks/package/post-install.sh \
+  -d "$ruby" -d "$ruby-dev" -d git \
+  -s dir -t deb -v "$version" \
+  tasks/package/kitchen_hooks.sh=/usr/local/bin/kitchen_hooks \
+  ./=/opt/kitchen_hooks
+
+# gem uninstall -aIx
+# dpkg -i *.deb
+# ls -la /opt/kitchen_hooks
+# kitchen_hooks art
+
+mkdir -p $ARTIFACTS
+mv *.deb $ARTIFACTS

data/tasks/package/kitchen_hooks.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+KITCHEN_HOOKS_RUBY="${KITCHEN_HOOKS_RUBY:-/usr/bin/ruby2.2}"
+KITCHEN_HOOKS_ROOT="${KITCHEN_HOOKS_ROOT:-/opt/kitchen_hooks}"
+export BUNDLE_GEMFILE="$KITCHEN_HOOKS_ROOT/Gemfile"
+unset BUNDLE_IGNORE_CONFIG
+exec "$KITCHEN_HOOKS_RUBY" -rbundler/setup "$KITCHEN_HOOKS_ROOT/bin/kitchen_hooks" $@

data/tasks/package/post-install.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+
+project=kitchen_hooks
+
+if ! hash bundle ; then
+  echo 'Could not run `bundle`, fixing that for you...'
+  gem install bundler || gem2.2 install bundler
+fi
+
+cd /opt/$project
+bundle install --without development:test:spec --local --deployment
+
+useradd --user-group --system -M --shell /bin/false $project || true
+
+for d in /opt/$project /etc/$project /var/log/$project /var/data/$project ; do
+  mkdir -p $d
+  chown -R $project:$project $d
+done

data/tasks/package/run.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -x
+set -e
+
+project="$(basename `pwd`)"
+artifacts="${1:-tasks/package/artifacts}"
+dockerfile="${2:-tasks/package/Dockerfile}"
+task_name="${3:-$project-package-$(date +%s)}"
+base_image="$(grep '^FROM' "$dockerfile" | awk '{ print $2 }')"
+
+cleanup() {
+  docker stop "$task_name"
+  docker rm "$task_name"
+  docker rmi "$task_name"
+}
+
+trap cleanup EXIT
+
+rm -rf "$artifacts"
+docker pull "$base_image"
+docker build -t "$task_name" -f "$dockerfile" .
+docker run --name "$task_name" -dt "$task_name"
+docker cp "$task_name":/artifacts "$artifacts"

data/tasks/test/Dockerfile

@@ -0,0 +1,16 @@
+FROM sczizzo/trusty-tool:latest
+MAINTAINER Sean Clemmer <sczizzo@gmail.com>
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY . /build
+
+RUN cd /build \
+ && touch .docker \
+ && bundle update \
+ && bundle exec rake report \
+ && mkdir -p /reports/test \
+ && mv doc /reports \
+ && mv coverage /reports \
+ && mv test/reports/* /reports/test
+
+VOLUME /reports

data/tasks/test/run.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -x
+set -e
+
+project="$(basename `pwd`)"
+reports="${1:-tasks/test/reports}"
+dockerfile="${2:-tasks/test/Dockerfile}"
+task_name="${3:-$project-test-$(date +%s)}"
+base_image="$(grep '^FROM' "$dockerfile" | awk '{ print $2 }')"
+
+cleanup() {
+  docker stop "$task_name"
+  docker rm "$task_name"
+  docker rmi "$task_name"
+}
+
+trap cleanup EXIT
+
+rm -rf "$reports"
+docker pull "$base_image"
+docker build -t "$task_name" -f "$dockerfile" .
+docker run --name "$task_name" -dt "$task_name"
+docker cp "$task_name":/reports "$reports"

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+require 'simplecov'
+require 'simplecov-cobertura'
+SimpleCov.formatters = [
+  SimpleCov::Formatter::HTMLFormatter,
+  SimpleCov::Formatter::CoberturaFormatter
+]
+SimpleCov.start

data/test/test_kitchen_hooks.rb

@@ -0,0 +1,19 @@
+require 'minitest/autorun'
+
+require_relative 'test_helper'
+require_relative '../lib/kitchen_hooks'
+
+Thread.abort_on_exception = true
+
+
+class TestKitchenHooks < MiniTest::Test
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_fails
+    assert false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat
@@ -219,6 +219,7 @@ files:
 - Rakefile
 - Readme.md
 - VERSION
+- Vagrantfile
 - bin/kitchen_hooks
 - etc/commit-constraint.json
 - etc/commit-cookbook.json
@@ -231,6 +232,15 @@ files:
 - lib/kitchen_hooks/helpers/sync_servers.rb
 - lib/kitchen_hooks/main.rb
 - lib/kitchen_hooks/metadata.rb
+- tasks/package/Dockerfile
+- tasks/package/_package.sh
+- tasks/package/kitchen_hooks.sh
+- tasks/package/post-install.sh
+- tasks/package/run.sh
+- tasks/test/Dockerfile
+- tasks/test/run.sh
+- test/test_helper.rb
+- test/test_kitchen_hooks.rb
 - web/app/kitchen_hooks.js
 - web/app/style/kitchen_hooks.css
 - web/public/favicon.ico
@@ -271,4 +281,6 @@ rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: GitLab WebHoook for automated Chef Server uploads
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/test_kitchen_hooks.rb