reagan 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38f1709f20a9992d8685abf028ab706efc1fd584
-  data.tar.gz: a20e5db170d66837c2711e3c9aae10f35616d885
+  metadata.gz: e6d0ac4c6953b8002c591704a429494fb946235e
+  data.tar.gz: 317e69c6027b0e9bc36b1eb0821480ca754f1f4d
 SHA512:
-  metadata.gz: f112be2741f0cd51aaa0db555f011024edaa6d5403d9e59ed58b687c7f65acdb21c386011da6508da874d1e386d5a03c0a87e58bc134b2912557abbf5b0a9db7
-  data.tar.gz: 399fc3e48f8c2d483eed5fb991f38cacbc54d22d3831ccace9871e68c529257f6eeb5b7ceef6c9af39cb227dd0e5dcae81b9e5074b0c008073c9344a72f2a4e2
+  metadata.gz: 96c72971adc53d14935b167ad37c7ec9192d975a07d330b171be8e45b1de19aff8e7099fb699178a64f813efe97366b81701b189393b6360952b2de1374e2cac
+  data.tar.gz: 56ccd982033fd749129f4c8296eac63ef4a91b0017cb703cabc7532ce60cea5ba766022a1cff35e382ea3a9f3e873fab46b2d902d397682d21542b77a35a6d0f

data/README.md

@@ -1,11 +1,12 @@
 reagan
 ======
 
-Trust But Verify - Ruby Jenkins build script that automates the testing of individual Chef cookbooks in a monolithic chef-repo.  Reagan allows you to test only the cookbooks that have changed in a particular pull request and includes the following tests:
+Trust But Verify - Ruby Jenkins build script that automates the testing of individual items in a monolithic chef-repo.  Reagan allows you to test only the cookbooks or roles/environments that have changed in a particular pull request and includes the following tests:
 
 * Ensure versions are bumped in cookbooks vs. the  current version on the server
 * Validate ruby / templates according to knife cookbook test
 * Optionally run any commands in a per cookbook reagan_test.yml file (rubocop? foodcritic? chefspec?)
+* Validate that JSON files parse
 
 ##Requirements
 * Ruby 1.9.3 (rbenv Jenkins plugin suggested to get more modern Ruby)

data/bin/reagan

@@ -22,12 +22,12 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'reagan'
 require 'optparse'
 
-flags = { :pull => nil, :cookbooks => nil, :config => '/etc/reagan.yml' }
+flags = { :pull => nil, :override_cookbooks => nil, :config => '/etc/reagan.yml' }
 
 parser = OptionParser.new do |opts|
   opts.banner = 'Usage: reagan [options]'
   opts.on('-o', '--override cb1,cb2', 'Comma separated list of cookbooks to test') do |cookbooks|
-    flags[:override_cookbooks] = cookbooks
+    flags[:override_cookbooks] = cookbooks.split(',')
   end
 
   opts.on('-p', '--pull_num 123', 'Github pull number to test') do |pull|

data/lib/change.rb

@@ -28,11 +28,11 @@ end
 class Change < Reagan
   attr_accessor :files
   def initialize
-    @files = files_to_test
+    @files = changed_files
   end
 
-  # return hash of json files / cookbooks that have been changed
-  def files_to_test
+  # return hash of chef objects that have been changed
+  def changed_files
     if @@config['flags']['override_cookbooks']
       files_from_override
     else
@@ -45,8 +45,8 @@ class Change < Reagan
   # build a files hash based on the override cookbooks passed by the user
   def files_from_override
     files = {}
-    files['json'] = []
-    files['cookbooks'] = @@config['flags']['override_cookbooks'].split(',')
+    %w(environments roles data_bags).each { |object| files[object] = {} }
+    files['cookbooks'] = @@config['flags']['override_cookbooks']
     files
   end
 
@@ -81,16 +81,14 @@ class Change < Reagan
   # builds a hash of files / cookbooks that changed based on the pull data from GH
   def hash_builder(pull_files)
     files = {}
-    files['json'] = []
-    files['cookbooks'] = []
+    %w(environments roles data_bags cookbooks).each { |object| files[object] = [] }
     cookbooks = []
 
     pull_files.each do |file|
-      # populate json array if file is json
-      files['json'] << file && next if file.match('.json$')
-
-      # populate cookbooks array if filename starts with cookbooks
-      cookbooks << file.split('/')[1]   if  file.match('^cookbooks')
+      files['environments'] << file && next if file.match('^environments')
+      files['roles'] << file && next if file.match('^roles')
+      files['data_bags'] << file && next if file.match('^data_bags')
+      cookbooks << file.split('/')[1] if  file.match('^cookbooks')
     end
     # set cookbooks array to set to dedupe list of cookbooks
     files['cookbooks'] = cookbooks.to_set

data/lib/config.rb

@@ -54,4 +54,5 @@ class ReaganConfig
     @flags.each { |k, v| config['flags'][k.to_s] = v }
     config
   end
+
 end

data/lib/reagan.rb

@@ -38,17 +38,31 @@ class Reagan
     puts "\n"
   end
 
-  # run tests on each changed cookbook
-  def run
-    # exit with a friendly message if nothing we test has been changed
-    if @changes['json'].empty? && @changes['cookbooks'].empty?
-      pretty_print('Nothing to test in this change. Reagan approves')
+  # exit with a friendly message if nothing we test has been changed
+  def check_empty_update
+    objects_updated = false
+    %w(cookbooks roles environments data_bags).each do |object|
+      objects_updated = true unless @changes[object].empty?
+    end
+
+    unless objects_updated
+      pretty_print('No objects to test. Exiting')
       exit 0
     end
+  end
 
-    pretty_print('The following cookbooks & json files will be tested')
-    @changes['cookbooks'].each { |cb| puts cb }
-    @changes['json'].each { |json| puts json }
+  # run tests on each changed cookbook
+  def run
+    check_empty_update
+
+    # print objects that will be tested
+    pretty_print('The following chef objects will be tested')
+    %w(cookbooks roles environments data_bags).each do |type|
+      unless @changes[type].empty?
+        puts "#{type}:"
+        @changes[type].each { |obj| puts '  ' + obj }
+      end
+    end
 
     results = []
     @changes['cookbooks'].each do |cookbook|
@@ -57,9 +71,12 @@ class Reagan
       results << TestVersion.new(cookbook).test
       results <<  TestReagan.new(cookbook).test
     end
-    @changes['json'].each do |file|
-      pretty_print("Testing JSON file #{file}")
-      results <<  TestJSON.new(file).test
+
+    %w(data_bags roles environments).each do |type|
+      @changes[type].each do |file|
+        pretty_print("Testing #{type} file #{file}")
+        results <<  TestJSON.new(file).test
+      end
     end
 
     # print success or failure

data/lib/test_version.rb

@@ -47,7 +47,12 @@ class  TestVersion < Reagan
           client_key: @@config['chef']['pem_path'],
           ssl: { verify: false }
         )
-      server_con.cookbook.all[@cookbook][0]
+      # return the version if the cookbook exists or return 0.0.0 if it's a new coobook not yet on the server
+      if server_con.cookbook.all[@cookbook]
+        server_con.cookbook.all[@cookbook][0]
+      else
+        '0.0.0'
+      end
     rescue Ridley::Errors::ConnectionFailed
       puts '    ERROR: Failed to connect to the Chef server. Cannot continue'
       exit 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reagan
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit