jujube 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a93daba9cc8d6302ae5cf0df9ade6a415405804
-  data.tar.gz: a2a5390ec3062f5016d78c3d8b9d539ce679d8be
+  metadata.gz: d1899d2c440e2e60202c88f29a5d90aaa45777aa
+  data.tar.gz: 25b2892d7bccb5b856025e826fac787dd917527f
 SHA512:
-  metadata.gz: 184ac4698dafbd082ad8cdd17e47554f7f179fb7936b39875e635348179eabf08c843f45ad18e31e27e56e04f3f424d920530ccbf064f47c99a5dbb9d1abbe1f
-  data.tar.gz: 9b410b8795b126e6ab4c73317f612aef264af70acd5cf44ad04b978903327f01ff1307180b1d97bcf62b6827d6e89d1eacee18c8f25cb8b7895ec55b5c681f9f
+  metadata.gz: ace24b0117da72efc6548ff513a3eec219cfaca63a623287f05644f83c74e69afba1bec1a0196c2e0504e5b2763c065f9b42d6875fcc41d64b75a0e1216281d3
+  data.tar.gz: 0676524d33bd24cfad3bc54338cb29ec2a8b7a4d0bfc8dd8ca6f4793dcb3bf14218abcd24e29552ee82217144aee9c6e5de78a4d7f19ac14fac7d7616a58dc16

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - rbx-2
 matrix:
   allow_failures:
-    - jruby-9
-    - jruby-head
+    - rvm: jruby-9
+    - rvm: jruby-head
+  fast_finish: true
 script: "bundle exec rake"

data/CHANGELOG.md

