kitchen_hooks 1.8.11 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a190a913941d4fa5945098cbddeb223deb9d0f9c
-  data.tar.gz: 257e9cd6d1618f0fe917da0723ba8adea83d3ded
+  metadata.gz: 5575ea1aa7831c073d5d219133294149cbf061b0
+  data.tar.gz: 2918acee2bf88ef5ed323d3ce4d7ca45c04d5f16
 SHA512:
-  metadata.gz: 1aec455f78a8fdfb6a669a604953fe645b7dc3160bc3c6c5e59a9a869d47fb2ae210d7b1519f1400f5db7febc4e392dc2974f486936f7fc1973db483f9092e23
-  data.tar.gz: f4ad9302b5f12d2aa0b0ee67d6d9594a057e0d8ff2fc0edb75854f572e578e828d025fdf5b98df8f6ce6fe726566a4bea0c0d3bb45af39ee5d215589c5e51525
+  metadata.gz: 850b070cfc0efde41badfce1928e9d40593870448246a91e54271cd6ee467639ad31be6dbfaceee3a2ac374db4f4f3ffc8c52662e1b7f848e2917cbb9b425bd6
+  data.tar.gz: 590daa062aed047b1419ccbb7f6bc681008bea246e5d5f975820a2256b01bccc29aa298a2fd83fdfb240fd7268e4fbba212bc5759eed691a68638e9917d8d6a8

data/.ruby-version

@@ -1 +1 @@
-2.2.4
+2.3.0

data/Readme.md

@@ -99,6 +99,7 @@ The configuration file is just JSON. Hopefully it's obvious:
         "room": "test",
         "token": "your_v1_api_token"
       },
+      "git_protocol": "daemon",
       "knives": {
         "user": "~/.chef/knife.rb",
         "system": "/etc/chef/knife.rb",
@@ -169,4 +170,4 @@ The `server` command also exposes some options for Sinatra configuration. See
 
 #### 1.0
 
-* Initial release. Gem structure in place, but lacking functionaily
+* Initial release. Gem structure in place, but lacking functionaily

data/VERSION

@@ -1 +1 @@
-1.8.11
+2.0.0

data/etc/commit-constraint.json

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

data/etc/config.json

@@ -2,6 +2,6 @@
   "sync_interval": null,
   "hipchat": null,
   "knives": {
-    "bng11": "~/.chef/dc1.rb"
+    "chef-z": "~/.chef/chef-z.rb"
   }
 }

data/kitchen_hooks.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'hipchat', '~> 1.4.0'
   s.add_runtime_dependency 'daybreak', '~> 0.3'
   s.add_runtime_dependency 'retryable', '~> 2'
-  s.add_runtime_dependency 'berkshelf', '< 4'
+  s.add_runtime_dependency 'berkshelf', '~> 4'
   s.add_runtime_dependency 'thor', '~> 0'
   s.add_runtime_dependency 'git', '~> 1.2'
   s.add_runtime_dependency 'sinatra', '~> 1.4'
   s.add_runtime_dependency 'ridley', '~> 4.1'
-  s.add_runtime_dependency 'chef', '~> 11.14'
+  s.add_runtime_dependency 'chef', '~> 12'
   s.add_runtime_dependency 'faraday', '= 0.9.1'
   s.add_runtime_dependency 'eventmachine', '= 1.0.4'
   s.add_runtime_dependency 'thin', '= 1.6.3'

data/lib/kitchen_hooks/app.rb

@@ -10,7 +10,6 @@ require_relative 'helpers'
 require_relative 'metadata'
 
 
-
 module KitchenHooks
   class App < Sinatra::Application
     set :root, File.join(KitchenHooks::ROOT, 'web')
@@ -65,6 +64,7 @@ module KitchenHooks
         @@hipchat_nick = config['hipchat']['nick'] || raise('No HipChat "nick" provided')
         @@hipchat_room = config['hipchat']['room'] || raise('No HipChat "room" provided')
       end
+      @@git_protocol = config.fetch('git_protocol', 'daemon')
       @@knives = config['knives'].map do |_, knife|
         Pathname.new(knife).expand_path.realpath.to_s
       end
