controlrepo 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3dbf4efa67f128e98f6fa56f518ded6d95df862
-  data.tar.gz: 1a189ac805a6eb0ce897d021a8030062ea569627
+  metadata.gz: c6f1e530d2aac6db832e66b31b06ccda1536595e
+  data.tar.gz: c4de4272d509eae7a31ea656b6681f524956f6ef
 SHA512:
-  metadata.gz: 306092ec87d7fc6ad9f7815e2c47814efb396b5deb93abcf9a05e5dbe9a47258601fb7203918b106de4ee60982dd39207711d96a334b52e240a54a7141a1593c
-  data.tar.gz: 46cdb8dd9a2c19176c2cfe09d6b0d5a5a887b055ca2c159117c29b663cf55ec42a79f4b68023d4c809086c37fd22886085f90a976944f3caea7cac1892972486
+  metadata.gz: df2d05bb540e4b6f287745d563f609ab56ed660a51085100b2ff1890417924a6161d8304e03f4617207768aa206052b3a1e2921359fec71d484a27abe071dec2
+  data.tar.gz: d157c35ed069a7b32dceef4fdecf42f01091d8a71288db187915282dcf816304d84d501b9ac78fc21dbbae284c2f9229f54f47b1f2ba67875e119d8f7fdd302a

data/README.md

