reagan 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6d0ac4c6953b8002c591704a429494fb946235e
-  data.tar.gz: 317e69c6027b0e9bc36b1eb0821480ca754f1f4d
+  metadata.gz: 15ec9f842a5eb1a06dd654d4f461da338026c746
+  data.tar.gz: 45f46483cf968a1df4fc629c0243a785860fe4fd
 SHA512:
-  metadata.gz: 96c72971adc53d14935b167ad37c7ec9192d975a07d330b171be8e45b1de19aff8e7099fb699178a64f813efe97366b81701b189393b6360952b2de1374e2cac
-  data.tar.gz: 56ccd982033fd749129f4c8296eac63ef4a91b0017cb703cabc7532ce60cea5ba766022a1cff35e382ea3a9f3e873fab46b2d902d397682d21542b77a35a6d0f
+  metadata.gz: 8a8ff757808d472928da7a48c2dd08acffad84bfc4515bb0067db1d4018947253e5248cf2dd2aadf50b4492c8e5cde4cb28ad90f6adede0caa8025dd17d4550f
+  data.tar.gz: 0b6c0efd5e6f93a94075130c75705a6c5ce2cb4ea18d9fb6f41f56b8bfc168c53f12302a3fcb2448348509ae048b59485141e476a32632f01f92a9493fe8da00

data/.gitignore

@@ -0,0 +1,38 @@
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+.DS_Store
+config.yml
+

data/.rubocop.yml