@@ -102,6 +102,7 @@ module KitchenHooks
     post '/' do
       request.body.rewind
       event = JSON::parse request.body.read rescue nil
+      event['repository']['protocol'] = @@git_protocol
       @@backlog.push event
     end
 
@@ -177,6 +178,8 @@ module KitchenHooks
 
 
     def self.process event
+      Thread.abort_on_exception = true
+
       if event.nil? # JSON parse failed
         mark event, 'failure', 'Could not parse WebHook payload'
         return
@@ -191,8 +194,19 @@ module KitchenHooks
         mark event, 'kitchen upload', possible_error
       end
 
+      if commit_to_data_bags?(event) ||
+         commit_to_environments?(event) ||
+         commit_to_roles?(event)
+        possible_error = begin
+          perform_upload_from_file event, knives
+        rescue Exception => e
+          report_error e, 'Could not perform upload from files: <i>%s</i>' % e.message.lines.first
+        end
+        mark event, 'upload from files', possible_error
+      end
+
       if tagged_commit_to_cookbook?(event) &&
-         tag_name(event) =~ /^v\d+/ # Cookbooks tagged with a version
+         tag_name(event) =~ /^v?\d+/ # Cookbooks tagged with a version
         possible_error = begin
           perform_cookbook_upload event, knives
         rescue Exception => e
@@ -212,4 +226,4 @@ module KitchenHooks
       end
     end
   end
-end
+end

data/lib/kitchen_hooks/helpers.rb

@@ -17,7 +17,6 @@ Celluloid.logger = nil
 Berkshelf.logger = Logger.new $stdout
 
 
-
 module KitchenHooks
   class App < Sinatra::Application
 
@@ -28,6 +27,7 @@ module KitchenHooks
       "#{n} #{plural}"
     end
 
