vagrant-dotvm 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c4493bbc971762cd78c087bddafd0f65a28e1e
-  data.tar.gz: 25b550ad3122a86fdba3798ad3837087bda96c52
+  metadata.gz: af05a860691da0d88715617d01a46581b0f4c5f7
+  data.tar.gz: ac1f7084700a621c080c90f52195246f667292aa
 SHA512:
-  metadata.gz: 9c855e57c186204b4b9c7c26db8a64c770eab5a12385a52853f6546491ee6270596890fc5ac26b9ca47e76ef53e0eef7002480c37c4b74d841f8d8c37e53dc0a
-  data.tar.gz: 129cc8bf0e2cbffa2b5985f33af4fd7e65a5224d53e74d57e40d9c5f8359d72b48d607990b4f9fa72b2ad577f066c95ebb58c9d2bf0744d5d8be28ae837d7c4c
+  metadata.gz: 00c8661dc1b6b789bc25c64e900c28e73fd5f3efadb4bcdd8080ed475e1195f01d6d99bff97b3584552718da845b76539bd754e6205fc59185aa0987f0d706a4
+  data.tar.gz: 708a029dc4ddea5d30777b2a951fb0eb16d444726a18fd86ee2d6cda00b8418cbbdc100feb583d4b03361948f9575bd50bef7b4e7f7efa9e3baf1d6a72d13c84

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.34.0
+* New configuration directory layout
+* Removed local variables
+* Introduced project variables
+* Removed examples, will be stored in separate repository
+* Technical improvements
+
+# 0.33.0
+* Better handling of errors in configuration
+* Fixed ability to set vCPUs in VMWare Fusion
+* Technical improvements
+
 # 0.32.1
 * Bugfix for situation when configuration file is empty
 * Bugfix for situation when configuration doesn't have machines

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

@@ -32,50 +32,6 @@ module VagrantPlugins
 
           result
         end
-
-        # Replaces variables in target object.
-        #
-        # @param vars [Hash] Hash of variables to be replaced.
-        # @param target [Object] Object to operate on.
-        # @return [Number] Number of performed replaces.
-        def replace_vars(vars, target)
-          replaced = 0
-
-          if target.kind_of?(Array)
-            target.each do |item|
-              replaced += replace_vars(vars, item)
-            end
-          elsif target.kind_of?(Hash)
-            target.each do |name, item|
-              replaced += replace_vars(vars, item)
-            end
-          elsif target.kind_of?(String)
-            vars.each do |k, v|
-              pattern = "%#{k}%"
-              replaced += 1 unless (target.gsub! pattern, v).kind_of?(NilClass)
-            end
-          elsif target.kind_of?(AbstractConfig)
-            replaced += target.replace_vars!(vars)
-          end
-
-          replaced
-        end
-
-        # Search for variables within this object
-        # and performs replaces of them.
-        #
-        # @param vars [Hash] Hash of variables to be replaced.
-        # @return [Number] Number of performed replaces.
-        def replace_vars!(vars)
-          replaced = 0
-
-          instance_variables.each do |var_name|
-            var = instance_variable_get(var_name)
-            replaced += replace_vars(vars, var)
-          end
-
-          replaced
-        end
       end
     end
   end

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

@@ -0,0 +1,30 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      # Class represents whole instance of DotVm.
+      class Instance < AbstractConfig
+        include OptionsSetter
+
+        OPTIONS_CATEGORIES = [
+          :ssh,
+          :winrm,
+          :vagrant,
+        ]
+
+        attr_reader :projects
+        attr_reader :options # mixin
+        attr_reader :variables
+
+        def initialize
+          @projects = []
+          @variables = Variables.new
+        end
+
+        def new_project
+          projects << (project = Project.new self)
+          project
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module VagrantPlugins
           :virtualbox,
         ]
 
+        attr_reader :parent
         attr_accessor :nick
         attr_accessor :hostname # name
         attr_accessor :box
