yaml_servers 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7160ed4f67167f19c574026d4edda401020fe383
-  data.tar.gz: d576649e0f3d99bb56ab7c1f8c67d1a6e9021493
+  metadata.gz: fd7967a0f1a84e7a0ed89ca103877cf97fc66a61
+  data.tar.gz: 9e10522b27b66f4167822e21a235629a568252e4
 SHA512:
-  metadata.gz: 28a0bbfc66281a03ff397224d57746394174e52ac9c6a467d92818830513bb6fa4ec51bc1af6358dbcff710408996e96c2f3057aabaac4837a77d221046d1544
-  data.tar.gz: b6a7c1267140ad6941d5ae4390eddd2635a61b4d28384808e3e1bc54a6ef385455df9a3ae77d22345103712c178d1193f19fa70e7c342e4dd3e2693e893a1512
+  metadata.gz: ea6173137d255e5e3eef6fb5d6a114eefb5e83148987a4b6dda75b9e6df9933cfec4bbd5d1416b39c57b26ab0008050e9fa0f85c3ae04ac2ef8cc2687222170f
+  data.tar.gz: 9dca87bef75696ac73a7c401f289cccd835252e90992a17e6b054b612d5e84ddd982f4fd91d3c6b099c561b056ab86e0a2e1d95492cbc8da7ded8991d5f8977f

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/Gemfile

@@ -1,5 +1,10 @@
 source "https://rubygems.org"
-source 'https://gems.reporo.com'
 
-# Specify your gem's dependencies in yaml_servers.gemspec
-gemspec
+# Vagrant's special group
+group :plugins do
+  gemspec
+end
+
+group :development do
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
+end

data/README.md

@@ -32,5 +32,5 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on Gitlab at https://gitlab.london.reporo.net/robb/yaml_servers.
+Bug reports and pull requests are welcome on Github at https://github.com/robmbrooks/yaml_servers.
 

data/Rakefile

@@ -1,13 +1,3 @@
-require "bundler/gem_tasks"
-
-# Don't push the gem to rubygems
-ENV["gem_push"] = "false" # Utilizes feature in bundler 1.3.0
-
-# Let bundler's release task do its job, minus the push to Rubygems,
-# and after it completes, use "gem inabox" to publish the gem to our
-# internal gem server.
-
-Rake::Task["release"].enhance do
-  spec = Gem::Specification::load(Dir.glob("*.gemspec").first)
-  sh "gem inabox pkg/#{spec.name}-#{spec.version}.gem"
-end
+require 'rubygems'
+require 'bundler/setup'
+Bundler::GemHelper.install_tasks

data/lib/yaml_servers/command.rb

@@ -0,0 +1,18 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+module YamlServers
+  class Command < Vagrant.plugin('2', :command)
+
+    def execute
+      config = @env.config_loader.load([:default, :home, :root])[0]
+      yaml_servers = { "servers" => config.yamlservers.servers }
+      @env.ui.info yaml_servers.to_yaml
+      0
+    end
+
+    def self.synopsis
+      'show rendered yaml config'
+    end
+  end
+end

data/lib/yaml_servers/config.rb

@@ -0,0 +1,9 @@
+module YamlServers
+  class Config < Vagrant.plugin('2', :config)
+    attr_accessor :servers
+
+    def initialize
+      @servers                  = { }
+    end
+  end
+end

data/lib/yaml_servers/plugin.rb

@@ -0,0 +1,18 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+module YamlServers
+  class Plugin < Vagrant.plugin('2')
+    name "YamlServers"
+
+    command 'yaml-config' do
+      require_relative 'command'
+      Command
+    end
+
+    config 'yamlservers' do
+      require_relative 'config'
+      Config
+    end
+  end
+end

data/lib/yaml_servers/read_yaml.rb

