vagrant-saltdeps 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a4c4b9157ca427b44fa7426ba6bfefad93aa60f
-  data.tar.gz: beb135e609501a3a1c0f019dba6e52d51ffabde5
+  metadata.gz: 5371e3683e7ec08d696d9cece6dea97e5939f863
+  data.tar.gz: 9061cdc8d6df7d9a70fc74d9e70e3ce503e44fb4
 SHA512:
-  metadata.gz: 509222d2ba3802e0ec03b85bd51f17cee60dae9507d4d3361582f439a9e82ffbf7fdff1fee3695b2eb1c4489e9a6fdae0bccd2736319585701fa8db8abe79c45
-  data.tar.gz: 76098f9991ee08dfc5a75a04cc942c27f006a5d4d6668dd8195f8a975cfd9d115b11b52bcaf1e6b456bef66cf4f79126a0f55dc73a6b4fb353dbaa4b8c248727
+  metadata.gz: ac52046d59ed1e07828fb87282fd740c5a82564a2b549ce6029bc7742f1df9bbb8b38bfe85966cdc94d7e6b6d68ca93c1fbcd91859b0ee88019ff09e7906d40a
+  data.tar.gz: ccd7ae62ccacdc27a490650bd0b8919beb6e314a4a814bb3561e6e0e368d770e12d9432573e3e321b30a6b996038a97d4bda8fc039d4dfbfc8aa3106ed895d33

data/CHANGLOG.md

@@ -1,8 +1,13 @@
+## 1.1.0 (2015-09-21)
+
+Base Vagrantfile:
+  - you can now configure a `base_vagratfile` git repo that all of your saltdeps projects can inherit from. This allows you to share common configuration. See README for more details. 
+
 ## 1.0.6 (2015-04-13)
 
 BugFixes:
   - change require so that case-sensitive filesystems can load the plugin.
-  
+
 ## 1.0.5 (2015-04-13)
 
 BugFixes:

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: f5ee8b8b7d25883e2715de630e03dcb550da3958
+  revision: 45ab5b4dc5f1860f4ad143f81b31fe4eaadf18f0
   specs:
-    vagrant (1.7.2)
-      bundler (>= 1.5.2, < 1.8.0)
+    vagrant (1.7.4)
+      bundler (>= 1.5.2, <= 1.10.5)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
       i18n (>= 0.6.0, <= 0.8.0)
-      listen (~> 2.8.0)
+      listen (~> 3.0.2)
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
       net-sftp (~> 2.1)
@@ -18,12 +18,12 @@ GIT
       rest-client (>= 1.6.0, < 2.0)
       wdm (~> 0.1.0)
       winrm (~> 1.3)
-      winrm-fs (~> 0.1.0)
+      winrm-fs (~> 0.2.2)
 
 PATH
   remote: .
   specs:
-    vagrant-saltdeps (1.0.2)
+    vagrant-saltdeps (1.1.0)
       activesupport (= 4.1.10)
       git (~> 1.2)
 
@@ -37,40 +37,36 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     builder (3.2.2)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    childprocess (0.5.5)
+    childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.2.5)
-    domain_name (0.5.23)
+    domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    ffi (1.9.8)
+    ffi (1.9.10)
     git (1.2.9.1)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
-    gyoku (1.2.3)
+    gyoku (1.3.1)
       builder (>= 2.1.2)
     hashicorp-checkpoint (0.1.4)
-    hitimes (1.2.2)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     httpclient (2.6.0.1)
     i18n (0.7.0)
-    json (1.8.2)
-    listen (2.8.6)
-      celluloid (>= 0.15.2)
+    json (1.8.3)
+    listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    little-plugger (1.1.3)
+    little-plugger (1.1.4)
     log4r (1.1.10)
     logging (1.8.2)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
-    mime-types (2.4.3)
+    mime-types (2.6.2)
     mini_portile (0.6.0)
-    minitest (5.5.1)
-    multi_json (1.11.0)
+    minitest (5.8.0)
+    multi_json (1.11.2)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -79,12 +75,12 @@ GEM
     netrc (0.10.3)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
-    nori (2.4.0)
+    nori (2.6.0)
     rake (10.4.2)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
+    rb-kqueue (0.2.4)
       ffi (>= 0.5.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -106,16 +102,14 @@ GEM
     rubyntlm (0.4.0)
     rubyzip (1.1.7)
     thread_safe (0.3.5)
-    timers (4.0.1)
-      hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.6)
+    unf_ext (0.0.7.1)
     uuidtools (2.1.5)
-    wdm (0.1.0)
-    winrm (1.3.0)
+    wdm (0.1.1)
+    winrm (1.3.4)
       builder (>= 2.1.2)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
@@ -124,7 +118,7 @@ GEM
       nori (~> 2.0)
       rubyntlm (~> 0.4.0)
       uuidtools (~> 2.1.2)
-    winrm-fs (0.1.0)
+    winrm-fs (0.2.2)
       erubis (~> 2.7)
       logging (~> 1.6, >= 1.6.1)
       rubyzip (~> 1.1)
