Merge pull request #114 from github/kpaulisse-mega-merge

Release 1.2.0

Author: kpaulisse

.rubocop.yml

@@ -52,6 +52,10 @@ Lint/EndAlignment:
 Style/FileName:
   Enabled: false
 
+# Sometimes it's cleaner without this
+Style/Documentation:
+  Enabled: false
+
 # To fix later
 Style/PercentLiteralDelimiters:
   Enabled: false

.travis.yml

@@ -7,9 +7,11 @@ script: "script/cibuild"
 matrix:
   include:
     # Build with latest ruby
-    - rvm: 2.3.1
+    - rvm: 2.4.1
       env: RUBOCOP_TEST="true" RSPEC_TEST="true"
     # Build with older ruby versions
+    - rvm: 2.3.4
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true"
     - rvm: 2.2
       env: RUBOCOP_TEST="false" RSPEC_TEST="true"
     - rvm: 2.1

.version

@@ -1 +1 @@
-1.1.0
+1.2.0

doc/CHANGELOG.md

@@ -8,6 +8,16 @@
 </tr>
 </thead><tbody>
 <tr valign=top>
+<td>1.2.0</td>
+<td>2017-05-18</td>
+<td>
+<li><a href="https://github.com/github/octocatalog-diff/pull/112">#112</a>: Split arguments added for ENC</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/113">#113</a>: (Enhancement) Override facts and ENC parameters using regular expressions</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/103">#111</a>: Simplify parallel processing to solve some intermittent failures</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/110">#110</a>: Ruby 2.4 compatibility</li>
+</td>
+</tr>
+<tr valign=top>
 <td>1.1.0</td>
 <td>2017-05-08</td>
 <td>

doc/advanced-override-facts.md

@@ -65,3 +65,16 @@ The following data types in parentheses are supported:
 | `(json)` | Treat the input as a JSON string (calls `JSON.parse` in ruby) |
 | `(boolean)` | Treat the input as a boolean -- it must be `true` or `false`, case-insensitive |
 | `(nil)` | Ignore any characters after `(nil)` and deletes the fact if the fact exists |
+
+## Regular expressions
+
+If you wish to match multiple facts by pattern, specify the regular expression in place of the key name. For example:
+
+```
+octocatalog-diff -n some-node.example.com -f master -t master \
+  --to-fact-override /^ipaddress/=10.11.12.13
+```
+
+In this example, `$::ipaddress`, `$::ipaddress_eth0`, `$::ipaddress_bond0`, and any other facts starting with "ipaddress" would be overridden. However, a fact named `$::additional_ipaddress` would not be overridden, because it does not match the regular expression.
+
+Please note that you cannot *add* a fact with a regular expression -- when using regular expressions you can only modify or delete facts.

doc/dev/integration-tests.md

@@ -22,7 +22,7 @@ describe 'whatever behavior' do
     # @result[:logs] is a String containing everything printed to STDERR (Logger)
     # @result[:output] is a String containing everything printed to STDOUT
     # @result[:diffs] is an Array of differences
-    # @result[:exitcode] is a Fixnum representing the exit code: 0 = no changes, 1 = failure, 2 = success, with changes
+    # @result[:exitcode] is an Integer representing the exit code: 0 = no changes, 1 = failure, 2 = success, with changes
     # @result[:exception] contains any exception that was thrown
   end
 
@@ -46,7 +46,7 @@ describe 'whatever behavior' do
     # @result[:logs] is a String containing everything printed to STDERR (Logger)
     # @result[:output] is a String containing everything printed to STDOUT
     # @result[:diffs] is an Array of differences
-    # @result[:exitcode] is a Fixnum representing the exit code: 0 = no changes, 1 = failure, 2 = success, with changes
+    # @result[:exitcode] is an Integer representing the exit code: 0 = no changes, 1 = failure, 2 = success, with changes
     # @result[:exception] contains any exception that was thrown
   end
 

doc/requirements.md

