vagrant-cookbook-fetcher 0.1.0 → 0.2.1

data/README.md

@@ -1,13 +1,15 @@
 vagrant-cookbook-fetcher
 ========================
 
+DEPRECATED - you should really use something like vagrant-berkshelf.  This thing came from a darker time.
+
 A Vagrant plugin to automatically fetch cookbooks, roles, and such whenever you run vagrant provision, up or start.
 
 ## Compatibility
 
 For vagrant 1.0.x, use vagrant-cookbook-fetcher 0.0.x .
 For vagrant 1.1.x, use vagrant-cookbook-fetcher 0.1.x .  It may or may not work.
-For vagrant 1.2.x, use vagrant-cookbook-fetcher 0.1.x .
+For vagrant 1.2.x+, use vagrant-cookbook-fetcher 0.1.+ .
 
 ## Behavior
 
@@ -43,11 +45,11 @@ In addition, a new command is added, 'vagrant checkout', which simply runs the c
     git,https://github.com/opscode-cookbooks/php.git,opscode-php/cookbooks/php,master,NONE
 
 The fields are: VCS,repo address, directory name, branch, credentials
- * VCS may be either 'git' or 'svn' (TODO).
+ * VCS may be either 'git' or nothing else, too bad.
  * repo address is the identifier of the repository from which to obtain the checkout.
  * directory name is the path under <vagrant-root>/checkouts to clone/checkout into.  It may contain slashes.
  * branch is the name of the git branch.  Leave blank for svn (use repo address for svn branching)
- * (this feature is TODO) credentials is the method to authenticate to the repo server.  NONE means use no authentication.  AGENT means to rely on a running ssh-agent to provide credentials.  All other values are taken to specify the location of a SSH private key, relative to <vagrant-root>, that should be used with a GIT_SSH wrapper.
+ * credentials column is unused.  Zing!
 
 ## Configuration
 
@@ -65,11 +67,11 @@ Default: false
 
 If true, no checkout will be be run.  This can be useful if you're provisioning frequently and making local changes to your recipes; if you use git rebase, your build will break whenever you have a local change and an incoming change at the same time.
 
-Even if the fetch is disabled, this plugin will still try to tell chef-solo about your cookbook, role, and data_bag paths, unless you override them.
+If vagrant-berkshelf is detected, this plugin will disable itself, as you should be using vagrant-berkshelf anyway.
 
 ## TODO
 
- * Add svn support
- * Actually respect the credentials column
- * Make checkout list format less awful, add headers
- * support chef, not just chef-solo
+ * Move everyone over to vagrant-berkshelf or PolicyFiles or something.
+
+
+

data/lib/vagrant-cookbook-fetcher/action_set_chef_paths.rb

@@ -10,31 +10,35 @@ module VagrantPlugins
         # there has got to be a better way
         provisioners_list = env[:machine].config.vm.provisioners
         chef_solo = provisioners_list.find { |p| p.name === :chef_solo }
+        vcf_config = env[:machine].config.cookbook_fetcher
 
         if chef_solo then
-          solo_cfg = chef_solo.config
 
-          Dir.chdir(env[:root_path]) do
-            # In Vagrant 1.2.x+, these are all arrays
-            solo_cfg.roles_path.push [:host, "combined/roles"]
-            solo_cfg.data_bags_path.push [:host, "combined/data_bags"]
+          unless vcf_config.disable then
+            solo_cfg = chef_solo.config
+
+            Dir.chdir(env[:root_path]) do
+              # In Vagrant 1.2.x+, these are all arrays
+              solo_cfg.roles_path.push [:host, "combined/roles"]
+              solo_cfg.data_bags_path.push [:host, "combined/data_bags"]
+              
+              # The first time we fetch cookbooks, we store the cookbook order in a file.
+              unless File.exists?(".cookbook-order") then
+                env[:ui].error "Cookbook Fetcher checkout could find not a .cookbook-order file.  You need to run provision with checkout enabled at least once (or else disable cookbook fetcher)."
+                return
+              end
+
+              # For cookbook path, Vagrant defaults to this:
+              # [[:host, "cookbooks"], [:vm, "cookbooks"]]
+              # But we're overriding that.
+              solo_cfg.cookbooks_path = []
+
+              # Read from filesystem
+              IO.readlines(".cookbook-order").each do |line| 
+                solo_cfg.cookbooks_path.push [ :host, line.chomp ]
+              end
 
-            # The first time we fetch cookbooks, we store the cookbook order in a file.
-            unless File.exists?(".cookbook-order") then
-              env[:ui].error "Cookbook Fetcher checkout could find not a .cookbook-order file.  You need to run provision with checkout enabled at least once (or else disable cookbook fetcher)."
-              return
             end
-
-            # For cookbook path, Vagrant defaults to this:
-            # [[:host, "cookbooks"], [:vm, "cookbooks"]]
-            # But we're overriding that.
-            solo_cfg.cookbooks_path = []
-
-            # Read from filesystem
-            IO.readlines(".cookbook-order").each do |line| 
-              solo_cfg.cookbooks_path.push [ :host, line.chomp ]
-            end
-
           end
         end
 

data/lib/vagrant-cookbook-fetcher/command.rb

@@ -1,13 +1,21 @@
 require_relative 'guts'
+
 module VagrantPlugins
   module CookbookFetcher
     class CheckoutCommand < Vagrant.plugin("2", "command")
       def execute
