onceover 3.12.4 → 3.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7982fd6ed17038eae9109520bbf77ae9d76f408d9359ff322af22295dc8e891
-  data.tar.gz: d03855de858e9bca91c5859f5ad2ca72bec38ca2f290568b5b1cde5f0a9b391a
+  metadata.gz: 457f570eb2550258473e9dca14eaecb7e317b88e39268472433b70dda6f69b75
+  data.tar.gz: 9ca15f1a931075c8cbcdd5268bebd5ec37fbf7b07faf382a1f9fb3dc226f5bb3
 SHA512:
-  metadata.gz: 4dee57a1d7154ffade07d3d6b88c6eb979c125d8e8dc1966b7eb5eb164118e9bbc77bcae5d876e3191ae9fdd52944885c50219ffc8318881e2153ece43279e35
-  data.tar.gz: 76e47414ae66b20c1865323dfd154df83cd92c68e204f20d0ed4406c109037d18d9f500835d2cd74cae728bbdbb8402a6b34f3c758779d2b52496da282197621
+  metadata.gz: 4e1e6713d8a54660aad1128d7f1e8ea920d59c5b77f72e37b508a8f203a6ecdcbe00043ddc5455e52fc0f81c7de984509793f0ed3ba468b6102e4d0c72eced48
+  data.tar.gz: 699733093cabc26131eccacb05e91a5a068b0266255d769c13f479bb28740f850608337d49ee1160f96d08334a785221be79549da071c8ad67b847f327e3f094

data/.gitignore

@@ -15,3 +15,4 @@ tmp
 
 .cucumber
 .vscode
+.idea

data/Gemfile

@@ -17,3 +17,9 @@ end
 if File.exists?(File.join(Dir.home, '.gemfile'))
   eval(File.read(File.join(Dir.home, '.gemfile')), binding)
 end
+
+if ENV['APPVEYOR'] == 'True'
+  # R10k needs to be pinned to this until the next release after 3.1.1
+  # in order to not have symlinks and therefor work on windows
+  gem 'r10k', git: 'https://github.com/puppetlabs/r10k.git'
+end

data/appveyor.yml

@@ -0,0 +1,38 @@
+---
+image: Visual Studio 2017
+
+cache:
+  - vendor/bundle
+
+branches:
+  only:
+  - master
+
+environment:
+  matrix:
+    - RUBY_VERSION: "24"
+    - RUBY_VERSION: "24-x64"
+    - RUBY_VERSION: "25"
+    - RUBY_VERSION: "25-x64"
+
+# scripts that are called at very beginning, before repo cloning
+init:
+  -  ps: Set-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem -Name LongPathsEnabled -Value 1 -Type DWord
+
+matrix:
+  fast_finish: false
+
+install:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle config --local path vendor/bundle
+  - bundle install
+
+build: "off"
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake full_tests

data/lib/onceover/deploy.rb

@@ -4,6 +4,8 @@ class Onceover
     def deploy_local(repo = Onceover::Controlrepo.new, opts = {})
       require 'onceover/controlrepo'
       require 'pathname'
+      require 'fileutils'
+      require 'json'
 
       logger.debug 'Deploying locally (R10K)...'
 
@@ -17,70 +19,61 @@ class Onceover
         FileUtils.mkdir_p(repo.tempdir)
       end
 
-      # We need to do the copy to a tempdir then move the tempdir to the
+      # Overall plan: Copy everything in control repo 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 want two copies so exclude those
-      #
-      # If there are more situations like this we can add them to this array as
-      # full paths
-      excluded_dirs = []
-      excluded_dirs << Pathname.new("#{repo.root}/.onceover")
-      excluded_dirs << Pathname.new(ENV['GEM_HOME']) if ENV['GEM_HOME']
-
-      #
+
+      # We need to exclude some files:
+      # * our own cache
+      # * stuff from git
+      # * stale puppet modules
+      # * random ruby gems (bundler/rvm?)
+      # * ...etc
+      excluded_dirs = [
+        File.join(repo.root, ".onceover"),
+        File.join(repo.root, ".git"),
+        File.join(repo.root, ".modules"),
+      ]
+      excluded_dirs << ENV['GEM_HOME'] if ENV['GEM_HOME']
+
       # A Local modules directory likely means that the user installed r10k folders into their local control repo
       # This conflicts with the step where onceover installs r10k after copying the control repo to the temporary
       # .onceover directory.  The following skips copying the modules folder, to not later cause an error.
-      #
-      if File.directory?("#{repo.root}/modules")
+      if File.directory?("modules")
         logger.warn "Found modules directory in your controlrepo, skipping the copy of this directory.  If you installed modules locally using r10k, this warning is normal, if you have created modules in a local modules directory, onceover does not support testing these files, please rename this directory to conform with Puppet best practices, as this folder will conflict with Puppet's native installation of modules."
       end
-      excluded_dirs << Pathname.new("#{repo.root}/modules")
 
-      controlrepo_files = get_children_recursive(Pathname.new(repo.root))
+      logger.debug "Creating temp dir as a staging directory for copying the controlrepo to #{repo.tempdir}"
+      temp_controlrepo = Dir.mktmpdir('controlrepo')
 
-      # Exclude the files that should be skipped
-      controlrepo_files.delete_if do |path|
-        parents = [path]
-        path.ascend do |parent|
-          parents << parent
-        end
-        parents.any? { |x| excluded_dirs.include?(x) }
-      end
+      # onceover stores a big list of all the relative paths it places within its cache directory
+      onceover_manifest = []
 
-      folders_to_copy = controlrepo_files.select { |x| x.directory? }
-      files_to_copy   = controlrepo_files.select { |x| x.file? }
+      Find.find repo.root do |source|
+        # work out a relative path to this source, eg:
+        # /home/geoff/control-repo/foo/bar -> foo/bar
+        relative_source = Pathname.new(source).relative_path_from(Pathname.new(repo.root)).to_s
 
-      logger.debug "Creating temp dir as a staging directory for copying the controlrepo to #{repo.tempdir}"
-      temp_controlrepo = Dir.mktmpdir('controlrepo')
+        target = File.join(temp_controlrepo, relative_source)
 
-      logger.debug "Creating directories under #{temp_controlrepo}"
-      FileUtils.mkdir_p(folders_to_copy.map { |folder| "#{temp_controlrepo}/#{(folder.relative_path_from(Pathname(repo.root))).to_s}"})
+        # ignore the path "." which represents the root of our control repo
+        if relative_source != "."
+          # add to list of files copied to cache by onceover
+          onceover_manifest << relative_source
 
-      logger.debug "Copying files to #{temp_controlrepo}"
-      files_to_copy.each do |file|
-        FileUtils.cp(file,"#{temp_controlrepo}/#{(file.relative_path_from(Pathname(repo.root))).to_s}")
+          if File.directory? source
+            Find.prune if excluded_dirs.include? source
+            FileUtils.mkdir target
+          else
+            FileUtils.copy source, target
+          end
+        end
       end
-
       logger.debug "Writing manifest of copied controlrepo files"
-      require 'json'
-      # Create a manifest of all files that were in the original repo
-      manifest = controlrepo_files.map do |file|
-        # Make sure the paths are relative so they remain relevant when used later
-        file.relative_path_from(Pathname(repo.root)).to_s
-      end
-      # Write all but the first as this is the root and we don't care about that
-      File.write("#{temp_controlrepo}/.onceover_manifest.json",manifest[1..-1].to_json)
+      File.write("#{temp_controlrepo}/.onceover_manifest.json", onceover_manifest.to_json)
 
       # When using puppetfile vs deploy with r10k, we want to respect the :control_branch
       # located in the Puppetfile. To accomplish that, we use git and find the current
       # branch name, then replace strings within the staged puppetfile, prior to copying.
-
       logger.debug "Checking current working branch"
       git_branch = `git rev-parse --abbrev-ref HEAD`.chomp
 
@@ -91,7 +84,7 @@ class Onceover
       new_puppetfile_contents = puppetfile_contents.gsub(/:control_branch/, "'#{git_branch}'")
       File.write("#{temp_controlrepo}/Puppetfile", new_puppetfile_contents)
 
-      # Remove all files written by the laste onceover run, but not the ones
+      # Remove all files written by the last onceover run, but not the ones
       # added by r10k, because that's what we are trying to cache but we don't
       # know what they are
       old_manifest_path = "#{repo.tempdir}/#{repo.environmentpath}/production/.onceover_manifest.json"
@@ -134,19 +127,5 @@ class Onceover
       # Return repo.tempdir for use
       repo.tempdir
     end
-
-    private
-
-    def get_children_recursive(pathname)
-      results = []
-      results << pathname
-      pathname.each_child do |child|
-        results << child
-        if child.directory?
-          results << get_children_recursive(child)
-        end
-      end
-      results.flatten
-    end
   end
 end

data/onceover.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.12.4"
+  s.version     = "3.12.5"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

data/spec/fixtures/controlrepos/caching/Puppetfile

@@ -1,17 +1,17 @@
-forge "http://forge.puppetlabs.com"
-#
-# I want to download some modules to check if r10k feature in Onceover works correctly.
-#
-
-# Versions should be updated to be the latest at the time you start
-mod "puppetlabs/stdlib",      '4.11.0'
-
-# Modules from Git
-# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
-mod 'apache',
- :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
- :commit => '83401079053dca11d61945bd9beef9ecf7576cbf'
-
-#mod 'apache',
-#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
-#  :branch => 'docs_experiment'
+forge "http://forge.puppetlabs.com"
+#
+# I want to download some modules to check if r10k feature in Onceover works correctly.
+#
+
+# Versions should be updated to be the latest at the time you start
+mod "puppetlabs/stdlib",      '4.11.0'
+
+# Modules from Git
+# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
+mod 'apache',
+ :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
+ :commit => '83401079053dca11d61945bd9beef9ecf7576cbf'
+
+#mod 'apache',
+#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
+#  :branch => 'docs_experiment'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.12.4
+  version: 3.12.5
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -319,6 +319,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/onceover
 - factsets/AIX-6.1-powerpc.json
 - factsets/AIX-7.1-powerpc.json