rzo 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93c6d5a4116cc4e11c108ab19356d1e1ada72d32
-  data.tar.gz: 12a9d2d9b7f138925a474170294a05d0481e32f9
+  metadata.gz: f2954e0711d95a790a603140732d64ad23aa31b4
+  data.tar.gz: e4240edc192d28ddc36cc95f7a07663b1a2aff9f
 SHA512:
-  metadata.gz: ab032adafed7bca9cb0905718feb61ad77e058d7299635c5a29a013292bcb092d54cf69e8d2774b9f208a178e896f1c2e237fb9937e760d9cd5b8ba1065b2a78
-  data.tar.gz: 40680c98c1034fd4c6fd91b1ca8bf680ba81f3489b55ba4ace6f4fde85c0052b16bc5dcd4546b12e04b560e667c28530af1213a59e78e9b59806c361d1e6dcf2
+  metadata.gz: 798d1d7b8934a933bf1799811b07a6e9621971777aeadf80fe114e46796153a810c6f1a88f9ce6ff129d1cf8a1407e7c8bc4d58afa542d4b64b5dc6fc64788ed
+  data.tar.gz: b85c666c757ca10feb5bc8bff846a1104ef0b264f295e7ad7d309b211a77cab3ee2b5c7de463ade2e544a6007b7346990bb24f178b53e239f5cc17f254c15965

data/.rubocop.yml

@@ -19,9 +19,6 @@ Style/InverseMethods:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-Lint/UnneededDisable:
-  Enabled: false
-
 Layout/MultilineOperationIndentation:
   Enabled: false
 
@@ -50,7 +47,10 @@ Style/Next:
 Style/NonNilCheck:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
   Enabled: false
 
 Style/TrailingCommaInArguments:

data/.travis.yml

@@ -6,8 +6,8 @@ notifications:
   email: false
 
 rvm:
-  - 2.1.9
-  - 2.4.1
+  - 2.4.4
+  - 2.5.1
 
 script:
   - 'bundle exec rake validate rubocop'

data/README.md

@@ -4,14 +4,14 @@ Rizzo is a heavily customized Vagrant configuration and work flow with a
 role based focus. It is meant to make working with Vagrant easier and
 purpose built for layered Puppet control repositories.
 
-Rizzo loads a personal configuration file, `~/.rizzo.json` by default, which
-lists one or more control repositories.  Rizzo then looks for and loads a
-`.rizzo.json` configuration file located at the root of the top level control
-repository.  The top level control repository is the first listed in
+Rizzo loads a personal configuration file, `~/.rizzo.yaml` by default, which
+lists one or more control repositories. Rizzo then looks for and loads a
+`.rizzo.yaml` configuration file located at the root of the top level control
+repository. The top level control repository is the first listed in
 the array of control repositories in the personal configuration file.
 
 There should be at least one node for every role that is managed by a
-control repo. This information is stored in `.rizzo.json` under the
+control repo. This information is stored in `.rizzo.yaml` under the
 control repo. This makes it apparent what roles are available and aids
 in functional testing.
 
@@ -29,7 +29,7 @@ Tested to work with ruby versions associated with Puppet, see
 
 # Installation
 
-Add the rizzo gem to your control repository `Gemfile`.  For example, in
+Add the rizzo gem to your control repository `Gemfile`. For example, in
 `puppetdata`:
 
 ```diff
@@ -61,7 +61,7 @@ bundle exec rizzo --help
 usage: rizzo [GLOBAL OPTIONS] SUBCOMMAND [ARGS]
 Sub Commands:
 
-  config       Print out the combined rizzo json config
+  config       Print out the combined rizzo yaml config
   generate     Initialize Vagrantfile in top control repo
 
 Global options: (Note, command line arguments supersede ENV vars in {}'s)
@@ -69,12 +69,12 @@ Global options: (Note, command line arguments supersede ENV vars in {}'s)
   -s, --syslog        Log to syslog
   -v, --verbose       Set log level to INFO
   -d, --debug         Set log level to DEBUG
-  -c, --config=<s>    Rizzo config file {RZO_CONFIG} (default: ~/.rizzo.json)
+  -c, --config=<s>    Rizzo config file {RZO_CONFIG} (default: ~/.rizzo.yaml)
   -e, --version       Print version and exit
   -h, --help          Show this message
 ```
 
-Once rizzo is installed, setup your configuration file, `~/.rizzo.json`, then
+Once rizzo is installed, setup your configuration file, `~/.rizzo.yaml`, then
 use `bundle exec rizzo generate` to write the `Vagrantfile` in your control
 repo.
 
@@ -94,48 +94,40 @@ repo.
 
 # Setup
 
-## `~/.rizzo.json`
+## `~/.rizzo.yaml`
 
-The personal configuration file is loaded first, from `~/.rizzo.json` by default.
+The personal configuration file is loaded first, from `~/.rizzo.yaml` by default.
 The global `--config` option allows the end user to specific a different path to
 the personal configuration file.
 
 Using this example, change the paths to your git repos:
 
