vagrant-dotvm 0.37.0 → 0.38.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c6f250ffa0d016a0f77aebecb935c60a6bf6404
-  data.tar.gz: a475da352ae92757cae54c2c32c1d513a231d074
+  metadata.gz: 546eb0a4d4130f0321c5958da2e8a8210dfd193d
+  data.tar.gz: 99856b339b3bf669c834a1863415a1d6a1e62b78
 SHA512:
-  metadata.gz: 54f0910f3a80bc6f40f8b0d589a86be42e503b3d10311e4fe3b82984364bc94fdd78225ad77e52d61e009fb8db7dbd57a9e7a16ae1095e4f17367b8421bcd54e
-  data.tar.gz: cc2af37e215d3b87ae993ca494df52dbfcb7f6f06cc2603fe7e17f058adfa41bf4146e8d807c3ef35914c3ed0defbca888a6d091acd5cc795337c262777e7067
+  metadata.gz: c6892a28599974ad49a9a86fafc2e4a11ff51ede778ea74f5a99f36e804f5b8dd07ed458e89886999333dec4b978d57111b6b93bf73855aa1b3435a5efd0d592
+  data.tar.gz: b96acaf5f2f054dcf764adbb81cd6fc424a0f0962f44a4acf7e77188b1baae2aef840fa344946573144709785ab531d8db6ec04fffc05fd8828b6fce4373aebe

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-# 0.37.0 (upcoming)
+# 0.38.0
+* Support for `.yml` extension
+* Added `force_remote_user` option to Ansible provision
+* Added `env` option to shell provision
+* Ability to configure groups without `vagrant-group` plugin installed
+
+# 0.37.0
 * Now it's possible to initialize DotVM environment with one command.
 
 # 0.36.0

data/Gemfile

@@ -7,6 +7,4 @@ end
 
 group :plugins do
   gemspec
-  gem 'vagrant-group',
-      git: 'git://github.com/krzysztof-magosa/vagrant-group.git'
 end

data/README.md

@@ -36,3 +36,6 @@ $ mkdir projects
 
 ## More information
 For more information please follow to [documentation](https://github.com/vagrant-dotvm/documentation).
+
+## Logo
+Computing graphic by [Webalys](http://www.streamlineicons.com/) from [Flaticon](http://www.flaticon.com/) is licensed under [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/). Made with [Logo Maker](http://logomakr.com).

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

@@ -122,6 +122,8 @@ module VagrantPlugins
         attr_accessor :recipes # chef
         attr_accessor :roles # chef
         attr_accessor :pillar
+        attr_accessor :force_remote_user # ansible
+        attr_accessor :env # shell
 
         attr_accessor :images
         attr_reader :build_images

data/lib/vagrant-dotvm/dotvm.rb

@@ -38,11 +38,11 @@ module VagrantPlugins
       def init_instance
         @instance = Config::Instance.new
         @instance.variables.append_group 'env', ENV
-        @instance.variables.append_group 'global', (parse_variables "#{@path}/variables/*.yaml")
+        @instance.variables.append_group 'global', (parse_variables "#{@path}/variables/*.{yaml,yml}")
       end
 
       def load_options
-        Dir["#{@path}/options/*.yaml"].each do |file|
+        Dir["#{@path}/options/*.{yaml,yml}"].each do |file|
           @instance.options = Replacer.new
             .on(YAML.load_file(file) || {})
             .using(@instance.variables)
@@ -53,7 +53,7 @@ module VagrantPlugins
       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 'project', (parse_variables "#{dir}/variables/*.{yaml,yml}")
           project.variables.append_group(
             'host',
             {
@@ -69,7 +69,7 @@ module VagrantPlugins
             }
           )
 
-          Dir["#{dir}/machines/*.yaml"].each do |file|
+          Dir["#{dir}/machines/*.{yaml,yml}"].each do |file|
             yaml = Replacer.new
                    .on(YAML.load_file(file) || [])
                    .using(@instance.variables.merge(project.variables))

data/lib/vagrant-dotvm/group/command.rb

@@ -0,0 +1,118 @@
+module VagrantPlugins
+  module Dotvm
+    module Group
+      class Command < Vagrant.plugin(2, :command)
+
+        COMMANDS = %w(up halt destroy provision reload hosts suspend resume)
+
+        def self.synopsis
+          'runs vagrant command on specific group of VMs'
+        end # self.synopsis
+
+        def execute
+          options = {
+            provision_ignore_sentinel: false, # otherwise reload command does provision
+          }
+          opts = OptionParser.new do |o|
+            o.banner = sprintf('Usage: vagrant group <%s> <group-name>', COMMANDS.join('|'))
+            o.separator ''
+
+            o.on('-h', '--help', 'Print this help') do
+              safe_puts(opts.help)
+              return nil
+            end
+
+            o.on('-f', '--force', 'Do action (destroy, halt) without confirmation.') do
+              options[:force_confirm_destroy] = true
+              options[:force_halt]            = true
+            end
+
+            o.on(nil, '--provision', 'Enable provisioning (up, reload).') do
+              options[:provision_ignore_sentinel] = true
+            end
+          end
+
+          argv = parse_options(opts)
+
+          action = argv[0]
+          pattern = argv[1]
+
+          if !pattern || !action || !COMMANDS.include?(action)
+            safe_puts(opts.help)
+            return nil
+          end
+
+          groups = find_groups(pattern)
+          if groups.length == 0
+            @env.ui.error('No groups matched the pattern given.')
+            return nil
+          end
+
+          if action == 'hosts'
+            groups.each do |group|
+              print_hosts(group)
+            end
+          else
+            groups.each do |group|
+              do_action(action, options, group)
+            end
+          end
+        end # execute
+
+        def print_hosts(group)
+          @env.ui.info("Hosts in #{group} group:")
+
+          with_target_vms do |machine|
+            if machine.config.dotvm_group.groups.key?(group)
+              if machine.config.dotvm_group.groups[group].to_a.include? machine.name.to_s
+                @env.ui.info(" - #{machine.name}")
+              end
+            else
+              @env.ui.warn('No hosts associated.')
+              break
+            end
+          end
+        end # print_hosts
+
+        def do_action(action, options, group)
+          with_target_vms do |machine|
+            if machine.config.dotvm_group.groups.key?(group)
+              if machine.config.dotvm_group.groups[group].include? machine.name.to_s
+                machine.action(action, **options)
+              end
+            end
+          end
+        end # do_action
+
+        def all_groups
+          groups = Set.new
+
+          with_target_vms do |machine|
+            machine.config.dotvm_group.groups.to_h.each do |group_name, _hosts|
+              groups << group_name
+            end
+          end
+
+          groups.to_a
+        end # all_groups
+
+        def find_groups(pattern)
+          groups = []
+
+          if pattern[0] == '/' && pattern[-1] == '/'
+            reg = Regexp.new(pattern[1..-2])
+            all_groups.each do |item|
+              groups << item if item.match(reg)
+            end
+          else
+            all_groups.each do |item|
+              groups << item if item == pattern
+            end
+          end
+
+          groups
+        end # find_groups
+      end # Command
+    end # Group
+  end # Dotvm
+end # VagrantPlugins

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

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module Dotvm
+    module Group
+      class Config < Vagrant.plugin(2, :config)
+        attr_accessor :groups
+
+        def initialize
+          @groups = UNSET_VALUE
+        end
+
+        def finalize!
+          @groups = {} if @groups == UNSET_VALUE
+        end
+      end # Config
+    end # Group
+  end # Dotvm
+end # VagrantPlugins

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

@@ -70,13 +70,11 @@ module VagrantPlugins
         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)
+          vc.dotvm_group.groups = {} unless vc.dotvm_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
+            vc.dotvm_group.groups[group] = [] unless vc.dotvm_group.groups.key?(group)
+            vc.dotvm_group.groups[group] << machine_cfg.nick
           end
         end
 

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

@@ -122,7 +122,9 @@ module VagrantPlugins
           :delete_node,
           :delete_client,
           :recipe,
-          :images
+          :images,
+          :force_remote_user,
+          :env
         ]
 
         RUNS_OPTIONS = [

data/lib/vagrant-dotvm/plugin.rb

@@ -8,6 +8,16 @@ module VagrantPlugins
         require_relative 'command'
         Command
       end
+
+      command(:group) do
+        require_relative 'group/command'
+        Group::Command
+      end
+
+      config(:dotvm_group) do
+        require_relative 'group/config'
+        Group::Config
+      end
     end # Plugin
   end # Dotvm
 end # VagrantPlugins

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = '0.37.0'
+    VERSION = '0.38.0.pre'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0.pre
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,8 @@ files:
 - lib/vagrant-dotvm/config/run.rb
 - lib/vagrant-dotvm/config/sharedfolder.rb
 - lib/vagrant-dotvm/dotvm.rb
+- lib/vagrant-dotvm/group/command.rb
+- lib/vagrant-dotvm/group/config.rb
 - lib/vagrant-dotvm/injector/abstractinjector.rb
 - lib/vagrant-dotvm/injector/authorizedkey.rb
 - lib/vagrant-dotvm/injector/host.rb
@@ -109,9 +111,9 @@ 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.4.5.1