vagrant-cookbook-fetcher 0.0.10 → 0.1.0

data/README.md

@@ -3,6 +3,12 @@ vagrant-cookbook-fetcher
 
 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 .
+
 ## Behavior
 
 Once you set a URL in your Vagrantfile that provides a list of checkouts, this plugin will create two directory trees (checkouts and combined):

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

@@ -0,0 +1,28 @@
+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

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

@@ -0,0 +1,29 @@
+require_relative "guts"
+
+module VagrantPlugins
+  module CookbookFetcher
+    class FetchCookbooksAction
+
+      def initialize(app, env)
+        @app = app
+      end
+      
+      def call(env)
+
+        vcf_config = env[:machine].config.cookbook_fetcher
+        unless vcf_config.disable then
+          CookbookFetcher.perform_fetch(\
+                                        :url => env[:machine].config.cookbook_fetcher.url,
+                                        :logger => env[:ui],
+                                        :path => env[:root_path]
+                                        )
+        else
+          env[:ui].info "Cookbook fetching disabled, skipping"
+        end
+        
+        # Continue daisy chain
+        @app.call(env)        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+module VagrantPlugins
+  module CookbookFetcher
+    class SetChefPathsAction
+
+      def initialize(app, env)
+        @app = app
+      end
+      
+      def call(env)
+        # 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 }
+
+        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"]
+
+            # 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
+
+        # Continue daisy chain
+        @app.call(env) 
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+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
+                                      )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module VagrantPlugins
+  module CookbookFetcher
+    class Config < Vagrant.plugin("2", :config)
+      attr_accessor :url
+      attr_accessor :disable
+
+      def initialize
+        super
+        @url     = UNSET_VALUE
+        @disable = UNSET_VALUE
+      end
+
+      def finalize!
+        @disable = false if @disable == UNSET_VALUE
+      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
+        end
+
+        { 'Cookbook Fetcher' => errors }
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,248 @@
+module VagrantPlugins
+  module CookbookFetcher
+
+    # Utility method - reads the config, fetches the checkout list, 
+    # does the checkout, and does the crosslinks.  Expects cwd to be the root_path.
+    def perform_fetch (args = {})
+      url    = args[:url]
+      logger = args[:logger]
+      path   = args[:path]
+
+      unless url then
+        logger.warn "No cookbook_fetcher URL specified - skipping checkouts"
+        return
+      end
+    
+      Dir.chdir(path) do
+        checkouts = CookbookFetcher.fetch_checkout_list(url,logger)
+        CookbookFetcher.perform_checkouts(checkouts,logger)
+        CookbookFetcher.update_links(checkouts,logger)
+      end
+    end
+    module_function :perform_fetch
+
+
+    private
+
+    # Utility method, fetches checkout list, parses it, 
+    # and writes cookbook order to a file in the current working directory.
+    def fetch_checkout_list (url, logger)
+      require 'open-uri'
+    
+      checkouts = { :by_dir => {}, :cookbook_list => [] } 
+      
+      logger.info "Fetching checkout list from #{url}"
+
+      # This is idiotic, but open-uri's open() fails on URLs like 'file:///...'
+      # It does fine on absolute paths, though.
+      url.gsub!(/^file:\/\//, '')
+
+      open(url, {:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE }) do |resp|
+        resp.each do |line|
+          line.chomp!
+          if !line.empty? then
+            pieces = line.split(/,/)
+            branch = pieces[3]
+            dir = pieces[2]
+
+            # Build info hash
+            checkouts[:by_dir][dir] = {
+              :vcs => pieces[0],
+              :repo => pieces[1],
+              :dir => dir,
+              :branch => pieces[3],
+              :creds => pieces[4],          
+            }
+          
+            # Build cookbook list.  Use first part of directory, and append cookbooks
+            checkouts[:cookbook_list].push 'checkouts/' + (dir.split('/'))[0] + '/cookbooks'
+
+            # Write cookbook order to a file, in case we are later disabled
+            File.open('.cookbook-order', 'w') do |f|
+              f.print(checkouts[:cookbook_list].join("\n"))
+            end
+          end
+        end
+      end
+      return checkouts
+    end
+    module_function :fetch_checkout_list
+
+    def safe_run (cmd, logger, ignore_regex = nil)
+      if logger.respond_to?(:debug) 
+        logger.debug("Running #{cmd}")
+      end
+      output = `#{cmd} 2>&1`
+      unless $?.success? then
+        pwd = Dir.pwd
+        logger.error("Got exit code #{$?.exitstatus} while running '#{cmd}' in '#{pwd}'")
+        logger.error("Output: #{output}")
+        exit $?.exitstatus
+      end
+      if (ignore_regex)
+        output.gsub!(ignore_regex, '')
+      end
+      output.chomp!
+      unless output.empty? 
+        puts output
+      end
+    end
+    module_function :safe_run
+
+    # Utility method.  Based on a parsed checkout list, 
+    # performs each of the checkouts, creating the checkouts/ directory in 
+    # the current directory.
+
+    def perform_checkouts (checkouts,logger)
+
+      if !Dir.exists?("checkouts") then Dir.mkdir("checkouts") end
+      
+      Dir.chdir("checkouts") do  
+        checkouts[:by_dir].each do |dir, info|
+          logger.info "Updating checkout '#{dir}'"
+
+          if info[:vcs] == 'git' then
+            if Dir.exists?(info[:dir]) then
+              # pull
+              Dir.chdir(info[:dir]) do
+                # TODO ignores git creds
+                cmd = "git remote set-url origin #{info[:repo]}"
+                safe_run(cmd, logger)
+                cmd = "git fetch origin"
+                safe_run(cmd, logger)
+
+                local_branch = `git rev-parse --verify --symbolic-full-name #{info[:branch]} 2> /dev/null`.rstrip
+                # no local branch
+                if ! $?.success? then
+                  cmd = "git rev-parse --verify -q --symbolic-full-name origin/#{info[:branch]}"
+                  unless system cmd then raise "Could not find branch or commit #{info[:branch]}" end
+                  cmd = "git checkout -b #{info[:branch]} origin/#{info[:branch]}"
+                  safe_run(cmd, logger)
+
+                elsif local_branch.empty? then
+                  # no branch
+                  cmd = "git checkout #{info[:branch]}"
+                  safe_run(cmd, logger)
+                else
+                  # local branch already exists
+                  cmd = "git checkout #{info[:branch]}"
+                  safe_run(cmd, logger, /Already on '.+'/)
+                  cmd = "git merge origin/#{info[:branch]}"
+                  safe_run(cmd, logger, /Already up-to-date\./)
+                end
+              end
+            else
+              # clone
+              # can't use --branch because it won't work with commit ids
+              cmd = "git clone --no-checkout #{info[:repo]} #{info[:dir]}"
+              safe_run(cmd, logger)
+              Dir.chdir(info[:dir]) do
+                cmd = "git rev-parse --verify -q origin/#{info[:branch]}"
+                # branch
+                if system cmd then
+                  current_branch=`git symbolic-ref HEAD 2> /dev/null`.rstrip
+                  if $?.success? && current_branch == "refs/heads/#{info[:branch]}" then
+                    cmd = "git checkout #{info[:branch]}"
+                    safe_run(cmd, logger)
+                  else
+                    cmd = "git checkout -B #{info[:branch]} origin/#{info[:branch]}"
+                    safe_run(cmd, logger)
+                  end
+                  #commit
+                else
+                  cmd = "git checkout #{info[:branch]}"
+                  safe_run(cmd, logger)
+                end
+              end
+            end
+          else
+            raise "Unsupported VCS '#{info[:vcs]}' in checkout list for entry '#{dir}'"
+          end
+        end
+      end
+    end
+    module_function :perform_checkouts
+
+    # Utility method - given a parsed checkout list, and assuming the checkout have
+    # already been performed, creates the combined/ directory in the current directory,
+    # and symlinks in the roles, nodes, etc.
+    def update_links (checkouts,logger) 
+      things_to_link = {
+        "roles"     => {:vagrant_pov_link => true,  :target_dir => "roles",     :step_in => false },
+        "nodes"     => {:vagrant_pov_link => true,  :target_dir => "nodes",     :step_in => false },
+        "handlers"  => {:vagrant_pov_link => true,  :target_dir => "handlers",  :step_in => false },
+        "data_bags" => {:vagrant_pov_link => true,  :target_dir => "data_bags", :step_in => true  },
+        "spec_ext"  => {:vagrant_pov_link => false, :target_dir => "spec",      :step_in => false },
+        "spec_int"  => {:vagrant_pov_link => true,  :target_dir => "spec",      :step_in => false },
+      }
+      logger.info "Updating links to #{things_to_link.keys.sort.join(', ')}"
+
+      if !Dir.exists?("combined") then Dir.mkdir("combined") end
+      Dir.chdir("combined") do  
+
+        # Create/clear the subdirs
+        things_to_link.keys.each do |thing|
+          if !Dir.exists?(thing) then Dir.mkdir(thing) end
+          if (things_to_link[thing][:step_in]) then
+            Dir.foreach(thing) do |top_dir|
+              Dir.foreach(thing + '/' + top_dir) do |file|
+                if FileTest.symlink?(file) then File.delete(file) end
+              end
+            end
+          else
+            Dir.foreach(thing) do |file|
+              if FileTest.symlink?(file) then File.delete(file) end
+            end
+          end
+        end
+      end
+
+      # Being careful to go in cookbook order, symlink the files
+      checkouts[:cookbook_list].each do |cookbook_dir|
+        checkout_dir = (cookbook_dir.split('/'))[1]
+        things_to_link.each do |thing, opts|
+          checkout_thing_dir = "checkouts/#{checkout_dir}/#{opts[:target_dir]}"
+          combined_dir = "combined/#{thing}"
+          if Dir.exists?(checkout_thing_dir) then
+            if opts[:step_in] then
+              Dir.foreach(checkout_thing_dir) do |checkout_top_dir|
+                next unless File.directory?(checkout_thing_dir + '/' + checkout_top_dir)
+                next if checkout_top_dir.start_with?('.')
+                combined_top_dir = combined_dir + '/' + checkout_top_dir
+                if !Dir.exists?(combined_top_dir) then Dir.mkdir(combined_top_dir) end
+                Dir.entries(checkout_thing_dir + '/' + checkout_top_dir).grep(/\.(rb|json)$/).each do |file|
+                  if opts[:vagrant_pov_link] then
+                    # Under vagrant, we see this directory as /vagrant/checkouts/<checkout>/data_bags/<dbag>/<dbag_entry.json>
+                    # Use -f so later checkouts can override earlier ones
+                    cmd = "ln -sf /vagrant/#{checkout_thing_dir + '/' + checkout_top_dir}/#{file} combined/#{thing}/#{checkout_top_dir}/#{file}"
+                    unless system cmd then raise "Could not '#{cmd}'" end
+                  else
+                    # Link as visible to the host machine
+                    # Use -f so later checkouts can override earlier ones
+                    cmd = "ln -sf ../../#{checkout_thing_dir + '/' + checkout_top_dir}/#{file} combined/#{thing}/#{checkout_top_dir}/#{file}"
+                    unless system cmd then raise "Could not '#{cmd}'" end
+                  end
+                end
+              end
+            else
+              Dir.entries(checkout_thing_dir).grep(/\.(rb|json)$/).each do |file|
+                if opts[:vagrant_pov_link] then
+                  # Under vagrant, we see this directory as /vagrant/checkouts/foo/role/bar.rb
+                  # Use -f so later checkouts can override earlier ones
+                  cmd = "ln -sf /vagrant/#{checkout_thing_dir}/#{file} combined/#{thing}/#{file}"
+                  unless system cmd then raise "Could not '#{cmd}'" end
+                else
+                  # Link as visible to the host machine
+                  # Use -f so later checkouts can override earlier ones
+                  cmd = "ln -sf ../../#{checkout_thing_dir}/#{file} combined/#{thing}/#{file}"
+                  unless system cmd then raise "Could not '#{cmd}'" end
+                end                
+              end
+            end
+          end
+        end
+      end  
+    end
+    module_function :update_links
+  end
+end

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

@@ -0,0 +1,37 @@
+module VagrantPlugins
+  module CookbookFetcher
+    class Plugin < Vagrant.plugin("2")
+      name "Cookbook Fetcher"
+
+      config "cookbook_fetcher" do
+        require_relative "config"
+        Config
+      end
+
+      # We want to act on 'up' and 'provision'
+      [
+       :machine_action_up,
+       :machine_action_provision
+      ].each do |chain| 
+
+        # This hook performs the actual fetch
+        action_hook(:cookbook_fetcher_do_fetch, chain) do |hook|
+          require_relative "action_fetch_cookbooks"
+          hook.before(Vagrant::Action::Builtin::Provision, VagrantPlugins::CookbookFetcher::FetchCookbooksAction)
+        end
+        
+        # This hook configures chef-solo to use a special set of paths
+        action_hook(:cookbook_fetcher_set_chef_paths, chain) do |hook|
+          require_relative "action_set_chef_paths"
+          hook.before(Vagrant::Action::Builtin::Provision, VagrantPlugins::CookbookFetcher::SetChefPathsAction)
+        end
+      end
+
+      command "checkout" do
+        require_relative "command"
+        CheckoutCommand
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module CookbookFetcher
+    NAME            = "vagrant-cookbook-fetcher"
+    VERSION         = "0.1.0"
+    AUTHOR          = "Clinton Wolfe"
+    AUTHOR_EMAIL    = "clintoncwolfe [at] gmail [dot] com"
+    SUMMARY         = "Fetch your Chef cookbooks whenever you provision"
+    DESCRIPTION     = "Whenever you run start, up, or provision, this plugin will dynamically fetch a list of checkouts from a URL; checkout each one; then create a combined roles directory, with symlinks."
+    URL             = "http://github.com/clintoncwolfe/vagrant-cookbook-fetcher"    
+  end
+end
+
+# Some older Vagrantfiles looked for this symbol to detect VCF.
+module CookbookFetcher 
+end

data/lib/vagrant-cookbook-fetcher.rb

@@ -0,0 +1,12 @@
+
+require "vagrant-cookbook-fetcher/version"
+require "vagrant-cookbook-fetcher/plugin"
+
+module VagrantPlugins
+  module CookbookFetcher
+    
+    # Defaults for config
+    # TODO
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cookbook-fetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,38 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-description: Whenever you run start, up, or provision, this plugin will dynamically
-  fetch a list of checkouts from a URL; checkout each one; then create a combined
-  roles directory, with symlinks.
-email: clinton@NOSPAM.omniti.com
+date: 2013-07-02 00:00:00.000000000 Z
+dependencies: []
+description: Fetch your Chef cookbooks whenever you provision
+email: clintoncwolfe [at] gmail [dot] com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ChangeLog
-- LICENSE
 - README.md
-- lib/vagrant_init.rb
-- lib/vagrant_cookbook_fetcher.rb
-homepage: https://github.com/clintoncwolfe/vagrant-cookbook-fetcher
+- 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/version.rb
+- lib/vagrant-cookbook-fetcher/action_set_chef_paths.rb
+- lib/vagrant-cookbook-fetcher.rb
+homepage: http://github.com/clintoncwolfe/vagrant-cookbook-fetcher
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -59,9 +46,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project: vagrant-cookbook-fetcher
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Fetch your Chef cookbooks whenever you provision
+summary: Whenever you run start, up, or provision, this plugin will dynamically fetch
+  a list of checkouts from a URL; checkout each one; then create a combined roles
+  directory, with symlinks.
 test_files: []

data/ChangeLog

@@ -1,29 +0,0 @@
-2013-04-17 0.0.10 Clinton Wolfe <clintoncwolfe at gmail dot com>
-   * Update README to include command integration, fix formatting
-
-2013-04-09 0.0.9 Clinton Wolfe <clintoncwolfe at gmail dot com>
-   * Rewrite combined/ linker to be more flexible
-   * Create two spec directories in combined/ - one symlinked from the perspective of
-	 the VM host, and one from the perspective of the VM guest
-
-2013-04-08 0.0.8 Clinton Wolfe <clintoncwolfe at gmail dot com>
-   * Correct rspec directory name specs => spec
-   * Update changelog with changes for 0.0.7
-
-2013-04-07 0.0.7 Clinton Wolfe <clintoncwolfe at gmail dot com>
-   * Ensure that checkout always occurs relative to Vagrant project root,
-	not current working directory
-   * Link 'specs' directories for rspec testing
-   * Add hook to run as command (vagrant checkout)
-   * Constrain to be vagrant 1.0.x plugin
-
-2012-09-25 0.0.6 Clinton Wolfe <clintoncwolfe at gmail dot com>
-
-   * Add changelog
-
-   * Fix broken initial checkout bug introduced in 0.0.5 (Graham Knop)
-
-2012-09-21 0.0.5 Clinton Wolfe <clintoncwolfe at gmail dot com>
-
-   * Add ability to specify a commit, not just a branch, in checkout lists (Graham Knop)
-   * Make databag combined symlinks properly descend one directory down (Clinton Wolfe)

data/LICENSE

@@ -1,29 +0,0 @@
-Copyright (c) 2012, OmniTI Computer Consulting, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name OmniTI Computer Consulting, Inc. nor the names
-      of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written
-      permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/vagrant_cookbook_fetcher.rb

@@ -1,315 +0,0 @@
-module CookbookFetcher
-
-  # http://vagrantup.com/v1/docs/extending/configuration.html
-  class Config < Vagrant::Config::Base
-    attr_accessor :url
-    attr_accessor :disable
-  end
-  Vagrant.config_keys.register(:cookbook_fetcher) { CookbookFetcher::Config }
-
-  # Utility method - reads the config, fetches the checkout list, 
-  # does the checkout, and does the crosslinks.  Expects cwd to be the root_path.
-  def perform_fetch (global_config, logger)
-
-    unless global_config.cookbook_fetcher then
-      logger.warn "No config.cookbook_fetcher section found in Vagrantfile - skipping checkouts"
-      return
-    end
-
-    url = global_config.cookbook_fetcher.url
-    unless url then
-      logger.warn "No config.cookbook_fetcher.url value found in Vagrantfile - skipping checkouts"
-      return
-    end
-    
-    checkouts = CookbookFetcher.fetch_checkout_list(url,logger)
-    CookbookFetcher.perform_checkouts(checkouts,logger)
-    CookbookFetcher.update_links(checkouts,logger)
-  end
-  module_function :perform_fetch
-
-  # Utility method, fetches checkout list, parses it, 
-  # and writes cookbook order to a file in the current working directory.
-  def fetch_checkout_list (url, logger)
-    require 'open-uri'
-    
-    checkouts = { :by_dir => {}, :cookbook_list => [] } 
-
-    logger.info "Fetching checkout list from #{url}"
-    open(url, {:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE }) do |resp|
-      resp.each do |line|
-        line.chomp!
-        if !line.empty? then
-          pieces = line.split(/,/)
-          branch = pieces[3]
-          dir = pieces[2]
-
-          # Build info hash
-          checkouts[:by_dir][dir] = {
-            :vcs => pieces[0],
-            :repo => pieces[1],
-            :dir => dir,
-            :branch => pieces[3],
-            :creds => pieces[4],          
-          }
-          
-          # Build cookbook list.  Use first part of directory, and append cookbooks
-          checkouts[:cookbook_list].push 'checkouts/' + (dir.split('/'))[0] + '/cookbooks'
-
-          # Write cookbook order to a file, in case we are later disabled
-          File.open('.cookbook-order', 'w') do |f|
-            f.print(checkouts[:cookbook_list].join("\n"))
-          end
-        end
-      end
-    end
-    return checkouts
-  end
-  module_function :fetch_checkout_list
-
-  # Utility method.  Based on a parsed checkout list, 
-  # performs each of the checkouts, creating the checkouts/ directory in 
-  # the current directory.
-  def perform_checkouts (checkouts,logger)
-
-    if !Dir.exists?("checkouts") then Dir.mkdir("checkouts") end
-    
-    Dir.chdir("checkouts") do  
-      checkouts[:by_dir].each do |dir, info|
-        logger.info "Updating checkout '#{dir}'"
-        if info[:vcs] == 'git' then
-
-          if Dir.exists?(info[:dir]) then
-            # pull
-            Dir.chdir(info[:dir]) do
-              # TODO ignores git creds
-              cmd = "git remote set-url origin #{info[:repo]}"
-              unless system cmd then raise "Could not '#{cmd}'" end
-              cmd = "git fetch origin"
-              unless system cmd then raise "Could not '#{cmd}'" end
-              local_branch = `git rev-parse --verify --symbolic-full-name #{info[:branch]} 2> /dev/null`.rstrip
-              # no local branch
-              if ! $?.success? then
-                cmd = "git rev-parse --verify -q --symbolic-full-name origin/#{info[:branch]}"
-                unless system cmd then raise "Could not find branch or commit #{info[:branch]}" end
-                cmd = "git checkout -b #{info[:branch]} origin/#{info[:branch]}"
-                unless system cmd then raise "Could not '#{cmd}'" end
-                # no branch
-              elsif local_branch.empty? then
-                cmd = "git checkout #{info[:branch]}"
-                unless system cmd then raise "Could not '#{cmd}'" end
-                # local branch already exists
-              else
-                cmd = "git checkout #{info[:branch]}"
-                unless system cmd then raise "Could not '#{cmd}'" end
-                cmd = "git merge origin/#{info[:branch]}"
-                unless system cmd then raise "Could not '#{cmd}'" end
-              end
-            end
-          else
-            # clone
-            # can't use --branch because it won't work with commit ids
-            cmd = "git clone --no-checkout #{info[:repo]} #{info[:dir]}"
-            unless system cmd then raise "Could not '#{cmd}'" end
-            Dir.chdir(info[:dir]) do
-              cmd = "git rev-parse --verify -q origin/#{info[:branch]}"
-              # branch
-              if system cmd then
-                current_branch=`git symbolic-ref HEAD 2> /dev/null`.rstrip
-                if $?.success? && current_branch == "refs/heads/#{info[:branch]}" then
-                  cmd = "git checkout #{info[:branch]}"
-                  unless system cmd then raise "Could not '#{cmd}'" end
-                else
-                  cmd = "git checkout -B #{info[:branch]} origin/#{info[:branch]}"
-                  unless system cmd then raise "Could not '#{cmd}'" end
-                end
-                #commit
-              else
-                cmd = "git checkout #{info[:branch]}"
-                unless system cmd then raise "Could not '#{cmd}'" end
-              end
-            end
-          end
-        else
-          raise "Unsupported VCS '#{info[:vcs]}' in checkout list for entry '#{dir}'"
-        end
-      end
-    end
-  end
-  module_function :perform_checkouts
-
-  # Utility method - given a parsed checkout list, and assuming the checkout have
-  # already been performed, creates the combined/ directory in the current directory,
-  # and symlinks in the roles, nodes, etc.
-  def update_links (checkouts,logger) 
-    things_to_link = {
-      "roles"     => {:vagrant_pov_link => true,  :target_dir => "roles",     :step_in => false },
-      "nodes"     => {:vagrant_pov_link => true,  :target_dir => "nodes",     :step_in => false },
-      "handlers"  => {:vagrant_pov_link => true,  :target_dir => "handlers",  :step_in => false },
-      "data_bags" => {:vagrant_pov_link => true,  :target_dir => "data_bags", :step_in => true  },
-      "spec_ext"  => {:vagrant_pov_link => false, :target_dir => "spec",      :step_in => false },
-      "spec_int"  => {:vagrant_pov_link => true,  :target_dir => "spec",      :step_in => false },
-    }
-    logger.info "Updating links to #{things_to_link.keys.sort.join(', ')}"
-
-    if !Dir.exists?("combined") then Dir.mkdir("combined") end
-    Dir.chdir("combined") do  
-
-      # Create/clear the subdirs
-      things_to_link.keys.each do |thing|
-        if !Dir.exists?(thing) then Dir.mkdir(thing) end
-        if (things_to_link[thing][:step_in]) then
-          Dir.foreach(thing) do |top_dir|
-            Dir.foreach(thing + '/' + top_dir) do |file|
-              if FileTest.symlink?(file) then File.delete(file) end
-            end
-          end
-        else
-          Dir.foreach(thing) do |file|
-            if FileTest.symlink?(file) then File.delete(file) end
-          end
-        end
-      end
-    end
-
-    # Being careful to go in cookbook order, symlink the files
-    checkouts[:cookbook_list].each do |cookbook_dir|
-      checkout_dir = (cookbook_dir.split('/'))[1]
-      things_to_link.each do |thing, opts|
-        checkout_thing_dir = "checkouts/#{checkout_dir}/#{opts[:target_dir]}"
-        combined_dir = "combined/#{thing}"
-        if Dir.exists?(checkout_thing_dir) then
-          if opts[:step_in] then
-            Dir.foreach(checkout_thing_dir) do |checkout_top_dir|
-              next unless File.directory?(checkout_thing_dir + '/' + checkout_top_dir)
-              next if checkout_top_dir.start_with?('.')
-              combined_top_dir = combined_dir + '/' + checkout_top_dir
-              if !Dir.exists?(combined_top_dir) then Dir.mkdir(combined_top_dir) end
-              Dir.entries(checkout_thing_dir + '/' + checkout_top_dir).grep(/\.(rb|json)$/).each do |file|
-                if opts[:vagrant_pov_link] then
-                  # Under vagrant, we see this directory as /vagrant/checkouts/<checkout>/data_bags/<dbag>/<dbag_entry.json>
-                  # Use -f so later checkouts can override earlier ones
-                  cmd = "ln -sf /vagrant/#{checkout_thing_dir + '/' + checkout_top_dir}/#{file} combined/#{thing}/#{checkout_top_dir}/#{file}"
-                  unless system cmd then raise "Could not '#{cmd}'" end
-                else
-                  # Link as visible to the host machine
-                  # Use -f so later checkouts can override earlier ones
-                  cmd = "ln -sf ../../#{checkout_thing_dir + '/' + checkout_top_dir}/#{file} combined/#{thing}/#{checkout_top_dir}/#{file}"
-                  unless system cmd then raise "Could not '#{cmd}'" end
-                end
-              end
-            end
-          else
-            Dir.entries(checkout_thing_dir).grep(/\.(rb|json)$/).each do |file|
-              if opts[:vagrant_pov_link] then
-                # Under vagrant, we see this directory as /vagrant/checkouts/foo/role/bar.rb
-                # Use -f so later checkouts can override earlier ones
-                cmd = "ln -sf /vagrant/#{checkout_thing_dir}/#{file} combined/#{thing}/#{file}"
-                unless system cmd then raise "Could not '#{cmd}'" end
-              else
-                # Link as visible to the host machine
-                # Use -f so later checkouts can override earlier ones
-                cmd = "ln -sf ../../#{checkout_thing_dir}/#{file} combined/#{thing}/#{file}"
-                unless system cmd then raise "Could not '#{cmd}'" end
-              end                
-            end
-          end
-        end
-      end
-    end  
-  end
-  module_function :update_links
-
-  # This is a Vagrant middleware plugin, which implements fetching the cookbooks
-  # http://vagrantup.com/v1/docs/extending/middleware.html
-  class FetchHook
-    def initialize(app, env)
-      @app = app
-    end
-
-    def call(env)
-      if !env[:global_config].cookbook_fetcher.disable then
-        Dir.chdir(env[:root_path]) do
-          CookbookFetcher.perform_fetch(env[:global_config], env[:ui])
-        end
-      else
-        env[:ui].info "Auto-checkout disabled, skipping"
-      end
-
-      # Continue daisy chain
-      @app.call(env) 
-    end
-  end
-
-  # Install fetcher hook
-  Vagrant.actions[:provision].insert(Vagrant::Action::General::Validate, CookbookFetcher::FetchHook)
-  # Note that :up includes :start ( see https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/action/builtin.rb )
-  Vagrant.actions[:start].insert(Vagrant::Action::General::Validate, CookbookFetcher::FetchHook)
-
-
-  # Middleware to tweak chef config
-  # Injects auto-checkout-derived chef-solo config
-  class ConfigureChef 
-    def initialize(app, env)
-      @app = app
-    end
-
-    def call(env)
-      # Do this even if fetch is disabled
-
-      # there has got to be a better way
-      provisioners_list = env[:vm].config.to_hash["keys"][:vm].provisioners 
-
-      chef_solo = provisioners_list.find { |p| p.shortcut === :chef_solo }
-      if !chef_solo.nil? then
-        solo_cfg = chef_solo.config
-      
-        # TODO - need cwd block
-        Dir.chdir(env[:root_path]) do
-          if solo_cfg.roles_path.nil? then
-            solo_cfg.roles_path = "combined/roles"
-          else
-            env[:ui].warn "Auto-checkout is keeping your custom chef-solo role path"
-          end
-
-          if solo_cfg.data_bags_path.nil? then
-            solo_cfg.data_bags_path = "combined/data_bags"
-          else
-            env[:ui].warn "Auto-checkout is keeping your custom chef-solo data_bags path"
-          end
-
-          # Cookbooks has a default
-          if solo_cfg.cookbooks_path === ["cookbooks", [:vm, "cookbooks"]] then
-            # Read from filesystem
-            if !File.exists?(".cookbook-order") then
-              env[:ui].error "Auto-checkout could find not a .cookbook-order file.  You need to run provision with autocheckout enabled at least once (or else specify your own cookbook path)"
-            end
-
-            cbs = []
-            IO.readlines(".cookbook-order").each { |line| cbs.push line.chomp }
-            solo_cfg.cookbooks_path = cbs
-          else
-            env[:ui].warn "Auto-checkout is keeping your custom chef-solo cookbook path"
-          end
-        end
-      end
-
-      # Continue daisy chain
-      @app.call(env) 
-    end
-  end
-
-  Vagrant.actions[:provision].insert(Vagrant::Action::VM::Provision, CookbookFetcher::ConfigureChef)
-  Vagrant.actions[:start].insert(Vagrant::Action::VM::Provision, CookbookFetcher::ConfigureChef)
-
-  class CheckoutCommand < Vagrant::Command::Base
-    def execute
-      Dir.chdir(@env.root_path) do
-        CookbookFetcher.perform_fetch(@env.config.global, @env.ui)
-      end
-    end
-  end
-  Vagrant.commands.register(:checkout) { CookbookFetcher::CheckoutCommand }
-
-
-end

data/lib/vagrant_init.rb

@@ -1 +0,0 @@
-require 'vagrant_cookbook_fetcher'