vagrant-librarian-puppet 0.0.1 → 0.2.0

data/.gitignore

@@ -15,3 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Puppetfile.lock
+modules
+.vagrant
+.tmp

data/Gemfile

@@ -1,4 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in ..gemspec
 gemspec
+
+group :development do
+  gem "vagrant", github: "mitchellh/vagrant"
+  gem "debugger"
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Gareth Rushgrove
+Copyright (c) 2013 Jimmy Cuadra
 
 MIT License
 
@@ -19,4 +19,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,13 +1,61 @@
+# vagrant-librarian-puppet
 
-Simple Vagrant middleware which runs `librarian-puppet install` before
-each `vagrant up` and `vagrant provision`.
+A [Vagrant](http://www.vagrantup.com/) plugin to install
+[Puppet](http://docs.puppetlabs.com/#puppetpuppet) modules using
+[Librarian-Puppet](https://github.com/rodjek/librarian-puppet).
 
-To install you can run
+## Requirements
 
-    vagrant gem install librarian-puppet-vagrant
+* Vagrant version 1.2.0 or greater.
 
-It's up to you to make sure you have librarian puppet installed and
-available on your path. To use this just add the following to your
-Vagrantfile:
+## Installation
 
-    require 'librarian/puppet/vagrant'  
+``` bash
+vagrant plugin install vagrant-librarian-puppet
+```
+
+## Usage
+
+Vagrant will automatically run Librarian-Puppet before any provisioning step, so
+simply set up your Puppetfile as you normally would.
+
+You may specify the subdirectory within which to run `librarian-puppet`
+using the `librarian_puppet.puppetfile_dir` config key.  Please keep in mind
+that you will need to explicitly set the `modules` path in the
+`:puppet` provisioner and this path must exist before running vagrant commands.
+
+**NOTE:** Since the puppet provisioner will fail if the path provided to
+"puppet.modules" doesn't exist and librarian-puppet will destroy and recreate
+the modules directory on each run, this plugin supports a placeholder file
+within the modules directory that can be checked into version control and will
+persist between provisions.
+
+```ruby
+Vagrant.configure("2") do |config|
+
+  config.librarian_puppet.puppetfile_dir = "puppet"
+  # placeholder_filename defaults to .PLACEHOLDER
+  config.librarian_puppet.placeholder_filename = ".MYPLACEHOLDER"
+
+  config.vm.provision :puppet do |puppet|
+    puppet.modules = "puppet/modules"
+
+    ...
+
+  end
+end
+```
+
+## Development
+
+``` bash
+bundle
+bundle exec vagrant up
+```
+
+## Acknowledgements
+
+Thanks to @jimmycuadra and other contributors for their work on
+[vagrant-librarian-chef](https://github.com/jimmycuadra/vagrant-librarian-chef).
+This plugin made some slight changes to work with puppet, but largely just used
+their code.

data/Vagrantfile

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.require_plugin 'vagrant-librarian-puppet'
+
+Vagrant.configure('2') do |config|
+  config.vm.box = 'precise64'
+  config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
+
+  config.librarian_puppet.puppetfile_dir = 'puppet'
+
+  config.vm.provision :puppet do |puppet|
+    puppet.manifests_path = 'manifests'
+    puppet.manifest_file = 'init.pp'
+    puppet.module_path = 'puppet/modules'
+  end
+
+end

data/lib/vagrant-librarian-puppet.rb

@@ -0,0 +1,2 @@
+require "vagrant-librarian-puppet/version"
+require "vagrant-librarian-puppet/plugin"

data/lib/vagrant-librarian-puppet/action/librarian_puppet.rb

@@ -0,0 +1,71 @@
+require 'librarian/puppet'
+require 'librarian/action'
+
+module VagrantPlugins
+  module LibrarianPuppet
+    module Action
+      class Install
+        def initialize(app, env)
+          @app = app
+          @env = env
+          # Config#finalize! SHOULD be called automatically
+          env[:global_config].librarian_puppet.finalize!
+        end
+
+        def call(env)
+          config = env[:global_config].librarian_puppet
+          if
+            provisioned? and
+            File.exist? File.join(env[:root_path], config.puppetfile_path)
+
+            env[:ui].info "Installing Puppet modules with Librarian-Puppet..."
+
+            # NB: Librarian::Puppet::Environment calls `which puppet` so we
+            # need to make sure VAGRANT_HOME/gems/bin has been added to the
+            # path.
+            original_path = ENV['PATH']
+            bin_path = env[:gems_path].join('bin')
+            ENV['PATH'] = "#{bin_path}#{::File::PATH_SEPARATOR}#{ENV['PATH']}"
+
+            # Determine if we need to persist placeholder file
+            placeholder_file = File.join(
+              env[:root_path],
+              config.puppetfile_dir,
+              'modules',
+              config.placeholder_filename
+            )
+            if File.exist? placeholder_file
+              placeholder_contents = File.read(placeholder_file)
+            else
+              placeholder_contents = nil
+            end
+
+            environment = Librarian::Puppet::Environment.new({
+              :project_path => File.join(env[:root_path], config.puppetfile_dir)
+            })
+            Librarian::Action::Ensure.new(environment).run
+            Librarian::Action::Resolve.new(environment).run
+            Librarian::Action::Install.new(environment).run
+
+            # Restore the original path
+            ENV['PATH'] = original_path
+
+            # Persist placeholder if necessary
+            if placeholder_contents != nil
+              File.open(placeholder_file, 'w') { |file|
+                file.write(placeholder_contents)
+              }
+            end
+
+          end
+          @app.call(env)
+        end
+
+        def provisioned?
+          @env[:provision_enabled].nil? ? true : @env[:provision_enabled]
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-librarian-puppet/config.rb

@@ -0,0 +1,23 @@
+module VagrantPlugins
+  module LibrarianPuppet
+    class Config < Vagrant.plugin(2, :config)
+      attr_accessor :puppetfile_dir
+      attr_accessor :placeholder_filename
+
+      def initialize
+        @puppetfile_dir = UNSET_VALUE
+        @placeholder_filename = UNSET_VALUE
+      end
+
+      def finalize!
+        @puppetfile_dir = '.' if @puppetfile_dir == UNSET_VALUE
+        @placeholder_filename = '.PLACEHOLDER' if @placeholder_filename == UNSET_VALUE
+      end
+
+      def puppetfile_path
+        @puppetfile_path ||= @puppetfile_dir ? File.join(@puppetfile_dir, 'Puppetfile') : 'Puppetfile'
+      end
+
+    end
+  end
+end

data/lib/vagrant-librarian-puppet/plugin.rb

@@ -0,0 +1,28 @@
+begin
+  require "vagrant"
+rescue LoadError
+  abort "vagrant-librarian-puppet must be loaded in a Vagrant environment."
+end
+
+require "vagrant-librarian-puppet/action/librarian_puppet"
+
+
+module VagrantPlugins
+  module LibrarianPuppet
+    class Plugin < Vagrant.plugin("2")
+      name "vagrant-librarian-puppet"
+      description <<-DESC
+A Vagrant plugin to install Puppet modules using Librarian-Puppet.
+DESC
+      action_hook "librarian_puppet" do |hook|
+        # XXX see if we can only hook so long as a command option isn't passed
+        hook.before Vagrant::Action::Builtin::Provision, Action::Install
+      end
+
+      config "librarian_puppet" do
+        require_relative "config"
+        Config
+      end
+    end
+  end
+end

data/lib/vagrant-librarian-puppet/version.rb

@@ -0,0 +1,5 @@
+module VagrantPlugins
+  module LibrarianPuppet
+    VERSION = "0.2.0"
+  end
+end

data/manifests/init.pp

@@ -0,0 +1,8 @@
+class dev {
+
+  include git
+  include supervisor
+
+}
+
+include dev

data/puppet/Puppetfile

@@ -0,0 +1,8 @@
+# Manage Puppet module dependencies with librarian-puppet
+
+forge 'http://forge.puppetlabs.com'
+
+mod 'supervisor',
+  :git => 'git://github.com/eventbrite/puppet-supervisor.git'
+
+mod 'puppetlabs/git'

data/vagrant-librarian-puppet.gemspec

@@ -1,19 +1,27 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'vagrant-librarian-puppet/version'
 
-require 'librarian/puppet/vagrant/version'
+Gem::Specification.new do |spec|
+  spec.name          = "vagrant-librarian-puppet"
+  spec.version       = VagrantPlugins::LibrarianPuppet::VERSION
+  spec.authors       = ["Michael Hahn"]
+  spec.email         = ["mwhahn@gmail.com"]
+  spec.description   = %q{A Vagrant plugin to install Puppet modules using Librarian-Puppet.}
+  spec.summary       = %q{A Vagrant plugin to install Puppet modules using Librarian-Puppet.}
+  spec.homepage      = "https://github.com/mhahn/vagrant-librarian-puppet"
+  spec.license       = "MIT"
 
-Gem::Specification.new do |gem|
-  gem.name          = "vagrant-librarian-puppet"
-  gem.version       = Librarian::Puppet::Vagrant::VERSION
-  gem.authors       = ["Gareth Rushgrove"]
-  gem.email         = ["gareth@morethanseven.net"]
-  gem.description   = "A middleware for vagrant to run librarian-puppet before up"
-  gem.summary       = "Vagrant middleware for people working with librarian-puppet"
-  gem.homepage      = "https://github.com/garethr/vagrant-librarian-puppet"
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  spec.add_runtime_dependency "librarian-puppet"
+  spec.add_runtime_dependency "librarian"
+  spec.add_runtime_dependency "puppet"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,71 +1,156 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vagrant-librarian-puppet
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
-- Gareth Rushgrove
+authors:
+- Michael Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-28 00:00:00 -05:00
-default_executable: 
-dependencies: []
-
-description: A middleware for vagrant to run librarian-puppet before up
-email: 
-- gareth@morethanseven.net
+date: 2013-10-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: librarian-puppet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: librarian
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A Vagrant plugin to install Puppet modules using Librarian-Puppet.
+email:
+- mwhahn@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/..rb
-- lib/librarian/puppet/vagrant.rb
-- lib/librarian/puppet/vagrant/version.rb
+- Vagrantfile
+- lib/vagrant-librarian-puppet.rb
+- lib/vagrant-librarian-puppet/action/librarian_puppet.rb
+- lib/vagrant-librarian-puppet/config.rb
+- lib/vagrant-librarian-puppet/plugin.rb
+- lib/vagrant-librarian-puppet/version.rb
+- manifests/init.pp
+- puppet/Puppetfile
 - vagrant-librarian-puppet.gemspec
-has_rdoc: true
-homepage: https://github.com/garethr/vagrant-librarian-puppet
-licenses: []
-
+homepage: https://github.com/mhahn/vagrant-librarian-puppet
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Vagrant middleware for people working with librarian-puppet
+summary: A Vagrant plugin to install Puppet modules using Librarian-Puppet.
 test_files: []
-

data/lib/..rb

@@ -1,5 +0,0 @@
-require "./version"
-
-module .
-  # Your code goes here...
-end

data/lib/librarian/puppet/vagrant.rb

@@ -1,23 +0,0 @@
-module Librarian
-  module Puppet
-    module Vagrant
-      class Middleware
-        def initialize(app, env)
-          @app = app
-        end
-        def call(env)
-          env[:ui].info 'Running librarian puppet'
-          result = system 'librarian-puppet install'
-          unless result
-            env[:ui].error 'Librarian Puppet failed to run, do you have a valid Puppetfile?'
-            exit
-          end
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
-
-Vagrant.actions[:up].insert(Vagrant::Action::VM::Provision, Librarian::Puppet::Vagrant::Middleware)
-Vagrant.actions[:provision].insert(Vagrant::Action::VM::Provision, Librarian::Puppet::Vagrant::Middleware)

data/lib/librarian/puppet/vagrant/version.rb

@@ -1,7 +0,0 @@
-module Librarian
-  module Puppet
-    module Vagrant
-      VERSION = "0.0.1"
-    end
-  end
-end