add addons, fixes #4

Author: rkh

README.md

@@ -43,7 +43,7 @@ end
 
 ## What is missing?
 
-* Full definition of current .travis.yml format
+* High level API for dealing with secure values
 * Serialization
 
 ## Defining Structure

SPEC.md

@@ -4,6 +4,63 @@ Here is a list of all the options understood by travis-yaml.
 Note that stricitly speaking Travis CI might not have the same understanding of these as travis-yaml has at the moment, since travis-yaml is not yet being used.
 
 ### Available Options
+#### `addons`
+**Expected format:** Key value mapping.
+
+#### `addons.code_climate`
+**Expected format:** Key value mapping.
+
+#### `addons.code_climate.repo_token`
+**Expected format:** String or encrypted string.
+
+#### `addons.coverty_scan`
+**Expected format:** Key value mapping.
+
+#### `addons.coverty_scan.branch_pattern`
+**Expected format:** String or encrypted string.
+
+#### `addons.coverty_scan.build_command`
+**Expected format:** String or encrypted string.
+
+#### `addons.coverty_scan.build_command_prepend`
+**Expected format:** String or encrypted string.
+
+#### `addons.coverty_scan.build_script_url`
+**Expected format:** String or encrypted string.
+
+#### `addons.coverty_scan.notification_email`
+**Expected format:** String or encrypted string.
+
+#### `addons.coverty_scan.project`
+**Expected format:** Key value mapping.
+
+#### `addons.coverty_scan.project.name`
+**This setting is required!**
+
+**Expected format:** String or encrypted string.
+
+#### `addons.firefox`
+`firefox` version to use.
+
+**Expected format:** String.
+
+#### `addons.hosts`
+**Expected format:** List of strings; or a single string.
+
+#### `addons.postgresql`
+`postgresql` version to use.
+
+**Expected format:** String.
+
+#### `addons.sauce_connect`
+**Expected format:** Key value mapping.
+
+#### `addons.sauce_connect.access_key`
+**Expected format:** String or encrypted string.
+
+#### `addons.sauce_connect.username`
+**Expected format:** String or encrypted string.
+
 #### `after_deploy`
 Commands that will be run on the VM.
 

lib/travis/yaml/nodes.rb

@@ -35,6 +35,7 @@ def self.[](key)
     require 'travis/yaml/nodes/notifications'
     require 'travis/yaml/nodes/branches'
     require 'travis/yaml/nodes/cache'
+    require 'travis/yaml/nodes/addons'
     require 'travis/yaml/nodes/root'
   end
 end

lib/travis/yaml/nodes/addons.rb

@@ -0,0 +1,32 @@
+module Travis::Yaml
+  module Nodes
+    class Addons < Mapping
+      class Addon < Mapping
+        def self.[](*keys)
+          Class.new(self) { map(*keys, to: Scalar[:str, :secure])}
+        end
+
+        def visit_scalar(visitor, type, value, implicit = true)
+          return super unless type == :bool
+        end
+      end
+
+      class CovertyScan < Addon
+        class Project < Mapping
+          map :name, to: Scalar[:str, :secure], required: true
+        end
+
+        map :project, to: Project
+        map :build_script_url, :branch_pattern, :notification_email, :build_command,
+          :build_command_prepend, to: Scalar[:str, :secure]
+      end
+
+      map :code_climate,  to: Addon[:repo_token], drop_empty: false
+      map :coverty_scan,  to: CovertyScan
+      map :firefox,       to: Version
+      map :hosts,         to: Sequence
+      map :postgresql,    to: Version
+      map :sauce_connect, to: Addon[:username, :access_key], drop_empty: false
+    end
+  end
+end

lib/travis/yaml/nodes/root.rb

@@ -5,7 +5,7 @@ class Root < Mapping
 
       map :language, required: true
       map :bundler_args, to: BundlerArgs
-      map :deploy, :ruby, :os, :compiler, :git, :jdk, :virtualenv, :matrix, :env, :notifications, :branches, :cache
+      map :deploy, :ruby, :os, :compiler, :git, :jdk, :virtualenv, :matrix, :env, :notifications, :branches, :cache, :addons
       map :lein, :otp_release, :go, :ghc, :node_js, :xcode_sdk, :xcode_scheme, :perl, :php, :python, :services, :gemfile, to: VersionList
       map :rvm, to: :ruby
       map :otp, to: :otp_release

spec/nodes/addons_spec.rb

@@ -0,0 +1,37 @@
+describe Travis::Yaml::Nodes::Addons do
+  context 'from Ruby' do
+    def addons(input)
+      Travis::Yaml.parse!(language: 'ruby', addons: input).addons
+    end
+
+    context 'code_climate' do
+      example { expect(addons(code_climate: true).code_climate).to be == {} }
+      example { expect(addons(code_climate: { repo_token: "foo" }).code_climate.repo_token).to be == "foo" }
+    end
+
+    context 'coverty_scan' do
+      example do
+        config = addons(coverty_scan: { project: { name: :foo } })
+        expect(config.coverty_scan.project.name).to be == "foo"
+      end
+    end
+
+    context 'firefox' do
+      example { expect(addons(firefox: '15').firefox).to be == '15' }
+    end
+
+    context 'hosts' do
+      example { expect(addons(hosts: 'foo.dev').hosts).to be == ['foo.dev'] }
+      example { expect(addons(hosts: ['foo.dev', 'bar.dev']).hosts).to be == ['foo.dev', 'bar.dev'] }
+    end
+
+    context 'postgresql' do
+      example { expect(addons(postgresql: '9.1').postgresql).to be == '9.1' }
+    end
+
+    context 'sauce_connect' do
+      example { expect(addons(sauce_connect: true).sauce_connect).to be == {} }
+      example { expect(addons(sauce_connect: { username: "foo" }).sauce_connect.username).to be == "foo" }
+    end
+  end
+end