-        CookbookFetcher.perform_fetch(
-                                      :url => @env.config_global.cookbook_fetcher.url,
-                                      :logger => @env.ui,
-                                      :path => @env.root_path
-                                      )
+
+        # Oddly, under vagrant ~ 1.4.1, @argv is ['--'].
+        # Disappearred by 1.7.2
+        scrubbed_args = @argv.reject {|e| e == '--' }
+        with_target_vms(scrubbed_args) do |machine|
+
+          CookbookFetcher.perform_fetch(
+                                        :url => machine.config.cookbook_fetcher.url,
+                                        :logger => @env.ui,
+                                        :path => @env.root_path
+                                        )
+        end
       end
     end
   end

data/lib/vagrant-cookbook-fetcher/config.rb

@@ -11,15 +11,21 @@ module VagrantPlugins
       end
 
       def finalize!
-        @disable = false if @disable == UNSET_VALUE
+        if Vagrant.has_plugin?('vagrant-berkshelf') 
+          # TODO: would ideally detect whether berkshelf is actually enabled
+          # TODO: this ui call seems to alkways get swallowed
+          ui.info('vagrant-berkshelf detected, disabling vagrant-cookbook-fetcher')
+          @disable = true
+        else 
+          @disable = false if @disable == UNSET_VALUE
+        end
       end
 
       def validate(machine)
         errors = []
-        unless @disable then
-          if @url == UNSET_VALUE
-            errors << "vagrant-cookbook-fetcher plugin requires a config parameter, 'url', which is missing."
-          end
+        if @url == UNSET_VALUE
+          # Disable vagrant cookbook fetcher if we don't specify a URL
+          @disable = true
         end
 
         { 'Cookbook Fetcher' => errors }

data/lib/vagrant-cookbook-fetcher/plugin.rb

@@ -8,10 +8,10 @@ module VagrantPlugins
         Config
       end
 
-      # We want to act on 'up' and 'provision'
       [
        :machine_action_up,
-       :machine_action_provision
+       :machine_action_provision,
+       :machine_action_reload,
       ].each do |chain| 
 
         # This hook performs the actual fetch

data/lib/vagrant-cookbook-fetcher/version.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module CookbookFetcher
     NAME            = "vagrant-cookbook-fetcher"
-    VERSION         = "0.1.0"
+    VERSION         = "0.2.1"
     AUTHOR          = "Clinton Wolfe"
     AUTHOR_EMAIL    = "clintoncwolfe [at] gmail [dot] com"
     SUMMARY         = "Fetch your Chef cookbooks whenever you provision"

data/lib/vagrant-cookbook-fetcher.rb

@@ -1,6 +1,5 @@
-
-require "vagrant-cookbook-fetcher/version"
-require "vagrant-cookbook-fetcher/plugin"
+require_relative "vagrant-cookbook-fetcher/version"
+require_relative "vagrant-cookbook-fetcher/plugin"
 
 module VagrantPlugins
   module CookbookFetcher

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cookbook-fetcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies: []
 description: Fetch your Chef cookbooks whenever you provision
 email: clintoncwolfe [at] gmail [dot] com
@@ -18,14 +18,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/vagrant-cookbook-fetcher/guts.rb
-- lib/vagrant-cookbook-fetcher/command.rb
-- lib/vagrant-cookbook-fetcher/action.rb
-- lib/vagrant-cookbook-fetcher/action_fetch_cookbooks.rb
 - lib/vagrant-cookbook-fetcher/config.rb
-- lib/vagrant-cookbook-fetcher/plugin.rb
+- lib/vagrant-cookbook-fetcher/action_fetch_cookbooks.rb
+- lib/vagrant-cookbook-fetcher/command.rb
 - lib/vagrant-cookbook-fetcher/version.rb
+- lib/vagrant-cookbook-fetcher/guts.rb
 - lib/vagrant-cookbook-fetcher/action_set_chef_paths.rb
+- lib/vagrant-cookbook-fetcher/plugin.rb
 - lib/vagrant-cookbook-fetcher.rb
 homepage: http://github.com/clintoncwolfe/vagrant-cookbook-fetcher
 licenses: []
@@ -47,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: vagrant-cookbook-fetcher
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Whenever you run start, up, or provision, this plugin will dynamically fetch

data/lib/vagrant-cookbook-fetcher/action.rb

@@ -1,28 +0,0 @@
-require "vagrant/action/builder"
-
-module VagrantPlugins
-  module CookbookFetcher
-    module Action
-      include Vagrant::Action::Builtin
-      
-      autoload :DetectCheckoutDisabled, File.expand_path("../action/detect_checkout_disabled", __FILE__)
-      autoload :FetchCookbooks, File.expand_path("../action/fetch_cookbooks", __FILE__)
-      autoload :UpdateLinks, File.expand_path("../action/update_links", __FILE__)
-      autoload :ConfigureChef, File.expand_path("../action/configure_chef", __FILE__)
-
-      def self.run_checkout
-        @run_checkout ||= ::Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use Call, DetectCheckoutDisabled do |env1, b2|
-            if env1[:checkout_disabled]
-              b2.use FetchCookbooks
-              b2.use UpdateLinks
-            end
-          end
-          b.use ConfigureChef
-        end
-      end
-
-    end
-  end
-end