reagan 0.8.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eb97fa712f2fce7de36576bdf54675b9ce31096
-  data.tar.gz: 516b0b9d1bae8c38a964361b8739f2a1c8301d2b
+  metadata.gz: 1cd896de4c2788114697c7ff8df89e864324d2b0
+  data.tar.gz: 59f8878ea5836ef1f887553a2c8bedd2e9abfd06
 SHA512:
-  metadata.gz: da189f2e45bae76d189c552725361d81311c4681be7c67b5b9ac717615b796393bde0002adbbcd39e83b918d6c29af450930d72f89210911b67b2362d3655669
-  data.tar.gz: 08cad4868acceff00afbf192b4a355c37f1c685be97391ade08e8ceab01335ddb78bf9d1ff61abe9477e66b271742e895e3c85761ffc724ab306fe1f48d760c3
+  metadata.gz: 13f87c4a768d237e634f8b1b556709b3d0c412d3e6f6d787870c37926d4cff43f175362de90428d1f4717357303545f6873a1f2d2f1f4e98d108943c4377170a
+  data.tar.gz: b6d4738eb02e1f04eea2a34b3fc95e5a8e9e70af97e1db37c36a07a1386013a80f5b8cacd2ec925bd5b3b3dd8650547635f181c5c49098d5d333f7cd8117e53c

data/.rubocop.yml

@@ -1,24 +1,18 @@
-AllCops:
-  Exclude:
-    - vendor/**
-
-AlignParameters:
-  Enabled: false
-CyclomaticComplexity:
-  Enabled: false
-Encoding:
-  Enabled: false
-HashSyntax:
+AbcSize:
   Enabled: false
-LineLength:
+
+Documentation:
   Enabled: false
+
 MethodLength:
   Enabled: false
-Metrics/AbcSize:
-  Enabled: false
-NumericLiterals:
-  Enabled: false
-SingleSpaceBeforeFirstArg:
+
+LineLength:
   Enabled: false
+
 PerceivedComplexity:
   Enabled: false
+
+CyclomaticComplexity:
+  Enabled: false
+

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-- 1.9.3
 - 2.1.5
 - 2.2.0
 script:

data/Gemfile

@@ -1,10 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'octokit', '~> 3.0'
-gem 'chef', '>= 11.0'
-gem 'ridley', '~> 4.0'
-
-group :test do
-  gem 'rubocop', '~> 0.28.0'
-  gem 'rake', '~> 10.0'
-end
+gemspec

data/README.md

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

data/bin/reagan

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 #
 # Author:: Tim Smith (<tim@cozy.co>)
 # Copyright:: Copyright (c) 2015 Tim Smith
@@ -19,6 +20,6 @@
 # load the libs
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'application'
+require 'reagan'
 
-Reagan::Application.new.run
+Reagan.run

data/lib/core/ext/string.rb

@@ -0,0 +1,35 @@
+# encoding: UTF-8
+#
+# Author:: Tim Smith (<tim@cozy.co>)
+# Copyright:: Copyright (c) 2014-2015 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.
+
+# add a simple method for making marquees
+class String
+  def marquee
+    puts "\n#{self}"
+    length.times { printf '-' }
+    puts "\n"
+  end
+
+  def to_red
+    "\033[31m#{self}\033[0m"
+  end
+
+  def indent(double_space_count = 1)
+    double_space_count.times { insert(0, '  ') }
+    self
+  end
+end

data/lib/reagan.rb

@@ -0,0 +1,82 @@
+# encoding: UTF-8
+#
+# Author:: Tim Smith (<tim@cozy.co>)
+# Copyright:: Copyright (c) 2014-2015 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.
+
+# main Reagan application to which gathers configs, determines changes, and runs tests
+module Reagan
+  require 'core/ext/string'
+  require 'reagan/config'
+  require 'reagan/changeset'
+  require 'reagan/test_json'
+  require 'reagan/test_knife'
+  require 'reagan/test_reagan'
+  require 'reagan/test_version'
+
+  # exit with a friendly message if nothing we test has been changed
+  def self::check_empty_update
+    if ChangeSet.empty?
+      'No objects to test. Exiting'.marquee
+      exit 0
+    end
+  end
+
+  # check and see if the -p flag was passed and if so print the config hash
+  def self::check_print_config
+    return unless Config.settings['flags']['print_config']
+    'Current config file / CLI flag values'.marquee
+    Config.pretty_print
+    exit 0
+  end
+
+  # run tests on each changed cookbook
+  def self::run
+    check_print_config
+    check_empty_update
+
+    # print objects that will be tested
+    'The following chef objects will be tested'.marquee
+    %w(cookbooks roles environments data_bags).each do |type|
+      unless ChangeSet.files[type].empty?
+        puts "#{type}:"
+        ChangeSet.files[type].each { |obj| puts '  ' + obj }
+      end
+    end
+
+    results = []
+    ChangeSet.files['cookbooks'].each do |cookbook|
+      "Testing cookbook #{cookbook}".marquee
+      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|
+      ChangeSet.files[type].each do |file|
+        "Testing #{type} file #{file}".marquee
+        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'
+    text.to_red.marquee
+
+    # if any test failed then exit 1 so jenkins can pick up the failure
+    exit 1 if failure
+  end
+end

data/lib/{change.rb → reagan/changeset.rb}

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #
 # Author:: Tim Smith (<tim@cozy.co>)
-# Copyright:: Copyright (c) 2014 Tim Smith
+# Copyright:: Copyright (c) 2014-2015 Tim Smith
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,6 @@
 # limitations under the License.
 
 begin
-  require 'rubygems'
   require 'octokit'
 rescue LoadError => e
   raise "Missing gem or lib #{e}"
@@ -25,32 +24,40 @@ end
 
 module Reagan
   # determines changed files in the commit
-  class Change < Application
-    attr_accessor :files
-    def initialize
-      @config = Reagan::Change.config
-      @files = changed_files
+  class ChangeSet
+    def self::files
+      @files ||= changed_files
     end
 
     # return hash of chef objects that have been changed
-    def changed_files
-      if @config['flags']['override_cookbooks']
+    def self::changed_files
+      if Config.settings['flags']['override_cookbooks']
         files_from_override
       else
-        pull = pull_num
+        pull = Config.settings['flags']['pull']
         puts "Grabbing contents of pull request #{pull}\n"
         hash_builder(query_gh(pull))
       end
     end
 
+    # check if the changeset is empty
+    def self::empty?
+      objects_updated = false
+      %w(cookbooks roles environments data_bags).each do |object|
+        objects_updated = true unless files[object].empty?
+        puts files
+      end
+      !objects_updated
+    end
+
     # build a files hash based on the override cookbooks passed by the user
-    def files_from_override
+    def self::files_from_override
       files = {}
       %w(environments roles data_bags).each { |object| files[object] = {} }
 
       # ensure that the passed cookbooks exist in the workspace first
       cookbooks = []
-      @config['flags']['override_cookbooks'] .each do |cb|
+      Config.settings['flags']['override_cookbooks'].each do |cb|
         if object_still_exists(::File.join('cookbooks/', cb))
           cookbooks << cb
         else
@@ -62,29 +69,19 @@ module Reagan
       files
     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
-
     # queries github for the files that have changed
-    def query_gh(pull_num)
+    def self::query_gh(pull_num)
       Octokit.auto_paginate = true # avoids issues with large commits
-      Octokit.api_endpoint = @config['github']['api_endpoint'] || 'https://api.github.com'
-      gh = Octokit::Client.new(:access_token => @config['github']['auth_token'])
-      files_from_pull(gh.pull_request_files(@config ['github']['repo'], pull_num))
+      Octokit.api_endpoint = Config.settings['github']['api_endpoint'] || 'https://api.github.com'
+      gh = Octokit::Client.new(access_token: Config.settings['github']['auth_token'])
+      files_from_pull(gh.pull_request_files(Config.settings['github']['repo'], pull_num))
+      rescue
+        puts 'Failed to query pull request contents from Github. Check the api_endpoint, repo, and token.'
+        exit 1
     end
 
     # convert pull request response to array of changed files
-    def files_from_pull(pull_changes)
+    def self::files_from_pull(pull_changes)
       files = []
       pull_changes.each do |file|
         files << file[:filename]
@@ -93,12 +90,12 @@ module Reagan
     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))
+    def self::object_still_exists(file)
+      ::File.exist?(::File.join(Config.settings['jenkins']['workspace_dir'], file))
     end
 
     # builds a hash of files / cookbooks that changed based on the pull data from GH
-    def hash_builder(pull_files)
+    def self::hash_builder(pull_files)
       files = {}
       %w(environments roles data_bags cookbooks).each { |object| files[object] = [] }
       cookbooks = []

data/lib/reagan/config.rb

@@ -0,0 +1,139 @@
+# encoding: UTF-8
+#
+# Author:: Tim Smith (<tim@cozy.co>)
+# Copyright:: Copyright (c) 2014-2015 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.
+
+begin
+  require 'yaml'
+  require 'optparse'
+rescue LoadError => e
+  raise "Missing gem or lib #{e}"
+end
+
+module Reagan
+  # builds a single config from passed flags, yaml config, and knife.rb
+  class Config
+    # lazy load config settings
+    def self::settings
+      @settings ||= merge_config
+    end
+
+    # pretty print the config hash
+    def self::pretty_print(hash = nil, spaces = 0)
+      hash = @settings if hash.nil?
+      hash.each do |k, v|
+        spaces.times { print ' ' }
+        print k.to_s + ': '
+        if v.class == Hash
+          print "\n"
+          pretty_print(v, spaces + 2)
+        else
+          puts v
+        end
+      end
+    end
+
+    # grabs the flags passed in via command line
+    def self::cli_flags
+      if @cli_flags
+        @cli_flags
+      else
+        flags = { 'config' => '/etc/reagan.yml' }
+        OptionParser.new do |opts|
+          opts.banner = 'Usage: reagan [options]'
+          opts.on('-o', '--override cb1,cb2', Array, 'Comma separated list of cookbooks to test') do |cookbooks|
+            flags[:override_cookbooks] = cookbooks
+          end
+
+          opts.on('-p', '--print', 'Print the config options that will be used') do |config|
+            flags['print_config'] = config
+          end
+
+          opts.on('-p', '--pull_num 123', Integer, '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!
+
+        @cli_flags = flags
+        flags
+      end
+    end
+
+    # loads the reagan.yml config file from /etc/reagan.yml or the passed location
+    def self::config_file
+      config = YAML.load_file(cli_flags['config'])
+
+      config
+      rescue Errno::ENOENT
+        puts "ERROR: Cannot load Reagan config file at #{cli_flags['config']}".to_red
+        exit 1
+      rescue Psych::SyntaxError
+        puts "ERROR: Syntax error in Reagan config file at #{cli_flags['config']}".to_red
+        exit 1
+    end
+
+    # make sure the config was properly loaded and contains the various keys we need
+    def self::validate
+      settings = Config.Settings
+
+      if settings == false
+        puts "ERROR: Reagan config at #{cli_flags['config']} does not contain any configuration data".to_red
+        exit 1
+      end
+
+      # make sure a pull request is specified
+      unless settings['flags']['pull']
+        puts 'Jenkins ghprbPullId environmental variable not set or --pull option not used.  Cannot continue'
+        exit 1
+      end
+
+      # if workstation not defined in the config file try to use the Jenkins workspace variable
+      unless settings['jenkins'] && loaded_file['jenkins']['workspace_dir']
+        workspace = ENV['WORKSPACE']
+        if workspace
+          settings['jenkins'] = {}
+          settings['jenkins']['workspace_dir'] = workspace
+        else
+          puts 'Jenkins workspace_dir not defined in the config file and $WORKSPACE env variable empty. Exiting'.to_red
+          exit
+        end
+      end
+    end
+
+    # join the config file with the passed flags into a single object
+    def self::merge_config
+      config = config_file
+      config['flags'] = {}
+      config['flags'].merge!(cli_flags)
+
+      # if no pull request provided at the CLI use the Jenkins environmental variable
+      unless config['flags']['pull']
+        config['flags']['pull'] = ENV['ghprbPullId']
+      end
+
+      config
+    end
+  end
+end

data/lib/{test_json.rb → reagan/test_json.rb}

@@ -16,17 +16,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-begin
-  require 'json'
-rescue LoadError => e
-  raise "Missing gem or lib #{e}"
-end
+require 'json'
 
 module Reagan
   # tests to make sure the version has been updated on the cookbook
-  class  TestJSON < Application
+  class TestJSON
     def initialize(file)
-      @config = Reagan::TestJSON.config
       @file = file
     end
 
@@ -35,13 +30,13 @@ module Reagan
     def test
       puts 'Running JSON parsing test:'
       begin
-        json_file = File.read(File.join(@config['jenkins']['workspace_dir'], @file))
+        json_file = File.read(File.join(Config.settings['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'
+      puts success ? 'PASS: JSON parses'.indent : 'FAIL: JSON does NOT parse'.indent
       success
     end
   end

data/lib/{test_knife.rb → reagan/test_knife.rb}

@@ -18,9 +18,8 @@
 
 module Reagan
   # tests cookbooks using knife cookbook test functionality
-  class TestKnife < Application
+  class TestKnife
     def initialize(cookbook)
-      @config = Reagan::TestKnife.config
       @cookbook = cookbook
     end
 
@@ -28,10 +27,10 @@ module Reagan
     # 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"
+      result = system "knife cookbook test -o #{File.join(Config.settings['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'
+      puts result ? 'PASS: Knife cookbook test was successful'.indent : 'FAIL: Knife cookbookk test was NOT successful'.indent
       result
     end
   end

data/lib/{test_reagan.rb → reagan/test_reagan.rb}

@@ -18,9 +18,8 @@
 
 module Reagan
   # tests cookbooks using tests defined in reagan_test.yml files
-  class TestReagan < Application
+  class TestReagan
     def initialize(cookbook)
-      @config = Reagan::TestReagan.config
       @cookbook = cookbook
     end
 
@@ -28,13 +27,13 @@ module Reagan
     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'))
+      if File.exist?(File.join(Config.settings['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'))
+        reagan_def = YAML.load_file(File.join(Config.settings['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))
+        Dir.chdir(File.join(Config.settings['jenkins']['workspace_dir'], 'cookbooks', @cookbook))
 
         status = true
         reagan_def['tests'].each do |test|
@@ -42,10 +41,10 @@ module Reagan
           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'
+        puts status ? 'PASS: reagan_test.yml test was successful' : '    FAIL: reagan_test.yml test was NOT successful'.indent
         status
       else
-        puts '    SKIP: No reagan_test.yml file found in the cookbook path. Skipping test'
+        puts 'SKIP: No reagan_test.yml file found in the cookbook path. Skipping test'.indent
         status
       end
     end

data/lib/{test_version.rb → reagan/test_version.rb}

@@ -17,7 +17,6 @@
 # limitations under the License.
 
 begin
-  require 'rubygems'
   require 'ridley'
   require 'chef/cookbook/metadata'
 rescue LoadError => e
@@ -26,16 +25,15 @@ end
 
 module Reagan
   # tests to make sure the version has been updated on the cookbook
-  class  TestVersion < Application
+  class TestVersion
     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.from_file(File.join(Config.settings['jenkins']['workspace_dir'], 'cookbooks', @cookbook, 'metadata.rb'))
       metadata.version
     end
 
@@ -44,11 +42,11 @@ module Reagan
       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 }
-          )
+          server_url: Config.settings['chef']['server_url'],
+          client_name: Config.settings['chef']['client_name'],
+          client_key: Config.settings['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]
@@ -56,7 +54,7 @@ module Reagan
           '0.0.0'
         end
       rescue Ridley::Errors::ConnectionFailed
-        puts '    ERROR: Failed to connect to the Chef server. Cannot continue'
+        puts '    ERROR: Failed to connect to the Chef server. Cannot continue'.to_red
         exit 1
       end
     end
@@ -69,9 +67,9 @@ module Reagan
       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"
+      puts "Server version: #{serv_v}".indent
+      puts "Commit version: #{commit_v}".indent
+      puts updated ? "PASS: Metadata version has been rev'd".indent : "FAIL: Metadata version has NOT been rev'd".indent
       updated
     end
   end

data/reagan.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'reagan'
-  s.version     = '0.8.2'
+  s.version     = '1.0.0'
   s.date        = Date.today.to_s
   s.platform = Gem::Platform::RUBY
   s.extra_rdoc_files = ['README.md', 'LICENSE']
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'chef', '>= 11.0'
   s.add_dependency 'ridley', '~> 4.0'
   s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'rubocop', '~> 0.28.0'
+  s.add_development_dependency 'rubocop', '~> 0.30.1'
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reagan
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.30.1
 description: Trust But Verify - Ruby build script for Jenkins that automates the testing
   of Chef cookbooks
 email: tim@cozy.co
@@ -97,13 +97,14 @@ files:
 - README.md
 - Rakefile
 - bin/reagan
-- lib/application.rb
-- lib/change.rb
-- lib/config.rb
-- lib/test_json.rb
-- lib/test_knife.rb
-- lib/test_reagan.rb
-- lib/test_version.rb
+- lib/core/ext/string.rb
+- lib/reagan.rb
+- lib/reagan/changeset.rb
+- lib/reagan/config.rb
+- lib/reagan/test_json.rb
+- lib/reagan/test_knife.rb
+- lib/reagan/test_reagan.rb
+- lib/reagan/test_version.rb
 - reagan.gemspec
 - reagan.yml.EXAMPLE
 - reagan_test.yml.EXAMPLE

data/lib/application.rb

@@ -1,105 +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.
-
-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'
-
-    def initialize
-      @config_obj = Reagan::Config.new
-      @@config = @config_obj.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
-
-    # check and see if the -p flag was passed and if so print the config hash
-    def check_print_config
-      return unless @@config['flags']['print_config']
-      pretty_print('Current config file / CLI flag values')
-      @config_obj.print_config
-      exit 0
-    end
-
-    # run tests on each changed cookbook
-    def run
-      check_print_config
-      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/config.rb

@@ -1,118 +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.
-
-begin
-  require 'yaml'
-  require 'optparse'
-rescue LoadError => e
-  raise "Missing gem or lib #{e}"
-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', :print_config => false }
-      OptionParser.new do |opts|
-        opts.banner = 'Usage: reagan [options]'
-        opts.on('-o', '--override cb1,cb2', Array, 'Comma separated list of cookbooks to test') do |cookbooks|
-          flags[:override_cookbooks] = cookbooks
-        end
-
-        opts.on('-p', '--print', 'Print the config options that will be used') do |config|
-          flags[:print_config] = config
-        end
-
-        opts.on('-p', '--pull_num 123', Integer, '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!
-
-      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
-
-      # if not workstation was set try to use the Jenkins workspace variable
-      unless config['jenkins'] && config['jenkins']['workspace_dir']
-        workspace = ENV['WORKSPACE']
-        if workspace
-          config['jenkins'] = {}
-          config['jenkins']['workspace_dir'] = workspace
-        else
-          puts 'Jenkins workspace not defined and $WORKSPACE empty. Exiting'
-          exit
-        end
-      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
-    end
-
-    # pretty print the config hash
-    def print_config(hash = nil, spaces = 0)
-      hash = @settings if hash.nil?
-      hash.each do |k, v|
-        spaces.times { print ' ' }
-        print k.to_s + ': '
-        if v.class == Hash
-          print "\n"
-          print_config(v, spaces + 2)
-        else
-          puts v
-        end
-      end
-    end
-  end
-end