-```json
-{
-  "defaults": {
-    "bootstrap_repo_path": "/Users/gh/git/bootstrap"
-  },
-  "control_repos": [
-    "/Users/gh/git/puppet-control-myteam",
-    "/Users/gh/git/puppetdata",
-    "/Users/gh/git/puppet-modules"
-  ],
-  "puppetmaster": {
-    "name": "infra-puppetca",
-    "modulepath": [
-      "./modules",
-      "./puppetdata/modules",
-      "./ghoneycutt/modules"
-    ],
-    "synced_folders": {
-      "/repos/puppetdata": {
-        "local": "/Users/gh/git/puppetdata",
-        "owner": "root",
-        "group": "root"
-      },
-      "/repos/ghoneycutt": {
-        "local": "/Users/gh/git/puppet-modules",
-        "owner": "root",
-        "group": "root"
-      }
-    }
-  }
-}
+```yaml
+---
+defaults:
+  bootstrap_repo_path: "/Users/gh/git/bootstrap"
+control_repos:
+- "/Users/gh/git/puppet-control-myteam"
+- "/Users/gh/git/puppetdata"
+- "/Users/gh/git/puppet-modules"
+puppetmaster:
+  name: "infra-puppetca"
+  modulepath:
+  - "./modules"
+  - "./puppetdata/modules"
+  - "./ghoneycutt/modules"
+  synced_folders:
+    /repos/puppetdata:
+      local: "/Users/gh/git/puppetdata"
+      owner: "root"
+      group: "root"
+    /repos/ghoneycutt:
+      local: "/Users/gh/git/puppet-modules"
+      owner: "root"
+      group: "root"
 ```
 
-Once you have a personal config file, `~/.rizzo.json`, change directories to
+Once you have a personal config file, `~/.rizzo.yaml`, change directories to
 your top level control repository and generate your `Vagrantfile`:
 
 ```shell
@@ -171,15 +163,15 @@ VM, run `vagrant status NAME`.
 ### defaults
 
 The defaults hash is merged with each node entries hash. Put user
-specific entries in the personal configuration file at `~/.rizzo.json` and
-control repo specific entries in `${PATH_TO_CONTROL_REPO}/.rizzo.json`.
+specific entries in the personal configuration file at `~/.rizzo.yaml` and
+control repo specific entries in `${PATH_TO_CONTROL_REPO}/.rizzo.yaml`.
 
 ### control_repos
 
 The control_repos array is a list of control repos. Rizzo takes the
 approach that control repos are layered. The ordering should match your
 `puppetmaster['modulepath']` array. The first control repo with a
-`.rizzo.json` in it will have that Rizzo config used.
+`.rizzo.yaml` in it will have that Rizzo config used.
 
 ### puppetmaster
 
@@ -207,52 +199,54 @@ local, which is the path on the host and owner and group which are the
 owner and group permissions the directory will be mounted with on the
 guest.
 
-## `controlrepo/.rizzo.json`
-
-```json
-{
-  "defaults": {
-    "bootstrap_script_path": "bootstrap_puppet4.sh",
-    "bootstrap_script_args": "-l -f `hostname -f`",
-    "bootstrap_guest_path": "/tmp/bootstrap",
-    "boot_timeout": "500",
-    "box": "centos7.box",
-    "box_url": "https://vagrantboxes/centos7.box",
-    "box_download_checksum": "3764a2c4ae3829aa4b50971e216c3a03736aafb2",
-    "box_download_checksum_type": "sha1",
-    "memory": "1024",
-    "netmask": "255.255.255.0",
-    "update_packages": true,
-    "update_packages_command": "yum -y update",
-    "shutdown": true,
-    "shutdown_command": "/sbin/shutdown -h now"
-  },
-  "nodes": [
-    {
-      "name": "infra-puppetca",
-      "hostname": "infra-puppetca1.example.org",
-      "forwarded_ports": [
-        {
-          "guest": "8140",
-          "host": "8140"
-        }
-      ],
-      "ip": "172.16.100.5",
-      "memory": "2048"
-    },
-    {
-      "name": "infra-puppet",
-      "hostname": "infra-puppet1.example.org",
-      "ip": "172.16.100.6",
-      "memory": "2048"
-    },
-    {
-      "name": "www-api",
-      "hostname": "www-api1.example.org",
-      "ip": "172.16.100.7"
-    }
-  ]
-}
+## `controlrepo/.rizzo.yaml`
+
+```yaml
+---
+defaults:
+  bootstrap_script_path: "bootstrap_puppet4.sh"
+  bootstrap_script_args: "-l -f `hostname -f`"
+  bootstrap_guest_path: "/tmp/bootstrap"
+  boot_timeout: 500
+  box: "centos7.box"
+  box_url: "https://vagrantboxes/centos7.box"
+  box_download_checksum: "3764a2c4ae3829aa4b50971e216c3a03736aafb2"
+  box_download_checksum_type: "sha1"
+  memory: "1024"
+  netmask: "255.255.255.0"
+  update_packages: true
+  update_packages_command: "yum -y update"
+  shutdown: true
+  shutdown_command: "/sbin/shutdown -h now"
+nodes:
+  - name: "infra-puppetca"
+    hostname: "infra-puppetca1.example.org"
+    forwarded_ports:
+    - guest: "8140"
+      host: "8140"
+    ip: "172.16.100.5"
+    memory: "2048"
+  - name: "infra-puppet"
+    hostname: "infra-puppet1.example.org"
+    ip: "172.16.100.6"
+    memory: "2048"
+  - name: "www-api"
+    hostname: "www-api1.example.org"
+    ip: "172.16.100.7"
+  - name: "mssql1"
+    hostname: "mysql1.example.org"
+    forwarded_ports:
+    - guest: "5985"
+      host: "5985"
+    ip: "172.16.100.8"
+    windows: true
+    gui: true
+    shutdown: false
+    update_packages: false
+    box: "mwrock/Windows2016"
+    box_url: ~
+    box_download_checksum: ~
+    box_download_checksum_type: ~
 ```
 
 ### defaults
@@ -308,10 +302,10 @@ Path of script to be used to bootstrap a system. This is relative to
 
 Any arguments to pass to `bootstrap_script_path`.
 
-#### boot_timeout
+#### boot_timeout (Integer)
 
 Optional parameter that sets the amount of time is seconds that Vagrant waits for
-a node to become available via ssh before it fails.  Default is 300 seconds.
+a node to become available via ssh before it fails. Default is 300 seconds.
 
 #### box
 
@@ -352,3 +346,14 @@ ensure the guest additions are working.
 #### shutdown_command
 
 The command used to shutdown the system.
+
+#### gui
+
+If this is set to `true` the GUI will be enabled. This brings up the
+VirtualBox window and aid in debugging on Windows systems.
+
+#### windows
+
+If this is set to `true`, extra options will be included to let Vagrant
+know this is a windows host and to use WinRM for the connect. It will
+also use the `name` entry instead of `hostname`.

data/Rakefile

@@ -1,4 +1,4 @@
-require 'json'
+require 'yaml'
 require 'rubocop/rake_task'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
@@ -8,13 +8,13 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc 'Validation tests'
 task :validate do
-  puts '=== Validating JSON (*.json) files'
-  filelist = FileList.new('**/*.json')
+  puts '=== Validating YAML (*.yaml) files'
+  filelist = FileList.new('**/*.yaml')
   filelist.exclude('.bundle/**')
-  filelist.each do |json_file|
-    puts json_file
-    json = File.read(json_file)
-    JSON.parse(json)
+  filelist.each do |yaml_file|
+    puts yaml_file
+    yaml = File.read(yaml_file)
+    YAML.parse(yaml)
   end
 
   puts "\n=== Validating ruby (*.rb, Vagrantfile, Rakefile and Gemfile) files"

data/ext/_rizzo.yaml

@@ -0,0 +1,23 @@
+---
+defaults:
+  bootstrap_repo_path: "/Users/jeff/projects/acme/bootstrap"
+control_repos:
+- "/Users/jeff/projects/acme/puppetdata"
+- "/Users/jeff/projects/acme/ghoneycutt-modules"
+puppetmaster:
+  name:
+  - infra-puppetfourca
+  - infra-puppetfour
+  modulepath:
+  - "./modules"
+  - "./puppetdata/modules"
+  - "./ghoneycutt/modules"
+  synced_folders:
+    "/repos/puppetdata":
+      local: "/Users/jeff/projects/acme/puppetdata"
+      owner: root
+      group: root
+    "/repos/ghoneycutt":
+      local: "/Users/jeff/projects/acme/ghoneycutt-modules"
+      owner: root
+      group: root

data/lib/rzo/app.rb

@@ -4,7 +4,7 @@ require 'rzo/option_parsing'
 require 'rzo/app/config'
 require 'rzo/app/generate'
 require 'rzo/app/roles'
-require 'json'
+require 'yaml'
 
 module Rzo
   ##

data/lib/rzo/app/config.rb

@@ -8,7 +8,7 @@ module Rzo
       def run
         exit_status = 0
         load_config!
-        write_file(opts[:output]) { |fd| fd.puts(JSON.pretty_generate(config)) }
+        write_file(opts[:output]) { |fd| fd.puts(config.to_yaml) }
         exit_status
       end
     end

data/lib/rzo/app/config_validation.rb

@@ -7,15 +7,15 @@ module Rzo
     ##
     # Mix-in module providing configuration validation methods and safety
     # checking.  The goal is to provide useful feedback to the end user in the
-    # situation where ~/.rizzo.json is configured to point at directories which
+    # situation where ~/.rizzo.yaml is configured to point at directories which
     # do not exist, have missing keys, etc...
     # rubocop:disable Metrics/ModuleLength
     module ConfigValidation
       ## Rizzo configuration schema for the personal configuration file at
-      # ~/.rizzo.json.  Minimum necessary to load the complete configuration from
+      # ~/.rizzo.yaml.  Minimum necessary to load the complete configuration from
       # all control repositories.
       RZO_PERSONAL_CONFIG_SCHEMA = {
-        '$schema' => 'http://json-schema.org/draft-06/schema#',
+        '$schema' => 'http://json-schema.org/draft/schema#',
         title: 'Personal Configuration',
         description: 'Rizzo personal configuration file',
         type: 'object',
@@ -60,7 +60,7 @@ module Rzo
                 items: { type: 'string' },
               },
               synced_folders: {
-                '$schema' => 'http://json-schema.org/draft-06/schema#',
+                '$schema' => 'http://json-schema.org/draft/schema#',
                 type: 'object',
                 properties: {
                   '/' => {},
@@ -160,7 +160,7 @@ module Rzo
 
       ##
       # Validate a personal configuration, typically originating from
-      # ~/.rizzo.json. This configuration is necessary to build a complete
+      # ~/.rizzo.yaml. This configuration is necessary to build a complete
       # control repo configuration using the top level control repo. This
       # validation focuses on the minimum necessary configuration to bootstrap
       # the complete configuration, primarily the repo locations and existence.
@@ -175,9 +175,9 @@ module Rzo
 
       ##
       # Validate a complete loaded configuration.  This is distinct from a base
-      # configuration in that the JSON files in each control repository have
+      # configuration in that the YAML files in each control repository have
       # already been merged, in order, on top of the base configuration
-      # originating at ~/.rizzo.json.  This implements safety checking.  These
+      # originating at ~/.rizzo.yaml.  This implements safety checking.  These
       # methods are expected to execute within the context of a
       # Rzo::App::Subcommand instance, therefore log methods and the parsed
       # configuration are assumed to be available.
@@ -304,3 +304,4 @@ module Rzo
     # rubocop:enable Metrics/ModuleLength
   end
 end
+# rubocop:enable Style/GuardClause

data/lib/rzo/app/generate.rb

@@ -17,7 +17,7 @@ module Rzo
         exit_status = 0
         load_config!
         # Vagrantfile
-        erbfile = File.expand_path('../templates/Vagrantfile.erb', __FILE__)
+        erbfile = File.expand_path('templates/Vagrantfile.erb', __dir__)
         content = vagrantfile_content(erbfile, config)
         write_file(opts[:vagrantfile]) { |fd| fd.write(content) }
         say "Wrote vagrant config to #{opts[:vagrantfile]}"
@@ -33,19 +33,27 @@ module Rzo
       #
       # @return [Array<Hash>] list of agent nodes to fill in the Vagrantfile
       # template.
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def vagrantfile_agents(config)
         pm_settings = puppetmaster_settings(config)
         agent_nodes = [*config['nodes']].reject do |n|
           pm_settings['name'].include?(n['name'])
         end
 
-        agent_nodes.each do |n|
-          n.deep_merge(config['defaults'])
+        agent_nodes.map! do |n|
+          new_n = deep_convert_boolean(n)
+          defaults = deep_convert_boolean(config['defaults'])
+          new_n.deep_merge(defaults)
+          n = deep_unconvert_boolean(new_n)
           log.debug "puppetagent #{n['name']} = \n" + n.pretty_inspect
+          n
         end
 
         agent_nodes
       end
+      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/AbcSize
 
       ##
       # Return a list of puppetmaster node definitions suitable for the
@@ -58,19 +66,26 @@ module Rzo
       # Vagrantfile template.
       #
       # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def vagrantfile_puppet_masters(config)
         pm_settings = puppetmaster_settings(config)
         pm_names = pm_settings['name']
 
         nodes = [*config['nodes']].find_all { |n| pm_names.include?(n['name']) }
-        nodes.each do |n|
-          n.deep_merge(config['defaults'])
-          n.deep_merge(pm_settings)
+        nodes.map! do |n|
+          new_n = deep_convert_boolean(n)
+          defaults = deep_convert_boolean(config['defaults'])
+          new_pm_settings = deep_convert_boolean(pm_settings)
+          new_n.deep_merge(defaults)
+          new_n.deep_merge(new_pm_settings)
+          n = deep_unconvert_boolean(new_n)
           n[:puppetmaster] = true
           log.debug "puppetmaster #{n['name']} = \n" + n.pretty_inspect
+          n
         end
       end
       # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
 
       ##
       # Return the proxy configuration exception list as a string, or nil if not set.
@@ -82,6 +97,7 @@ module Rzo
       def proxy_config(config)
         # Proxy Setting
         return nil unless config['config']
+
         config['config']['no_proxy'] || DEFAULT_NO_PROXY
       end
 
@@ -132,6 +148,46 @@ module Rzo
 
       # Constants used by the Vagrantfile.erb template.
       DEFAULT_NO_PROXY = 'localhost,127.0.0.1'.freeze
+
+      private
+
+      ##
+      # Convert boolean to string for deep_merge
+      # rubocop:disable Metrics/MethodLength
+      def deep_convert_boolean(hash)
+        new_hash = {}
+        hash.each_pair do |key, value|
+          if value.is_a?(Hash)
+            new_hash[key] = deep_convert_boolean(value)
+          elsif value.is_a?(TrueClass)
+            new_hash[key] = 'true'
+          elsif value.is_a?(FalseClass)
+            new_hash[key] = 'false'
+          else
+            new_hash[key] = value
+          end
+        end
+        return new_hash
+      end
+
+      ##
+      # Convert boolean strings to boolean for use after deep_merge
+      def deep_unconvert_boolean(hash)
+        new_hash = {}
+        hash.each_pair do |key, value|
+          if value.is_a?(Hash)
+            new_hash[key] = deep_unconvert_boolean(value)
+          elsif value == 'true'
+            new_hash[key] = true
+          elsif value == 'false'
+            new_hash[key] = false
+          else
+            new_hash[key] = value
+          end
+        end
+        return new_hash
+      end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/rzo/app/roles.rb

@@ -14,8 +14,10 @@ module Rzo
       # name.  This is the same as the name of the VM.
       def roles
         return [] unless nodes = config['nodes']
+
         nodes.each_with_object([]) do |node, a|
           next unless node['name']
+
           a << node['name']
         end
       end

data/lib/rzo/app/subcommand.rb

@@ -2,6 +2,7 @@ require 'pathname'
 require 'rzo/logging'
 require 'deep_merge'
 require 'rzo/app/config_validation'
+require 'yaml'
 module Rzo
   class App
     # The base class for subcommands
@@ -13,7 +14,7 @@ module Rzo
       # The options hash injected from the application controller via the
       # initialize method.
       attr_reader :opts
-      # The Rizzo configuration after loading ~/.rizzo.json (--config).
+      # The Rizzo configuration after loading ~/.rizzo.yaml (--config).
       # See #load_config!
       attr_reader :config
       # The present working directory at startup
@@ -24,10 +25,11 @@ module Rzo
       def self.load_rizzo_config(fpath)
         config_file = Pathname.new(fpath).expand_path
         raise ErrorAndExit, "Cannot read config file #{config_file}" unless config_file.readable?
-        config = JSON.parse(config_file.read)
+
+        config = YAML.safe_load(config_file.read)
         log.debug "Loaded #{config_file}"
         config
-      rescue JSON::ParserError => e
+      rescue Psych::SyntaxError => e
         raise ErrorAndExit, "Could not parse rizzo config #{config_file} #{e.message}"
       end
 
@@ -59,14 +61,14 @@ module Rzo
       # Load rizzo configuration.  Populate @config.
       #
       # Read rizzo configuration by looping through control repos and stopping
-      # at first match and merge on top of local, defaults (~/.rizzo.json)
+      # at first match and merge on top of local, defaults (~/.rizzo.yaml)
       def load_config!
         config = load_rizzo_config(opts[:config])
         validate_personal_config!(config)
         repos = reorder_repos(config['control_repos'])
         config['control_repos'] = repos
         @config = load_repo_configs(config, repos)
-        debug "Merged configuration: \n#{JSON.pretty_generate(@config)}"
+        debug "Merged configuration: \n#{@config.to_yaml}"
         # TODO: Move these validations to an instance method?
         validate_complete_config!(@config)
         # validate_forwarded_ports(@config)
@@ -75,7 +77,7 @@ module Rzo
       end
 
       ##
-      # Given a list of repository paths, load .rizzo.json from the root of each
+      # Given a list of repository paths, load .rizzo.yaml from the root of each
       # repository and return the result merged onto config.  The merging
       # behavior is implemented by
       # [deep_merge](http://www.rubydoc.info/gems/deep_merge/1.1.1)
@@ -83,12 +85,12 @@ module Rzo
       # @param [Hash] config the starting config hash.  Repo config maps will be
       #   merged on top of this starting map.
       #
-      # @param [Array] repos the list of repositories to load .rizzo.json from.
+      # @param [Array] repos the list of repositories to load .rizzo.yaml from.
       #
       # @return [Hash] the merged configuration hash.
       def load_repo_configs(config = {}, repos = [])
         repos.each_with_object(config.dup) do |repo, hsh|
-          fp = Pathname.new(repo).expand_path + '.rizzo.json'
+          fp = Pathname.new(repo).expand_path + '.rizzo.yaml'
           if readable?(fp.to_s)
             hsh.deep_merge!(load_rizzo_config(fp.to_s))
           else
@@ -130,7 +132,7 @@ module Rzo
       # Helper to raise a duplicate port error
       def raise_port_err(port, node)
         raise ErrorAndExit, "host port #{port} on node #{node} " \
-          'is a duplicate.  Ports must be unique.  Check .rizzo.json ' \
+          'is a duplicate.  Ports must be unique.  Check .rizzo.yaml ' \
           'files in each control repository for duplicate forwarded_ports entries.'
       end
 
@@ -138,7 +140,7 @@ module Rzo
       # Helper to raise a duplicate port error
       def raise_ip_err(ip, node)
         raise ErrorAndExit, "host ip #{ip} on node #{node} " \
-          'is a duplicate.  IP addresses must be unique.  Check .rizzo.json ' \
+          'is a duplicate.  IP addresses must be unique.  Check .rizzo.yaml ' \
           'files in each control repository for duplicate ip entries'
       end
 
@@ -175,22 +177,23 @@ module Rzo
       ##
       # Memoized method to return the fully qualified path to the current rizzo
       # project directory, based on the pwd.  The project directory is the
-      # dirname of the full path to a `.rizzo.json` config file.  Return false
-      # if not a project directory.  ~/.rizzo.json is considered a personal
+      # dirname of the full path to a `.rizzo.yaml` config file.  Return false
+      # if not a project directory.  ~/.rizzo.yaml is considered a personal
       # configuration and not a project configuration.
       #
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       def project_dir(path)
         return @project_dir unless @project_dir.nil?
-        rizzo_file = Pathname.new("#{path}/.rizzo.json")
-        personal_config = Pathname.new(File.expand_path('~/.rizzo.json'))
+
+        rizzo_file = Pathname.new("#{path}/.rizzo.yaml")
+        personal_config = Pathname.new(File.expand_path('~/.rizzo.yaml'))
         iterations = 0
         while @project_dir.nil? && iterations < 100
           iterations += 1
           if readable?(rizzo_file.to_s) && rizzo_file != personal_config
             @project_dir = rizzo_file.dirname.to_s
           else
-            rizzo_file = rizzo_file.dirname.dirname + '.rizzo.json'
+            rizzo_file = rizzo_file.dirname.dirname + '.rizzo.yaml'
             @project_dir = false if rizzo_file.dirname.root?
           end
         end
@@ -211,5 +214,6 @@ module Rzo
         end
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/rzo/app/templates/Vagrantfile.erb

@@ -13,16 +13,35 @@ Vagrant.configure(2) do |config|
 
   config.vm.define <%= nc['name'].inspect %>, autostart: false do |cfg|
     cfg.vm.box = <%= nc['box'].inspect %>
+    <%- if nc['box_url'] -%>
     cfg.vm.box_url = <%= nc['box_url'].inspect %>
+    <%- end -%>
+    <%- if nc['box_download_checksum'] -%>
     cfg.vm.box_download_checksum = <%= nc['box_download_checksum'].inspect %>
+    <%- end -%>
+    <%- if nc['box_download_checksum_type'] -%>
     cfg.vm.box_download_checksum_type = <%= nc['box_download_checksum_type'].inspect %>
+    <%- end -%>
     <%- if nc['boot_timeout'] -%>
     cfg.vm.boot_timeout = <%= nc['boot_timeout'].inspect %>
     <%- end -%>
+    <%- if nc['memory'] || nc['gui'] -%>
     cfg.vm.provider :virtualbox do |vb|
+      <%- if nc['memory'] -%>
       vb.customize ['modifyvm', :id, '--memory', <%= nc['memory'].inspect %>]
+      <%- end -%>
+      <%- if nc['gui'] -%>
+      vb.gui = <%= nc['gui'].inspect %>
+      <%- end -%>
     end
+    <%- end -%>
+    <%- if nc['windows'] == true -%>
+    cfg.vm.guest = :windows
+    cfg.vm.communicator = :winrm
+    cfg.vm.hostname = <%= nc['name'].inspect %>
+    <%- else -%>
     cfg.vm.hostname = <%= nc['hostname'].inspect %>
+    <%- end -%>
     cfg.vm.network 'private_network',
       ip: <%= nc['ip'].inspect %>,
       netmask: <%= nc['netmask'].inspect %>
@@ -40,17 +59,21 @@ Vagrant.configure(2) do |config|
     cfg.vm.synced_folder <%= nc['bootstrap_repo_path'].inspect %>,
       <%= nc['bootstrap_guest_path'].inspect %>,
       owner: 'vagrant', group: 'root'
+    <%- end -%>
     <%- if nc[:puppetmaster] -%>
     cfg.vm.provision 'shell', inline: <%= "echo 'modulepath = #{nc['modulepath'].join(':')}' > #{nc['bootstrap_guest_path']}/environment.conf".inspect %>
     <%- end -%>
-    cfg.vm.provision 'shell', inline: <%= "/bin/bash #{nc['bootstrap_guest_path']}/#{nc['bootstrap_script_path']} #{nc['bootstrap_script_args']}".inspect %>
-    <%- if nc['update_packages'] -%>
+    <%- if nc['windows'] == true -%>
+    cfg.vm.provision 'shell', inline: <%= "#{nc['bootstrap_guest_path']}\\#{nc['bootstrap_script_path']} #{nc['bootstrap_script_args']}".inspect %>
+    <%- else -%>
+    cfg.vm.provision 'shell', inline: <%= "/bin/bash #{nc['bootstrap_guest_path']}/#{nc['bootstrap_script_path']} #{nc['bootstrap_script_args']}".inspect.chomp %>
+    <%- end -%>
+    <%- if nc['update_packages'] == true -%>
     cfg.vm.provision 'shell', inline: <%= nc['update_packages_command'].inspect %>
     <%- end -%>
-    <%- if nc['shutdown'] -%>
+    <%- if nc['shutdown'] == true -%>
     cfg.vm.provision 'shell', inline: <%= nc['shutdown_command'].inspect %>
     <%- end -%>
-    <%- end -%>
   end
   <%- end -%>
 end

data/lib/rzo/option_parsing.rb

@@ -66,7 +66,7 @@ module Rzo
         opt :debug, 'Set log level to DEBUG {RZO_DEBUG="true"}',
             default: env['RZO_DEBUG'] == 'true'
         opt :config, 'Rizzo config file {RZO_CONFIG}',
-            default: env['RZO_CONFIG'] || '~/.rizzo.json'
+            default: env['RZO_CONFIG'] || '~/.rizzo.yaml'
       end
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
@@ -123,11 +123,12 @@ module Rzo
 usage: #{NAME} [GLOBAL OPTIONS] SUBCOMMAND [ARGS]
 Sub Commands:
 
-  config       Print out the combined rizzo json config
+  config       Print out the combined rizzo yaml config
   generate     Initialize Vagrantfile in top control repo
   roles        Output all roles defined in the combined config
 
 Global options: (Note, command line arguments supersede ENV vars in {}'s)
     BANNERMSG
+    # rubocop:enable Layout/IndentHeredoc
   end
 end

data/lib/rzo/version.rb

@@ -5,7 +5,7 @@ module Rzo
   # The authoritative location of the rzo version.  It should be possible to
   # `require 'rizzo/version'` and access `Rizzo::VERSION` from third party
   # libraries and the gemspec.  The version is defined as a Semantic Version.
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 
   ##
   # Return the SemVer string, e.g. `"0.1.0"`

data/rzo.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rzo/version'
 
@@ -40,6 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.14'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_dependency 'deep_merge', '~> 1.1'
-  spec.add_dependency 'json', '~> 2.1'
-  spec.add_dependency 'json-schema', '~> 2.8'
+  spec.add_dependency 'json-schema', '>= 2.8.1'
 end

data/scripts/functional_gem_behavior.sh

@@ -90,19 +90,19 @@ debug() {
   echo -e "${BLUE}Debug:${NC} $msg" >&2
 }
 
-# Move ~/.rizzo.json out of the way if it exists
-if [[ -e ~/.rizzo.json ]]; then
-  debug "Moving ~/.rizzo.json to ~/.rizzo.json.$STAMP"
-  mv -f ~/.rizzo.json ~/.rizzo.json.$STAMP
+# Move ~/.rizzo.yaml out of the way if it exists
+if [[ -e ~/.rizzo.yaml ]]; then
+  debug "Moving ~/.rizzo.yaml to ~/.rizzo.yaml.$STAMP"
+  mv -f ~/.rizzo.yaml ~/.rizzo.yaml.$STAMP
 fi
 
 # Clean up our temp directory
 scratch=$(mktemp -d)
 export TMPDIR="$scratch"
 finish() {
-  if [[ -e ~/.rizzo.json.$STAMP ]]; then
-    mv -f ~/.rizzo.json.$STAMP ~/.rizzo.json
-    debug "Moved ~/.rizzo.json.$STAMP to ~/.rizzo.json"
+  if [[ -e ~/.rizzo.yaml.$STAMP ]]; then
+    mv -f ~/.rizzo.yaml.$STAMP ~/.rizzo.yaml
+    debug "Moved ~/.rizzo.yaml.$STAMP to ~/.rizzo.yaml"
   fi
   if [[ -d "$scratch" ]]; then
     rm -rf "$scratch"
@@ -193,26 +193,38 @@ fi
 # Puppet data repositories used by rizzo
 PUPPETDATA="${TMPDIR}/git/puppetdata"
 
-desc "With a valid ~/.rizzo.json file looking like:"
-cat > ~/.rizzo.json <<EOCONFIG
-{
-  "defaults": { "bootstrap_repo_path": "${HOME}/git/bootstrap" },
-  "control_repos": [ "${PUPPETDATA}", "${HOME}/git/ghoneycutt-modules" ],
-  "puppetmaster": {
-    "name": [ "puppetca", "puppet" ],
-    "modulepath": [ "./modules", "./puppetdata/modules", "./ghoneycutt/modules" ],
-    "synced_folders": {
-      "/repos/puppetdata": { "local": "${PUPPETDATA}", "owner": "root", "group": "root" },
-      "/repos/ghoneycutt": { "local": "${HOME}/git/ghoneycutt-modules", "owner": "root", "group": "root" }
-    }
-  }
-}
+desc "With a valid ~/.rizzo.yaml file looking like:"
+cat > ~/.rizzo.yaml <<EOCONFIG
+---
+  defaults:
+    box: el6-rc5
+    bootstrap_repo_path: "${HOME}/git/bootstrap"
+  control_repos:
+  - ${PUPPETDATA}
+  - ${HOME}/git/ghoneycutt-modules
+  puppetmaster:
+    name:
+    - puppetca
+    - puppet
+    modulepath:
+    - ./modules
+    - ./puppetdata/modules
+    - ./ghoneycutt/modules
+    synced_folders:
+      /repos/puppetdata:
+        local: "${PUPPETDATA}"
+        owner: "root"
+        group: "root"
+      /repos/ghoneycutt:
+        local: "${HOME}/git/ghoneycutt-modules"
+        owner: "root"
+        group: "root"
 EOCONFIG
 # Print out the config
-expected=$(mktemp -t XXXXXX.rizzo.json)
-ruby -rjson -e 'puts JSON.pretty_generate(JSON.parse(ARGF.read))' ~/.rizzo.json | tee $expected
+expected=$(mktemp -t XXXXXX.rizzo.yaml)
+ruby -ryaml -e 'puts YAML.safe_load(ARGF.read).to_yaml' ~/.rizzo.yaml | tee $expected
 
-desc "rzo config is expected to pretty generate the JSON config"
+desc "rzo config is expected to pretty generate the YAML config"
 stdout=$(mktemp -t XXXXXX.stdout)
 stderr=$(mktemp -t XXXXXX.stderr)
 rzo config > $stdout 2> $stderr
@@ -264,7 +276,7 @@ else
   pass "It does."
 fi
 
-desc "rzo roles with no personal .rizzo.json is expected to warn"
+desc "rzo roles with no personal .rizzo.yaml is expected to warn"
 stdout=$(mktemp -t XXXXXX.stdout)
 stderr=$(mktemp -t XXXXXX.stderr)
 rzo roles 2> $stderr > $stdout
@@ -278,7 +290,7 @@ if ! [[ -d "$PUPPETDATA" ]]; then
   mkdir -p "$PUPPETDATA"
   debug "Created $PUPPETDATA"
 fi
-echo '{"nodes":[{"name":"puppetca"}]}' > ${PUPPETDATA}/.rizzo.json
+echo '{"nodes":[{"name":"puppetca"}]}' > ${PUPPETDATA}/.rizzo.yaml
 
 stdout=$(mktemp -t XXXXXX.stdout)
 stderr=$(mktemp -t XXXXXX.stderr)
@@ -304,13 +316,7 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.define "puppetca", autostart: false do |cfg|
-    cfg.vm.box = nil
-    cfg.vm.box_url = nil
-    cfg.vm.box_download_checksum = nil
-    cfg.vm.box_download_checksum_type = nil
-    cfg.vm.provider :virtualbox do |vb|
-      vb.customize ['modifyvm', :id, '--memory', nil]
-    end
+    cfg.vm.box = "el6-rc5"
     cfg.vm.hostname = nil
     cfg.vm.network 'private_network',
       ip: nil,

data/scripts/json2yaml.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'json'
+require 'yaml'
+
+input = ARGV[0]
+
+json_data = File.read(input)
+data = JSON.parse(json_data)
+output = input.gsub('.json', '.yaml')
+puts output
+File.open(output, 'w') do |o|
+  o.write(data.to_yaml)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rzo
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Garrett Honeycutt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -193,34 +193,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 2.8.1
 description: Rizzo (rzo) is a tool for working with Vagrant and layered Puppet control
   repos
 email:
@@ -247,7 +233,7 @@ files:
 - bin/setup
 - exe/rizzo
 - exe/rzo
-- ext/_rizzo.json
+- ext/_rizzo.yaml
 - lib/rzo.rb
 - lib/rzo/app.rb
 - lib/rzo/app/config.rb
@@ -262,6 +248,7 @@ files:
 - lib/rzo/version.rb
 - rzo.gemspec
 - scripts/functional_gem_behavior.sh
+- scripts/json2yaml.rb
 homepage: https://github.com/ghoneycutt/rizzo
 licenses:
 - Apache-2.0
@@ -283,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Rizzo (rzo) is a tool for working with Vagrant and layered Puppet control

data/ext/_rizzo.json

@@ -1,32 +0,0 @@
-{
-  "defaults": {
-    "bootstrap_repo_path": "/Users/jeff/projects/acme/bootstrap"
-  },
-  "control_repos": [
-    "/Users/jeff/projects/acme/puppetdata",
-    "/Users/jeff/projects/acme/ghoneycutt-modules"
-  ],
-  "puppetmaster": {
-    "name": [
-      "infra-puppetfourca",
-      "infra-puppetfour"
-    ],
-    "modulepath": [
-      "./modules",
-      "./puppetdata/modules",
-      "./ghoneycutt/modules"
-    ],
-    "synced_folders": {
-      "/repos/puppetdata": {
-        "local": "/Users/jeff/projects/acme/puppetdata",
-        "owner": "root",
-        "group": "root"
-      },
-      "/repos/ghoneycutt": {
-        "local": "/Users/jeff/projects/acme/ghoneycutt-modules",
-        "owner": "root",
-        "group": "root"
-      }
-    }
-  }
-}