@@ -138,3 +132,6 @@ DEPENDENCIES
   rspec (~> 3.2)
   vagrant!
   vagrant-saltdeps!
+
+BUNDLED WITH
+   1.10.3

data/README.md

@@ -36,9 +36,9 @@ deps:
 * **name** - The name of your current formula, and the folder in the same directory as the Vagrantfile where your salt state data exists. This also determines the name of the folder created in `/srv/salt`
 * **deps** - A list of dependencies for your formula
   * **apache** - In this example we are telling saltdeps that we expect a folder in this repo with our salt states to be called apache. This also determins the folder names that saltdeps creates
-    * **git** - The git repo to checkout from. Currently only git ssh protocol is supported. 
+    * **git** - The git repo to checkout from. Currently only git ssh protocol is supported.
     * **branch** - The branch of the dependent fromula you would like to check out
-    
+
 After defining a saltdeps.yml file you must configure your Vagrantfile. You should put the vagrant-saltdeps provisioner before your salt provisioner since it touches the salt provisioner configuration.
 
 ```
@@ -61,6 +61,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   if Vagrant.has_plugin?("vagrant-saltdeps")
     config.vm.provision :saltdeps do |deps|
+      deps.base_vagrantfile = "ssh://git@github.com/jhughes/vagrant-base.git"
       deps.checkout_path =  "./.vagrant-salt/deps"
       deps.deps_path     =  "./.vagrant-salt/saltdeps.yml"
     end
@@ -100,6 +101,7 @@ This project exposes a few configuration options so you can decide the best way
 * **merge_pillars** - Tells saltdeps if it should merge your dependent pillars into one file. Defaults to `true`.
 * **merge_grains** - Tells saltdeps if it should merge your dependent grains into one file. Defaults to `true`.
 * **merge_path** - Path where saltdeps should put the results of the merged pillars and grains files. Defaults to `.vagrant-salt/compiled_grains` and `.vagrant-salt/compiled_pillars`.
+* **base_vagrantfile** - This defines a git repo that has a single `Vagrantfile` in the root of the repository. This Vagrantfile is loaded before the Vagrantfile in the root of the project. The intention here is to allow for common configuration to be shared between salt formula. Any settings in the base Vagrantfile can be overridden with the Vagrantfile in your salt formula repository. The goal is to reduce the number of edits you have to do across the Vagranfiles in your different formulas. 
 
 
 ## Development

data/lib/vagrant-saltdeps/action.rb

@@ -0,0 +1,45 @@
+require 'git'
+module Vagrant
+  module Saltdeps
+    class Action
+      def initialize(app, env)
+        @app = app
+      end
+
+      def call(env)
+         base_vagrantfile = ''
+         checkout_path = ''
+         config_loader = env[:env].config_loader
+
+         v = Vagrantfile.new(config_loader, [:home,:root])
+         v.config.vm.provisioners.each do |provisioner|
+           if provisioner.config.class.to_s == 'VagrantPlugins::Saltdeps::Config::Provisioner'
+             base_vagrantfile = provisioner.config.base_vagrantfile
+             checkout_path = provisioner.config.checkout_path
+           end
+         end
+
+         if base_vagrantfile != Vagrant::Plugin::V2::Config.const_get(:UNSET_VALUE)
+           uri    = base_vagrantfile
+           name   = "base-vagrantfile"
+           branch = 'master'
+
+           if File.directory? checkout_path + "/#{name}"
+             g = Git.open checkout_path + "/#{name}"
+           else
+             g = Git.clone(uri, name, path: checkout_path)
+           end
+           begin
+             g.checkout(branch)
+             g.pull
+           rescue  Git::GitExecuteError => e
+             raise GitCheckoutError.new :branch => branch, :message => e.message
+           end
+
+           config_loader.set(:base_vagrantfile, "#{checkout_path}/#{name}/Vagrantfile")
+           env[:env].instance_variable_set(:@vagrantfile, Vagrantfile.new(config_loader, [:home, :base_vagrantfile, :root]))
+         end
+      end
+    end
+  end
+end

data/lib/vagrant-saltdeps/config/provisioner.rb

@@ -0,0 +1,64 @@
+module VagrantPlugins
+  module Saltdeps
+    module Config
+      class Provisioner < Vagrant.plugin('2', :config)
+        attr_accessor :checkout_path
+        attr_accessor :deps_path
+        attr_accessor :grains_path
+        attr_accessor :pillars_path
+        attr_accessor :merge_pillars
+        attr_accessor :merge_grains
+        attr_accessor :merged_path
+        attr_accessor :base_vagrantfile
+
+        def initialize
+          super
+          @machine       = nil
+          @checkout_path = UNSET_VALUE
+          @deps_path     = '.vagrant-salt/saltdeps.yml'
+          @grains_path   = UNSET_VALUE
+          @pillars_path  = UNSET_VALUE
+          @merge_pillars = UNSET_VALUE
+          @merge_grains  = UNSET_VALUE
+          @merged_path   = UNSET_VALUE
+          @base_vagrantfile = UNSET_VALUE
+        end
+
+        def validate(machine)
+          @machine = machine
+          errors = _detected_errors
+          if @checkout_path
+            Pathname.new(@checkout_path).expand_path(machine.env.root_path)
+          else
+            @checkout_path = '.saltdeps'
+            Pathname.new(@checkout_path).expand_path(machine.env.root_path)
+          end
+
+          expand(@grains_path,  errors)
+          expand(@pillars_path, errors)
+
+
+          return {"salt provisioner" => errors}
+        end
+
+        def finalize!
+          @grains_path   = '.vagrant-salt/grains'  if @grains_path  == UNSET_VALUE
+          @pillars_path  = '.vagrant-salt/pillars' if @pillars_path == UNSET_VALUE
+          @merged_path   = '.vagrant-salt'         if @merged_path  == UNSET_VALUE
+
+          @merge_grains  = true if @merge_grains  == UNSET_VALUE
+          @merge_pillars = true if @merge_pillars == UNSET_VALUE
+        end
+
+        private
+
+        def expand(path, errors=[], check=false)
+          expanded = Pathname.new(path).expand_path(@machine.env.root_path)
+          if check && !expanded.file?
+            errors << "The file at #{expanded} does not exist. Please give a valid path to your saltdeps.yml file."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-saltdeps/plugin.rb

@@ -18,13 +18,17 @@ module VagrantPlugins
       This plugin manages salt formula dependencies.
       DESC
 
+      action_hook :basevagrant, :environment_load do |hook|
+        require_relative './action.rb'
+        hook.prepend(Vagrant::Saltdeps::Action)
+      end
+
       config(:saltdeps, :provisioner) do
-        require File.expand_path("../config", __FILE__)
-        Config
+        require File.expand_path("../config/provisioner", __FILE__)
+        Config::Provisioner
       end
 
       provisioner(:saltdeps) do
-
         # Return the provider
         require File.expand_path("../provisioner", __FILE__)
         Provisioner

data/lib/vagrant-saltdeps/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Saltdeps
-    VERSION = '1.0.6'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-saltdeps
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Joseph Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -82,7 +82,8 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-saltdeps.rb
-- lib/vagrant-saltdeps/config.rb
+- lib/vagrant-saltdeps/action.rb
+- lib/vagrant-saltdeps/config/provisioner.rb
 - lib/vagrant-saltdeps/errors.rb
 - lib/vagrant-saltdeps/plugin.rb
 - lib/vagrant-saltdeps/provisioner.rb
@@ -109,9 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Manages vagrant salt dependencies
 test_files: []
-has_rdoc: 

data/lib/vagrant-saltdeps/config.rb

@@ -1,64 +0,0 @@
-module VagrantPlugins
-  module Saltdeps
-    class Config < Vagrant.plugin('2', :config)
-      attr_accessor :checkout_path
-      attr_accessor :deps_path
-      attr_accessor :grains_path
-      attr_accessor :pillars_path
-      attr_accessor :merge_pillars
-      attr_accessor :merge_grains
-      attr_accessor :merged_path
-
-      def initialize
-        super
-        @machine       = nil
-        @checkout_path = UNSET_VALUE
-        @deps_path     = UNSET_VALUE
-        @grains_path   = UNSET_VALUE
-        @pillars_path  = UNSET_VALUE
-        @merge_pillars = UNSET_VALUE
-        @merge_grains  = UNSET_VALUE
-        @merged_path   = UNSET_VALUE
-      end
-
-      def validate(machine)
-        @machine = machine
-        errors = _detected_errors
-        if @checkout_path
-          Pathname.new(@checkout_path).expand_path(machine.env.root_path)
-        else
-          @checkout_path = '.saltdeps'
-          Pathname.new(@checkout_path).expand_path(machine.env.root_path)
-        end
-
-        expand(@deps_path,    errors, true)
-        expand(@grains_path,  errors)
-        expand(@pillars_path, errors)
-
-
-        return {"salt provisioner" => errors}
-      end
-
-      def finalize!
-        @deps_path     = expand('.vagrant-salt/saltdeps.yml') if @deps_path    == UNSET_VALUE
-        @grains_path   = '.vagrant-salt/grains'  if @grains_path  == UNSET_VALUE
-        @pillars_path  = '.vagrant-salt/pillars' if @pillars_path == UNSET_VALUE
-        @merged_path   = '.vagrant-salt'         if @merged_path  == UNSET_VALUE
-
-        @merge_grains  = true if @merge_grains  == UNSET_VALUE
-        @merge_pillars = true if @merge_pillars == UNSET_VALUE
-      end
-
-      private
-
-      def expand(path, errors=[], check=false)
-        expanded = Pathname.new(@deps_path).expand_path(@machine.env.root_path)
-        if check && !expanded.file?
-          errors << "The file at #{expanded} does not exist. Please give a valid path to your saltdeps.yml file."
-        end
-      end
-
-
-    end
-  end
-end