vagrant-r10k 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 960030dda2dd99db2efe4b2af6b221b71eb5d9b6
-  data.tar.gz: 348677e6e82c9ee94941072595b082a05b0de1e3
+  metadata.gz: 11ae37b7c28f43dcdd732d3b5515e4f2c0eadcc1
+  data.tar.gz: a7d31bd3f78eea85d5e1e0098471d26f6c08a477
 SHA512:
-  metadata.gz: 3efa13ca03e10cce33813c4aa1732a3472fb933f65ca4b1ff0f04965a8f22af460717123343d96d581775f06d6030255a7da05d66a28ed0341c89f77ac388e0b
-  data.tar.gz: e14a90077d15f61922e04d04c67526bea681279c1479690758b954ab37d7ce46c44ca31d105f375d8b3693c43b8d134605efe320f21f2c7479829390bf028622
+  metadata.gz: 336d24166bda7d40cd6a8c3a6ffecc8e6247aae15892fadb9ce8b887e8b36ec3b271f6ad1bf417d93c53f7738ae3054bf57c60eea49883541e4dea818e5d8a1c
+  data.tar.gz: 7a11489ace64e0edb07410b28740e4df80f6c952fb94243a59fe673024db027418b3e5b37b8be44484b6a92df8db3e3786075f77249a9d3e95163851d576aa12

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.1

data/README.md

@@ -22,7 +22,45 @@ conflicting Puppet installation.
 Add the following to your Vagrantfile, before the puppet section:
 
     config.r10k.puppet_dir = 'dir' # the parent directory that contains your module directory and Puppetfile
-	config.r10k.puppetfile_path = 'dir/Puppetfile' # the path to your Puppetfile, within the repo
+    config.r10k.puppetfile_path = 'dir/Puppetfile' # the path to your Puppetfile, within the repo
+
+For the following example directory structure:
+
+    .
+    ├── README.md
+    ├── Vagrantfile
+    ├── docs
+    │   └── foo.md
+    ├── puppet
+    │   ├── Puppetfile
+    │   ├── manifests
+    │   │   └── default.pp
+    │   └── modules
+    └── someproject
+        └── foo.something
+
+The configuration for r10k and puppet would look like:
+
+    # r10k plugin to deploy puppet modules
+    config.r10k.puppet_dir = "puppet"
+    config.r10k.puppetfile_path = "puppet/Puppetfile"
+    
+    # Provision the machine with the appliction
+    config.vm.provision "puppet" do |puppet|
+      puppet.manifests_path = "puppet/manifests"
+      puppet.manifest_file  = "default.pp"
+      puppet.module_path = "puppet/modules"
+    end
+
+If you provide an array of directories in puppet.module_path, vagrant-r10k will use the first directory listed for auto configuration. If you want to let r10k use a different directory, see below.
+
+## Usage with explicit path to module installation directory
+
+Add the following to your Vagrantfile, before the puppet section:
+
+    config.r10k.puppet_dir = 'dir' # the parent directory that contains your module directory and Puppetfile
+    config.r10k.puppetfile_path = 'dir/Puppetfile' # the path to your Puppetfile, within the repo
+    config.r10k.module_path = 'dir/moduledir' # the path where r10k should install its modules (should be same / one of those in puppet provisioner, will be checked)
 
 For the following example directory structure:
 
@@ -35,21 +73,23 @@ For the following example directory structure:
     │   ├── Puppetfile
     │   ├── manifests
     │   │   └── default.pp
-    │   └── modules
+    │   ├── modules # your own modules
+    │   └── vendor # modules installed by r10k
     └── someproject
-        └── foo.something
+	└── foo.something
 
 The configuration for r10k and puppet would look like:
 
     # r10k plugin to deploy puppet modules
     config.r10k.puppet_dir = "puppet"
     config.r10k.puppetfile_path = "puppet/Puppetfile"
+    config.r10k.module_path = "puppet/vendor"
     
     # Provision the machine with the appliction
     config.vm.provision "puppet" do |puppet|
       puppet.manifests_path = "puppet/manifests"
       puppet.manifest_file  = "default.pp"
-      puppet.module_path = "puppet/modules"
+      puppet.module_path = ["puppet/modules", "puppet/vendor"]
     end
 
 ## Contributing
@@ -57,13 +97,32 @@ The configuration for r10k and puppet would look like:
 1. Fork it ( https://github.com/jantman/vagrant-r10k/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+4. Increment the version number in `lib/vagrant-r10k/version.rb`
+5. Add yourself to the "Contributors" list below.
+6. Push to the branch (`git push origin my-new-feature`)
+7. Create a new Pull Request
+
+### Contributors
+
+* Oliver Bertuch - [https://github.com/poikilotherm](https://github.com/poikilotherm)
 
 ## Testing
 
 Still need to write tests... but they'll be using bundler and rspec.
 
+__Note__ that developming vagrant plugins _requires_ ruby 2.0.0 or newer.
+A `.ruby-version` is provided to get [rvm](https://rvm.io/workflow/projects)
+to use 2.1.1.
+
+For manual testing:
+
+    bundle install --path vendor
+	VAGRANT_LOG=debug bundle exec vagrant up
+
+To use an existing project's Vagrantfile, you can just specify the directory that the Vagrantfile
+is in using the ``VAGRANT_CWD`` environment variable (i.e. prepend ``VAGRANT_CWD=/path/to/project``
+to the above command).
+
 ## Debugging
 
 Exporting ``VAGRANT_LOG=debug`` will also turn on debug-level logging for r10k.

data/Rakefile

@@ -2,3 +2,10 @@ require 'bundler/gem_tasks'
 require 'rubygems'
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
+
+task :default => [:help]
+
+desc "Display the list of available rake tasks"
+task :help do
+  system("rake -T")
+end

data/lib/vagrant-r10k/config.rb

@@ -3,10 +3,12 @@ module VagrantPlugins
     class Config < Vagrant.plugin('2', :config)
       attr_accessor :puppet_dir
       attr_accessor :puppetfile_path
+      attr_accessor :module_path
 
       def initialize
         @puppet_dir = UNSET_VALUE
         @puppetfile_path = UNSET_VALUE
+        @module_path = UNSET_VALUE
       end
 
       def validate(machine)
@@ -30,6 +32,11 @@ module VagrantPlugins
         puppetfile = File.join(machine.env.root_path, puppetfile_path)
         errors << "puppetfile '#{puppetfile}' does not exist" if !File.file?(puppetfile)
 
+        if module_path != UNSET_VALUE
+          module_path_path = File.join(machine.env.root_path, module_path)
+          errors << "module_path directory '#{module_path_path}' does not exist" if !File.directory?(module_path_path)
+        end
+        
         { "vagrant-r10k" => errors }
       end
 

data/lib/vagrant-r10k/modulegetter.rb

@@ -50,17 +50,41 @@ module VagrantPlugins
         end
 
         puppetfile_path = File.join(env_dir, @env[:machine].config.r10k.puppetfile_path)
+
         module_path = nil
+        # override the default mechanism for building a module_path with the optional config argument
+        if @env[:machine].config.r10k.module_path != unset
+          module_path = @env[:machine].config.r10k.module_path
+        end
+
         manifest_file = nil
         manifests_path = nil
         @env[:machine].config.vm.provisioners.each do |prov|
           if prov.name == :puppet
-            module_path = File.join(env_dir, prov.config.module_path)
+            # if module_path has been set before, check if it fits to one defined in the provisioner config
+            if module_path != nil
+              if prov.config.module_path.is_a?(Array) and ! prov.config.module_path.include?(module_path) 
+                @env[:ui].detail "vagrant-r10k: module_path \"#{module_path}\" is not within the ones defined in puppet provisioner; not running"
+                @app.call(env)
+                return
+              elsif ! prov.config.module_path.is_a?(Array) and prov.config.module_path != module_path
+                @env[:ui].detail "vagrant-r10k: module_path \"#{module_path}\" is not the same as in puppet provisioner; not running"
+                @app.call(env)
+                return
+              end
+            # no modulepath explict set in config, build one from the provisioner config
+            else
+              module_path = prov.config.module_path.is_a?(Array) ? prov.config.module_path[0] : prov.config.module_path
+              @env[:ui].info "vagrant-r10k: Building the r10k module path with puppet provisioner module_path \"#{module_path}\". (if module_path is an array, first element is used)"
+            end
+
             manifest_file = File.join(env_dir, prov.config.manifest_file)
             manifests_path = File.join(env_dir, prov.config.manifests_path[1])
           end
         end
 
+        # now join the module_path with the env_dir to have an absolute path
+        module_path = File.join(env_dir, module_path)
         @env[:ui].info "vagrant-r10k: Beginning r10k deploy of puppet modules into #{module_path} using #{puppetfile_path}"
 
         if ENV["VAGRANT_LOG"] == "debug"

data/lib/vagrant-r10k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module R10k
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-r10k
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jason Antman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r10k
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md