@@ -2,10 +2,10 @@
 
 To run `octocatalog-diff` you will need these basics:
 
-- Ruby 2.0 or higher
+- Ruby 2.0 through 2.4 (we test octocatalog-diff with Ruby 2.0, 2.1, 2.2, 2.3, and 2.4)
 - Mac OS, Linux, or other Unix-line operating system (Windows is not supported)
 - Ability to install gems, e.g. with [rbenv](https://github.com/rbenv/rbenv) or [rvm](https://rvm.io/), or root privileges to install into the system Ruby
-- Puppet agent for [Linux](https://docs.puppet.com/puppet/latest/reference/install_linux.html) or [Mac OS X](https://docs.puppet.com/puppet/latest/reference/install_osx.html), or installed as a gem
+- Puppet agent for [Linux](https://docs.puppet.com/puppet/latest/reference/install_linux.html) or [Mac OS X](https://docs.puppet.com/puppet/latest/reference/install_osx.html), or installed as a gem (we support Puppet 3.8.7 and all versions of Puppet 4.x)
 
 We recommend that you also have the following to get the most out of `octocatalog-diff`, but these are not absolute requirements:
 

lib/octocatalog-diff/api/v1/override.rb

@@ -13,7 +13,8 @@ class Override
         # Constructor: Accepts a key and value.
         # @param input [Hash] Must contain :key and :value
         def initialize(input)
-          @key = input.fetch(:key)
+          key = input.fetch(:key)
+          @key = key =~ %r{\A/(.+)/\Z} ? Regexp.new(Regexp.last_match(1)) : key
           @value = parsed_value(input.fetch(:value))
         end
 
@@ -29,6 +30,7 @@ def self.create_from_input(input, key = nil)
           # If input is not a string, we can still construct the object if the key is given.
           # That input would come directly from code and not from the command line, since inputs
           # from the command line are always strings.
+          # Also support regular expressions for the key name, if delimited by //.
           if key.nil? && input.is_a?(String)
             unless input.include?('=')
               raise ArgumentError, "Fact override '#{input}' is not in 'key=(data type)value' format"
@@ -72,9 +74,9 @@ def convert_to_data_type(datatype, value)
           return value if datatype == 'string'
           return parse_json(value) if datatype == 'json'
           return nil if datatype == 'nil'
-          if datatype == 'fixnum'
+          if datatype == 'fixnum' || datatype == 'integer'
             return Regexp.last_match(1).to_i if value =~ /^(-?\d+)$/
-            raise ArgumentError, "Illegal fixnum '#{value}'"
+            raise ArgumentError, "Illegal integer '#{value}'"
           end
           if datatype == 'float'
             return Regexp.last_match(1).to_f if value =~ /^(-?\d*\.\d+)$/

lib/octocatalog-diff/bootstrap.rb

@@ -10,7 +10,7 @@ class Bootstrap
     # @param options [Hash] Options hash:
     #        :path [String] => Directory to bootstrap
     #        :bootstrap_script [String] => Bootstrap script, relative to directory
-    # @return [Hash] => [Fixnum] :status_code, [String] :output
+    # @return [Hash] => [Integer] :status_code, [String] :output
     def self.bootstrap(options = {})
       # Options validation
       unless options[:path].is_a?(String)

lib/octocatalog-diff/catalog-diff/differ.rb

@@ -530,7 +530,7 @@ def hashdiff_initial(catalog1_in, catalog2_in)
 
           # Added a new key that points to some kind of data structure that we know how
           # to handle.
-          if obj[1] =~ /^(.+)\f([^\f]+)$/ && [String, Fixnum, Float, TrueClass, FalseClass, Array, Hash].include?(obj[2].class)
+          if obj[1] =~ /^(.+)\f([^\f]+)$/ && [String, Integer, Float, TrueClass, FalseClass, Array, Hash].include?(obj[2].class)
             hashdiff_add_remove.add(obj[1])
             next
           end