comrad 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65b0763c5febe700ed75a932c1c2dacb44a772c3
-  data.tar.gz: a5ad52ae173ec08e29a99ce89097eac72ca24a9a
+  metadata.gz: 8a9a22acd9b3c8b83814572541f1e01776bfb441
+  data.tar.gz: 0f8a3aa36c336afe154cbde1d6975465f5090792
 SHA512:
-  metadata.gz: df39545a8e9c536d2d0f33fcaf1bd6e878ca4888f8d733bab7b4626c805cdc795262a87f0ec8dbd866d4c8753334d1b6b895db4a97715caad0dbe3d3e3ee0a97
-  data.tar.gz: ebf5185b313fb5cacc3591364ef97b5d2fc7b9b8e390142205605df47a9ca22f67f2f2ce4aad9288571ea1da5e41ba3fe5875b265ecc5059a5f6327c1babfc9b
+  metadata.gz: fbbdf600e995f32a28a2d6833bfcb2a5995774c4784cdc0f74e2812d4e262543ec182dadb4a2903a02d19cb646b2c4a9e42f270a0e5b40e33cd478e74c6917b4
+  data.tar.gz: 3bdb338f840f62f4d1b0f4c68b94f2b3eb188e2f097e615d42895e313d56c5d8c840573a1052892704f39d16cff1bff7f4c347747a0a000e48a92bef11beb9b2

data/.rubocop.yml

@@ -1,24 +1,12 @@
-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:
-  Enabled: false
-PerceivedComplexity:
+
+LineLength:
   Enabled: false
+

data/comrad.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'comrad'
-  s.version     = '0.1.2'
+  s.version     = '0.1.3'
   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 'slack-post', '~> 0.3', '>= 0.3.1'
   s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'rubocop', '~> 0.30.0'
+  s.add_development_dependency 'rubocop', '~> 0.32.0'
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.name

data/lib/comrad/changeset.rb

@@ -42,7 +42,7 @@ module Comrad
     # fetch build data using Jenkins API
     def self::fetch_build_data
       j = Config.config['jenkins']
-      url = j['url'] + '/job/' + j['job_name'] + '/' + ENV['BUILD_NUMBER'] + '/api/json?'
+      url = j['url'] + '/job/' + j['job_name'] + '/' + Config.config['buildnum'] + '/api/json?'
       conn = RestClient::Resource.new(url, j['username'], j['password'])
       JSON.parse(conn.get)
     end

data/lib/comrad/config.rb

@@ -42,19 +42,17 @@ module Comrad
       end
     end
 
-    # make sure the BUILD_NUMBER Jenkins variable exists.  If not force help
-    def self::check_jenkins_env_variable
-      if ENV['BUILD_NUMBER'].nil?
-        puts "Jenkins set BUILD_NUMBER environmental variable not set. Cannot continue.\n\n"
-        ARGV[0] = '-h'
+    # make sure we have a build number
+    def self::validate_config(conf)
+      if conf['buildnum'].nil?
+        puts "Jenkins set BUILD_NUMBER environmental variable not set, and Comrad --buildnum CLI flag not used. Cannot continue without a build number.\n\n"
+        exit!
       end
     end
 
     # grabs the flags passed in via command line
     def self::parse_flags
-      check_jenkins_env_variable
-
-      flags = { config: '/etc/comrad.yml', print_config: false, quiet: false }
+      flags = { config: '/etc/comrad.yml', print_config: false, quiet: false, buildnum: ENV['BUILD_NUMBER'] }
       OptionParser.new do |opts|
         opts.banner = 'Usage: comrad [options]'
 
@@ -78,6 +76,10 @@ module Comrad
           flags[:scary] = scary
         end
 
+        opts.on('-b', '--build-num 123', 'Run comrad against a particular Jenkins build for testing') do |build|
+          flags[:buildnum] = build
+        end
+
         opts.on('-h', '--help', 'Displays Help') do
           puts opts
           exit
@@ -108,6 +110,10 @@ module Comrad
       config = file_config.dup
       config['flags'] = {}
       flags_config.each { |k, v| config['flags'][k.to_s] = v }
+
+      # massage in either the buildnum CLI flag or the Jenkins provided ENV variable
+      config['buildnum'] = config['flags']['buildnum']
+      validate_config(config)
       config
     end
   end

metadata

@@ -1,91 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: comrad
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.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: slack-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !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'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.32.0
 description: Your rad comrade - Sync changes from git to Chef Server via Jenkins
 email: tim@cozy.co
 executables:
@@ -94,9 +94,9 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -116,27 +116,27 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - comrad
-- --main
+- "--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.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Your rad comrade - Sync changes from git to Chef Server via Jenkins