vagrant-capistrano 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5946799050c81410f4d157820c316043266d58f
-  data.tar.gz: 645a902a282df9ff5c19df637d90389154364a1c
+  metadata.gz: 737128dc537f5fb5dd1976dda2c93f622fdb937e
+  data.tar.gz: 3f56e0e8676d7ee3b81d1bea8db32baa79d84751
 SHA512:
-  metadata.gz: 540e3bf84aaf7d22e505bb237c79264d52bf40e22df5239548ecc400eb7f58f96b4b8de90e43f10641af90aef6f6f306c7a28e61e11260c88060b6ee666f738f
-  data.tar.gz: ecf9deece10e735b9cc6a8f755eb83d9d5823b2d80aafd69b48e72002c64974613dc5513a8d4d115b3c7a50e54fbe7d5930c7ab48bf3b01ab57af6164b2a12c3
+  metadata.gz: c9a047e2bd0ba4af48c6639e42f7b48eb9575d0fef0b1b2cfb26eb4e5b8e43faafe201c45a567be6de15b4eeb7e4b187a128643240dd5bea39031652426d6b83
+  data.tar.gz: 98e1fe6d290ffb904b5b944611c4d6053e7e92ec550df42b4ff1cea056e9c9b2aff691e7c07b1a3b8f0f8249b4c50b12b69c614b8b91b83328c0dd050ed287d9

data/lib/vagrant/capistrano/config.rb

@@ -7,14 +7,16 @@ module VagrantPlugins
       attr_accessor :capfile
       attr_accessor :rubystring
       attr_accessor :stage
-      attr_accessor :post_setup_tasks
+      attr_accessor :tasks
+      attr_accessor :environment
       attr_accessor :hiera_root
 
       def initialize
         @capfile = UNSET_VALUE
         @rubystring = UNSET_VALUE
         @stage = UNSET_VALUE
-        @post_setup_tasks = []
+        @tasks = UNSET_VALUE
+        @environment = UNSET_VALUE
         @hiera_root = UNSET_VALUE
       end
 
@@ -22,7 +24,8 @@ module VagrantPlugins
         @capfile   = nil if @capfile == UNSET_VALUE
         @rubystring   = nil if @rubystring == UNSET_VALUE
         @stage = nil if @stage == UNSET_VALUE
-        @post_setup_tasks = nil if @post_setup_tasks == UNSET_VALUE
+        @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
       end
 

data/lib/vagrant/capistrano/provisioner.rb

@@ -12,20 +12,14 @@ module VagrantPlugins
           "HOSTS" => "#{@machine.ssh_info[:host]}:#{@machine.ssh_info[:port]}",
           "HIERA_ROOT" => File.expand_path(@config.hiera_root),
           "HIERA_CONFIG_PATH" => File.join(File.expand_path(@config.hiera_root),'hiera.yaml')
-        }
+        }.merge(@config.environment)
+
         rvm_do = "rvm #{@config.rubystring} do "
         commands = ["cd #{File.dirname(@config.capfile)}"]
-        commands << "#{rvm_do} cap #{@config.stage} rvm:install_ruby" 
-        commands << "#{rvm_do} cap #{@config.stage} deploy:setup"
-        @config.post_setup_tasks.each do |task|
+        @config.tasks.each do |task|
           commands << "#{rvm_do} cap #{@config.stage} #{task}"
         end
         system(env, commands.join(" && "))
-
-        # now do cap deploy
-        commands = ["cd #{File.dirname(@config.capfile)}"]
-        commands << "#{rvm_do} cap #{@config.stage} deploy" 
-        system(env, commands.join(" && "))
       end
     end
   end

data/lib/vagrant/capistrano/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Capistrano
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

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