vagrant-saltdeps 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f30a2edd74d3fe6c8ebc68de8621952ac69ba6f
-  data.tar.gz: 5c68fbf2509dabd794aeddfe54a807ebc928c0a0
+  metadata.gz: 9be297f3cfa2753d1efb9ce69a918ad7b3fec970
+  data.tar.gz: 41675ca3e8010efeefc5dde80f43d977cc4a4b7e
 SHA512:
-  metadata.gz: 6ba5840dae5a22d317ecc0321fd1702f43e0e78091582268a0d837d45ae040a5e4e5bc943bd8917ca277e24b4e48b2befa82209eaa9072db9a92f3ef339cfd7f
-  data.tar.gz: d6091fcdcc8e05af8d6f473f4daa01c6d6276524ae2e308716a6e9543e641c64faaedcade99c4a1fd6926f7eaa3ea297ecfc122118e0f5c433e213544fd33822
+  metadata.gz: 7077e201093f952b6e894953e4dde51d9091bbc6519c1911bddbba4f2d8fc590c83148f7c4450402c713f39a644c5b63e503cbcf929a0b1dc69305d7797dae76
+  data.tar.gz: 26909405ea5f39cf8161ac62b3cac6d30d519e7a71a459858d33cd4fe0a92cb5505c5bdf61ee5ce67d5a3a4edbea0a433709798e1978f4405db1092e27519a1d

data/CHANGLOG.md

@@ -0,0 +1,11 @@
+## 1.0.1 (2015-03-31)
+
+Bugfixes:
+
+  - update README.md
+  - cleanup on vagrant destroy
+  - create CHANGLOG.md
+
+## 1.0.0 (2015-03-30)
+
+Initial Release

data/Gemfile.lock

@@ -23,10 +23,9 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-saltdeps (1.0.0)
+    vagrant-saltdeps (1.0.1)
       activesupport (= 4.1.10)
       git (~> 1.2)
-      pry (~> 0.10)
 
 GEM
   remote: https://rubygems.org/
@@ -42,7 +41,6 @@ GEM
       timers (~> 4.0.0)
     childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.0)
     diff-lcs (1.2.5)
     domain_name (0.5.23)
       unf (>= 0.0.5, < 1.0.0)
@@ -69,7 +67,6 @@ GEM
     logging (1.8.2)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
-    method_source (0.8.2)
     mime-types (2.4.3)
     mini_portile (0.6.0)
     minitest (5.5.1)
@@ -83,10 +80,6 @@ GEM
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     nori (2.4.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
     rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
@@ -112,7 +105,6 @@ GEM
     rspec-support (3.2.2)
     rubyntlm (0.4.0)
     rubyzip (1.1.7)
-    slop (3.6.0)
     thread_safe (0.3.5)
     timers (4.0.1)
       hitimes

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2015 Joseph Hughes
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,2 +1,111 @@
-# vagrant-Saltdeps
-manage your salt dependencies for vagrant testing
+# vagrant-saltdeps
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/joshughes/vagrant-saltdeps?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+When testing salt formula with vagrant you may have one or many dependent formulas that are required to fully test your new formula. Vagrantsaltdeps is meant to help you manage these dependencies by checking them out from git and making them avaliable to your vagrant machine. 
+
+**NOTE:** This plugin requires Vagrant 1.2+,
+
+## Features
+
+* Check out dependent salt formula from git
+* Branch support for dependent formula
+* Grains and Pillar merging from dependent formula
+
+
+## Usage
+
+Install using standard Vagrant 1.1+ plugin installation methods. 
+
+```
+$ vagrant plugin install vagrant-saltdeps
+...
+```
+
+
+## Quick Start
+
+After installing the plugin (instructions above), you must create a saltdeps.yml file somewhere in your repo. This file along with your grains and pillar files must live in the same place across your repos. Here is an example. 
+
+```
+apache:
+  git: ssh://git@stash.itriagehealth.com/salt/artifactory-formula.git
+  branch: develop
+```
+
+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. 
+
+```
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "ubuntu/trusty64"
+  config.vm.synced_folder "./.vagrant-salt", "/srv/salt", id: "vagrant-root"
+
+  config.ssh.forward_agent = true
+
+  config.vm.provider :virtualbox do |vb|
+    # Use VBoxManage to customize the VM. For example to change memory:
+    vb.customize ["modifyvm", :id, "--memory", "1024"]
+  end
+
+  if Vagrant.has_plugin?("vagrant-saltdeps")
+    config.vm.provision :saltdeps do |deps|
+      deps.checkout_path =  "./.vagrant-salt/deps"
+      deps.deps_path     =  "./.vagrant-salt/saltdeps.yml"
+    end
+  end
+
+  # Provision VM with current formula, in masterless mode
+  config.vm.provision :salt do |salt|
+    salt.minion_config = "./.vagrant-salt/minion"
+    salt.run_highstate = true
+    salt.install_type = 'stable'
+    salt.colorize = true
+    salt.verbose = true
+  end
+
+  # Run serverspec tests
+  if Vagrant.has_plugin?("vagrant-serverspec")
+    config.vm.provision :serverspec do |spec|
+      spec.pattern = './spec/*_spec.rb'
+    end
+  end
+end
+
+```
+
+This will get you started using the plugin. For further plugin configuration options please read below. 
+
+With the example above a new folder will be created in `.vagrant-salt/deps` called `apache-formula`. In this folder saltdeps will checkout the development branch from git and search to see if any grains or pillar files from that formula need to be merged into this formula's current grains and pillars. It will then configure the salt provisioner so it has access to the grain and pillar data and sync the apache formula to the vagrant vm. 
+
+## Configuration 
+
+This project exposes a few configuration options so you can decide the best way to lay out your salt-formula and still be able to test it in vagrant. 
+
+* **checkout_path** - Where you want saltdeps to checkout your dependent formulas. Defaults to `.saltdeps`
+* **deps_path** - The path to yor saltdeps.yml file. Defaults to `.vagrant-salt/saltdeps.yml'
+* **grains_path** - The path in **all** your repos where the grains file can be found. Defaults to `.vagrant-salt/grains`
+* **pillars_path** - The path in **all** your repos where the pillars file can be found. Defaults to `.vagrant-salt/pillars`
+* **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`.
+
+
+## Development
+
+To work on the `vagrant-saltdeps` plugin, fork this repository out, and use
+[Bundler](http://gembundler.com) to get the dependencies: **Note:** vagrant requires `bundler < 1.8`. So you will need to install `1.7.13` and use the syntax below to make sure you are running with that version.
+
+```
+$  bundle _1.7.13_
+```
+
+Currently there are not unit tests, but to test you can go to a directory with a Vagrantfile and run the following. 
+
+```
+$  bundle _1.7.13_ exec vagrant provision
+```

data/lib/vagrant-saltdeps/config.rb

@@ -40,7 +40,7 @@ module VagrantPlugins
       end
 
       def finalize!
-        @deps_path     = expand('.vagrant-salt') if @deps_path    == UNSET_VALUE
+        @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

data/lib/vagrant-saltdeps/provisioner.rb

@@ -1,7 +1,7 @@
 require 'log4r'
 require 'vagrant'
 require 'git'
-require 'pry'
+require 'fileutils'
 require "log4r"
 
 
@@ -63,21 +63,39 @@ module VagrantPlugins
         end
       end
 
+      def cleanup
+        if File.directory? @checkout_path
+          FileUtils.rm_rf(@checkout_path)
+        end
+        if File.directory? @merged_path
+          FileUtils.rm(@merged_path + '/compiled_grains') if File.exists? @merged_path + '/compiled_grains'
+          FileUtils.rm(@merged_path + '/compiled_pillars') if File.exists? @merged_path + '/compiled_pillars'
+        end
+        cleanup_check_path = self.clean_up_path
+        @deps.keys.each do |dep|
+          FileUtils.rm_rf(cleanup_check_path + '/' + dep) if File.directory?(cleanup_check_path + '/' + dep)
+        end
+      end
+
       def merge_grains
         output_path = File.expand_path(@merged_path+'/compiled_grains', @machine.env.root_path)
-        merge(@grains_path, output_path) if @merge_grains
-        @machine.config.vm.provisioners.each do |provisioner|
-          next unless provisioner.type == :salt
-          provisioner.config.grains_config= output_path
+        if @merge_grains
+          merge(@grains_path, output_path)
+          @machine.config.vm.provisioners.each do |provisioner|
+            next unless provisioner.type == :salt
+            provisioner.config.grains_config= output_path
+          end
         end
       end
 
       def merge_pillars
         output_path = File.expand_path(@merged_path+'/compiled_pillars', @machine.env.root_path)
-        merge(@pillars_path, output_path) if @merge_pillars
-        @machine.config.vm.provisioners.each do |provisioner|
-          next unless provisioner.type == :salt
-          provisioner.config.pillar(YAML.load_file(output_path))
+        if @merge_pillars
+          merge(@pillars_path, output_path)
+          @machine.config.vm.provisioners.each do |provisioner|
+            next unless provisioner.type == :salt
+            provisioner.config.pillar(YAML.load_file(output_path))
+          end
         end
       end
 
@@ -95,6 +113,12 @@ module VagrantPlugins
         File.open(output,  'w') {|f| f.write merge_object.to_yaml }
       end
 
+      def clean_up_path
+        checkout_path = @checkout_path.split('/')
+        base_checkout_path = checkout_path[0..(checkout_path.length-2)].join('/')
+        File.expand_path(base_checkout_path, @machine.env.root_path)
+      end
+
     end
   end
 end

data/lib/vagrant-saltdeps/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Saltdeps
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/vagrant-saltdeps.gemspec

@@ -1,6 +1,6 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'vagrant-Saltdeps/version'
+require 'vagrant-saltdeps/version'
 
 Gem::Specification.new do |s|
   s.name          = "vagrant-saltdeps"
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency "git", "~> 1.2"
-  s.add_runtime_dependency "pry", '~> 0.10'
   s.add_runtime_dependency "activesupport", '4.1.10'
 
   s.add_development_dependency "rake", '~> 10.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-saltdeps
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Joseph Hughes
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -88,9 +74,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGLOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - lib/vagrant-saltdeps.rb