reagan 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c57ac3d0f9f3664186c3953f46f63821a921bcdb
-  data.tar.gz: 6397367c982e95994c545d2bf3d79376c884da45
+  metadata.gz: 82b26aac734f61733db7108f0987c104cf5f00eb
+  data.tar.gz: 93867b5e5b4889286c1a38a910ef8d741fd7b1d6
 SHA512:
-  metadata.gz: dec04d8ddf8f29d291b44309421309c65543dbd4dcab87172e1e3fd0628d8f146636eb87c0fb6240facaeeb7766f1bd1416bd62ad3b4c207f040c9b1893919ad
-  data.tar.gz: 89376a9ddc021258cca2f2752fa81140cf7b372b72c778f2944eced0c06380bbe1c221c4600df9085459a0a6193b315f8af9fc3fc3310691c84813b5f5da3196
+  metadata.gz: 8c02e7bb3ddfa4d14fcde1a0c6d7ec34ea96cf70e43efcb74475d7625d7978e768a8c4d2d8915d06b053e0d1ca2cfd285de69cd1ce64f56be99124f334562314
+  data.tar.gz: b03136abd428f35af38207375daa2a30f05fd46009d6a12411dd2c3c73f5b8a3c6cedfeef14cf410fe3c4aa8bb866fbd42a033726630bcd7c3fad3724de40cb2

data/lib/reagan/config.rb

@@ -96,7 +96,7 @@ module Reagan
 
     # make sure the config was properly loaded and contains the various keys we need
     def self::validate
-      settings = Config.Settings
+      settings = Config.settings
 
       if settings == false
         puts "ERROR: Reagan config at #{cli_flags['config']} does not contain any configuration data".to_red
@@ -105,20 +105,14 @@ module Reagan
 
       # 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'
+        puts 'Jenkins ghprbPullId environmental variable not set or --pull option not used.  Cannot continue'.to_red
         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
+      # make sure either jenkins gave us a workspace variable or its defined in the config
+      unless ENV['WORKSPACE'] || (settings['jenkins'] && settings['jenkins']['workspace_dir'])
+        puts 'Jenkins workspace_dir not defined in the config file and $WORKSPACE env variable empty. Exiting'.to_red
+        exit 1
       end
     end
 
@@ -133,6 +127,12 @@ module Reagan
         config['flags']['pull'] = ENV['ghprbPullId']
       end
 
+      # merge in the jenkins workspace variable on top of the config file
+      if ENV['WORKSPACE']
+        config['jenkins'] = {} unless config['jenkins'] # create the higher level hash if it doesn't exist
+        config['jenkins']['workspace_dir'] = ENV['WORKSPACE']
+      end
+
       config
     end
   end

data/lib/reagan/test_json.rb

@@ -36,7 +36,7 @@ module Reagan
       rescue JSON::JSONError
         success = false
       end
-      puts success ? 'PASS: JSON parses'.indent : 'FAIL: JSON does NOT parse'.indent
+      puts success ? 'PASS: JSON parses'.indent : 'FAIL: JSON does NOT parse'.indent.to_red
       success
     end
   end

data/lib/reagan/test_knife.rb

@@ -30,7 +30,7 @@ module Reagan
       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'.indent : 'FAIL: Knife cookbookk test was NOT successful'.indent
+      puts result ? 'PASS: Knife cookbook test was successful'.indent : 'FAIL: Knife cookbookk test was NOT successful'.indent.to_red
       result
     end
   end

data/lib/reagan/test_reagan.rb

@@ -41,7 +41,7 @@ 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'.indent
+        puts status ? 'PASS: reagan_test.yml test was successful' : '    FAIL: reagan_test.yml test was NOT successful'.indent.to_red
         status
       else
         puts 'SKIP: No reagan_test.yml file found in the cookbook path. Skipping test'.indent

data/lib/reagan/test_version.rb

@@ -69,7 +69,7 @@ module Reagan
       puts "Running cookbook version rev'd test:"
       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
+      puts updated ? "PASS: Metadata version has been rev'd".indent : "FAIL: Metadata version has NOT been rev'd".indent.to_red
       updated
     end
   end

data/lib/reagan.rb

@@ -47,6 +47,7 @@ module Reagan
     # ensure output syncs to the console so jenkins can record it
     $stdout.sync = $stderr.sync = true
 
+    Config.validate
     check_print_config
     check_empty_update
 

data/reagan.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'reagan'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.date        = Date.today.to_s
   s.platform = Gem::Platform::RUBY
   s.extra_rdoc_files = ['README.md', 'LICENSE']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reagan
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Tim Smith