@@ -5,6 +5,15 @@ adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [0.12.0][0.12.0]
+
+### Added
+
+* Support the `string` parameter (see http://docs.openstack.org/infra/jenkins-job-builder/parameters.html#parameters.string) ([#3](https://github.com/randycoulman/jujube/pull/3)) (@jgeysens)
+* Support Rake 11.x versions ([#4](https://github.com/randycoulman/jujube/pull/4))
+* Support the `validating_string` parameter (see http://docs.openstack.org/infra/jenkins-job-builder/parameters.html#parameters.validating-string) ([#7](https://github.com/randycoulman/jujube/pull/7))
+* Support the `trigger_parameterized_builds` publisher (see http://docs.openstack.org/infra/jenkins-job-builder/publishers.html#publishers.trigger-parameterized-builds) ([#9](https://github.com/randycoulman/jujube/pull/9))
+
 ## [0.11.0][0.11.0]
 
 ### Breaking Changes
@@ -25,7 +34,7 @@ adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
-* Support the `priority_sorter` property. (see http://docs.openstack.org/infra/jenkins-job-builder/properties.html#properties.priority-sorter).
+* Support the `priority_sorter` property (see http://docs.openstack.org/infra/jenkins-job-builder/properties.html#properties.priority-sorter).
 * Links to documentation for the `fitnesse` publisher and `store` SCM that have now been merged into jenkins-job-builder.
 * This CHANGELOG.
 
@@ -70,7 +79,8 @@ adheres to [Semantic Versioning](http://semver.org/).
 
 * Initial public release.
 
-[unreleased]: https://github.com/randycoulman/jujube/compare/v0.11.0...HEAD
+[unreleased]: https://github.com/randycoulman/jujube/compare/v0.12.0...HEAD
+[0.12.0]: https://github.com/randycoulman/jujube/compare/v0.11.0...v0.12.0
 [0.11.0]: https://github.com/randycoulman/jujube/compare/v0.10.0...v0.11.0
 [0.10.0]: https://github.com/randycoulman/jujube/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/randycoulman/jujube/compare/v0.8.0...v0.9.0

data/README.md

@@ -94,7 +94,6 @@ end
 
 The following job attributes are supported:
 
-* `description`
 * `project_type` -- doesn't normally need to be specified.  If any `axes` are added to the
   job, then `project_type` is automatically inferred to be `matrix`
 * `description`
@@ -107,13 +106,14 @@ The following job attributes are supported:
 The following sections and components are supported:
 
 * `axes`: (`label_expression`, `slave`)
+* `parameters`: (`string`, `validating_string`)
 * `properties`: (`throttle`)
 * `scm`: (`git`, `store`)
 * `triggers`: (`pollscm`, `pollurl`, `reverse`)
 * `wrappers`: (`timeout`, `timestamps`)
 * `builders`: (`shell`)
 * `publishers`: (`archive`, `cppcheck`, `email_ext`, `fitnesse`, `ircbot`, `junit`, 
-  `trigger`, `unittest`, `xunit`)
+  `trigger`, `trigger_parameterized_builds`, `unittest`, `xunit`)
 * `notifications`: None defined yet
 
 See [the end-to-end example job](examples/fixtures/endToEnd/endToEnd.job) for example

data/acceptance/fixtures/endToEnd/endToEnd.job

@@ -8,11 +8,18 @@ job "endToEnd" do |j|
 
   j.axes << slave(:arch, %w{i386 amd64})
 
+  j.parameters << string(name: "STRING_PARAM", default: "DEFAULT VALUE", description: "DESCRIPTION")
+  j.parameters << validating_string(name: "VALIDATING",
+                                    default: "DEFAULT",
+                                    description: "DESCRIPTION",
+                                    regex: "REGEX",
+                                    msg: "MESSAGE")
+
+  j.properties << priority_sorter(priority: 150)
   j.properties << throttle(max_per_node: 2,
                            max_total: 4,
                            option: "category",
                            categories: %w{CAT1 CAT2})
-  j.properties << priority_sorter(priority: 150)
 
   j.scm << git(url: "URL", branches: %w{master dev}, wipe_workspace: false)
   j.scm << store(script: "SCRIPT",
@@ -53,6 +60,29 @@ job "endToEnd" do |j|
   j.publishers << ircbot(notify_start: true)
   j.publishers << junit(results: "RESULTS", keep_long_stdio: false)
   j.publishers << trigger(project: "PROJECT")
+  j.publishers << trigger_parameterized_builds do |builds|
+    builds << build(project: %w[PROJECT1 PROJECT2],
+                    predefined_parameters: { param1: "VALUE1", param2: "VALUE2" },
+                    current_parameters: true,
+                    node_parameters: false,
+                    svn_revision: true,
+                    include_upstream: false,
+                    git_revision: { combine_queued_commits: true },
+                    boolean_parameters: { bool1: true, bool2: false },
+                    condition: "FAILED_OR_BETTER",
+                    property_file: "FILE.properties",
+                    fail_on_missing: true,
+                    use_matrix_child_files: false,
+                    only_exact_matrix_child_runs: true,
+                    file_encoding: "UTF-8",
+                    trigger_with_no_params: false,
+                    restrict_matrix_project: 'label=="x86"',
+                    node_label_name: "LABEL_NAME",
+                    node_label: "LABEL")
+    builds << build(project: "SINGLE_PROJECT",
+                    predefined_parameters: { param: "VALUE" },
+                    git_revision: true)
+  end
   j.publishers << xunit do |types|
     types << unittest(pattern: "PATTERN", deleteoutput: false)
   end

data/acceptance/fixtures/endToEnd/expected.yml

@@ -15,7 +15,20 @@
           values:
             - i386
             - amd64
+    parameters:
+      - string:
+          name: STRING_PARAM
+          default: "DEFAULT VALUE"
+          description: DESCRIPTION
+      - validating-string:
+          name: VALIDATING
+          default: DEFAULT
+          description: DESCRIPTION
+          regex: REGEX
+          msg: MESSAGE
     properties:
+      - priority-sorter:
+          priority: 150
       - throttle:
           max-per-node: 2
           max-total: 4
@@ -23,8 +36,6 @@
           categories:
             - CAT1
             - CAT2
-      - priority-sorter:
-          priority: 150
     scm:
       - git:
           url: URL
@@ -100,6 +111,35 @@
           keep-long-stdio: false
       - trigger:
           project: PROJECT
+      - trigger-parameterized-builds:
+        - project:
+            - PROJECT1
+            - PROJECT2
+          predefined-parameters: |
+            param1=VALUE1
+            param2=VALUE2
+          current-parameters: true
+          node-parameters: false
+          svn-revision: true
+          include-upstream: false
+          git-revision:
+            combine-queued-commits: true
+          boolean-parameters:
+              bool1: true
+              bool2: false
+          condition: FAILED_OR_BETTER
+          property-file: FILE.properties
+          fail-on-missing: true
+          use-matrix-child-files: false
+          only-exact-matrix-child-runs: true
+          file-encoding: UTF-8
+          trigger-with-no-params: false
+          restrict-matrix-project: label=="x86"
+          node-label-name: LABEL_NAME
+          node-label: LABEL
+        - project: SINGLE_PROJECT
+          predefined-parameters: param=VALUE
+          git-revision: true
       - xunit:
           types:
             - unittest:

data/acceptance/jujube/acceptance_test.rb

@@ -26,11 +26,11 @@ class AcceptanceTest < Minitest::Test
   end
 
   def assert_file_exists(filename)
-    assert(File.exists?(filename), "File #{filename} does not exist")
+    assert(File.exist?(filename), "File #{filename} does not exist")
   end
 
   def assert_directory_exists(filename)
-    assert(Dir.exists?(filename), "Directory #{filename} does not exist")
+    assert(Dir.exist?(filename), "Directory #{filename} does not exist")
   end
 
   def fixture_root

data/jujube.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jujube/version'
+require "jujube/version"
 
 Gem::Specification.new do |spec|
   spec.name = "jujube"
@@ -22,7 +22,7 @@ EOF
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.1"
+  spec.add_development_dependency "rake", ">= 10.1", "< 12"
   spec.add_development_dependency "minitest", "~> 5.3"
   spec.add_development_dependency "flexmock", "~> 2.0"
   spec.add_development_dependency "yard", "~>0.8.7"

data/lib/jujube/components.rb

@@ -1,5 +1,6 @@
 require_relative "components/macros"
 require_relative "components/helpers"
+require_relative "components/axes"
 require_relative "components/parameters"
 require_relative "components/properties"
 require_relative "components/scm"
@@ -13,6 +14,7 @@ module Jujube
   # Helper methods for creating jenkins-job-builder components.
   module Components
     include Helpers
+    include Axes
     include Parameters
     include Properties
     include Scm

data/lib/jujube/components/axes.rb

@@ -0,0 +1,46 @@
+module Jujube
+  module Components
+
+    # Helper methods for creating matrix axes components.
+    module Axes
+      extend Macros
+
+      # Specify a `label-expression` axis for a matrix job.
+      #
+      # See {http://docs.openstack.org/infra/jenkins-job-builder/project_matrix.html}.
+      #
+      # @param name [Symbol, String] The name of the axis.
+      # @param values [Array<String>] The values of the axis.
+      # @return [Hash] The specification for the axis.
+      def label_expression(name, values)
+        axis(name, values, :label_expression)
+      end
+
+      # Specify a `slave` axis for a matrix job.
+      #
+      # See {http://docs.openstack.org/infra/jenkins-job-builder/project_matrix.html}.
+      #
+      # @param name [Symbol, String] The name of the axis.
+      # @param values [Array<String>] The values of the axis.
+      # @return [Hash] The specification for the axis.
+      def slave(name, values)
+        axis(name, values, :slave)
+      end
+
+      private
+
+      # Specify an axis for a matrix job.
+      #
+      # See {http://docs.openstack.org/infra/jenkins-job-builder/project_matrix.html}.
+      #
+      # @param name [Symbol, String] The name of the axis.
+      # @param values [Array<String>] The values of the axis.
+      # @param type [Symbol, String] The axis type.
+      # @return [Hash] The specification for the axis.
+      def axis(name, values, type)
+        options = {type: canonicalize(type), name: canonicalize(name), values: values}
+        to_config("axis", options)
+      end
+    end
+  end
+end

data/lib/jujube/components/parameters.rb

@@ -3,48 +3,25 @@ module Jujube
 
     # Helper methods for creating job parameter components.
     module Parameters
+      extend Macros
 
-      # @!group Matrix Axes
-
-      # Specify a `label-expression` axis for a matrix job.
+      # @!method string(options = {})
+      # Specify a `string` parameter for a job.
       #
-      # See {http://docs.openstack.org/infra/jenkins-job-builder/project_matrix.html}.
+      # See {http://docs.openstack.org/infra/jenkins-job-builder/parameters.html#parameters.string}.
       #
-      # @param name [Symbol, String] The name of the axis.
-      # @param values [Array<String>] The values of the axis.
-      # @return [Hash] The specification for the axis.
-      def label_expression(name, values)
-        axis(name, values, :label_expression)
-      end
+      # @param options [Hash] The configuration options for the component.
+      # @return [Hash] The specification for the component.
+      standard_component :string
 
-      # Specify a `slave` axis for a matrix job.
-      #
-      # See {http://docs.openstack.org/infra/jenkins-job-builder/project_matrix.html}.
+      # @!method validating_string(options = {})
+      # Specify a `validating-string` parameter for a job.
       #
-      # @param name [Symbol, String] The name of the axis.
-      # @param values [Array<String>] The values of the axis.
-      # @return [Hash] The specification for the axis.
-      def slave(name, values)
-        axis(name, values, :slave)
-      end
-
-      private
-
-      # Specify an axis for a matrix job.
+      # See {http://docs.openstack.org/infra/jenkins-job-builder/parameters.html#parameters.validating-string}.
       #
-      # See {http://docs.openstack.org/infra/jenkins-job-builder/project_matrix.html}.
-      #
-      # @param name [Symbol, String] The name of the axis.
-      # @param values [Array<String>] The values of the axis.
-      # @param type [Symbol, String] The axis type.
-      # @return [Hash] The specification for the axis.
-      def axis(name, values, type)
-        options = {type: canonicalize(type), name: canonicalize(name), values: values}
-        to_config("axis", options)
-      end
-
-      # @!endgroup
-
+      # @param options [Hash] The configuration options for the component.
+      # @return [Hash] The specification for the component.
+      standard_component :validating_string
     end
   end
 end

data/lib/jujube/components/publishers.rb

@@ -68,6 +68,31 @@ module Jujube
       # @return [Hash] The specification for the component.
       standard_component :trigger
 
+      # Specify a `trigger-parameterized-builds` publisher for a job.
+      #
+      # See {http://docs.openstack.org/infra/jenkins-job-builder/publishers.html#publishers.trigger-parameterized-builds}.
+      #
+      # `trigger-parameterized-builds` can trigger multiple sets of builds,
+      # each with their own configuration.  Each build specification is added
+      # in a nested configuration block using the {#build} method.
+      #
+      # @example
+      #   job "trigger-parameterized-builds-example" do |j|
+      #     j.publishers << trigger_parameterized_builds do |builds|
+      #       builds << build(project: %w[PROJECT1 PROJECT2], condition: "SUCCESS")
+      #       builds << build(project: "SINGLE_PROJECT", current_parameters: true)
+      #     end
+      #   end
+      #
+      # @yieldparam builds [Array] An array to which nested build specifications
+      #   should be added by the block.
+      # @return [Hash] The specification for the component.
+      def trigger_parameterized_builds
+        builds = []
+        yield(builds) if block_given?
+        {"trigger-parameterized-builds" => builds}
+      end
+
       # Specify an `xunit` publisher for a job.
       #
       # See {http://docs.openstack.org/infra/jenkins-job-builder/publishers.html#publishers.xunit}.
@@ -90,6 +115,38 @@ module Jujube
         to_config("xunit", nested_options(:types, options, &block))
       end
 
+      # @!group trigger_parameterized_builds Builds
+
+      # Configure a `build` for a {#trigger_parameterized_builds} publisher.
+      #
+      # See {http://docs.openstack.org/infra/jenkins-job-builder/publishers.html#publishers.trigger-parameterized-builds}.
+      #
+      # @param options [Hash] The configuration options for the build.
+      # @return [Hash] The specification for the build.
+      def build(options = {})
+        identity = ->(value) { value }
+        transforms = {
+            predefined_parameters: ->(value) do
+              result = value.map { |k,v| "#{k}=#{v}" }.join("\n")
+              value.size > 1 ? result + "\n" : result
+            end,
+            boolean_parameters: ->(value) do
+              Hash[value.map { |k,v| [k.to_s, v] }]
+            end,
+            git_revision: ->(value) do
+              value.is_a?(Hash) ? canonicalize_options(value) : value
+            end
+        }
+        transformed_options = options.map do |k, v|
+          transform = transforms.fetch(k) { identity }
+          [k, transform.call(v)]
+        end
+
+        canonicalize_options(Hash[transformed_options])
+      end
+
+      # @!endgroup
+
       # @!group xunit Test Types
 
       # @!method unittest(options = {})
@@ -101,6 +158,7 @@ module Jujube
       # @return [Hash] The specification for the test type.
       named_config :unittest
 
+      # @!endgroup
     end
   end
 end

data/lib/jujube/components/triggers.rb

@@ -5,6 +5,7 @@ module Jujube
     module Triggers
       extend Macros
 
+      # @!method pollscm(options = {})
       # Specify a `pollscm` trigger for a job.
       #
       # This trigger requires jenkins-job-builder 1.3.0 or later.

data/lib/jujube/job.rb

@@ -93,6 +93,11 @@ module Jujube
 
     # @!group Sections
 
+    # Sections are listed in the order specified under Module Execution in the
+    # Jenkins Job Builder documentation.
+    #
+    # See {http://docs.openstack.org/infra/jenkins-job-builder/definition.html#module-execution}.
+
     # @!method axes
     #   The matrix axes for the job.
     #
@@ -104,6 +109,17 @@ module Jujube
     #   @return [Array]
     section :axes
 
+    # @!method parameters
+    #   The parameters for the job.
+    #
+    #   Add parameters in the job's configuration block using helper methods defined in
+    #   {Components::Parameters}.
+    #
+    #   See {http://docs.openstack.org/infra/jenkins-job-builder/parameters.html}.
+    #
+    #   @return [Array]
+    section :parameters
+
     # @!method properties
     #   The Properties for the job.
     #
@@ -194,6 +210,8 @@ module Jujube
       {'job' => config}
     end
 
+    @registry = nil
+
     # Keep track of all `Job`s defined during the execution of the passed block.
     #
     # This is used during job loading so that no extra syntax is required in the job

data/lib/jujube/version.rb

@@ -1,3 +1,5 @@
+# Top-level namespace for the gem.
 module Jujube
-  VERSION = "0.11.0"
+  # The current gem version.
+  VERSION = "0.12.0"
 end

data/test/components/axes_test.rb

@@ -0,0 +1,15 @@
+require_relative "../test_helper"
+
+class AxesTest < Minitest::Test
+  include Jujube::Components
+
+  def test_label_expression
+    expected = {"axis" => {"type" => "label-expression", "name" => "arch", "values" => %w{i386 amd64}}}
+    assert_equal(expected, label_expression(:arch, %w{i386 amd64}))
+  end
+
+  def test_slave
+    expected = {"axis" => {"type" => "slave", "name" => "arch", "values" => %w{i386 amd64}}}
+    assert_equal(expected, slave(:arch, %w{i386 amd64}))
+  end
+end

data/test/components/parameters_test.rb

@@ -3,13 +3,13 @@ require_relative "../test_helper"
 class ParametersTest < Minitest::Test
   include Jujube::Components
 
-  def test_label_expression_axis
-    expected = {"axis" => {"type" => "label-expression", "name" => "arch", "values" => %w{i386 amd64}}}
-    assert_equal(expected, label_expression(:arch, %w{i386 amd64}))
+  def test_string
+    expected = {"string" => {"name" => "NAME", "default" => "DEFAULT"}}
+    assert_equal(expected, string(name: "NAME", default: "DEFAULT"))
   end
 
-  def test_slave_axis
-    expected = {"axis" => {"type" => "slave", "name" => "arch", "values" => %w{i386 amd64}}}
-    assert_equal(expected, slave(:arch, %w{i386 amd64}))
+  def test_validating_string
+    expected = {"validating-string" => {"name" => "NAME", "regex" => "REGEX", "msg" => "MESSAGE" }}
+    assert_equal(expected, validating_string(name: "NAME", regex: "REGEX", msg: "MESSAGE"))
   end
 end

data/test/components/properties_test.rb

@@ -3,13 +3,13 @@ require_relative "../test_helper"
 class PropertiesTest < Minitest::Test
   include Jujube::Components
 
-  def test_throttle
-    expected = {"throttle" => {"max-total" => 42, "option" => "category", "categories" => %w{cat1 cat2}}}
-    assert_equal(expected, throttle(max_total: 42, option: "category", categories: %w{cat1 cat2}))
-  end
-
   def test_priority_sorter
     expected = {"priority-sorter" => {"priority" => 42}}
     assert_equal(expected, priority_sorter(priority: 42))
   end
+
+  def test_throttle
+    expected = {"throttle" => {"max-total" => 42, "option" => "category", "categories" => %w{cat1 cat2}}}
+    assert_equal(expected, throttle(max_total: 42, option: "category", categories: %w{cat1 cat2}))
+  end
 end

data/test/components/publishers_test.rb

@@ -3,6 +3,16 @@ require_relative "../test_helper"
 class PublishersTest < Minitest::Test
   include Jujube::Components
 
+  def test_archive
+    expected = {"archive" => {"artifacts" => "ARTIFACTS", "latest-only" => true, "allow-empty" => true}}
+    assert_equal(expected, archive(artifacts: "ARTIFACTS", latest_only: true, allow_empty: true))
+  end
+
+  def test_cppcheck
+    expected = {"cppcheck" => {"pattern" => "PATTERN"}}
+    assert_equal(expected, cppcheck(pattern: "PATTERN"))
+  end
+
   def test_email_ext
     assert_equal("email-ext", email_ext)
   end
@@ -12,6 +22,11 @@ class PublishersTest < Minitest::Test
     assert_equal(expected, email_ext(recipients: %w{fred barney}.join(", ")))
   end
 
+  def test_fitnesse
+    expected = {"fitnesse" => {"results" => "RESULTS"}}
+    assert_equal(expected, fitnesse(results: "RESULTS"))
+  end
+
   def test_ircbot
     expected = {"ircbot" => {"notify-start" => true}}
     assert_equal(expected, ircbot(notify_start: true))
@@ -22,14 +37,69 @@ class PublishersTest < Minitest::Test
     assert_equal(expected, junit(results: "RESULTS", keep_long_stdio: false))
   end
 
-  def test_archive
-    expected = {"archive" => {"artifacts" => "ARTIFACTS", "latest-only" => true, "allow-empty" => true}}
-    assert_equal(expected, archive(artifacts: "ARTIFACTS", latest_only: true, allow_empty: true))
+  def test_trigger
+    expected = {"trigger" => {"project" => "PROJECT"}}
+    assert_equal(expected, trigger(project: "PROJECT"))
   end
 
-  def test_cppcheck
-    expected = {"cppcheck" => {"pattern" => "PATTERN"}}
-    assert_equal(expected, cppcheck(pattern: "PATTERN"))
+  def test_trigger_parameterized_builds
+    expected = {"trigger-parameterized-builds" => [
+        {"project" => ["PROJECT1", "PROJECT2"], "condition" => "UNSTABLE"}
+    ]}
+    actual = trigger_parameterized_builds do |builds|
+      builds << build(project: %w[PROJECT1 PROJECT2], condition: "UNSTABLE")
+    end
+    assert_equal(expected, actual)
+  end
+
+  def test_trigger_parameterized_builds_formats_single_predefined_parameter
+    expected = {"trigger-parameterized-builds" => [
+        {"predefined-parameters" => "param=value"}
+    ]}
+    actual = trigger_parameterized_builds do |builds|
+      builds << build(predefined_parameters: {param: 'value'})
+    end
+    assert_equal(expected, actual)
+  end
+
+  def test_trigger_parameterized_builds_formats_multiiple_predefined_parameters
+    expected = {"trigger-parameterized-builds" => [
+        {"predefined-parameters" => "param1=value1\nparam2=value2\n"}
+    ]}
+    actual = trigger_parameterized_builds do |builds|
+      builds << build(predefined_parameters: {param1: 'value1', param2: 'value2'})
+    end
+    assert_equal(expected, actual)
+  end
+
+  def test_trigger_parameterized_builds_formats_boolean_parameters
+    expected = {"trigger-parameterized-builds" => [
+        {"boolean-parameters" => {"param_1" => true, "param_2" => false}}
+    ]}
+    actual = trigger_parameterized_builds do |builds|
+      builds << build(boolean_parameters: {param_1: true, param_2: false})
+    end
+    assert_equal(expected, actual)
+  end
+
+  def test_trigger_parameterized_builds_formats_git_revision_as_boolean
+    expected = {"trigger-parameterized-builds" => [
+        {"git-revision" => true}
+    ]}
+    actual = trigger_parameterized_builds do |builds|
+      builds << build(git_revision: true)
+    end
+    assert_equal(expected, actual)
+  end
+
+  def test_trigger_parameterized_builds_formats_git_revision_as_nested_hash
+    expected = {"trigger-parameterized-builds" => [
+        {"git-revision" => {"combine-queued-commits" => true}}
+    ]}
+    actual = trigger_parameterized_builds do |builds|
+      builds << build(git_revision: {combine_queued_commits: true})
+    end
+    assert_equal(expected, actual)
   end
 
   def test_xunit
@@ -43,14 +113,4 @@ class PublishersTest < Minitest::Test
     end
     assert_equal(expected, actual)
   end
-
-  def test_trigger
-    expected = {"trigger" => {"project" => "PROJECT"}}
-    assert_equal(expected, trigger(project: "PROJECT"))
-  end
-
-  def test_fitnesse
-    expected = {"fitnesse" => {"results" => "RESULTS"}}
-    assert_equal(expected, fitnesse(results: "RESULTS"))
-  end
 end

data/test/components/wrappers_test.rb

@@ -3,10 +3,6 @@ require_relative "../test_helper"
 class WrappersTest < Minitest::Test
   include Jujube::Components
 
-  def test_timestamps
-    assert_equal('timestamps', timestamps)
-  end
-
   def test_timeout
     expected = {'timeout' => {'type' => 'elastic', 'fail' => true}}
     assert_equal(expected, timeout(type: 'elastic', fail: true))
@@ -16,4 +12,8 @@ class WrappersTest < Minitest::Test
     expected = {'timeout' => {'elastic-percentage' => 150, 'elastic-default-timeout' => 3}}
     assert_equal(expected, timeout(elastic_percentage: 150, elastic_default_timeout: 3))
   end
+
+  def test_timestamps
+    assert_equal('timestamps', timestamps)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jujube
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Randy Coulman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,22 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +119,7 @@ files:
 - jujube.gemspec
 - lib/jujube.rb
 - lib/jujube/components.rb
+- lib/jujube/components/axes.rb
 - lib/jujube/components/builders.rb
 - lib/jujube/components/helpers.rb
 - lib/jujube/components/macros.rb
@@ -131,6 +138,7 @@ files:
 - lib/jujube/macros.rb
 - lib/jujube/utils.rb
 - lib/jujube/version.rb
+- test/components/axes_test.rb
 - test/components/builders_test.rb
 - test/components/parameters_test.rb
 - test/components/properties_test.rb
@@ -177,6 +185,7 @@ test_files:
 - acceptance/jujube/acceptance_test.rb
 - acceptance/jujube/end_to_end_test.rb
 - acceptance/jujube/usage_test.rb
+- test/components/axes_test.rb
 - test/components/builders_test.rb
 - test/components/parameters_test.rb
 - test/components/properties_test.rb