reagan 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b50af94af60d52b062aac91541b09ffbafb0da
-  data.tar.gz: 3f65732bf92ff843e7d7e3593b029e26b05b8cff
+  metadata.gz: dcd3469e7bc317073069aca8545749fc91e2deeb
+  data.tar.gz: 839ce97f7831bb90a2dfe4471e2378bac9abd954
 SHA512:
-  metadata.gz: 6468567d547eab42e6bc080d9fec6687e62228e3f1d1670f1d9efc2ffad4c33afb8092e03114ee9213c6cd2d2eafdefff0e756771386912e45007c2aedbd0bbe
-  data.tar.gz: 16341d281bca1af4f60b59dc38e18fa96ebf44263eccfbfe1f67912073b1b6d6caca26a2b74823a624a9013e4a6eacd2e66763cb74f7ae8353cf3a55c2c60c24
+  metadata.gz: e8b5229fabf0a74cb6ecdb940eab38cabc80bdb05a84c902a2d6a24b4e2df8eb8d9aa0768b9150aee6364e2dd0b338d75fdaab11389c316458fac7ed24536b48
+  data.tar.gz: 3f9918f84823b43ca7219d4defab2ef6a910adea416bc02e7e8919cfc0eab51437e6e2ac1817a0f7c4c938d98474001dc4db592c2edccdba8e84977ca96d8eb9

data/bin/reagan

@@ -22,20 +22,20 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'reagan'
 require 'optparse'
 
-options = { :pull => nil, :cookbooks => nil, :config => '/etc/reagan.yml' }
+flags = { :pull => nil, :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|
-    options[:cookbooks] = cookbooks
+    flags[:cookbooks] = cookbooks
   end
 
   opts.on('-p', '--pull_num 123', 'Github pull number to test') do |pull|
-    options[:pull] = pull
+    flags[:pull] = pull
   end
 
   opts.on('-c', '--config reagan.yml', 'Path to config file (defaults to /etc/reagan.yml)') do |config|
-    options[:config] = config
+    flags[:config] = config
   end
 
   opts.on('-h', '--help', 'Displays Help') do
@@ -46,4 +46,4 @@ end
 
 parser.parse!
 
-Reagan.new(options).run
+Reagan.new(flags).run

data/lib/change.rb

@@ -27,8 +27,7 @@ end
 # determines changed files in the commit
 class Change < Reagan
   attr_accessor :files
-  def initialize(options)
-    @options = options
+  def initialize
     @files = list_files_changed
   end
 
@@ -50,8 +49,8 @@ class Change < Reagan
   end
 
   def pull_num
-    if @options[:pull]
-      pull = @options[:pull]
+    if @@config['flags']['pull']
+      pull = @@config['flags']['pull']
     elsif ENV['ghprbPullId']
       pull = ENV['ghprbPullId']
     else
@@ -60,13 +59,18 @@ class Change < Reagan
     pull
   end
 
+  # return list of cookbooks changed either from override value or from polling github pull request
   def list_files_changed
-    pull = pull_num
-    puts "Grabbing contents of pull request #{pull}\n"
+    if @@config['flags']['cookbooks']
+      @@config['flags']['cookbooks'].split(',')
+    else
+      pull = pull_num
+      puts "Grabbing contents of pull request #{pull}\n"
 
-    gh = Octokit::Client.new(:access_token => @@config['github']['auth_token'])
+      gh = Octokit::Client.new(:access_token => @@config['github']['auth_token'])
 
-    pull_files = files_from_pull(gh.pull_request_files(@@config ['github']['repo'], pull))
-    unique_cookbooks(pull_files)
+      pull_files = files_from_pull(gh.pull_request_files(@@config ['github']['repo'], pull))
+      unique_cookbooks(pull_files)
+    end
   end
 end

data/lib/config.rb

@@ -0,0 +1,60 @@
+# 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'
+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
+
+  # loads the reagan.yml config file from /etc/reagan.yml or the passed location
+  def load_config_file
+    begin
+      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
+  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
+
+end

data/lib/reagan.rb

@@ -18,16 +18,16 @@
 
 # the main class for the reagan app.  gets called by the reagan bin
 class Reagan
-  require 'yaml'
+  require 'config'
   require 'change'
   require 'test_knife'
   require 'test_version'
   require 'test_reagan'
 
   attr_accessor :config
-  def initialize(options)
-    @@config = YAML.load_file(options[:config])
-    @options = options
+  def initialize(flags)
+    @@config = ReaganConfig.new(flags).settings
+    @cookbooks = Change.new.files
   end
 
   # nicely prints marques
@@ -37,27 +37,31 @@ class Reagan
     puts "\n"
   end
 
-  # grab the changes and run the tests
+  # run tests on each changed cookbook
   def run
-    # use passed in list of cookbooks or grab from GH
-    if @options[:cookbooks]
-      cookbooks = @options[:cookbooks].split(',')
-    else
-      cookbooks = Change.new(@options).files
+    # exit with a friendly message if no cookbooks have been changed
+    if @cookbooks.empty?
+      pretty_print('Nothing to test in this change. Reagan approves')
+      exit 0
     end
 
     pretty_print('The following cookbooks will be tested')
-    cookbooks.each { |cb| puts cb }
+    @cookbooks.each { |cb| puts cb }
 
     results = []
-    cookbooks.each do |cookbook|
+    @cookbooks.each do |cookbook|
       pretty_print("Testing cookbook #{cookbook}")
-      results << TestVersion.new(cookbook).test
       results <<  TestKnife.new(cookbook).test
+      results << TestVersion.new(cookbook).test
       results <<  TestReagan.new(cookbook).test
     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 results.include?(false)
+    exit 1 if failure
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reagan
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - bin/reagan
 - lib/change.rb
+- lib/config.rb
 - lib/reagan.rb
 - lib/test_knife.rb
 - lib/test_reagan.rb