@@ -0,0 +1,22 @@
+AllCops:
+  Exclude:
+    - vendor/**
+
+AlignParameters:
+  Enabled: false
+CyclomaticComplexity:
+  Enabled: false
+Encoding:
+  Enabled: false
+HashSyntax:
+  Enabled: false
+LineLength:
+  Enabled: false
+MethodLength:
+  Max: 30
+NumericLiterals:
+  Enabled: false
+SingleSpaceBeforeFirstArg:
+  Enabled: false
+PerceivedComplexity:
+  Enabled: false

data/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'octokit', '~> 3.0'
+gem 'chef', '~> 11.0'
+gem 'ridley', '~> 4.0'
+gem 'rake', '~> 10.0'

data/README.md

@@ -31,11 +31,11 @@ While this app is written to be run as a Jenkins job it can also be run locally.
 source 'https://rubygems.org'
 
 gem 'chef', '~> 11.0'
-gem 'berkshelf', '~> 3.1'
+gem 'berkshelf', '~> 3.2'
 
 group :test do
-  gem 'reagan', '~> 0.4'
-  gem 'rubocop', '~> 0.26'
+  gem 'reagan', '~> 0.6'
+  gem 'rubocop', '~> 0.27'
   gem 'foodcritic', '~> 4.0'
 end
 ```

data/bin/reagan

@@ -19,31 +19,6 @@
 # load the libs
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'reagan'
-require 'optparse'
+require 'application'
 
-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.split(',')
-  end
-
-  opts.on('-p', '--pull_num 123', 'Github pull number to test') do |pull|
-    flags[:pull] = pull
-  end
-
-  opts.on('-c', '--config reagan.yml', 'Path to config file (defaults to /etc/reagan.yml)') do |config|
-    flags[:config] = config
-  end
-
-  opts.on('-h', '--help', 'Displays Help') do
-    puts opts
-    exit
-  end
-end
-
-parser.parse!
-
-Reagan.new(flags).run
+Reagan::Application.new.run

data/lib/application.rb

@@ -0,0 +1,96 @@
+# encoding: UTF-8
+#
+# Author:: Tim Smith (<tim@cozy.co>)
+# Copyright:: Copyright (c) 2014 Tim Smith
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Reagan
+  # the main class for the reagan app.  gets called by the reagan bin
+  class Application
+    require 'config'
+    require 'change'
+    require 'test_json'
+    require 'test_knife'
+    require 'test_reagan'
+    require 'test_version'
+
+    attr_accessor :config
+    def initialize
+      @@config = Reagan::Config.new.settings
+      @changes = Reagan::Change.new.files
+    end
+
+    def self.config
+      @@config
+    end
+
+    # nicely prints marques
+    def pretty_print(string)
+      puts "\n#{string}"
+      string.length.times { printf '-' }
+      puts "\n"
+    end
+
+    # 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
+
+    # 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|
+        pretty_print("Testing cookbook #{cookbook}")
+        results <<  Reagan::TestKnife.new(cookbook).test
+        results << Reagan::TestVersion.new(cookbook).test
+        results <<  Reagan::TestReagan.new(cookbook).test
+      end
+
+      %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
+      failure = results.include?(false)
+      text = failure ? 'Reagan testing has failed' : 'All Reagan tests have suceeded'
+      pretty_print(text)
+
+      # if any test failed then exit 1 so jenkins can pick up the failure
+      exit 1 if failure
+    end
+  end
+end

data/lib/change.rb

@@ -17,81 +17,99 @@
 # limitations under the License.
 
 begin
-  require 'reagan'
   require 'rubygems'
   require 'octokit'
 rescue LoadError => e
   raise "Missing gem or lib #{e}"
 end
 
-# determines changed files in the commit
-class Change < Reagan
-  attr_accessor :files
-  def initialize
-    @files = changed_files
-  end
+module Reagan
+  # determines changed files in the commit
+  class Change < Application
+    attr_accessor :files
+    def initialize
+      @config = Reagan::Change.config
+      @files = changed_files
+    end
 
-  # return hash of chef objects that have been changed
-  def changed_files
-    if @@config['flags']['override_cookbooks']
-      files_from_override
-    else
-      pull = pull_num
-      puts "Grabbing contents of pull request #{pull}\n"
-      hash_builder(query_gh(pull))
+    # return hash of chef objects that have been changed
+    def changed_files
+      if @config['flags']['override_cookbooks']
+        files_from_override
+      else
+        pull = pull_num
+        puts "Grabbing contents of pull request #{pull}\n"
+        hash_builder(query_gh(pull))
+      end
     end
-  end
 
-  # build a files hash based on the override cookbooks passed by the user
-  def files_from_override
-    files = {}
-    %w(environments roles data_bags).each { |object| files[object] = {} }
-    files['cookbooks'] = @@config['flags']['override_cookbooks']
-    files
-  end
+    # build a files hash based on the override cookbooks passed by the user
+    def files_from_override
+      files = {}
+      %w(environments roles data_bags).each { |object| files[object] = {} }
 
-  # fetch pull num from either ENV or CLI param
-  def pull_num
-    if @@config['flags']['pull']
-      pull = @@config['flags']['pull']
-    elsif ENV['ghprbPullId']
-      pull = ENV['ghprbPullId']
-    else
-      puts 'Jenkins ghprbPullId environmental variable not set or --pull option not used.  Cannot continue'
-      exit 1
+      # ensure that the passed cookbooks exist in the workspace first
+      cookbooks = []
+      @config['flags']['override_cookbooks'] .each do |cb|
+        if object_still_exists(::File.join('cookbooks/', cb))
+          cookbooks << cb
+        else
+          puts "Skipping override cookbook #{cb} as it does not exist in the workspace"
+        end
+      end
+
+      files['cookbooks'] = cookbooks
+      files
     end
-    pull
-  end
 
-  # queries github for the files that have changed
-  def query_gh(pull_num)
-    gh = Octokit::Client.new(:access_token => @@config['github']['auth_token'])
-    files_from_pull(gh.pull_request_files(@@config ['github']['repo'], pull_num))
-  end
+    # fetch pull num from either ENV or CLI param
+    def pull_num
+      if @config['flags']['pull']
+        pull = @config['flags']['pull']
+      elsif ENV['ghprbPullId']
+        pull = ENV['ghprbPullId']
+      else
+        puts 'Jenkins ghprbPullId environmental variable not set or --pull option not used.  Cannot continue'
+        exit 1
+      end
+      pull
+    end
 
-  # convert pull request response to array of changed files
-  def files_from_pull(pull_changes)
-    files = []
-    pull_changes.each do |file|
-      files << file[:filename]
+    # queries github for the files that have changed
+    def query_gh(pull_num)
+      gh = Octokit::Client.new(:access_token => @config['github']['auth_token'])
+      files_from_pull(gh.pull_request_files(@config ['github']['repo'], pull_num))
+    end
+
+    # convert pull request response to array of changed files
+    def files_from_pull(pull_changes)
+      files = []
+      pull_changes.each do |file|
+        files << file[:filename]
+      end
+      files
+    end
+
+    # check to see if the file exists in the workspace so we don't test deleted objects
+    def object_still_exists(file)
+      ::File.exist?(::File.join(@config['jenkins']['workspace_dir'],file))
     end
-    files
-  end
 
-  # builds a hash of files / cookbooks that changed based on the pull data from GH
-  def hash_builder(pull_files)
-    files = {}
-    %w(environments roles data_bags cookbooks).each { |object| files[object] = [] }
-    cookbooks = []
+    # builds a hash of files / cookbooks that changed based on the pull data from GH
+    def hash_builder(pull_files)
+      files = {}
+      %w(environments roles data_bags cookbooks).each { |object| files[object] = [] }
+      cookbooks = []
 
-    pull_files.each do |file|
-      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')
+      pull_files.each do |file|
+        files['environments'] << file && next if file.match('^environments') && object_still_exists(file)
+        files['roles'] << file && next if file.match('^roles') && object_still_exists(file)
+        files['data_bags'] << file && next if file.match('^data_bags') && object_still_exists(file)
+        cookbooks << file.split('/')[1] if  file.match('^cookbooks') && object_still_exists(::File.join('cookbooks/', file.split('/')[1]))
+      end
+      # set cookbooks array to set to dedupe list of cookbooks
+      files['cookbooks'] = cookbooks.to_set
+      files
     end
-    # set cookbooks array to set to dedupe list of cookbooks
-    files['cookbooks'] = cookbooks.to_set
-    files
   end
 end

data/lib/config.rb

@@ -18,41 +18,69 @@
 
 begin
   require 'yaml'
+  require 'optparse'
 rescue LoadError => e
   raise "Missing gem or lib #{e}"
 end
 
-# builds a single config from passed flags, yaml config, and knife.rb
-class ReaganConfig
-  attr_accessor :settings
-  def initialize(flags)
-    @flags = flags
-    @config_file = load_config_file
-    @settings = build_config
-  end
+module Reagan
+  # builds a single config from passed flags, yaml config, and knife.rb
+  class Config
+    attr_accessor :settings
+    def initialize
+      @flags = flag_parser
+      @config_file = load_config_file
+      @settings = build_config
+    end
+
+    # grabs the flags passed in via command line
+    def flag_parser
+      flags = { :pull => nil, :override_cookbooks => nil, :config => '/etc/reagan.yml' }
+      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.split(',')
+        end
+
+        opts.on('-p', '--pull_num 123', 'Github pull number to test') do |pull|
+          flags[:pull] = pull
+        end
+
+        opts.on('-c', '--config reagan.yml', 'Path to config file (defaults to /etc/reagan.yml)') do |config|
+          flags[:config] = config
+        end
+
+        opts.on('-h', '--help', 'Displays Help') do
+          puts opts
+          exit
+        end
+      end.parse!
 
-  # loads the reagan.yml config file from /etc/reagan.yml or the passed location
-  def load_config_file
-    config = YAML.load_file(@flags[:config])
-    if config == false
-      puts "ERROR: Reagan config at #{@flags[:config]} does not contain any configuration data"
+      flags
+    end
+
+    # loads the reagan.yml config file from /etc/reagan.yml or the passed location
+    def load_config_file
+      config = YAML.load_file(@flags[:config])
+      if config == false
+        puts "ERROR: Reagan config at #{@flags[:config]} does not contain any configuration data"
+        exit 1
+      end
+      config
+    rescue Errno::ENOENT
+      puts "ERROR: Cannot load Reagan config file at #{@flags[:config]}"
+      exit 1
+    rescue Psych::SyntaxError
+      puts "ERROR: Syntax error in Reagan config file at #{@flags[:config]}"
       exit 1
     end
-    config
-  rescue Errno::ENOENT
-    puts "ERROR: Cannot load Reagan config file at #{@flags[:config]}"
-    exit 1
-  rescue Psych::SyntaxError
-    puts "ERROR: Syntax error in Reagan config file at #{@flags[:config]}"
-    exit 1
-  end
 
-  # join the config file with the passed flags into a single object
-  def build_config
-    config = @config_file
-    config['flags'] = {}
-    @flags.each { |k, v| config['flags'][k.to_s] = v }
-    config
+    # join the config file with the passed flags into a single object
+    def build_config
+      config = @config_file
+      config['flags'] = {}
+      @flags.each { |k, v| config['flags'][k.to_s] = v }
+      config
+    end
   end
-
 end

data/lib/test_json.rb

@@ -22,24 +22,27 @@ rescue LoadError => e
   raise "Missing gem or lib #{e}"
 end
 
-# tests to make sure the version has been updated on the cookbook
-class  TestJSON < Reagan
-  def initialize(file)
-    @file = file
-  end
+module Reagan
+  # tests to make sure the version has been updated on the cookbook
+  class  TestJSON < Application
+    def initialize(file)
+      @config = Reagan::TestJSON.config
+      @file = file
+    end
 
-  # performs JSON format test
-  # returns  true if json can be parsed and false if it cannot
-  def test
-    puts "Running JSON parsing test:"
-    begin
-      json_file = File.read(File.join(@@config['jenkins']['workspace_dir'], @file))
-      JSON.parse(json_file)
-      success = true
-    rescue JSON::JSONError
-      success = false
+    # performs JSON format test
+    # returns  true if json can be parsed and false if it cannot
+    def test
+      puts 'Running JSON parsing test:'
+      begin
+        json_file = File.read(File.join(@config['jenkins']['workspace_dir'], @file))
+        JSON.parse(json_file)
+        success = true
+      rescue JSON::JSONError
+        success = false
+      end
+      puts success ? '    PASS: JSON parses' : '    FAIL: JSON does NOT parse'
+      success
     end
-    puts success ? "    PASS: JSON parses" : "    FAIL: JSON does NOT parse"
-    success
   end
 end

data/lib/test_knife.rb

@@ -16,20 +16,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# tests cookbooks using knife cookbook test functionality
-class TestKnife < Reagan
-  def initialize(cookbook)
-    @cookbook = cookbook
-  end
+module Reagan
+  # tests cookbooks using knife cookbook test functionality
+  class TestKnife < Application
+    def initialize(cookbook)
+      @config = Reagan::TestKnife.config
+      @cookbook = cookbook
+    end
 
-  # performs knife cookbook test
-  # returns  true if  cookbook passed or false if it failed
-  def test
-    # grab the version of the cookbook in the local metadata
-    result = system "knife cookbook test -o #{File.join(@@config['jenkins']['workspace_dir'], 'cookbooks')} #{@cookbook} > /dev/null 2>&1"
+    # performs knife cookbook test
+    # returns  true if  cookbook passed or false if it failed
+    def test
+      # grab the version of the cookbook in the local metadata
+      result = system "knife cookbook test -o #{File.join(@@config['jenkins']['workspace_dir'], 'cookbooks')} #{@cookbook} > /dev/null 2>&1"
 
-    puts 'Running knife cookbook test:'
-    puts result ? '    PASS: Knife cookbook test was successful' : '    FAIL: Knife cookbookk test was NOT successful'
-    result
+      puts 'Running knife cookbook test:'
+      puts result ? '    PASS: Knife cookbook test was successful' : '    FAIL: Knife cookbookk test was NOT successful'
+      result
+    end
   end
 end

data/lib/test_reagan.rb

@@ -16,34 +16,38 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# tests cookbooks using tests defined in reagan_test.yml files
-class TestReagan < Reagan
-  def initialize(cookbook)
-    @cookbook = cookbook
-  end
+module Reagan
+  # tests cookbooks using tests defined in reagan_test.yml files
+  class TestReagan < Application
+    def initialize(cookbook)
+      @config = Reagan::TestReagan.config
+      @cookbook = cookbook
+    end
 
-  # returns  true if tests defined in reagan_test.yml passed/don't exist or false if it failed
-  def test
-    puts 'Running reagan_test.yml defined tests:'
-    # check to see if a reagan_test.yml file exists
-    if File.exist?(File.join(@@config['jenkins']['workspace_dir'], 'cookbooks', @cookbook, 'reagan_test.yml'))
+    # returns  true if tests defined in reagan_test.yml passed/don't exist or false if it failed
+    def test
+      puts 'Running reagan_test.yml defined tests:'
+      # check to see if a reagan_test.yml file exists
+      if File.exist?(File.join(@config['jenkins']['workspace_dir'], 'cookbooks', @cookbook, 'reagan_test.yml'))
 
-      # load the reagan config file
-      reagan_def = YAML.load_file(File.join(@@config['jenkins']['workspace_dir'], 'cookbooks', @cookbook, 'reagan_test.yml'))
+        # load the reagan config file
+        reagan_def = YAML.load_file(File.join(@config['jenkins']['workspace_dir'], 'cookbooks', @cookbook, 'reagan_test.yml'))
 
-      # change into the cookbook dir so rake tests run locally
-      Dir.chdir(File.join(@@config['jenkins']['workspace_dir'], 'cookbooks', @cookbook))
+        # change into the cookbook dir so rake tests run locally
+        Dir.chdir(File.join(@config['jenkins']['workspace_dir'], 'cookbooks', @cookbook))
 
-      status = true
-      reagan_def['tests'].each do |test|
-        result = system test
-        status = false if result == false
+        status = true
+        reagan_def['tests'].each do |test|
+          puts "  reagan_test.yml test: '#{test}'"
+          result = system test
+          status = false if result == false
+        end
+        puts status ? '    PASS: reagan_test.yml test was successful' : '    FAIL: reagan_test.yml test was NOT successful'
+        status
+      else
+        puts '    SKIP: No reagan_test.yml file found in the cookbook path. Skipping test'
+        status
       end
-      puts status ? '    PASS: reagan_test.yml test was successful' : '    FAIL: reagan_test.yml test was NOT successful'
-      status
-    else
-      puts '    SKIP: No reagan_test.yml file found in the cookbook path. Skipping test'
-      status
     end
   end
 end

data/lib/test_version.rb

@@ -24,52 +24,55 @@ rescue LoadError => e
   raise "Missing gem or lib #{e}"
 end
 
-# tests to make sure the version has been updated on the cookbook
-class  TestVersion < Reagan
-  def initialize(cookbook)
-    @cookbook = cookbook
-  end
+module Reagan
+  # tests to make sure the version has been updated on the cookbook
+  class  TestVersion < Application
+    def initialize(cookbook)
+      @config = Reagan::TestVersion.config
+      @cookbook = cookbook
+    end
 
-  # grab the version of the cookbook in the local metadata
-  def check_commit_version
-    metadata = Chef::Cookbook::Metadata.new
-    metadata.from_file(File.join(@@config['jenkins']['workspace_dir'], 'cookbooks', @cookbook, 'metadata.rb'))
-    metadata.version
-  end
+    # grab the version of the cookbook in the local metadata
+    def check_commit_version
+      metadata = Chef::Cookbook::Metadata.new
+      metadata.from_file(File.join(@config['jenkins']['workspace_dir'], 'cookbooks', @cookbook, 'metadata.rb'))
+      metadata.version
+    end
 
-  # grab the most recent version of the cookbook on the chef server
-  def check_server_version
-    Ridley::Logging.logger.level = Logger.const_get 'ERROR'
-    begin
-      server_con = Ridley.new(
-          server_url: @@config['chef']['server_url'],
-          client_name: @@config['chef']['client_name'],
-          client_key: @@config['chef']['pem_path'],
-          ssl: { verify: false }
-        )
-      # 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'
+    # grab the most recent version of the cookbook on the chef server
+    def check_server_version
+      Ridley::Logging.logger.level = Logger.const_get 'ERROR'
+      begin
+        server_con = Ridley.new(
+            server_url: @config['chef']['server_url'],
+            client_name: @config['chef']['client_name'],
+            client_key: @config['chef']['pem_path'],
+            ssl: { verify: false }
+          )
+        # 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
       end
-    rescue Ridley::Errors::ConnectionFailed
-      puts '    ERROR: Failed to connect to the Chef server. Cannot continue'
-      exit 1
     end
-  end
 
-  # performs version update test
-  # returns  true if version has been rev'd and false if not
-  def test
-    commit_v = check_commit_version
-    serv_v = check_server_version
-    updated = Gem::Version.new(serv_v) < Gem::Version.new(commit_v) ? true : false
+    # performs version update test
+    # returns  true if version has been rev'd and false if not
+    def test
+      commit_v = check_commit_version
+      serv_v = check_server_version
+      updated = Gem::Version.new(serv_v) < Gem::Version.new(commit_v) ? true : false
 
-    puts "Running cookbook version rev'd test:"
-    puts "    Server version: #{serv_v}"
-    puts "    Commit version: #{commit_v}"
-    puts updated ? "    PASS: Metadata version has been rev'd" : "    FAIL: Metadata version has NOT been rev'd"
-    updated
+      puts "Running cookbook version rev'd test:"
+      puts "    Server version: #{serv_v}"
+      puts "    Commit version: #{commit_v}"
+      puts updated ? "    PASS: Metadata version has been rev'd" : "    FAIL: Metadata version has NOT been rev'd"
+      updated
+    end
   end
 end

data/reagan.gemspec

@@ -0,0 +1,25 @@
+Gem::Specification.new do |s|
+  s.name        = 'reagan'
+  s.version     = '0.7.0'
+  s.date        = Date.today.to_s
+  s.platform = Gem::Platform::RUBY
+  s.extra_rdoc_files = ['README.md', 'LICENSE']
+  s.summary     = 'Trust But Verify - Ruby build script for Jenkins that automates the testing of Chef cookbooks'
+  s.description = s.summary
+  s.authors     = ['Tim Smith']
+  s.email       = 'tim@cozy.co'
+  s.homepage    = 'http://www.github.com/tas50/reagan'
+  s.license     = 'Apache-2.0'
+
+  s.required_ruby_version = '>= 1.9.3'
+  s.add_dependency 'octokit', '~> 3.0'
+  s.add_dependency 'chef', '~> 11.0'
+  s.add_dependency 'ridley', '~> 4.0'
+  s.add_development_dependency 'rake', '~> 10.0'
+
+  s.files         = `git ls-files -z`.split("\x0")
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.require_paths = ['lib']
+  s.extra_rdoc_files = ['README.md']
+  s.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'reagan', '--main', 'README.md']
+end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: reagan
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '11.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '11.0'
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Trust But Verify - Ruby build script for Jenkins that automates the testing
@@ -74,19 +74,22 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.md
-- LICENSE
 files:
+- .gitignore
+- .rubocop.yml
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/reagan
+- lib/application.rb
 - lib/change.rb
 - lib/config.rb
-- lib/reagan.rb
 - lib/test_json.rb
 - lib/test_knife.rb
 - lib/test_reagan.rb
 - lib/test_version.rb
+- reagan.gemspec
 - reagan.yml.EXAMPLE
 - reagan_test.yml.EXAMPLE
 homepage: http://www.github.com/tas50/reagan
@@ -94,25 +97,30 @@ licenses:
 - Apache-2.0
 metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- --line-numbers
+- --inline-source
+- --title
+- reagan
+- --main
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Trust But Verify - Ruby build script for Jenkins that automates the testing
   of Chef cookbooks
 test_files: []
-has_rdoc: 

data/lib/reagan.rb

@@ -1,90 +0,0 @@
-# encoding: UTF-8
-#
-# Author:: Tim Smith (<tim@cozy.co>)
-# Copyright:: Copyright (c) 2014 Tim Smith
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# the main class for the reagan app.  gets called by the reagan bin
-class Reagan
-  require 'config'
-  require 'change'
-  require 'test_knife'
-  require 'test_version'
-  require 'test_reagan'
-  require 'test_json'
-
-  attr_accessor :config
-  def initialize(flags)
-    @@config = ReaganConfig.new(flags).settings
-    @changes = Change.new.files
-  end
-
-  # nicely prints marques
-  def pretty_print(string)
-    puts "\n#{string}"
-    string.length.times { printf '-' }
-    puts "\n"
-  end
-
-  # 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
-
-  # 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|
-      pretty_print("Testing cookbook #{cookbook}")
-      results <<  TestKnife.new(cookbook).test
-      results << TestVersion.new(cookbook).test
-      results <<  TestReagan.new(cookbook).test
-    end
-
-    %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
-    failure = results.include?(false)
-    text = failure ? 'Reagan testing has failed' : 'All Reagan tests have suceeded'
-    pretty_print(text)
-
-    # if any test failed then exit 1 so jenkins can pick up the failure
-    exit 1 if failure
-  end
-end