@@ -42,6 +43,10 @@ module VagrantPlugins
         attr_accessor :guest
         attr_reader :usable_port_range
 
+        def initialize(parent)
+          @parent = parent
+        end
+
         def name=(value)
           @hostname = value
         end
@@ -91,8 +96,8 @@ module VagrantPlugins
           @shared_folders = convert_array(shared_folders, SharedFolder.name)
 
           settings = {
-            'host'     => '%project.host%',
-            'guest'    => '%project.guest%',
+            'host'     => @parent.variables['host.project_dir'],
+            'guest'    => @parent.variables['guest.project_dir'],
             'disabled' => false,
             'create'   => false,
             'type'     => nil,

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

@@ -0,0 +1,23 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      # Class represents one project
+      class Project < AbstractConfig
+        attr_reader :parent
+        attr_reader :variables
+        attr_reader :machines
+
+        def initialize(parent)
+          @parent = parent
+          @variables = Variables.new
+          @machines = Array.new
+        end
+
+        def new_machine
+          machines << (machine = Machine.new self)
+          machine
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/dotvm.rb

@@ -8,79 +8,81 @@ module VagrantPlugins
       end
 
       private
-      def get_globals
-        globals = {}
+      def parse_variables(path)
+        result = {}
 
-        Dir[@path + '/globals/*.yaml'].each do |fname|
+        Dir[path].each do |fname|
           yaml = YAML::load(File.read(fname)) || {}
           yaml.each do |name, value|
-            globals[name] = value
+            raise "Variable #{name} already exists." if result.has_key? name
+            result[name] = value
           end
         end
 
-        globals
+        result
       end
 
       private
-      def prefix_vars(vars, prefix)
-        result = {}
+      def init_instance
+        @instance = Config::Instance.new
+        @instance.variables.append_group 'env', ENV
+        @instance.variables.append_group 'global', (parse_variables "#{@path}/variables/*.yaml")
+      end
 
-        vars.each do |name, value|
-          result[prefix + name] = value
+      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
         end
-
-        result
       end
 
       private
-      def process_config(fname)
-        yaml = YAML::load(File.read(fname)) || {}
-
-        begin
-          conf = Config::Root.new
-          conf.populate yaml
-
-          vars = {}
-          vars.merge! prefix_vars(ENV, 'env.')
-          vars.merge! prefix_vars(get_globals, 'global.')
-          vars.merge! prefix_vars(conf.vars.to_h, 'local.')
-          vars.merge!(
+      def load_projects
+        Dir["#{@path}/projects/*"].each do |dir|
+          project = @instance.new_project
+          project.variables.append_group 'project', (parse_variables "#{dir}/variables/*.yaml")
+          project.variables.append_group(
+            'host',
             {
-              'project.host'  => File.dirname(fname),
-              'project.guest' => '/dotvm/project',
+              'project_dir' => dir,
+              'files_dir' => "#{dir}/files",
+            }
+          )
+          project.variables.append_group(
+            'guest',
+            {
+              'project_dir' => DOTVM_PROJECT_PATH,
+              'files_dir' => "#{DOTVM_PROJECT_PATH}/files"
             }
           )
 
-          for _ in (0..5)
-            last = conf.replace_vars! vars
-            break if last == 0
+          Dir["#{dir}/machines/*.yaml"].each do |file|
+            begin
+              yaml = Replacer.new
+                     .on(YAML::load(File.read(file)) || [])
+                     .using(@instance.variables.merge(project.variables))
+                     .result
+
+              yaml.each do |machine_yaml|
+                machine = project.new_machine
+                machine.populate machine_yaml
+              end
+            rescue VagrantPlugins::Dotvm::Config::InvalidConfigError => e
+              raise Vagrant::Errors::VagrantError.new, "DotVM: #{file}: #{e.message}"
+            end
           end
-
-          raise 'Too deep variables relations, possible recurrence.' unless last == 0
-        rescue VagrantPlugins::Dotvm::Config::InvalidConfigError => e
-          file = fname[(@path.length + '/projects/'.length)..-1]
-          raise Vagrant::Errors::VagrantError.new, "DotVM: #{file}: #{e.message}"
-        end
-
-        conf
-      end
-
-      private
-      def get_configs
-        configs = []
-
-        Dir[@path + '/projects/*/*.yaml'].each do |fname|
-          configs << process_config(fname)
         end
-
-        return configs
       end
 
       public
       def inject(vc)
-        get_configs.each do |config|
-          Injector::Root.inject config: config, vc: vc
-        end
+        init_instance
+        load_options
+        load_projects
+        Injector::Instance.inject @instance, vc
       end
 
     end # DotVm

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

@@ -13,6 +13,7 @@ module VagrantPlugins
             s.path       = "#{UTILS_PATH}/authorize_key.sh"
             s.args       = [pubkey]
             s.privileged = false
+            s.name       = "authorized ssh key #{pubkey.split[2]}"
           end
         end
       end

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

@@ -7,6 +7,7 @@ module VagrantPlugins
             s.path       = "#{UTILS_PATH}/add_host.sh"
             s.args       = [host.ip, host.host]
             s.privileged = true
+            s.name       = "host #{host.host} -> #{host.ip}"
           end
         end
       end

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

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class Instance < AbstractInjector
+        def self.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)
+            end
+          end
+
+          instance.projects.each do |project|
+            Injector::Project.inject project, vc
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class Project < AbstractInjector
+        def self.inject(project, vc)
+          project.machines.to_a.each do |machine_cfg|
+            Machine.inject machine_cfg: machine_cfg, vc: vc
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ module VagrantPlugins
             s.path       = "#{UTILS_PATH}/setup_route.sh"
             s.args       = [route.destination, route.gateway]
             s.privileged = true
+            s.name       = "route to #{route.destination} via #{route.gateway}"
           end
         end
       end

data/lib/vagrant-dotvm/paths.rb

@@ -1,5 +1,6 @@
 module VagrantPlugins
   module Dotvm
     UTILS_PATH = File.dirname(__FILE__) + '/../../utils'
+    DOTVM_PROJECT_PATH = '/dotvm/project'
   end
 end

data/lib/vagrant-dotvm/replacer.rb

@@ -0,0 +1,76 @@
+module VagrantPlugins
+  module Dotvm
+    class Replacer
+      def initialize
+        @limit = 10
+      end
+
+      def on(target)
+        @target = target
+        self
+      end
+
+      def using(vars)
+        @vars = vars
+        self
+      end
+
+      def limit(limit)
+        @limit = limit
+        self
+      end
+
+      def result
+        0.upto(@limit).each do |_|
+          @replaced = 0
+          target = _replace_vars @target
+          return target if @replaced == 0
+        end
+
+        raise 'Too deep variables relations, possible recurrence.'
+      end
+
+      private
+      def process_string(target)
+        @vars.each do |k, v|
+          pattern = "%#{k}%"
+
+          if target.include? pattern
+            @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
+
+              target = target.gsub pattern, v.to_s
+            end
+          end
+        end
+
+        target
+      end
+
+      private
+      def _replace_vars(target)
+        case target
+        when Hash
+          target.each do |k, v|
+            target[k] = _replace_vars v
+          end
+        when Array
+          target.map! do |v|
+            _replace_vars v
+          end
+        when String
+          target = process_string target
+        end
+
+        target
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/variables.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module Dotvm
+    class Variables < Hash
+      def append_group(group, items)
+        items.each do |name, value|
+          self["#{group}.#{name}"] = value
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = '0.33.0'
+    VERSION = '0.34.0'
   end
 end

data/lib/vagrant-dotvm.rb

@@ -6,8 +6,12 @@ require 'vagrant-dotvm/version'
 require 'vagrant-dotvm/paths'
 require 'vagrant-dotvm/dotvm'
 
+require 'vagrant-dotvm/variables'
+require 'vagrant-dotvm/replacer'
+
 require 'vagrant-dotvm/injector/abstractinjector'
-require 'vagrant-dotvm/injector/root'
+require 'vagrant-dotvm/injector/instance'
+require 'vagrant-dotvm/injector/project'
 require 'vagrant-dotvm/injector/machine'
 require 'vagrant-dotvm/injector/provision'
 require 'vagrant-dotvm/injector/authorizedkey'
@@ -19,7 +23,8 @@ require 'vagrant-dotvm/injector/network'
 require 'vagrant-dotvm/config/optionssetter'
 require 'vagrant-dotvm/config/invalidconfigerror'
 require 'vagrant-dotvm/config/abstractconfig'
-require 'vagrant-dotvm/config/root'
+require 'vagrant-dotvm/config/instance'
+require 'vagrant-dotvm/config/project'
 require 'vagrant-dotvm/config/machine'
 require 'vagrant-dotvm/config/provision'
 require 'vagrant-dotvm/config/authorizedkey'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,26 +51,19 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- examples/.gitignore
-- examples/Vagrantfile
-- examples/config/projects/playground/Puppetfile
-- examples/config/projects/playground/bootstrap.sh
-- examples/config/projects/playground/config.ini
-- examples/config/projects/playground/default.pp
-- examples/config/projects/playground/main.yaml
-- examples/config/projects/playground/modules/.gitkeep
 - lib/vagrant-dotvm.rb
 - lib/vagrant-dotvm/config/abstractconfig.rb
 - lib/vagrant-dotvm/config/authorizedkey.rb
 - lib/vagrant-dotvm/config/buildimage.rb
 - lib/vagrant-dotvm/config/host.rb
+- lib/vagrant-dotvm/config/instance.rb
 - lib/vagrant-dotvm/config/invalidconfigerror.rb
 - lib/vagrant-dotvm/config/machine.rb
 - lib/vagrant-dotvm/config/network.rb
 - lib/vagrant-dotvm/config/option.rb
 - lib/vagrant-dotvm/config/optionssetter.rb
+- lib/vagrant-dotvm/config/project.rb
 - lib/vagrant-dotvm/config/provision.rb
-- lib/vagrant-dotvm/config/root.rb
 - lib/vagrant-dotvm/config/route.rb
 - lib/vagrant-dotvm/config/run.rb
 - lib/vagrant-dotvm/config/sharedfolder.rb
@@ -78,14 +71,17 @@ files:
 - lib/vagrant-dotvm/injector/abstractinjector.rb
 - lib/vagrant-dotvm/injector/authorizedkey.rb
 - lib/vagrant-dotvm/injector/host.rb
+- lib/vagrant-dotvm/injector/instance.rb
 - lib/vagrant-dotvm/injector/machine.rb
 - lib/vagrant-dotvm/injector/network.rb
+- lib/vagrant-dotvm/injector/project.rb
 - lib/vagrant-dotvm/injector/provision.rb
-- lib/vagrant-dotvm/injector/root.rb
 - lib/vagrant-dotvm/injector/route.rb
 - lib/vagrant-dotvm/injector/sharedfolder.rb
 - lib/vagrant-dotvm/paths.rb
 - lib/vagrant-dotvm/plugin.rb
+- lib/vagrant-dotvm/replacer.rb
+- lib/vagrant-dotvm/variables.rb
 - lib/vagrant-dotvm/version.rb
 - utils/add_host.sh
 - utils/authorize_key.sh

data/examples/.gitignore

@@ -1 +0,0 @@
-.vagrant/

data/examples/Vagrantfile

@@ -1,10 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-require 'vagrant-dotvm'
-
-Vagrant.configure(2) do |config|
-  config_path = File.dirname(File.expand_path(__FILE__)) + "/config"
-  dotvm = VagrantPlugins::Dotvm::Dotvm.new config_path
-  dotvm.inject(config)
-end

data/examples/config/projects/playground/Puppetfile

@@ -1,6 +0,0 @@
-moduledir '/etc/puppet/modules'
-
-mod 'puppetlabs/apt',      '2.1.0'
-mod 'puppetlabs/concat',   '1.2.3'
-mod 'puppetlabs/stdlib',   '4.6.0'
-mod 'puppetlabs/nodejs',   '0.8.0'

data/examples/config/projects/playground/bootstrap.sh

@@ -1,15 +0,0 @@
-# Go to %project.guest% directory, so relative paths will work here.
-cd "$1"
-
-# Ruby gems binaries go there.
-PATH="/usr/local/bin:$PATH"
-
-# Install puppet from EPEL repository
-rpm --force -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
-yum install -y puppet
-
-# Install r10k - puppet module manager
-gem install r10k
-
-# Install required puppet modules
-r10k puppetfile install

data/examples/config/projects/playground/default.pp

@@ -1,9 +0,0 @@
-package { 'npm':
-  ensure   => installed,
-}
-
-package { 'grunt-cli':
-  ensure   => installed,
-  provider => npm,
-  require  => Package['npm'],
-}

data/examples/config/projects/playground/main.yaml

@@ -1,52 +0,0 @@
-machines:
-  - nick: machine1
-    name: machine1.example.com
-    box: chef/centos-7.0
-    memory: 1024
-    cpus: 1
-    cpucap: 100
-    primary: true
-    natnet: 192.168.22.0/24
-    boot_timeout: 300
-    box_check_update: true
-    box_version: ">= 0"
-    graceful_halt_timeout: 60
-    post_up_message: "hello!"
-    autostart: true
-    networks:
-      - net: private_network
-        type: static
-        ip: 192.168.56.100
-        mask: 255.255.255.0
-        interface: "intnet0"
-      - net: public_network
-        type: dhcp
-        bridge: "en0: Wi-Fi (AirPort)"
-      - net: forwarded_port
-        guest: 80
-        host: 54321
-        protocol: tcp
-    authorized_keys:
-      - type: file
-        path: "~/.ssh/id_rsa.pub"
-      - type: static
-        key: "ssh-rsa fakeSSHpubKEY km@laptop"
-    provision:
-      - type: file
-        source: "%project.host%/config.ini"
-        destination: "~/config.ini"
-      - type: shell
-        path: "%project.host%/bootstrap.sh"
-        privileged: true
-        args:
-          - "%project.guest%"
-      - type: puppet
-        manifests_path: "%project.host%"
-        manifest_file: "default.pp"
-        module_path: "%project.host%/modules"
-    shared_folders:
-      - host: ~/projects
-        guest: /srv/www
-        disabled: false
-        create: false
-        type: null

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

@@ -1,29 +0,0 @@
-module VagrantPlugins
-  module Dotvm
-    module Config
-      class Root < AbstractConfig
-        OPTIONS_CATEGORIES = [
-          :ssh,
-          :winrm,
-          :vagrant,
-        ]
-
-        include OptionsSetter
-
-        attr_reader :machines
-        attr_reader :options # mixin
-        attr_reader :vars
-
-        def machines=(machines)
-          ensure_type machines, Array, 'machines'
-          @machines = convert_array(machines, Machine.name)
-        end
-
-        def vars=(vars)
-          ensure_type vars, Hash, 'vars'
-          @vars = vars
-        end
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-module VagrantPlugins
-  module Dotvm
-    module Injector
-      class Root < AbstractInjector
-        def self.inject(config: nil, vc: nil)
-          config.options.to_h.each do |category, options|
-            options.to_a.each do |option|
-              vc.send(category).send("#{option.name}=", option.value)
-            end
-          end
-
-          config.machines.to_a.each do |machine_cfg|
-            Machine.inject machine_cfg: machine_cfg, vc: vc
-          end
-        end
-      end # Root
-    end # Injector
-  end # Dotvm
-end # VagrantPlugins