@@ -44,16 +44,20 @@ Install all the gems:
 Add this to your [Rakefile](#rake-tasks):
 
 ```ruby
-require 'puppetlabs_spec_helper/rake_tasks'
+require 'controlrepo/rake_tasks'
 ```
 
+Create directories:
+
+`mkdir -p spec/acceptance/nodesets`
+
 Generate your [controlrepo.yaml](#controlrepoyaml):
 
 `bundle exec rake generate_controlrepo_yaml > spec/controlrepo.yaml`
 
 Generate your [nodesets](#nodesets):
 
-`bundle exec rake generate_nodesets > spec/acceptance/controlrepo-nodes.yml`
+`bundle exec rake generate_nodesets > spec/acceptance/nodesets/controlrepo-nodes.yml`
 
 *Optional:* [Get hiera working](#hiera-data)
 

data/controlrepo.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "controlrepo"
-  s.version     = "2.0.2"
+  s.version     = "2.0.3"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppetlabs.com"]
   s.homepage    = ""
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json'
   s.add_runtime_dependency 'beaker-rspec'
   s.add_runtime_dependency 'rspec-puppet'
+  s.add_runtime_dependency 'puppetlabs_spec_helper'
   s.add_runtime_dependency 'rspec'
   s.add_runtime_dependency 'bundler'
   s.add_runtime_dependency 'r10k'

data/lib/controlrepo.rb

@@ -107,6 +107,8 @@ class Controlrepo
     spec_dir: #{@spec_dir}
     facts_files: #{@facts_files}
     nodeset_file: #{@nodeset_file}
+    roles: #{roles}
+    profiles #{profiles}
     END
   end
 
@@ -228,7 +230,8 @@ class Controlrepo
     begin
       YAML.load_file(hiera_config_file)
     rescue TypeError
-      raise "Could not load hiera config file: #{hiera_config_file}"
+      puts "WARNING: Could not find hiera config file, continuing"
+      nil
     end
   end
 
@@ -250,6 +253,9 @@ class Controlrepo
     env_conf = File.read(@environment_conf)
     env_conf = env_conf.split("\n")
 
+    # Delete commented out lines
+    env_conf.delete_if { |l| l =~ /^\s*#/}
+
     # Map the lines into a hash
     environment_config = {}
     env_conf.each do |line|

data/lib/controlrepo/rake_tasks.rb

@@ -102,9 +102,6 @@ task :controlrepo_autotest_prep do
   # Create spec_helper_accpetance.rb
   @config.write_spec_helper_acceptance("#{@repo.tempdir}/spec",@repo)
 
-  # Create Gemfile
-  @config.write_gemfile(@repo.tempdir)
-
   # Deduplicate and write the tests (Spec and Acceptance)
   Controlrepo::Test.deduplicate(@config.spec_tests).each do |test|
     @config.write_spec_test("#{@repo.tempdir}/spec/classes",test)
@@ -113,16 +110,17 @@ task :controlrepo_autotest_prep do
   @config.write_acceptance_tests("#{@repo.tempdir}/spec/acceptance",Controlrepo::Test.deduplicate(@config.acceptance_tests))
 
   # Parse the current hiera config, modify, and write it to the temp dir
-  hiera_config = @repo.hiera_config
-  hiera_config.each do |setting,value|
-    if value.is_a?(Hash)
-      if value.has_key?(:datadir)
-        hiera_config[setting][:datadir] = "#{@repo.temp_environmentpath}/#{@config.environment}/#{value[:datadir]}"
+  unless @repo.hiera_config ==nil
+    hiera_config = @repo.hiera_config
+    hiera_config.each do |setting,value|
+      if value.is_a?(Hash)
+        if value.has_key?(:datadir)
+          hiera_config[setting][:datadir] = "#{@repo.temp_environmentpath}/#{@config.environment}/#{value[:datadir]}"
+        end
       end
     end
+    File.write("#{@repo.temp_environmentpath}/#{@config.environment}/hiera.yaml",hiera_config.to_yaml)
   end
-  binding.pry
-  File.write("#{@repo.temp_environmentpath}/#{@config.environment}/hiera.yaml",hiera_config.to_yaml)
 
   @config.create_fixtures_symlinks(@repo)
 end
@@ -131,7 +129,7 @@ task :controlrepo_autotest_spec do
   Dir.chdir(@repo.tempdir) do
     #`bundle install --binstubs`
     #`bin/rake spec_standalone`
-    exec("bundle install --without acceptance; bundle exec rake spec_standalone")
+    exec("bundle exec rake spec_standalone")
   end
 end
 
@@ -139,7 +137,7 @@ task :controlrepo_autotest_acceptance do
   Dir.chdir(@repo.tempdir) do
     #`bundle install --binstubs`
     #`bin/rake spec_standalone`
-    exec("bundle install; bundle exec rake acceptance")
+    exec("bundle exec rake acceptance")
   end
 end
 

data/lib/controlrepo/testconfig.rb

@@ -37,10 +37,10 @@ class Controlrepo
       @node_groups << Controlrepo::Group.new('all_nodes',@nodes)
       @class_groups << Controlrepo::Group.new('all_classes',@classes)
 
-      config['classes'].each { |clarse| @classes << Controlrepo::Class.new(clarse) }
-      config['nodes'].each { |node| @nodes << Controlrepo::Node.new(node) }
-      config['node_groups'].each { |name, members| @node_groups << Controlrepo::Group.new(name, members) }
-      config['class_groups'].each { |name, members| @class_groups << Controlrepo::Group.new(name, members) }
+      config['classes'].each { |clarse| @classes << Controlrepo::Class.new(clarse) } unless config['classes'] == nil
+      config['nodes'].each { |node| @nodes << Controlrepo::Node.new(node) } unless config['nodes'] == nil
+      config['node_groups'].each { |name, members| @node_groups << Controlrepo::Group.new(name, members) } unless config['node_groups'] == nil
+      config['class_groups'].each { |name, members| @class_groups << Controlrepo::Group.new(name, members) } unless config['class_groups'] == nil
 
       config['test_matrix'].each do |test_hash|
         test_hash.each do |machines, settings|
@@ -159,12 +159,6 @@ class Controlrepo
       File.write("#{location}/Rakefile",ERB.new(rakefile_template, nil, '-').result(binding))
     end
 
-    def write_gemfile(location)
-      template_dir = File.expand_path('../../templates',File.dirname(__FILE__))
-      gemfile_template = File.read(File.expand_path('./Gemfile.erb',template_dir))
-      File.write("#{location}/Gemfile",ERB.new(gemfile_template, nil, '-').result(binding))
-    end
-
     def write_spec_helper(location, repo)
       environmentpath = repo.temp_environmentpath
       modulepath = repo.config['modulepath']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: controlrepo
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Dylan Ratcliffe
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppetlabs_spec_helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +179,6 @@ files:
 - lib/controlrepo/test.rb
 - lib/controlrepo/testconfig.rb
 - templates/.fixtures.yml.erb
-- templates/Gemfile.erb
 - templates/Rakefile.erb
 - templates/acceptance_test_spec.rb.erb
 - templates/controlrepo.yaml.erb

data/templates/Gemfile.erb

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-group :spec do
-  gem 'rspec-puppet'
-  gem 'puppetlabs_spec_helper'
-end
-
-group :acceptance do
-  gem 'beaker-rspec'
-  gem 'controlrepo', :git => 'https://github.com/dylanratcliffe/controlrepo_gem.git'
-end
-
-gem 'rake'