+
     # http://stackoverflow.com/questions/4136248/how-to-generate-a-human-readable-time-range-using-ruby-on-rails
     def self.humanize_seconds secs
       [
@@ -53,7 +53,6 @@ module KitchenHooks
     end
 
 
-
     def self.perform_constraint_application event, knives
       $stdout.puts 'started perform_constraint_application event=%s, knives=%s' % [
         event['after'], knives.inspect
@@ -121,7 +120,11 @@ module KitchenHooks
 
       tmp_clone event, :tagged_commit do |clone|
         tagged_version = tag_name(event).delete('v')
-        cookbook_version = File.read(File.join(clone, 'VERSION')).strip
+        if File.exist? File.join(clone, 'VERSION')
+          cookbook_version = File.read(File.join(clone, 'VERSION')).strip
+        else
+          cookbook_version = File.foreach(File.join(clone, 'metadata.rb')).grep(/version/)[0][/\"(.*)\"/,1]
+        end
         unless tagged_version == cookbook_version
           raise 'Tagged version does not match cookbook version'
         end
@@ -167,6 +170,31 @@ module KitchenHooks
     end
 
 
+    def self.perform_upload_from_file event, knives
+      return false unless commit_to_master?(event)
+      $stdout.puts 'started perform_upload_from_file event=%s, knives=%s' % [
+        event['after'], knives.inspect
+      ]
+
+      tmp_clone event, :latest_commit do |clone|
+        Dir.chdir clone do
+          if commit_to_data_bags?(event)
+            data_bag_from_file repo_name(event), files_pushed(event), knives
+          end
+          if commit_to_environments?(event)
+            environment_from_file files_pushed(event), knives
+          end
+          if commit_to_roles?(event)
+            role_from_file files_pushed(event), knives
+          end
+        end
+      end
+
+      $stdout.puts "finished perform_upload_from_file: #{event['after']}"
+      return # no error
+    end
+
+
 
     def self.kitchen_upload knives
       if Dir.exist? 'data_bags'
@@ -192,8 +220,8 @@ module KitchenHooks
         knives.peach do |k|
           begin
             Dir['environments/*'].each do |e|
-              upload_environment e, k # Can't use the default logic, as we
-                                      # maintain our own pins
+              # Can't use the default logic, as we maintain our own pins
+              upload_environment e, k
             end
           rescue
             raise 'Could not upload environments'
@@ -203,6 +231,47 @@ module KitchenHooks
     end
 
 
+    def self.data_bag_from_file data_bag, items, knives
+      $stdout.puts 'Uploading data_bags'
+      begin
+        items.each do |item|
+          # Try to guess if there is one repo per data bag or
+          # all data bags are in the sub-folders in the same repo.
+          if item.split('/').length > 1
+            data_bag = item.split('/')[-2]
+          end
+          with_each_knife_do 'data bag from file ' + data_bag + ' ' + item, knives
+        end
+      rescue
+        raise 'Could not upload data bags'
+      end
+    end
+
+
+    def self.role_from_file roles, knives
+      $stdout.puts 'Uploading roles'
+      begin
+        roles.each do |role|
+          with_each_knife_do 'role from file ' + role, knives
+        end
+      rescue
+        raise 'Could not upload roles'
+      end
+    end
+
+
+    def self.environment_from_file environments, knives
+      $stdout.puts 'Uploading environments'
+      begin
+        environments.each do |environment|
+          with_each_knife_do 'environment from file ' + environment, knives
+        end
+      rescue
+        raise 'Could not upload environments'
+      end
+    end
+
+
     def self.berkshelf_config knife
       ridley = Ridley::from_chef_config knife, ssl: { verify: false }
       config = {
@@ -230,8 +299,8 @@ module KitchenHooks
       env_git_work_tree = ENV.delete 'GIT_WORK_TREE'
 
       knife_args = if knife
-        '--config %s' % Shellwords::escape(berkshelf_config knife)
-      end
+                     '--config %s' % Shellwords::escape(berkshelf_config knife)
+                   end
 
       cmd = 'berks install --debug --berksfile %s %s 2>&1' % [
         Shellwords::escape(berksfile), knife_args
@@ -286,7 +355,14 @@ module KitchenHooks
       dir = File::join root, Time.now.to_f.to_s, cookbook_name(event)
       FileUtils.mkdir_p dir
 
-      repo = Git.clone git_daemon_style_url(event), dir, log: $stdout
+      git_protocol = event['repository']['protocol']
+      if git_protocol == 'daemon'
+        git_clone_url = git_daemon_style_url(event)
+      else
+        git_clone_url = event['repository']["git_#{git_protocol}_url"]
+      end
+
+      repo = Git.clone git_clone_url, dir, log: $stdout
 
       commit = self.send(commit_method, event)
 
@@ -428,6 +504,8 @@ module KitchenHooks
         %Q| <i>#{author(event)}</i> constrained <a href="#{gitlab_tag_url(event)}">#{tag_name(event)}</a> with <a href="#{gitlab_url(event)}">#{cookbook_name(event)}</a> #{version_link event} |
       when 'release'
         %Q| Kitchen Hooks <b>v#{event}</b> released! |
+      when 'upload from files'
+        %Q| <i>#{author(event)}</i> uploaded <a href="#{gitlab_url(event)}">files</a> to chef |
       else
         raise entry.inspect
       end.strip
@@ -440,17 +518,27 @@ module KitchenHooks
       return if event.nil?
       %Q|
         <i>#{author(event)}</i> pushed #{push_details(event)}
-      |.strip
+        |.strip
     end
 
 
     def push_details e ; App.push_details e end
 
+
     def self.push_details event
       return if event.nil?
       %Q|
         <a href="#{gitlab_url(event)}">#{event['after']}</a> to <a href="#{repo_url(event)}">#{repo_name(event)}</a>
-      |.strip
+        |.strip
+    end
+
+
+    def self.files_pushed event
+      files = []
+      event.fetch('commits').each do |commit|
+        files << commit.select { |k,v| k =~ /(added|modified)/ }.values.flatten
+      end
+      files.flatten.uniq
     end
 
 
@@ -464,13 +552,37 @@ module KitchenHooks
     end
 
 
+    def self.repo_namespace event
+      event['project']['path_with_namespace'].split('/')[0] rescue nil
+    end
+
     def self.cookbook_name event
       repo_name(event).sub(/^(app|base|realm|fork)_/, 'bjn_')
     end
 
 
     def self.cookbook_repo? event
-      repo_name(event) =~ /^(app|base|realm|fork)_/
+      repo_name(event) =~ /^(app|base|realm|fork)_/ ||
+        repo_name(event) =~ /cookbook/ ||
+        repo_namespace(event) =~ /cookbook/
+    end
+
+
+    def self.data_bag_repo? event
+      repo_name(event) =~ /data.*bag/ ||
+        repo_namespace(event) =~ /data.*bag/
+    end
+
+
+    def self.environment_repo? event
+      repo_name(event) =~ /environment/ ||
+        repo_namespace(event) =~ /environment/
+    end
+
+
+    def self.role_repo? event
+      repo_name(event) =~ /role/ ||
+        repo_namespace(event) =~ /role/
     end
 
 
@@ -527,6 +639,21 @@ module KitchenHooks
     end
 
 
+    def self.commit_to_roles? event
+      role_repo?(event) && not_deleted?(event)
+    end
+
+
+    def self.commit_to_environments? event
+      environment_repo?(event) && not_deleted?(event)
+    end
+
+
+    def self.commit_to_data_bags? event
+      data_bag_repo?(event) && not_deleted?(event)
+    end
+
+
     def self.commit_to_realm? event
       repo_name(event) =~ /^realm_/
     end
@@ -534,26 +661,28 @@ module KitchenHooks
 
     def self.tagged_commit_to_cookbook? event
       cookbook_repo?(event) &&
-      event['ref'] =~ %r{/tags/} &&
-      not_deleted?(event)
+        event['ref'] =~ %r{/tags/} &&
+        not_deleted?(event)
     end
 
 
     def self.tagged_commit_to_realm? event
       tagged_commit_to_cookbook?(event) &&
-      commit_to_realm?(event)
+        commit_to_realm?(event)
     end
 
+
     def self.version_url event
       return unless v = event['version']
       url = git_daemon_style_url(event).sub(/^git/, 'http').sub(/\.git$/, '')
       "#{url}/commits/#{v}"
     end
 
+
     def self.version_link event
       return unless v = event['version']
       url = version_url(event)
       'at <a href="%s">%s</a>' % [ url, v ]
     end
   end
-end
+end

data/tasks/package/_package.sh

@@ -33,4 +33,4 @@ bundle exec fpm -n kitchen_hooks \
 # kitchen_hooks art
 
 mkdir -p $ARTIFACTS
-mv *.deb $ARTIFACTS
+mv *.deb $ARTIFACTS

data/tasks/run/Dockerfile

@@ -0,0 +1,13 @@
+FROM sczizzo/trusty-tool:latest
+MAINTAINER Sean Clemmer <sczizzo@gmail.com>
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY . /kitchen_hooks
+
+RUN mkdir -p /etc/kitchen_hooks/ && touch /etc/kitchen_hooks/app.db
+RUN ln -s /kitchen_hooks/etc/config.json /etc/config.json
+RUN cd /kitchen_hooks && bundle update && bundle package --all && rake build && rake install
+
+EXPOSE 80
+
+CMD kitchen_hooks server -c etc/config.json -p 80 -e production

data/tasks/run/run.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -x
+set -e
+
+project="$(basename `pwd`)"
+dockerfile="${2:-tasks/run/Dockerfile}"
+task_name="${3:-$project-run-$(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
+
+docker pull "$base_image"
+docker build -t "$task_name" -f "$dockerfile" .
+docker run -v ~/.chef:/root/.chef --name "$task_name" -t "$task_name"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.8.11
+  version: 2.0.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat
@@ -56,14 +56,14 @@ dependencies:
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.14'
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.14'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +238,8 @@ files:
 - tasks/package/kitchen_hooks.sh
 - tasks/package/post-install.sh
 - tasks/package/run.sh
+- tasks/run/Dockerfile
+- tasks/run/run.sh
 - tasks/test/Dockerfile
 - tasks/test/run.sh
 - test/test_helper.rb
@@ -278,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: GitLab WebHoook for automated Chef Server uploads