vagrant-dotvm 0.34.0 → 0.35.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af05a860691da0d88715617d01a46581b0f4c5f7
-  data.tar.gz: ac1f7084700a621c080c90f52195246f667292aa
+  metadata.gz: 3dab3eb77f8227efb87c30af0591e3e7013bbaa1
+  data.tar.gz: 9cd913f4d0d329db63f9c903972e472676d23e01
 SHA512:
-  metadata.gz: 00c8661dc1b6b789bc25c64e900c28e73fd5f3efadb4bcdd8080ed475e1195f01d6d99bff97b3584552718da845b76539bd754e6205fc59185aa0987f0d706a4
-  data.tar.gz: 708a029dc4ddea5d30777b2a951fb0eb16d444726a18fd86ee2d6cda00b8418cbbdc100feb583d4b03361948f9575bd50bef7b4e7f7efa9e3baf1d6a72d13c84
+  metadata.gz: 7bc0a27d27b0d5e01e875546b4151d0046e0419849271b143edc30953b36560f6ad0045dcdbadbe12857af84a762434631ba36b804d33e425c74ff05b906e1e6
+  data.tar.gz: a13b24e90c97ae5025752107696636a4e8f8a2a2b52f3030f9b6d348bb4f73780e087fec28c765a3eedbaab18b1fb0f9bbee9c045bcb4ae1f17d7aff12859b5c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.35.0
+* Technical improvements
+
 # 0.34.0
 * New configuration directory layout
 * Removed local variables

data/CONTRIBUTING.md

