vagrant-cookbook-fetcher 0.0.8 → 0.0.9

data/ChangeLog

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

data/lib/vagrant_cookbook_fetcher.rb

@@ -142,18 +142,25 @@ module CookbookFetcher
   # 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", "nodes", "handlers", "data_bags", "spec"]
-    logger.info "Updating links to #{things_to_link.join(', ')}"
+    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.each do |thing|
+      things_to_link.keys.each do |thing|
         if !Dir.exists?(thing) then Dir.mkdir(thing) end
-        if (thing == "data_bags") then
-          Dir.foreach(thing) do |dbag_dir|
-            Dir.foreach(thing + '/' + dbag_dir) do |file|
+        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
@@ -168,29 +175,43 @@ module CookbookFetcher
     # 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|
-        co_thing_dir = "checkouts/#{checkout_dir}/#{thing}"
+      things_to_link.each do |thing, opts|
+        checkout_thing_dir = "checkouts/#{checkout_dir}/#{opts[:target_dir]}"
         combined_dir = "combined/#{thing}"
-        if Dir.exists?(co_thing_dir) then
-          if (thing == "data_bags") then
-            Dir.foreach(co_thing_dir) do |co_dbag_dir|
-              next unless File.directory?(co_thing_dir + '/' + co_dbag_dir)
-              next if co_dbag_dir.start_with?('.')
-              combined_dbag_dir = combined_dir + '/' + co_dbag_dir
-              if !Dir.exists?(combined_dbag_dir) then Dir.mkdir(combined_dbag_dir) end
-              Dir.entries(co_thing_dir + '/' + co_dbag_dir).grep(/\.(rb|json)$/).each do |file|
-                # 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/#{co_thing_dir + '/' + co_dbag_dir}/#{file} combined/#{thing}/#{co_dbag_dir}/#{file}"
-                unless system cmd then raise "Could not '#{cmd}'" end
+        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(co_thing_dir).grep(/\.(rb|json)$/).each do |file|
-              # 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/#{co_thing_dir}/#{file} combined/#{thing}/#{file}"
-              unless system cmd then raise "Could not '#{cmd}'" end
+            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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cookbook-fetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: