vagrant-capistrano 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fdf0b9b3305610260516e7411958d448b41258c
-  data.tar.gz: b5bb020d1caee8dbf6989823ac148cffb23286c6
+  metadata.gz: 42eea4ad4c923b083bdb3587bb9ee4da6d114708
+  data.tar.gz: 5e9d728af24c2bc0a9909e11c3084586988e6dac
 SHA512:
-  metadata.gz: cc3d55c1dfc73a4856e76a80a0247ffaaf937a1cfde870944a827651463c13404d93c9ff407a64471d2cbf5159f90fd0af3a923050ab6c19e61e30f41f531594
-  data.tar.gz: 57d4cfdb1dbf3b09b031c2b18fb6f63d8bf710664eb11e5c714545924a5b687937d4354bd2466bd7eb2cece0c687cfdec153eabc54d05bae03852d6572ba1d1f
+  metadata.gz: 704d70c29028e80fbd7a1347a3627df563977566dedbb12580a3524bf6b3ccf1bac6f5cdba753aabfb422baffe73ae4d8f44e8e60c2c255ab37706bade77c618
+  data.tar.gz: 7a8396ce71c3729156b48b0bf683c35024678b418e8bd3bf85ec75b2d55a3fcb213a9e5628c0eee070cc5547f5edd79ec86fd02ac83155378b089eb03503fe7b

data/README.md

@@ -10,43 +10,34 @@ vagrant plugin install vagrant-capistrano
 
 ## Usage
 
-```ruby
-config.vm.provision "capistrano" do |cap|
-  cap.capfile = '../some-project/Capfile'
-  cap.rubystring = 'ruby-2.0.0-p458@project' 
-  cap.stage = 'testing'
-  cap.post_setup_tasks = ['rvm:install'] 
-end
-```
+    config.vm.provision "capistrano" do |cap|
+      cap.capfile = '../some-project/Capfile'
+      cap.rubystring = 'ruby-2.0.0-p458@gemset' 
+      cap.stage = 'testing'
+      cap.tasks = ['rvm:install'] 
+      cap.environment = { 'ENV_VAR' => 'VALUE' } 
+      cap.hiera_root = '../hiera' 
+    end
 
 This provisioner will set the following environment variables before executing capistrano:
 
-```
-DEPLOYMENT_USER = 'vagrant' (or whatever the vagrant ssh user is set to)
-SSH_IDENTITY = private ssh key of the DEPLOYMENT_USER
-HOSTS= IP address and port of the vagrant ssh daemon
-```
+    DEPLOYMENT_USER = 'vagrant' (or whatever the vagrant ssh user is set to)
+    SSH_IDENTITY = private ssh key of the DEPLOYMENT_USER
+    HOSTS= IP address and port of the vagrant ssh daemon
 
 In order for this plugin to successfully execute your capsitrano tasks, should your include the following in your Capfile (or deploy.rb):
 
-```ruby
-# required for vagrant
-set :ssh_options,   { keys: [ENV['SSH_IDENTITY']] } if ENV['SSH_IDENTITY']
-set :user,          ENV['DEPLOYMENT_USER'] || "deployment"
-```
-
-This provisioner will cd into the directory containing your Capfile, then perform 
+    # required for vagrant
+    set :ssh_options,   { keys: [ENV['SSH_IDENTITY']] } if ENV['SSH_IDENTITY']
+    set :user,          ENV['DEPLOYMENT_USER'] || "deployment"
 
-```
-cap (stage) rvm_install_ruby
-cap (stage) deploy:setup
-```
-
-then any capistrano tasks in post_setup_tasks, followed by
+This provisioner will cd into the directory containing your Capfile, then perform the tasks listed in the cap.tasks array. If
+omitted, it defaults to:
 
-```
-cap (stage) deploy
-```
+    cap (stage) misc:update_needed? rvm:install_ruby deploy:setup deploy
+    cap (stage) rvm:install_ruby
+    cap (stage) deploy:setup
+    cap (stage) deploy
 
 ## Contributing
 

data/lib/vagrant/capistrano/config.rb

@@ -10,6 +10,7 @@ module VagrantPlugins
       attr_accessor :tasks
       attr_accessor :environment
       attr_accessor :hiera_root
+      attr_accessor :hiera_role
 
       def initialize
         @capfile = UNSET_VALUE
@@ -18,6 +19,7 @@ module VagrantPlugins
         @tasks = UNSET_VALUE
         @environment = UNSET_VALUE
         @hiera_root = UNSET_VALUE
+        @hiera_role = UNSET_VALUE
       end
 
       def finalize!
@@ -27,6 +29,7 @@ module VagrantPlugins
         @tasks = ['misc:update_needed?', 'rvm:install_ruby','deploy:setup','deploy'] if @tasks == UNSET_VALUE
         @environment = {} if @environment == UNSET_VALUE
         @hiera_root = nil if @hiera_root == UNSET_VALUE
+        @hiera_role = nil if @hiera_role == UNSET_VALUE
       end
 
 

data/lib/vagrant/capistrano/provisioner.rb

@@ -16,6 +16,7 @@ module VagrantPlugins
           "SSH_IDENTITY" => @machine.ssh_info[:private_key_path].join(":"),
           "HOSTS" => "#{@machine.ssh_info[:host]}:#{@machine.ssh_info[:port]}",
           "HIERA_ROOT" => File.expand_path(@config.hiera_root),
+          "HIERA_ROLE" => @config.hiera_role,
           "HIERA_CONFIG_PATH" => File.join(File.expand_path(@config.hiera_root),'hiera.yaml')
         }.merge(@config.environment)
 

data/lib/vagrant/capistrano/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Capistrano
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Martin Skinner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler