onceover 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9cca70e7c3e4acba9f3a2aa60ae16087f30261f
-  data.tar.gz: e1f6255a54a6be2d9985b57bc82ca97bc7487bf6
+  metadata.gz: dcd6ae85ed397165b0be23b34790c9f8b52a3f68
+  data.tar.gz: a23571dcacd9dd5b7bc703f7c46e045431cf29fe
 SHA512:
-  metadata.gz: 6af61ee99bc06e538611e109157b9e328f53d02b2b6a1eddd0af6a1841cc65f065b131e3792e64767bb4d53a2df9a0c7255c79e0753b829402db2e677545c84f
-  data.tar.gz: 888e3c95a2630cbc47016af32084ef402f0c928e6b2ce3b46003a3828000e8d8f0a1a6c6b37581c4391d5c2e049a36a5805a8b89add7411d558819f04a6273a8
+  metadata.gz: 16b79ab89c3eedf30ecc2ae67b3ce115c4a3f91ffc03f83da0a91482ac9668fe46717569b2ed54b5fcf3582d0f401e27322691c1f796868882db83bb9d65b877
+  data.tar.gz: b00f9e885a561659c18545fdda62d6956944c9cc88a1d0df751059e4658833901b95900d1691394a24c3df3e16af4cdbf2765a9bf5be096cc88e9c7864cc66c7

data/controlrepo.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.0.5"
+  s.version     = "3.0.6"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rspec', '>= 3.0.0'
   s.add_runtime_dependency 'bundler'
   s.add_runtime_dependency 'r10k', '>=2.1.0'
-  s.add_runtime_dependency 'puppet'
+  s.add_runtime_dependency 'puppet', '>=3.4.0'
   s.add_runtime_dependency 'git'
   s.add_runtime_dependency 'cri', '>= 2.6'
   s.add_runtime_dependency 'colored', '~> 1.2'

data/lib/onceover/testconfig.rb

@@ -135,10 +135,39 @@ class Onceover
       # We need to do the copy to a tempdir then move the tempdir to the
       # destination, just in case we get a recursive copy
       # TODO: Improve this to save I/O
+
+      # We might need to exclude some files
+      #
+      # if we are using bundler to install gems below the controlrepo
+      # we don't wan two copies so exclude those
+      #
+      # If there are more situations like this we can add them to this array as
+      # full paths
+      excluded_files = []
+      if ENV['GEM_HOME']
+        logger.debug "Excluding #{ENV['GEM_HOME']} from controlrepo copy"
+        excluded_files << Dir.glob("#{ENV['GEM_HOME']}/**/*")
+        excluded_files.flatten!
+      end
+
+      # Exclude the files we need to
+      controlrepo_files = Dir.glob("#{repo.root}/**/*")
+      files_to_copy = (controlrepo_files - excluded_files).delete_if { |path| Pathname(path).directory? }
+      folders_to_copy = (controlrepo_files - excluded_files).keep_if { |path| Pathname(path).directory? }
+
       logger.debug "Creating temp dir as a staging directory for copying the controlrepo to #{repo.tempdir}"
       temp_controlrepo = Dir.mktmpdir('controlrepo')
-      FileUtils.cp_r(Dir["#{repo.root}/*"], "#{temp_controlrepo}")
+
+      logger.debug "Creating directories under #{temp_controlrepo}"
+      FileUtils.mkdir_p(folders_to_copy.map { |folder| "#{temp_controlrepo}/#{(Pathname(folder).relative_path_from(Pathname(repo.root))).to_s}"})
+
+      logger.debug "Copying files to #{temp_controlrepo}"
+      files_to_copy.each do |file|
+        FileUtils.cp(file,"#{temp_controlrepo}/#{(Pathname(file).relative_path_from(Pathname(repo.root))).to_s}")
+      end
       FileUtils.mkdir_p("#{repo.tempdir}/#{repo.environmentpath}/production")
+
+      logger.debug "Copying #{temp_controlrepo} to #{repo.tempdir}/#{repo.environmentpath}/production"
       FileUtils.cp_r(Dir["#{temp_controlrepo}/*"], "#{repo.tempdir}/#{repo.environmentpath}/production")
       FileUtils.rm_rf(temp_controlrepo)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement