reagan 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cdf319dc7aafcfdab1c853b9dc1ccc807e0cfe5
-  data.tar.gz: 2c3f9b61287238314f851ace86fa9ea736b00dc3
+  metadata.gz: 7eb97fa712f2fce7de36576bdf54675b9ce31096
+  data.tar.gz: 516b0b9d1bae8c38a964361b8739f2a1c8301d2b
 SHA512:
-  metadata.gz: fb69381eee4203050887b8f906913ecab3584ca7c3db68c0b711d0238813ecb669e9de2fe26227ad1c19d23c92b5d96f722d40c07b8cff0c18f66d50bae4b2ba
-  data.tar.gz: 02b7f2e4c3505c615505f023489d1d4834879289643f73dec06673c766e7a654fb02351d355a2e0c1f79ff96b226a160c41e20b43979500fe58a717c15edbe91
+  metadata.gz: da189f2e45bae76d189c552725361d81311c4681be7c67b5b9ac717615b796393bde0002adbbcd39e83b918d6c29af450930d72f89210911b67b2362d3655669
+  data.tar.gz: 08cad4868acceff00afbf192b4a355c37f1c685be97391ade08e8ceab01335ddb78bf9d1ff61abe9477e66b271742e895e3c85761ffc724ab306fe1f48d760c3

data/.gitignore

@@ -33,6 +33,11 @@ Gemfile.lock
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 
+# OS X
 .DS_Store
+
+# reagan related files
 config.yml
 
+# vi files
+*.swp

data/.rubocop.yml

@@ -13,7 +13,9 @@ HashSyntax:
 LineLength:
   Enabled: false
 MethodLength:
-  Max: 30
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
 NumericLiterals:
   Enabled: false
 SingleSpaceBeforeFirstArg:

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+- 1.9.3
+- 2.1.5
+- 2.2.0
+script:
+  - bundle exec rake test
+

data/Gemfile

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

data/bin/reagan

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 # Author:: Tim Smith (<tim@cozy.co>)
-# Copyright:: Copyright (c) 2014 Tim Smith
+# Copyright:: Copyright (c) 2015 Tim Smith
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/config.rb

@@ -38,15 +38,15 @@ module Reagan
       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', 'Comma separated list of cookbooks to test') do |cookbooks|
-          flags[:override_cookbooks] = cookbooks.split(',')
+        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', 'Github pull number to test') do |pull|
+        opts.on('-p', '--pull_num 123', Integer, 'Github pull number to test') do |pull|
           flags[:pull] = pull
         end
 
@@ -70,6 +70,19 @@ module Reagan
         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]}"

data/reagan.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'reagan'
-  s.version     = '0.8.1'
+  s.version     = '0.8.2'
   s.date        = Date.today.to_s
   s.platform = Gem::Platform::RUBY
   s.extra_rdoc_files = ['README.md', 'LICENSE']
@@ -16,6 +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.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.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.28.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.28.0
 description: Trust But Verify - Ruby build script for Jenkins that automates the testing
   of Chef cookbooks
 email: tim@cozy.co
@@ -77,6 +91,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rubocop.yml
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md