vagrant-lifecycle 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29027245ea6a0c12182c436e2b8fccaf4fe5c4ff
-  data.tar.gz: 47e5c269d3f64e03c49a1eccbaffcb927fa4cc65
+  metadata.gz: 5611fea343055e79d06bb2a9133d859fecdecd9a
+  data.tar.gz: e7b510084e3d9a4b1fbf05f9f5317fed57265012
 SHA512:
-  metadata.gz: cd3ffc644244ecbb8acf2b9f91aae3df4d5ff5c6cfe211f32bcbc9a8a50e83114f9cb25f2fb463e48abfa57cfd757e3ff2735de94cf4960bb57730288969f141
-  data.tar.gz: e8b4a58117aa15d6c9c7c9e133201d2663ca5924c3dac749027ce6403b70d058116fec99a8f94d71943a02ceaca33ab99e08743743728bfed75859a1860ff2ef
+  metadata.gz: 6a72769bc4e0a041db10cee8cd21dda552b09d1e4104c923cd2f971cef0274760aaa5e4066632c1404af206b17c5f806aa6404243b3762e2a5ef33923dcc1b95
+  data.tar.gz: b93ff762ce27e57bb02140b5c737b00c8083712d5319ce176773161d5d8e5ddbf4c4ad58fccf95aec19444c5774d272d2af74f7f8874f03b2135fc666add63d7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # vagrant-lifecycle Changelog
 
+## 0.1.2
+
+Added middleware environment `:lifecycle_event` key for usage with other plugins.
+
 ## 0.1.1
 
 Code cleanup. Added missing vagrant command synopsis.

data/README.md

@@ -2,6 +2,9 @@
 
 Vagrant Lifecycle is a Vagrant plugin that allows execution of custom provisioning events for the Chef provisioners.
 
+The primarily goal of this plugin is to ease the development and testing of Chef recipes intended for use on services
+like AWS OpsWorks.
+
 ## Installation
 
 1. Install the latest version of [Vagrant](https://www.vagrantup.com/downloads.html)
@@ -52,9 +55,15 @@ You can execute provisioning on the specific lifecycle event via command (for ex
 $ vagrant lifecycle -e deploy
 ```
 
-## More examples
+### Usage with other Vagrant plugins
+
+Currently executed lifecycle event name is available in other Vagrant plugin's middlewares through `:lifecycle_event` 
+key of the environment hash. Please note that this key will not be set during regular provision even if the
+`lifecycle.default_event` is configured.
+
+### More examples
 
-### Evaluate run list based on lifecycle event and node roles 
+#### Evaluate run list based on lifecycle event and node roles 
 
 Example Vagrantfile configuration section:
 
@@ -98,7 +107,7 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-### Require additional parameter(s) for a specific lifecycle event
+#### Require additional parameter(s) for a specific lifecycle event
 
 Example Vagrantfile configuration section:
 
@@ -116,11 +125,11 @@ Vagrant.configure("2") do |config|
         end
         parser.parse!
       end
-      opt_parser.program_name="vagrant -e deploy"
+      opt_parser.program_name="vagrant lifecycle -e deploy"
 
       if options.empty?
         puts opt_parser.help
-        exit
+        exit 1
       end
 
       unless options.key?(:application)
@@ -147,11 +156,10 @@ Sample usage:
 $ vagrant lifecycle -e deploy -a really_cool_app
 ```
 
-### Use specific machine info
+#### Use specific machine info
 
 Example Vagrantfile configuration section:
 
-
 ```ruby
 Vagrant.configure("2") do |config|
   config.lifecycle.events = {

data/lib/vagrant-lifecycle/command.rb

@@ -1,7 +1,3 @@
-require "vagrant-lifecycle/version"
-
-require 'json'
-
 module VagrantPlugins
   module Lifecycle
     class Command < Vagrant.plugin(2, :command)
@@ -9,11 +5,37 @@ module VagrantPlugins
         "provisions the vagrant machine using a custom lifecycle event"
       end
 
+      # Like OptionParser.order!, but leave any unrecognized --switches alone
+      def order_recognized!(parser, args)
+        extra_opts = []
+        begin
+          parser.order!(args) {|a| extra_opts << a}
+        rescue OptionParser::InvalidOption => e
+          extra_opts << e.args[0]
+          retry
+        end
+        args[0, 0] = extra_opts
+      end
+
       def execute
-        MiddleWareConfig.instance.enabled = true
+        options = Hash.new
+        opt_parser = OptionParser.new do |parser|
+          parser.on("-e", "--event EVENT", "Lifecycle event to execute") do |p|
+            options[:event] = p
+          end
+          order_recognized!(parser, ARGV)
+        end
+        opt_parser.program_name="vagrant lifecycle"
+
+        unless options.key?(:event)
+          @env.ui.error "Lifecycle event parameter missing!"
+          puts opt_parser.help
+          exit 1
+        end
+        lifecycle_event = options[:event]
 
         with_target_vms([], reverse: true) do |machine|
-          machine.action(:provision)
+          machine.action(:provision, {:lifecycle_event => lifecycle_event})
         end
 
         exit 0

data/lib/vagrant-lifecycle/config.rb

@@ -1,4 +1,3 @@
-require 'pathname'
 require 'vagrant/util/hash_with_indifferent_access'
 
 module VagrantPlugins

data/lib/vagrant-lifecycle/middleware.rb

@@ -1,19 +1,5 @@
-require "vagrant-lifecycle/version"
-require "singleton"
-require 'json'
-
 module VagrantPlugins
   module Lifecycle
-    class MiddleWareConfig
-      include Singleton
-
-      attr_accessor :enabled
-
-      def initialize
-        @enabled = false
-      end
-    end
-
     class MiddleWare
       def initialize(app, env)
         @app = app
@@ -22,36 +8,8 @@ module VagrantPlugins
         @logger = Log4r::Logger.new("vagrant::lifecycle::#{klass}")
       end
 
-      # Like OptionParser.order!, but leave any unrecognized --switches alone
-      def order_recognized!(parser, args)
-        extra_opts = []
-        begin
-          parser.order!(args) {|a| extra_opts << a}
-        rescue OptionParser::InvalidOption => e
-          extra_opts << e.args[0]
-          retry
-        end
-        args[0, 0] = extra_opts
-      end
-
       def call(env)
-        if MiddleWareConfig.instance.enabled
-          options = Hash.new
-          opts = OptionParser.new do |parser|
-            parser.on("-e", "--event EVENT", "Lifecycle event to execute") do |p|
-              options[:event] = p
-            end
-            order_recognized!(parser, ARGV)
-          end
-
-          unless options.key?(:event)
-            env[:ui].error "Lifecycle event parameter missing!"
-            env[:interrupted] = true
-          end
-          event = options[:event]
-        else
-          event = env[:machine].config.lifecycle.default_event
-        end
+        event = env[:lifecycle_event] || env[:machine].config.lifecycle.default_event || nil
 
         if event.nil?
           @app.call(env)

data/lib/vagrant-lifecycle/plugin.rb

@@ -1,13 +1,12 @@
-require "vagrant-lifecycle/command"
-require "vagrant-lifecycle/middleware"
-require "vagrant-lifecycle/version"
-
-require 'json'
+require 'vagrant-lifecycle/command'
+require 'vagrant-lifecycle/config'
+require 'vagrant-lifecycle/middleware'
+require 'vagrant-lifecycle/version'
 
 module VagrantPlugins
   module Lifecycle
     class Plugin < Vagrant.plugin(2)
-      name "Lifecycle Plugin"
+      name 'Lifecycle Plugin'
 
       def self.provision
         Vagrant::Action::Builder.new.tap do |b|
@@ -17,17 +16,16 @@ module VagrantPlugins
 
       [:machine_action_up, :machine_action_reload, :machine_action_provision].each do |action|
         action_hook(:lifecycle_provision, action) do |hook|
-          # hook.after(Vagrant::Action::Builtin::ConfigValidate, Plugin.provision_init)
           hook.before(Vagrant::Action::Builtin::Provision, Plugin.provision)
         end
       end
 
-      command "lifecycle" do
+      command 'lifecycle' do
         Command
       end
 
       config(:lifecycle) do
-        require_relative "config"
+        require_relative 'config'
         Config
       end
     end

data/lib/vagrant-lifecycle/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Lifecycle
-    VERSION = "0.1.1"
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lifecycle
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nikola Stojiljkovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler