controlrepo 2.0.3 → 2.0.5

data/lib/controlrepo.rb

@@ -5,8 +5,8 @@ require 'yaml'
 require 'find'
 require 'pathname'
 require 'controlrepo/beaker'
-begin 
-  require 'pry' 
+begin
+  require 'pry'
 rescue LoadError
   # We don't care if i'ts not here, this is just used for
   # debugging sometimes
@@ -23,6 +23,7 @@ class Controlrepo
   attr_accessor :spec_dir
   attr_accessor :temp_modulepath
   attr_accessor :nodeset_file
+  attr_accessor :manifest
 
   # Create methods on self so that we can access these basic things without
   # having to actually instantiate the class, I'm debating how much stuff
@@ -97,6 +98,7 @@ class Controlrepo
     @temp_environmentpath = nil
     @tempdir = nil
     $temp_modulepath = nil
+    @manifest = config['manifest'] ? File.expand_path(config['manifest'],@root) : nil
   end
 
   def to_s
@@ -108,7 +110,7 @@ class Controlrepo
     facts_files: #{@facts_files}
     nodeset_file: #{@nodeset_file}
     roles: #{roles}
-    profiles #{profiles}
+    profiles: #{profiles}
     END
   end
 
@@ -285,6 +287,10 @@ class Controlrepo
     File.write(r10k_config_file,data.to_yaml)
   end
 
+  def temp_manifest
+    config['manifest'] ? File.expand_path(config['manifest'],@tempdir) : nil
+  end
+
   private
 
   def read_facts(facts_file)
@@ -341,4 +347,4 @@ class Controlrepo
     end
     return nil
   end
-end
+end

data/lib/controlrepo/beaker.rb

@@ -24,7 +24,7 @@ class Controlrepo
       begin
         if facts['os']['distro']['id'] == 'Debian'
           os = 'Debian'
-          version = "#{facts['os']['distro']['release']['major']}.#{facts['os']['distro']['release']['minor']}"
+          version = facts['os']['distro']['release']['full']
         end
       rescue
         # Do nothing

data/lib/controlrepo/rake_tasks.rb

@@ -80,8 +80,11 @@ task :controlrepo_autotest_prep do
   @config = Controlrepo::TestConfig.new("#{@repo.spec_dir}/controlrepo.yaml")
 
   # Verify that all the files exist for the tests we have set up
-  @config.spec_tests.each { |test| @config.verify_spec_test(@repo,test) }
-  @config.acceptance_tests.each { |test| @config.verify_acceptance_test(@repo,test) }
+  if Rake.application.top_level_tasks[0] == "controlrepo_spec"
+    @config.spec_tests.each { |test| @config.verify_spec_test(@repo,test) }
+  elsif Rake.application.top_level_tasks[0] == "controlrepo_acceptance"
+    @config.acceptance_tests.each { |test| @config.verify_acceptance_test(@repo,test) }
+  end
 
   # Deploy r10k to a temp dir
   @config.r10k_deploy_local(@repo)
@@ -161,8 +164,3 @@ task :r10k_deploy_local do
   # Deploy r10k to a temp dir
   config.r10k_deploy_local(repo)
 end
-
-# TODO: We could use rspec's tagging abilities to choose which if the acceptance tests to run.
-
-
-

data/lib/controlrepo/test.rb

@@ -113,7 +113,6 @@ class Controlrepo
       # This should take an array of tests and remove any duplicates from them
 
       # this will be an array of arrays, or maybe hashes
-      # TODO: Rewrite this so that it merges options hashes, or takes one, decide on the right behaviour
       combinations = []
       new_tests = []
       tests.each do |test|

data/lib/controlrepo/testconfig.rb

@@ -19,7 +19,9 @@ class Controlrepo
     def initialize(file, environment = ENV['CONTROLREPO_env'])
       begin
         config = YAML.load(File.read(file))
-      rescue YAML::ParserError
+      rescue Errno::ENOENT
+        raise "Could not find spec/controlrepo.yaml"
+      rescue Psych::SyntaxError
         raise "Could not parse the YAML file, check that it is valid YAML and that the encoding is correct"
       end
 
@@ -96,7 +98,7 @@ class Controlrepo
       Dir["#{spec_dir}/pre_conditions/*.pp"].each do |condition_file|
         puppetcode << File.read(condition_file)
       end
-      return false if puppetcode.count == 0
+      return nil if puppetcode.count == 0
       puppetcode.join("\n")
     end
 
@@ -184,12 +186,5 @@ class Controlrepo
         end
       end
     end
-
-    # TODO: Work out the best way to format the output
-    # TODO: Look into bundling bundler into the temp dir
-    # TODO: Write task for beaker tests *brace yourself* Dont forget about the beaker file you have
-    # TODO: Compare the outlout of the beaker helper that I wrote
-    #       with the output from the templated tests, us ethe better one
-    #       bearing in minf that beaker has logger options that could help
   end
 end

data/templates/spec_helper.rb.erb

@@ -2,6 +2,8 @@ require 'puppetlabs_spec_helper/module_spec_helper'
 
 RSpec.configure do |c|
   c.parser = 'future'
+  c.environmentpath = '<%= environmentpath %>'
   c.module_path = '<%= modulepath %>'
   c.hiera_config = '<%= environmentpath %>/<%= @environment %>/hiera.yaml'
-end
+  c.manifest = '<%= repo.temp_manifest %>'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: controlrepo
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ''
+description: Testing tools for Puppet controlrepos
 email:
 - dylan.ratcliffe@puppetlabs.com
 executables: []
@@ -163,10 +163,18 @@ files:
 - README.md
 - Rakefile
 - controlrepo.gemspec
+- factsets/CentOS-5.11-32.json
+- factsets/CentOS-5.11-64.json
+- factsets/CentOS-6.6-32.json
 - factsets/CentOS-6.6-64.json
 - factsets/CentOS-7.0-64.json
+- factsets/Debian-6.0.10-32.json
+- factsets/Debian-6.0.10-64.json
+- factsets/Debian-7.8-32.json
 - factsets/Debian-7.8-64.json
 - factsets/Ubuntu-12.04-32.json
+- factsets/Ubuntu-12.04-64.json
+- factsets/Ubuntu-14.04-32.json
 - factsets/Ubuntu-14.04-64.json
 - factsets/Windows_Server-2008r2-64.json
 - factsets/Windows_Server-2012r2-64.json
@@ -186,7 +194,7 @@ files:
 - templates/spec_helper.rb.erb
 - templates/spec_helper_acceptance.rb.erb
 - templates/test_spec.rb.erb
-homepage: ''
+homepage: https://github.com/dylanratcliffe/controlrepo_gem
 licenses:
 - Apache-2.0
 metadata: {}
@@ -209,5 +217,5 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: ''
+summary: Testing tools for Puppet controlrepos
 test_files: []