@@ -0,0 +1,9 @@
+# Contribution rules
+
+* Follow [Community-driven Ruby Style Guide](https://github.com/bbatsov/ruby-style-guide)
+* Check style using [Rubocop](https://github.com/bbatsov/rubocop) before sending pull request
+* Don't send multiple unrelated functionalities in one pull request
+* Don't use micro optimisations which are hard to read
+* Your code will be published under [MIT license](LICENSE.txt)
+
+By sending pull request you confirm that you agree with above rules.

data/Gemfile

@@ -1,10 +1,12 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git'
+  gem 'vagrant',
+      git: 'git://github.com/mitchellh/vagrant.git'
 end
 
 group :plugins do
   gemspec
-  gem 'vagrant-group', :git => 'git://github.com/krzysztof-magosa/vagrant-group.git'
+  gem 'vagrant-group',
+      git: 'git://github.com/krzysztof-magosa/vagrant-group.git'
 end

data/README.md

@@ -1,7 +1,6 @@
 # DotVm
 
 [![Code Climate](https://codeclimate.com/github/vagrant-dotvm/vagrant-dotvm/badges/gpa.svg)](https://codeclimate.com/github/vagrant-dotvm/vagrant-dotvm)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/krzysztof-magosa/vagrant-dotvm/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/krzysztof-magosa/vagrant-dotvm/?branch=master)
 [![Gem Version](https://badge.fury.io/rb/vagrant-dotvm.svg)](http://badge.fury.io/rb/vagrant-dotvm)
 
 ## What is that?
@@ -25,33 +24,15 @@ Then create Vagrantfile like that:
 require 'vagrant-dotvm'
 
 Vagrant.configure(2) do |config|
-  # config directory will be expected in the same
-  # directory as Vagrantfile.
-  config_path = File.dirname(File.expand_path(__FILE__)) + "/config"
-  dotvm = VagrantPlugins::Dotvm::Dotvm.new config_path
+  dotvm = VagrantPlugins::Dotvm::Dotvm.new __dir__
   dotvm.inject(config)
 end
 ```
 
 Prepare directory for storing your projects:
 ```
-$ mkdir -p config/projects
+$ mkdir projects
 ```
 
-## How to configure machine
-You need to create folder named after your project in `config/projects`.
-In this folder you can create as many YAML files as you want.
-In each one you are able to define multiple machines.
-
-Please refer to [example](/examples) to see possible options.
-
-## Available variables
-You can use variables inside of config values.
-Environment variables are accessible by using env prefix, e.g. `%env.LOGNAME%`.  
-
-Predefined variables:  
-* `%project.host%` - points to project directory on host
-* `%project.guest%` - points to project directory on guest
-
 ## More information
-For more information please follow to [wiki](https://github.com/krzysztof-magosa/vagrant-dotvm/wiki/Getting-started).
+For more information please follow to [wiki](https://github.com/vagrant-dotvm/vagrant-dotvm/wiki/Getting-started).

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/lib/vagrant-dotvm/config/abstractconfig.rb

@@ -7,13 +7,20 @@ module VagrantPlugins
         # @param data [Hash] Hash with data
         def populate(data)
           data.each do |key, value|
-            raise InvalidConfigError.new "Invalid configuration option: #{key}." until respond_to? "#{key}="
+            unless respond_to? "#{key}="
+              fail(
+                InvalidConfigError.new,
+                "Invalid configuration option: #{key}."
+              )
+            end
+
             send("#{key}=", value)
           end
         end
 
         def ensure_type(value, type, name = '')
-          raise InvalidConfigError.new "'#{name}' must be #{type.name}." unless value.kind_of?(type) || value.kind_of?(NilClass)
+          return true if value.is_a?(type) || value.is_a?(NilClass)
+          fail InvalidConfigError.new, "'#{name}' must be #{type.name}."
         end
 
         # Converts array of hashes into array of specialized objects.

data/lib/vagrant-dotvm/config/host.rb

@@ -1,6 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Config
+      # Stores host configuration
       class Host < AbstractConfig
         attr_accessor :ip
         attr_accessor :host

data/lib/vagrant-dotvm/config/instance.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
         OPTIONS_CATEGORIES = [
           :ssh,
           :winrm,
-          :vagrant,
+          :vagrant
         ]
 
         attr_reader :projects

data/lib/vagrant-dotvm/config/invalidconfigerror.rb

@@ -1,6 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Config
+      # Exception signaling error in configuration
       class InvalidConfigError < ArgumentError
       end
     end

data/lib/vagrant-dotvm/config/machine.rb

@@ -1,11 +1,12 @@
 module VagrantPlugins
   module Dotvm
     module Config
+      # Stores machine configuration
       class Machine < AbstractConfig
         include OptionsSetter
 
         OPTIONS_CATEGORIES = [
-          :virtualbox,
+          :virtualbox
         ]
 
         attr_reader :parent
@@ -53,7 +54,7 @@ module VagrantPlugins
 
         def usable_port_range=(value)
           m = value.scan(/^(\d+)\.\.(\d+)$/)
-          raise InvalidConfigError.new 'Invalid usable_port_range, it must be in A..B format.' if m.length == 0
+          fail InvalidConfigError.new, 'Invalid usable_port_range, it must be in A..B format.' if m.length == 0
           @usable_port_range = Range.new(m[0][0].to_i, m[0][1].to_i)
         end
 
@@ -95,18 +96,18 @@ module VagrantPlugins
           ensure_type shared_folders, Array, 'shared_folders'
           @shared_folders = convert_array(shared_folders, SharedFolder.name)
 
+          # Mount DotVM project directory
           settings = {
             'host'     => @parent.variables['host.project_dir'],
             'guest'    => @parent.variables['guest.project_dir'],
             'disabled' => false,
             'create'   => false,
-            'type'     => nil,
+            'type'     => nil
           }
           item = SharedFolder.new
           item.populate settings
           @shared_folders << item
         end
-
       end
     end
   end

data/lib/vagrant-dotvm/config/network.rb

@@ -1,6 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Config
+      # Stores network configuration
       class Network < AbstractConfig
         attr_reader :net
         attr_accessor :type
@@ -17,7 +18,7 @@ module VagrantPlugins
         attr_accessor :auto_config
 
         def initialize
-          @net      = :private_network
+          @net = :private_network
         end
 
         def net=(value)
@@ -27,7 +28,7 @@ module VagrantPlugins
             'public_network'  => :public_network,
             'public'          => :public_network,
             'forwarded_port'  => :forwarded_port,
-            'port'            => :forwarded_port,
+            'port'            => :forwarded_port
           }
 
           @net = nets[value]

data/lib/vagrant-dotvm/config/option.rb

@@ -1,6 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Config
+      # Stores one option
       class Option < AbstractConfig
         attr_accessor :name
         attr_accessor :value

data/lib/vagrant-dotvm/config/optionssetter.rb

@@ -5,14 +5,14 @@ module VagrantPlugins
         def options=(options)
           ensure_type options, Hash, 'options'
 
-          @options  = {}
+          @options = {}
           self.class::OPTIONS_CATEGORIES.each do |cat|
             @options[cat] = []
           end
 
           options.to_h.each do |key, confs|
             key = key.to_sym
-            raise InvalidConfigError.new "Invalid options category: #{key}." unless @options.has_key?(key)
+            fail InvalidConfigError.new, "Invalid options category: #{key}." unless @options.key?(key)
             ensure_type confs, Array, "options.#{key}"
 
             confs.to_a.each do |conf|

data/lib/vagrant-dotvm/config/project.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
         def initialize(parent)
           @parent = parent
           @variables = Variables.new
-          @machines = Array.new
+          @machines = []
         end
 
         def new_machine

data/lib/vagrant-dotvm/config/route.rb

@@ -1,6 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Config
+      # Stores route configuration
       class Route < AbstractConfig
         attr_accessor :destination
         attr_accessor :gateway

data/lib/vagrant-dotvm/dotvm.rb

@@ -1,20 +1,27 @@
 module VagrantPlugins
   module Dotvm
     class Dotvm
-
       def initialize(path = nil)
-        raise 'path must be set.' until path
+        fail 'path must be set.' until path
         @path = path
       end
 
+      def inject(vc)
+        init_instance
+        load_options
+        load_projects
+        Injector::Instance.inject @instance, vc
+      end
+
       private
+
       def parse_variables(path)
         result = {}
 
         Dir[path].each do |fname|
-          yaml = YAML::load(File.read(fname)) || {}
+          yaml = YAML.load(File.read(fname)) || {}
           yaml.each do |name, value|
-            raise "Variable #{name} already exists." if result.has_key? name
+            fail "Variable #{name} already exists." if result.key? name
             result[name] = value
           end
         end
@@ -22,24 +29,21 @@ module VagrantPlugins
         result
       end
 
-      private
       def init_instance
         @instance = Config::Instance.new
         @instance.variables.append_group 'env', ENV
         @instance.variables.append_group 'global', (parse_variables "#{@path}/variables/*.yaml")
       end
 
-      private
       def load_options
         Dir["#{@path}/options/*.yaml"].each do |file|
           @instance.options = Replacer.new
-                              .on(YAML::load(File.read(file)) || {})
-                              .using(@instance.variables)
-                              .result
+            .on(YAML.load(File.read(file)) || {})
+            .using(@instance.variables)
+            .result
         end
       end
 
-      private
       def load_projects
         Dir["#{@path}/projects/*"].each do |dir|
           project = @instance.new_project
@@ -48,21 +52,21 @@ module VagrantPlugins
             'host',
             {
               'project_dir' => dir,
-              'files_dir' => "#{dir}/files",
+              'files_dir' => "#{dir}/files"
             }
           )
           project.variables.append_group(
             'guest',
             {
               'project_dir' => DOTVM_PROJECT_PATH,
-              'files_dir' => "#{DOTVM_PROJECT_PATH}/files"
+              'files_dir' => DOTVM_FILES_PATH
             }
           )
 
           Dir["#{dir}/machines/*.yaml"].each do |file|
             begin
               yaml = Replacer.new
-                     .on(YAML::load(File.read(file)) || [])
+                     .on(YAML.load(File.read(file)) || [])
                      .using(@instance.variables.merge(project.variables))
                      .result
 
@@ -77,14 +81,6 @@ module VagrantPlugins
         end
       end
 
-      public
-      def inject(vc)
-        init_instance
-        load_options
-        load_projects
-        Injector::Instance.inject @instance, vc
-      end
-
     end # DotVm
   end # Dotvm
 end # VagrantPlugins

data/lib/vagrant-dotvm/injector/abstractinjector.rb

@@ -1,13 +1,16 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class AbstractInjector
+      # Helper functions used by injectors
+      module AbstractInjector
+        module_function
+
         # Extracts specified `options` from `source` and return them as hash.
         #
         # @param source [Object] Object to extract data from
         # @param options [Array] List of options to be extraced
         # @return [Hash] Extracted data
-        def self.generate_hash(source, options)
+        def generate_hash(source, options)
           hash = {}
 
           options.each do |opt|
@@ -15,7 +18,7 @@ module VagrantPlugins
             hash[opt] = val unless val.nil?
           end
 
-          return hash
+          hash
         end
 
         # Rewrite `options` from `source` to `target`.
@@ -23,7 +26,7 @@ module VagrantPlugins
         # @param source [Object] Object to rewrite data from
         # @param target [Object] Object to rewrite data to
         # @param options [Array] List of options to be rewritten
-        def self.rewrite_options(source, target, options)
+        def rewrite_options(source, target, options)
           options.each do |opt|
             val = source.send(opt)
             target.send("#{opt}=", val) unless val.nil?

data/lib/vagrant-dotvm/injector/authorizedkey.rb

@@ -1,8 +1,13 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class AuthorizedKey < AbstractInjector
-        def self.inject(key: nil, machine: nil)
+      # Injects DotVm authorized key configuration into Vagrant
+      module AuthorizedKey
+        extend AbstractInjector
+
+        module_function
+
+        def inject(key: nil, machine: nil)
           if key.type == 'file'
             pubkey = File.readlines(File.expand_path(key.path)).first.strip
           elsif key.type == 'static'

data/lib/vagrant-dotvm/injector/host.rb

@@ -1,8 +1,13 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Host < AbstractInjector
-        def self.inject(host: nil, machine: nil)
+      # Injects DotVm host configuration into Vagrant
+      module Host
+        extend AbstractInjector
+
+        module_function
+
+        def inject(host: nil, machine: nil)
           machine.vm.provision 'shell', run: 'always' do |s|
             s.path       = "#{UTILS_PATH}/add_host.sh"
             s.args       = [host.ip, host.host]

data/lib/vagrant-dotvm/injector/instance.rb

@@ -1,8 +1,13 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Instance < AbstractInjector
-        def self.inject(instance, vc)
+      # Injects DotVm instance configuration into Vagrant
+      module Instance
+        extend AbstractInjector
+
+        module_function
+
+        def inject(instance, vc)
           instance.options.to_h.each do |category, options|
             options.to_a.each do |option|
               vc.send(category).send("#{option.name}=", option.value)

data/lib/vagrant-dotvm/injector/machine.rb

@@ -1,7 +1,10 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Machine < AbstractInjector
+      # Injects DotVm machine configuration into Vagrant
+      module Machine
+        extend AbstractInjector
+
         BOX_OPTIONS = [
           :box,
           :hostname,
@@ -20,35 +23,73 @@ module VagrantPlugins
           :box_url,
           :communicator,
           :guest,
-          :usable_port_range,
+          :usable_port_range
         ]
 
-        def self.inject(machine_cfg: nil, vc: nil)
-          define_opts = {}
-          define_opts[:primary]   = machine_cfg.primary   unless machine_cfg.primary.nil?
-          define_opts[:autostart] = machine_cfg.autostart unless machine_cfg.autostart.nil?
+        module_function
 
-          vc.vm.define machine_cfg.nick, **define_opts do |machine|
-            BOX_OPTIONS.each do |opt|
-              val = machine_cfg.send(opt)
-              machine.vm.send("#{opt}=", val) unless val.nil?
-            end
+        def inject_options(machine_cfg, machine)
+          BOX_OPTIONS.each do |opt|
+            val = machine_cfg.send(opt)
+            machine.vm.send("#{opt}=", val) unless val.nil?
+          end
+        end
 
-            machine.vm.provider 'virtualbox' do |vb|
-              vb.customize ['modifyvm', :id, '--memory',          machine_cfg.memory] unless machine_cfg.memory.nil?
-              vb.customize ['modifyvm', :id, '--cpus',            machine_cfg.cpus]   unless machine_cfg.cpus.nil?
-              vb.customize ['modifyvm', :id, '--cpuexecutioncap', machine_cfg.cpucap] unless machine_cfg.cpucap.nil?
-              vb.customize ['modifyvm', :id, '--natnet1',         machine_cfg.natnet] unless machine_cfg.natnet.nil?
+        def inject_vbox(machine_cfg, machine)
+          mapping = [
+            ['--memory', :memory],
+            ['--cpus', :cpus],
+            ['--cpuexecutioncap', :cpucap],
+            ['--natnet1', :natnet]
+          ]
 
-              machine_cfg.options.to_h[:virtualbox].to_a.each do |option|
-                vb.customize ['modifyvm', :id, option.name, option.value]
-              end
+          machine.vm.provider 'virtualbox' do |vb|
+            mapping.each do |item|
+              value = machine_cfg.send(item[1])
+              vb.customize ['modifyvm', :id, item[0], value] unless value.nil?
             end
 
-            machine.vm.provider 'vmware_fusion' do |vf|
-              vf.vmx['memsize']  = machine_cfg.memory unless machine_cfg.memory.nil?
-              vf.vmx['numvcpus'] = machine_cfg.cpus   unless machine_cfg.cpus.nil?
+            machine_cfg.options.to_h[:virtualbox].to_a.each do |option|
+              vb.customize ['modifyvm', :id, option.name, option.value]
             end
+          end
+        end
+
+        def inject_vmware(machine_cfg, machine)
+          mapping = [
+            ['memsize', :memory],
+            ['numvcpus', :cpus]
+          ]
+
+          machine.vm.provider 'vmware_fusion' do |vf|
+            mapping.each do |item|
+              value = machine_cfg.send(item[1])
+              vf.vmx[item[1]] = value unless value.nil?
+            end
+          end
+        end
+
+        def inject_groups(machine_cfg, vc)
+          return false unless Vagrant.has_plugin?('vagrant-group')
+
+          vc.group.groups = {} unless vc.group.groups.is_a?(Hash)
+
+          machine_cfg.groups.to_a.each do |group|
+            vc.group.groups[group] = [] unless vc.group.groups.key?(group)
+            vc.group.groups[group] << machine_cfg.nick
+          end
+        end
+
+        def inject(machine_cfg: nil, vc: nil)
+          define_opts = {}
+          define_opts[:primary]   = machine_cfg.primary   unless machine_cfg.primary.nil?
+          define_opts[:autostart] = machine_cfg.autostart unless machine_cfg.autostart.nil?
+
+          vc.vm.define machine_cfg.nick, **define_opts do |machine|
+            inject_options machine_cfg, machine
+            inject_vbox machine_cfg, machine
+            inject_vmware machine_cfg, vc
+            inject_groups machine_cfg, vc
 
             machine_cfg.networks.to_a.each do |net|
               Network.inject net: net,
@@ -62,7 +103,7 @@ module VagrantPlugins
 
             machine_cfg.hosts.to_a.each do |host|
               Host.inject host: host,
-                       machine: machine
+                          machine: machine
             end
 
             machine_cfg.provision.to_a.each do |provision|
@@ -79,15 +120,6 @@ module VagrantPlugins
               AuthorizedKey.inject key: key,
                                    machine: machine
             end
-
-            if Vagrant.has_plugin?('vagrant-group')
-              vc.group.groups = {} unless vc.group.groups.kind_of?(Hash)
-
-              machine_cfg.groups.to_a.each do |group|
-                vc.group.groups[group] = [] unless vc.group.groups.has_key?(group)
-                vc.group.groups[group] << machine_cfg.nick
-              end
-            end
           end
         end
       end

data/lib/vagrant-dotvm/injector/network.rb

@@ -1,7 +1,10 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Network < AbstractInjector
+      # Injects DotVm network configuration into Vagrant
+      module Network
+        extend AbstractInjector
+
         OPTIONS = [
           :type,
           :ip,
@@ -17,7 +20,9 @@ module VagrantPlugins
           :auto_config,
         ]
 
-        def self.inject(net: nil, machine: nil)
+        module_function
+
+        def inject(net: nil, machine: nil)
           machine.vm.network net.net, **generate_hash(net, OPTIONS)
         end
       end

data/lib/vagrant-dotvm/injector/project.rb

@@ -1,8 +1,13 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Project < AbstractInjector
-        def self.inject(project, vc)
+      # Injects DotVm project configuration into Vagrant
+      module Project
+        extend AbstractInjector
+
+        module_function
+
+        def inject(project, vc)
           project.machines.to_a.each do |machine_cfg|
             Machine.inject machine_cfg: machine_cfg, vc: vc
           end

data/lib/vagrant-dotvm/injector/provision.rb

@@ -1,7 +1,10 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Provision < AbstractInjector
+      # Injects DotVm provision configuration into Vagrant
+      module Provision
+        extend AbstractInjector
+
         OPTIONS = [
           :path,
           :inline,
@@ -119,7 +122,7 @@ module VagrantPlugins
           :delete_node,
           :delete_client,
           :recipe,
-          :images,
+          :images
         ]
 
         RUNS_OPTIONS = [
@@ -128,11 +131,12 @@ module VagrantPlugins
           :args,
           :auto_assign_name,
           :daemonize,
-          :restart,
+          :restart
         ]
 
-        public
-        def self.inject(provision_cfg: nil, machine: nil)
+        module_function
+
+        def inject(provision_cfg: nil, machine: nil)
           machine.vm.provision provision_cfg.type, run: provision_cfg.run do |p|
             rewrite_options(provision_cfg, p, OPTIONS)
 

data/lib/vagrant-dotvm/injector/route.rb

@@ -1,8 +1,13 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Route < AbstractInjector
-        def self.inject(route: nil, machine: nil)
+      # Injects DotVm route configuration into Vagrant
+      module Route
+        extend AbstractInjector
+
+        module_function
+
+        def inject(route: nil, machine: nil)
           machine.vm.provision 'shell', run: 'always' do |s|
             s.path       = "#{UTILS_PATH}/setup_route.sh"
             s.args       = [route.destination, route.gateway]

data/lib/vagrant-dotvm/injector/sharedfolder.rb

@@ -1,7 +1,10 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class SharedFolder < AbstractInjector
+      # Injects DotVm shared folder configuration into Vagrant
+      module SharedFolder
+        extend AbstractInjector
+
         OPTIONS = [
           :disabled,
           :create,
@@ -20,11 +23,17 @@ module VagrantPlugins
           :rsync__verbose,
           :smb_host,
           :smb_password,
-          :smb_username,
+          :smb_username
         ]
 
-        def self.inject(folder: nil, machine: nil)
-          machine.vm.synced_folder folder.host, folder.guest, **generate_hash(folder, OPTIONS)
+        module_function
+
+        def inject(folder: nil, machine: nil)
+          machine.vm.synced_folder(
+            folder.host,
+            folder.guest,
+            **generate_hash(folder, OPTIONS)
+          )
         end
       end
     end

data/lib/vagrant-dotvm/paths.rb

@@ -2,5 +2,6 @@ module VagrantPlugins
   module Dotvm
     UTILS_PATH = File.dirname(__FILE__) + '/../../utils'
     DOTVM_PROJECT_PATH = '/dotvm/project'
+    DOTVM_FILES_PATH = "#{DOTVM_PROJECT_PATH}/files"
   end
 end

data/lib/vagrant-dotvm/plugin.rb

@@ -1,10 +1,8 @@
 module VagrantPlugins
   module Dotvm
-
     class Plugin < Vagrant.plugin(2)
       name 'Dotvm'
       description 'Easy YAML based multi machine config.'
     end # Plugin
-
   end # Dotvm
 end # VagrantPlugins

data/lib/vagrant-dotvm/replacer.rb

@@ -27,34 +27,36 @@ module VagrantPlugins
           return target if @replaced == 0
         end
 
-        raise 'Too deep variables relations, possible recurrence.'
+        fail 'Too deep variables relations, possible recurrence.'
       end
 
       private
+
       def process_string(target)
         @vars.each do |k, v|
           pattern = "%#{k}%"
+          next unless target.include? pattern
 
-          if target.include? pattern
-            @replaced += 1
+          @replaced += 1
 
-            if target == pattern
-              target = v
-              break unless v.is_a? String # value is no longer string, so replace cannot be performed
-            else
-              unless v.respond_to? :to_s
-                raise 'Non-string values cannot be joined together.'
-              end
+          if target == pattern
+            target = v
 
-              target = target.gsub pattern, v.to_s
+            # value is no longer string, so
+            # replace cannot be performed
+            break unless v.is_a? String
+          else
+            unless v.respond_to? :to_s
+              fail 'Non-string values cannot be joined together.'
             end
+
+            target = target.gsub pattern, v.to_s
           end
         end
 
         target
       end
 
-      private
       def _replace_vars(target)
         case target
         when Hash

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = '0.34.0'
+    VERSION = '0.35.1.pre'
   end
 end

data/vagrant-dotvm.gemspec

@@ -4,19 +4,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant-dotvm/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "vagrant-dotvm"
+  spec.name          = 'vagrant-dotvm'
   spec.version       = VagrantPlugins::Dotvm::VERSION
-  spec.authors       = ["Krzysztof Magosa"]
-  spec.email         = ["krzysztof@magosa.pl"]
-  spec.summary       = "Easy YAML based multi machine config approach for Vagrant."
-  spec.homepage      = "http://github.com/vagrant-dotvm/vagrant-dotvm"
-  spec.license       = "MIT"
+  spec.authors       = ['Krzysztof Magosa']
+  spec.email         = ['krzysztof@magosa.pl']
+  spec.summary       = 'Easy YAML based multi machine config approach for Vagrant.'
+  spec.homepage      = 'http://github.com/vagrant-dotvm/vagrant-dotvm'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.1.pre
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -102,12 +103,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Easy YAML based multi machine config approach for Vagrant.