@@ -0,0 +1,111 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+module YamlServers
+  class ReadYaml
+
+    def self.apply_defaults(config, defaults)
+      # merge defaults
+      config = defaults.deep_merge(config)
+
+      # apply defaults to each server
+      servers = {}
+      config["servers"].each { |hostname, server|
+        servers[hostname] = config["default"].deep_merge(server.is_a?(Hash) ? server : { })
+        servers[hostname]["is_primary"] = (hostname == config["primary"])
+        if servers[hostname].key?("ip") then
+          begin
+            servers[hostname]["ip"] = Resolv.new.getaddresses(server["ip"])[0]
+          rescue => err
+            STDERR.puts err
+            servers[hostname]["ip"] = server["ip"]
+          end
+        end
+        servers[hostname]["nfshome"] = File.expand_path(servers[hostname]["nfshome"]) if servers[hostname]["nfshome"]
+        servers[hostname]["inline"] = servers[hostname]["inline"].lines.to_a if servers[hostname]["inline"].is_a?(String)
+      } if config.key?("servers")
+
+      return servers
+    end
+
+    def self.get_yaml(file, missing_ok)
+      if missing_ok then
+        return {} unless File.file?(file)
+      end
+
+      begin
+        yaml = YAML::load(File.read(file))
+      rescue => err
+        STDERR.puts "Warning: #{file} not available"
+        STDERR.puts err
+      end
+
+      # if our config is not a hash we assume it is a list of servers
+      if yaml and !yaml.is_a?(Hash) then
+        begin
+          return { "servers" => Hash[yaml.to_a.map {|server| server.is_a?(Hash) ? server.flatten : [server.to_str,nil]}] }
+        rescue => err
+          STDERR.puts err
+          return {}
+        end
+      elsif yaml.is_a?(Hash) and !yaml.key?("servers") and !missing_ok
+        yaml = { "servers" => yaml }
+      end
+      return yaml ? yaml : {}
+    end
+
+    def self.get_config(path, defaults = {}, yaml_configs = [], localconf = "local.yaml")
+      # get data from local.yaml
+      local_config = get_yaml(File.join(path,localconf),true)
+
+      # get additional configs set as include in local config
+      yaml_configs = yaml_configs | (local_config.key?("include") ? local_config["include"] : [])
+
+      # collect servers from each yaml file applying defaults
+      servers = {}
+      config = {}
+      yaml_configs.each do |yaml|
+        config = get_yaml(File.join(path,yaml),false)
+
+        # merge localconf defaults over top of lower precedence defaults
+        config = config.deep_merge(local_config.reject { |key| key == "servers"} )
+
+        # get servers from config
+        servers.merge!(apply_defaults(config, defaults))
+      end
+
+      # build new config hash with servers collected above and local config applied
+      config = { "servers" => servers, "primary" => config["primary"] }
+      config = defaults.deep_merge(config)
+      config = config.deep_merge(local_config)
+
+      # we need at least one server
+      config["servers"] = { "default" => nil }  unless config.key?("servers")
+
+      # final rendering
+      return apply_defaults(config, defaults)
+    end
+
+    def self.get_provider_opt(default = false)
+      opts = GetoptLong.new(
+        [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+        [ '--provider', GetoptLong::OPTIONAL_ARGUMENT ]
+      )
+      opts.quiet = true
+
+      provider = default
+      begin
+        opts.each do |opt, arg|
+          case opt
+          when '--provider'
+            if arg
+              provider=arg
+            end
+          end
+        end
+      rescue => err
+      end
+      return provider
+    end
+  end
+end

data/lib/yaml_servers/version.rb

@@ -1,3 +1,3 @@
 module YamlServers
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/yaml_servers.rb

@@ -1,115 +1,19 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+begin
+  require 'vagrant'
+rescue LoadError
+  raise 'The Vagrant yaml_servers plugin must be run within Vagrant.'
+end
+
 require 'active_support'
 require 'active_support/core_ext'
 require 'getoptlong'
 require 'resolv'
 require 'yaml'
+require "yaml_servers/command"
+require "yaml_servers/config"
+require "yaml_servers/plugin"
+require "yaml_servers/read_yaml"
 require "yaml_servers/version"
-
-module YamlServers
-  def self.apply_defaults(config, defaults)
-    # merge defaults
-    config = defaults.deep_merge(config)
-
-    # apply defaults to each server
-    servers = {}
-    config["servers"].each { |hostname, server|
-      servers[hostname] = config["default"].deep_merge(server.is_a?(Hash) ? server : { })
-      servers[hostname]["is_primary"] = (hostname == config["primary"])
-      if servers[hostname].key?("ip") then
-        begin
-          servers[hostname]["ip"] = Resolv.new.getaddresses(server["ip"])[0]
-        rescue => err
-          STDERR.puts err
-          servers[hostname]["ip"] = server["ip"]
-        end
-      end
-      servers[hostname]["nfshome"] = File.expand_path(servers[hostname]["nfshome"]) if servers[hostname]["nfshome"]
-      servers[hostname]["inline"] = servers[hostname]["inline"].lines.to_a if servers[hostname]["inline"].is_a?(String)
-    } if config.key?("servers")
-
-    return servers
-  end
-
-  def self.get_yaml(file, missing_ok)
-    if missing_ok then
-      return {} unless File.file?(file)
-    end
-
-    begin
-      yaml = YAML::load(File.read(file))
-    rescue => err
-      STDERR.puts "Warning: #{file} not available"
-      STDERR.puts err
-    end
-
-    # if our config is not a hash we assume it is a list of servers
-    if yaml and !yaml.is_a?(Hash) then
-      begin
-        return { "servers" => Hash[yaml.to_a.map {|server| server.is_a?(Hash) ? server.flatten : [server.to_str,nil]}] }
-      rescue => err
-        STDERR.puts err
-        return {}
-      end
-    elsif yaml.is_a?(Hash) and !yaml.key?("servers") and !missing_ok
-      yaml = { "servers" => yaml }
-    end
-    return yaml ? yaml : {}
-  end
-
-  def self.get_config(path, defaults = {}, yaml_configs = [], localconf = "local.yaml")
-    # get data from local.yaml
-    local_config = get_yaml(File.join(path,localconf),true)
-
-    # get additional configs set as include in local config
-    yaml_configs = yaml_configs | (local_config.key?("include") ? local_config["include"] : [])
-
-    # collect servers from each yaml file applying defaults
-    servers = {}
-    config = {}
-    yaml_configs.each do |yaml|
-      config = get_yaml(File.join(path,yaml),false)
-
-      # merge localconf defaults over top of lower precedence defaults
-      config = config.deep_merge(local_config.reject { |key| key == "servers"} )
-
-      # get servers from config
-      servers.merge!(apply_defaults(config, defaults))
-    end
-
-    # build new config hash with servers collected above and local config applied
-    config = { "servers" => servers, "primary" => config["primary"] }
-    config = defaults.deep_merge(config)
-    config = config.deep_merge(local_config)
-
-    # we need at least one server
-    config["servers"] = { "default" => nil }  unless config.key?("servers")
-
-    # final rendering
-    return apply_defaults(config, defaults)
-  end
-
-  def self.get_provider_opt(default = false)
-    opts = GetoptLong.new(
-      [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
-      [ '--provider', GetoptLong::OPTIONAL_ARGUMENT ]
-    )
-    opts.quiet = true
-
-    provider = default
-    begin
-      opts.each do |opt, arg|
-        case opt
-        when '--provider'
-          if arg
-            provider=arg
-          end
-        end
-      end
-    rescue => err
-    end
-    return provider
-  end
-end

data/yaml_servers.gemspec

@@ -7,20 +7,11 @@ Gem::Specification.new do |spec|
   spec.name          = "yaml_servers"
   spec.version       = YamlServers::VERSION
   spec.authors       = ["Robert Brooks"]
-  spec.email         = ["robert.brooks@reporo.com"]
+  spec.email         = ["robmbrooks@gmail.com"]
 
   spec.summary       = %q{yaml_servers creates a hash of server configs from yaml}
   spec.description   = %q{yaml_servers creates a hash of server config from yaml}
   spec.homepage      = "https://github.com/robmbrooks/yaml_servers"
-
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-#  if spec.respond_to?(:metadata)
-#    spec.metadata['allowed_push_host'] = "http://gems.reporo.com"
-#  else
-#    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-#  end
-
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -30,5 +21,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "geminabox"
 end

metadata

@@ -1,91 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: yaml_servers
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Robert Brooks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !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: geminabox
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: yaml_servers creates a hash of server config from yaml
 email:
-- robert.brooks@reporo.com
+- robmbrooks@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - lib/yaml_servers.rb
+- lib/yaml_servers/command.rb
+- lib/yaml_servers/config.rb
+- lib/yaml_servers/plugin.rb
+- lib/yaml_servers/read_yaml.rb
 - lib/yaml_servers/version.rb
 - yaml_servers.gemspec
 homepage: https://github.com/robmbrooks/yaml_servers
@@ -97,19 +87,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: yaml_servers creates a hash of server configs from yaml
 test_files: []
-has_rdoc: