bindler 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6d59688e238982b74eda8eb7d14899b303ab60f
-  data.tar.gz: 3cdcb581db73a6cefe4283deceadfc020395b09e
+  metadata.gz: 1ee682fcd6eb61c143513850d676616ce96b6d1f
+  data.tar.gz: f5dc7c1baef26adea185c238c76958034d37688d
 SHA512:
-  metadata.gz: f15de7057324a5ec25bbecf277bd53bbe905432d1e961b7ef80f3b242958eae177b9cfea3ced998ac8577297c4c8a7feef22097f310923feb42c20353f88c423
-  data.tar.gz: 4627248c78aa63ab7b15858347357cb5c08f31467a86845d5eb79d63e1148fa1b7f0c50a2a4bbd48cc57f1dc0ccd692406fac039dc537d05f75646dded595f9a
+  metadata.gz: dbf6923420ca24f3a20c270739e732baa1eadde4b019e0963cd9e821fd1339d7187b07b6f12c95395723448a123bd11676719e3ef4fc2f9d2babe9493bfc0e06
+  data.tar.gz: 75f19d62c42e6060e99c4f569d014fc2916d773a6e0903694566596b1af21d9381957da49341191083a5b088a3f6db60b668cca00f2c58b2eac539907c4f13e9

data/Gemfile.lock

@@ -31,7 +31,7 @@ GIT
 PATH
   remote: .
   specs:
-    bindler (0.1.2)
+    bindler (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/bindler/bend_vagrant.rb

@@ -17,22 +17,61 @@ Vagrant::Environment.class_eval do
   alias old_hook hook
   def hook(name)
     unless @__custom_plugins_loaded
-      bindler_debug 'Loading local plugins...'
-      __load_local_plugins
+      if bindler_plugins_file
+        bindler_debug 'Loading local plugins...'
+        __load_local_plugins
+      else
+        lookup_paths = VagrantPlugins::Bindler::LocalPluginsManifestExt::PLUGINS_JSON_LOOKUP
+        bindler_debug "Local plugins manifest file not found, looked into #{lookup_paths.inspect}"
+      end
+
+      bindler_debug 'Loading plugins installed globally...'
+      __load_global_plugins
 
       @__custom_plugins_loaded = true
     end
     old_hook name
   end
 
-  # This method loads plugins from a project specific `plugins.json` file
-  def __load_local_plugins
-    unless bindler_plugins_file
-      lookup_paths = VagrantPlugins::Bindler::LocalPluginsManifestExt::PLUGINS_JSON_LOOKUP
-      bindler_debug "Local plugins manifest file not found, looked into #{lookup_paths.inspect}"
-      return
+  # This method loads plugins from `~/.vagrant.d/global-plugins.json` file
+  #
+  # It is basically a Copy & Paste from Vagrant::Environment#load_plugins [1]
+  #
+  #   [1] https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/environment.rb#L720-L754
+  #
+  # DISCUSS: What if vagrant had a way of setting the path for the manifest file
+  #          for the whole environment?
+  def __load_global_plugins
+    # If we're in a Bundler environment, don't load plugins. This only
+    # happens in plugin development environments.
+    if defined?(Bundler)
+      require 'bundler/shared_helpers'
+      if Bundler::SharedHelpers.in_bundle?
+        @logger.warn("In a bundler environment, not loading environment plugins!")
+        return
+      end
+    end
+
+    # Load the plugins
+    plugins_json_file = @home_path.join("global-plugins.json")
+    bindler_debug("Loading plugins from: #{plugins_json_file}")
+    if plugins_json_file.file?
+      data = JSON.parse(plugins_json_file.read)
+      data["installed"].each do |plugin|
+        bindler_info("Loading plugin from JSON: #{plugin}")
+        begin
+          Vagrant.require_plugin(plugin)
+        rescue Vagrant::Errors::PluginLoadError => e
+          @ui.error(e.message + "\n")
+        rescue Vagrant::Errors::PluginLoadFailed => e
+          @ui.error(e.message + "\n")
+        end
+      end
     end
+  end
 
+  # This method loads plugins from a project specific `plugins.json` file
+  def __load_local_plugins
     ARGV.each do |arg|
       if !arg.start_with?("-") && arg == 'bindler'
         bindler_debug 'bindler command detected, setting VAGRANT_NO_PLUGINS to 1'
@@ -47,6 +86,7 @@ Vagrant::Environment.class_eval do
     end
 
     # Prepend our local gem path and reset the paths that Rubygems knows about.
+    bindler_debug 'Tweaking GEM_HOME'
     ENV["GEM_PATH"] = "#{local_data_path.join('gems')}#{::File::PATH_SEPARATOR}#{ENV["GEM_PATH"]}"
     ::Gem.clear_paths
 

data/lib/bindler/logging.rb

@@ -4,6 +4,10 @@ module VagrantPlugins
       def bindler_debug(msg)
         @logger.debug "[BINDLER] #{msg}"
       end
+
+      def bindler_info(msg)
+        @logger.info "[BINDLER] #{msg}"
+      end
     end
   end
 end

data/lib/bindler/version.rb

@@ -1,3 +1,3 @@
 module Bindler
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler