vagrant-lifecycle 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1adfe0fd188550f1ce0ae66be31da607e6f9eb70
-  data.tar.gz: '082e1254bdc78785e15fd46a43d401769d9884c8'
+  metadata.gz: c7cba661db2ccbce052ecedd8c595e4d2fe10281
+  data.tar.gz: 8547b53d8ca47345faa5e59f28b836d7d4ed915b
 SHA512:
-  metadata.gz: ec1d88ac133062baee4af4149098e3036ec6645f77654e6cb3ee8661ee7d91a3601a9e6342916406f4066c3a0cfd869e7acb9166e89884f5b3792c0f14a8c0cd
-  data.tar.gz: ae2802b31cdb3010cd78131a19ed8cc38786cb03f149da7c1d621e1f87500efb33357e1d70e78969d7e0539188a5b7f352460177f4184efa7d317e16768a8f84
+  metadata.gz: a6ae430f852bce5e02cbf3f520611dfc529ea69a51e7ff6c16a630bdc4b870d088eb338b022ff50715c0d53bbaa1f2ae2ff2916ab0e7b5b67ab91ab28c38e7ce
+  data.tar.gz: 7b02208f54e5927cf85b32b806fbf14898df1a317dce1295760ecbbdc5c3ef7a9b25f66ecfa199d4d673dfe58ea77d1a93dcd601bcff7fa7f41f05b715083c07

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # vagrant-lifecycle Changelog
 
+## 0.1.4
+
+Changed Vagrant action the plugin hooks to so it can be used together with vagrant-databags plugin (with guaranteed 
+order of execution).
+
 ## 0.1.3
 
 Added support for Chef Zero and Chef Client provisioners.

data/Gemfile.lock

@@ -33,7 +33,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lifecycle (0.1.3)
+    vagrant-lifecycle (0.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -129,7 +129,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 1.5)
   rake
   rspec
   spork

data/README.md

@@ -179,4 +179,10 @@ Vagrant.configure("2") do |config|
      }
   }
 end
-```
+```
+
+#### Simulate OpsWorks stack
+
+Both vagrant-lifecycle and [vagrant-databags](https://github.com/nstojiljkovic/vagrant-databags) plugins are required for
+this example. Sample code is available in the 
+[vagrant-databags documentation](https://github.com/nstojiljkovic/vagrant-databags#simulate-opsworks-stack).

data/lib/vagrant-lifecycle.rb

@@ -1,7 +1,7 @@
 require 'vagrant'
 
+require_relative 'vagrant-lifecycle/action'
 require_relative 'vagrant-lifecycle/config'
-require_relative 'vagrant-lifecycle/middleware'
 require_relative 'vagrant-lifecycle/plugin'
 require_relative 'vagrant-lifecycle/version'
 

data/lib/vagrant-lifecycle/action.rb

@@ -0,0 +1,10 @@
+require "pathname"
+
+module VagrantPlugins
+  module Lifecycle
+    module Action
+      action_root = Pathname.new(File.expand_path("../action", __FILE__))
+      autoload :EvalLifecycleRunList, action_root.join("eval_lifecycle_run_list")
+    end
+  end
+end

data/lib/vagrant-lifecycle/action/eval_lifecycle_run_list.rb

@@ -0,0 +1,61 @@
+module VagrantPlugins
+  module Lifecycle
+    module Action
+      class EvalLifecycleRunList
+        def initialize(app, env)
+          @app = app
+
+          klass = self.class.name.downcase.split('::').last
+          @logger = Log4r::Logger.new("vagrant::lifecycle::#{klass}")
+        end
+
+        def call(env)
+          event = env[:lifecycle_event] || env[:machine].config.lifecycle.default_event || nil
+
+          if event.nil?
+            @app.call(env)
+          else
+            chef_provisioners = env[:machine].config.vm.provisioners.select do |provisioner|
+              # Vagrant 1.7 changes provisioner.name to provisioner.type
+              if provisioner.respond_to? :type
+                provisioner.type.to_sym == :chef_solo || provisioner.type.to_sym == :chef_client || provisioner.type.to_sym == :chef_zero
+              else
+                provisioner.name.to_sym == :chef_solo || provisioner.name.to_sym == :chef_client || provisioner.name.to_sym == :chef_zero
+              end
+            end
+
+            # @type [Hash]
+            lifecycle_events = env[:machine].config.lifecycle.events
+
+            if lifecycle_events.key?(event) || lifecycle_events.key?(event.to_sym) || lifecycle_events.key?(event.to_s)
+              # @type [lambda]
+              event_lambda = lifecycle_events[event] || lifecycle_events[event.to_sym] || lifecycle_events[event.to_s]
+
+              chef_provisioners.each do |chef|
+                begin
+                  new_run_list = event_lambda.call(chef.config.run_list || [], env)
+                  @logger.debug "Setting run_list = #{new_run_list.inspect}"
+
+                  if new_run_list.kind_of?(Array)
+                    chef.config.run_list = new_run_list
+                  else
+                    env[:ui].error "Could not evaluate proper run list for the lifecycle event #{event}!"
+                    env[:interrupted] = true
+                  end
+                rescue Exception => e
+                  env[:ui].error "Failed while evaluating run list for the event #{event} with error: #{e}"
+                  env[:interrupted] = true
+                end
+              end
+            else
+              env[:ui].error "Lifecycle event #{event} not configured!"
+              env[:interrupted] = true
+            end
+
+            @app.call(env)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lifecycle/plugin.rb

@@ -1,6 +1,5 @@
 require 'vagrant-lifecycle/command'
 require 'vagrant-lifecycle/config'
-require 'vagrant-lifecycle/middleware'
 require 'vagrant-lifecycle/version'
 
 module VagrantPlugins
@@ -8,15 +7,10 @@ module VagrantPlugins
     class Plugin < Vagrant.plugin(2)
       name 'Lifecycle Plugin'
 
-      def self.provision
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use MiddleWare
-        end
-      end
-
       [:machine_action_up, :machine_action_reload, :machine_action_provision].each do |action|
         action_hook(:lifecycle_provision, action) do |hook|
-          hook.before(Vagrant::Action::Builtin::Provision, Plugin.provision)
+          # contrary to how this might sound, this hook is run before :run_provisioner
+          hook.after Vagrant::Action::Builtin::Provision, Action::EvalLifecycleRunList
         end
       end
 

data/lib/vagrant-lifecycle/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Lifecycle
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/vagrant-lifecycle.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Nikola Stojiljkovic"]
   spec.email         = ["xection@gmail.com"]
 
-  spec.summary       = %q{Vagrant plugin to run custom Chef run list and filtered data bags during provisioning}
+  spec.summary       = %q{Vagrant plugin to run custom Chef run list during provisioning}
   # spec.description   = %q{TODO: Write a longer description or delete this line.}
   spec.homepage      = "https://github.com/nstojiljkovic/vagrant-lifecycle"
   spec.license       = "Apache-2.0"
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lifecycle
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nikola Stojiljkovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,9 +72,10 @@ files:
 - bin/console
 - bin/setup
 - lib/vagrant-lifecycle.rb
+- lib/vagrant-lifecycle/action.rb
+- lib/vagrant-lifecycle/action/eval_lifecycle_run_list.rb
 - lib/vagrant-lifecycle/command.rb
 - lib/vagrant-lifecycle/config.rb
-- lib/vagrant-lifecycle/middleware.rb
 - lib/vagrant-lifecycle/plugin.rb
 - lib/vagrant-lifecycle/version.rb
 - vagrant-lifecycle.gemspec
@@ -101,6 +102,5 @@ rubyforge_project:
 rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: Vagrant plugin to run custom Chef run list and filtered data bags during
-  provisioning
+summary: Vagrant plugin to run custom Chef run list during provisioning
 test_files: []

data/lib/vagrant-lifecycle/middleware.rb

@@ -1,59 +0,0 @@
-module VagrantPlugins
-  module Lifecycle
-    class MiddleWare
-      def initialize(app, env)
-        @app = app
-
-        klass = self.class.name.downcase.split('::').last
-        @logger = Log4r::Logger.new("vagrant::lifecycle::#{klass}")
-      end
-
-      def call(env)
-        event = env[:lifecycle_event] || env[:machine].config.lifecycle.default_event || nil
-
-        if event.nil?
-          @app.call(env)
-        else
-          chef_provisioners = env[:machine].config.vm.provisioners.select do |provisioner|
-            # Vagrant 1.7 changes provisioner.name to provisioner.type
-            if provisioner.respond_to? :type
-              provisioner.type.to_sym == :chef_solo || provisioner.type.to_sym == :chef_client || provisioner.type.to_sym == :chef_zero
-            else
-              provisioner.name.to_sym == :chef_solo || provisioner.name.to_sym == :chef_client || provisioner.name.to_sym == :chef_zero
-            end
-          end
-
-          # @type [Hash]
-          lifecycle_events = env[:machine].config.lifecycle.events
-
-          if lifecycle_events.key?(event) || lifecycle_events.key?(event.to_sym) || lifecycle_events.key?(event.to_s)
-            # @type [lambda]
-            event_lambda = lifecycle_events[event] || lifecycle_events[event.to_sym] || lifecycle_events[event.to_s]
-
-            chef_provisioners.each do |chef|
-              begin
-                new_run_list = event_lambda.call(chef.config.run_list || [], env)
-                @logger.debug "Setting run_list = #{new_run_list.inspect}"
-
-                if new_run_list.kind_of?(Array)
-                  chef.config.run_list = new_run_list
-                else
-                  env[:ui].error "Could not evaluate proper run list for the lifecycle event #{event}!"
-                  env[:interrupted] = true
-                end
-              rescue Exception => e
-                env[:ui].error "Failed while evaluating run list for the event #{event} with error: #{e}"
-                env[:interrupted] = true
-              end
-            end
-          else
-            env[:ui].error "Lifecycle event #{event} not configured!"
-            env[:interrupted] = true
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end