controlrepo 2.0.1 → 2.0.2

data/factsets/Windows_Server-2012r2-64.json

@@ -0,0 +1,164 @@
+{
+  "name": "win-e5k8tm30719",
+  "values": {
+    "agent_specified_environment": "production",
+    "architecture": "x64",
+    "dhcp_servers": {
+      "Ethernet": "10.0.2.2",
+      "system": "10.0.2.2"
+    },
+    "dmi": {
+      "manufacturer": "innotek GmbH",
+      "product": {
+        "name": "VirtualBox",
+        "serial_number": "0"
+      }
+    },
+    "env_windows_installdir": "C:\\Program Files\\Puppet Labs\\Puppet",
+    "facterversion": "3.1.1",
+    "fqdn": "WIN-E5K8TM30719",
+    "hardwareisa": "x64",
+    "hardwaremodel": "x86_64",
+    "hostname": "WIN-E5K8TM30719",
+    "id": "WIN-E5K8TM30719\\vagrant",
+    "identity": {
+      "user": "WIN-E5K8TM30719\\vagrant"
+    },
+    "interfaces": "Ethernet",
+    "ipaddress": "10.0.2.15",
+    "ipaddress6": "fe80::a180:36e0:3a6e:1005%12",
+    "ipaddress6_Ethernet": "fe80::a180:36e0:3a6e:1005%12",
+    "ipaddress_Ethernet": "10.0.2.15",
+    "is_virtual": true,
+    "kernel": "windows",
+    "kernelmajversion": "6.3",
+    "kernelrelease": "6.3.9600",
+    "kernelversion": "6.3.9600",
+    "macaddress": "08:00:27:81:38:FA",
+    "macaddress_Ethernet": "08:00:27:81:38:FA",
+    "manufacturer": "innotek GmbH",
+    "memory": {
+      "system": {
+        "available": "1.42 GiB",
+        "available_bytes": 1521610752,
+        "capacity": "29.13%",
+        "total": "2.00 GiB",
+        "total_bytes": 2147012608,
+        "used": "596.43 MiB",
+        "used_bytes": 625401856
+      }
+    },
+    "memoryfree": "1.42 GiB",
+    "memoryfree_mb": 1451.12109375,
+    "memorysize": "2.00 GiB",
+    "memorysize_mb": 2047.55078125,
+    "mtu_Ethernet": 1500,
+    "netmask": "255.255.255.0",
+    "netmask6": "ffff:ffff:ffff:ffff::",
+    "netmask6_Ethernet": "ffff:ffff:ffff:ffff::",
+    "netmask_Ethernet": "255.255.255.0",
+    "network": "10.0.2.0",
+    "network6": "fe80::%12",
+    "network6_Ethernet": "fe80::%12",
+    "network_Ethernet": "10.0.2.0",
+    "networking": {
+      "dhcp": "10.0.2.2",
+      "fqdn": "WIN-E5K8TM30719",
+      "hostname": "WIN-E5K8TM30719",
+      "interfaces": {
+        "Ethernet": {
+          "bindings": [
+            {
+              "address": "10.0.2.15",
+              "netmask": "255.255.255.0",
+              "network": "10.0.2.0"
+            }
+          ],
+          "bindings6": [
+            {
+              "address": "fe80::a180:36e0:3a6e:1005%12",
+              "netmask": "ffff:ffff:ffff:ffff::",
+              "network": "fe80::%12"
+            }
+          ],
+          "dhcp": "10.0.2.2",
+          "ip": "10.0.2.15",
+          "ip6": "fe80::a180:36e0:3a6e:1005%12",
+          "mac": "08:00:27:81:38:FA",
+          "mtu": 1500,
+          "netmask": "255.255.255.0",
+          "netmask6": "ffff:ffff:ffff:ffff::",
+          "network": "10.0.2.0",
+          "network6": "fe80::%12"
+        }
+      },
+      "ip": "10.0.2.15",
+      "ip6": "fe80::a180:36e0:3a6e:1005%12",
+      "mac": "08:00:27:81:38:FA",
+      "mtu": 1500,
+      "netmask": "255.255.255.0",
+      "netmask6": "ffff:ffff:ffff:ffff::",
+      "network": "10.0.2.0",
+      "network6": "fe80::%12",
+      "primary": "Ethernet"
+    },
+    "operatingsystem": "windows",
+    "operatingsystemmajrelease": "2012 R2",
+    "operatingsystemrelease": "2012 R2",
+    "os": {
+      "architecture": "x64",
+      "family": "windows",
+      "hardware": "x86_64",
+      "name": "windows",
+      "release": {
+        "full": "2012 R2",
+        "major": "2012 R2"
+      },
+      "windows": {
+        "system32": "C:\\Windows\\system32"
+      }
+    },
+    "osfamily": "windows",
+    "path": "C:/Program Files/Puppet Labs/Puppet/facter/bin;C:\\Program Files\\Puppet Labs\\Puppet\\puppet\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\facter\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\hiera\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\mcollective\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\sys\\ruby\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\sys\\tools\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\Git\\cmd;C:\\Program Files (x86)\\Git\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\bin",
+    "physicalprocessorcount": 1,
+    "processor0": "Intel(R) Core(TM) i7-4850HQ CPU @ 2.30GHz",
+    "processorcount": 1,
+    "processors": {
+      "count": 1,
+      "isa": "x64",
+      "models": [
+        "Intel(R) Core(TM) i7-4850HQ CPU @ 2.30GHz"
+      ],
+      "physicalcount": 1
+    },
+    "productname": "VirtualBox",
+    "puppetversion": "4.2.3",
+    "ruby": {
+      "platform": "x64-mingw32",
+      "sitedir": "C:/Program Files/Puppet Labs/Puppet/sys/ruby/lib/ruby/site_ruby/2.1.0",
+      "version": "2.1.7"
+    },
+    "rubyplatform": "x64-mingw32",
+    "rubysitedir": "C:/Program Files/Puppet Labs/Puppet/sys/ruby/lib/ruby/site_ruby/2.1.0",
+    "rubyversion": "2.1.7",
+    "serialnumber": "0",
+    "system32": "C:\\Windows\\system32",
+    "system_uptime": {
+      "days": 0,
+      "hours": 0,
+      "seconds": 287,
+      "uptime": "0:04 hours"
+    },
+    "timezone": "Coordinated Universal Time",
+    "uptime": "0:04 hours",
+    "uptime_days": 0,
+    "uptime_hours": 0,
+    "uptime_seconds": 287,
+    "virtual": "virtualbox",
+    "clientcert": "win-e5k8tm30719",
+    "clientversion": "4.2.3",
+    "clientnoop": false
+  },
+  "timestamp": "2015-11-19T01:47:05.215450000+00:00",
+  "expiration": "2015-11-19T02:17:05.215450000+00:00"
+}

data/lib/controlrepo.rb

@@ -90,7 +90,7 @@ class Controlrepo
     @environment_conf = File.expand_path('./environment.conf',@root)
     @facts_dir = File.expand_path('./spec/factsets',@root)
     @spec_dir = File.expand_path('./spec',@root)
-    @facts_files = Dir["#{@facts_dir}/*.json"]
+    @facts_files = [Dir["#{@facts_dir}/*.json"],Dir["#{File.expand_path('../../factsets',__FILE__)}/*.json"]].flatten
     @nodeset_file = File.expand_path('./spec/acceptance/nodesets/controlrepo-nodes.yml',@root)
     @role_regex = /role[s]?:{2}/
     @profile_regex = /profile[s]?:{2}/
@@ -99,6 +99,17 @@ class Controlrepo
     $temp_modulepath = nil
   end
 
+  def to_s
+    <<-END.gsub(/^\s{4}/,'')
+    puppetfile: #{@puppetfile}
+    environment_conf: #{@environment_conf}
+    facts_dir: #{@facts_dir}
+    spec_dir: #{@spec_dir}
+    facts_files: #{@facts_files}
+    nodeset_file: #{@nodeset_file}
+    END
+  end
+
   def roles
     classes.keep_if { |c| c =~ @role_regex }
   end
@@ -214,7 +225,11 @@ class Controlrepo
   end
 
   def hiera_config
-    YAML.load_file(hiera_config_file)
+    begin
+      YAML.load_file(hiera_config_file)
+    rescue TypeError
+      raise "Could not load hiera config file: #{hiera_config_file}"
+    end
   end
 
   def hiera_config=(data)

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']
+          version = "#{facts['os']['distro']['release']['major']}.#{facts['os']['distro']['release']['minor']}"
         end
       rescue
         # Do nothing
@@ -69,7 +69,7 @@ class Controlrepo
           version = facts['os']['release']['major']
         end
       rescue
-        # Do nothing, this is the easiest way to handle the hash bing in different formats
+        # Do nothing, this is the easiest way to handle the hash being in different formats
       end
 
       begin
@@ -78,13 +78,13 @@ class Controlrepo
           version = facts['os']['distro']['release']['major']
         end
       rescue
-        # Do nothing, this is the easiest way to handle the hash bing in different formats
+        # Do nothing, this is the easiest way to handle the hash being in different formats
       end
 
       begin
         if facts['os']['distro']['id'] == 'Debian'
-          platform = 'Debian'
-          version = facts['os']['distro']['release']['major']
+          platform = 'debian'
+          version = facts['os']['distro']['release']['full']
         end
       rescue
         # Do nothing

data/lib/controlrepo/rake_tasks.rb

@@ -24,6 +24,20 @@ task :hiera_setup do
   repo.hiera_config = current_config
 end
 
+task :controlrepo_details do
+  require 'controlrepo'
+  puts Controlrepo.new.to_s
+end
+
+task :generate_controlrepo_yaml do
+  require 'controlrepo'
+  repo = Controlrepo.new
+  template_dir = File.expand_path('../../templates',File.dirname(__FILE__))
+  controlrepo_yaml_template = File.read(File.expand_path('./controlrepo.yaml.erb',template_dir))
+  puts ERB.new(controlrepo_yaml_template, nil, '-').result(binding)
+end
+
+
 task :generate_nodesets do
   require 'controlrepo/beaker'
   require 'net/http'
@@ -31,47 +45,33 @@ task :generate_nodesets do
 
   repo = Controlrepo.new
 
-  begin
-    Dir.mkdir("#{repo.root}/spec/acceptance")
-    puts "Created #{repo.root}/spec/acceptance"
-  rescue Errno::EEXIST
-    # Do nothing, this is okay
-  end
+  puts "HOSTS:"
 
-  begin
-    Dir.mkdir("#{repo.root}/spec/acceptance/nodesets")
-    puts "Created #{repo.root}/spec/acceptance/nodesets"
-  rescue Errno::EEXIST
-    # Do nothing, this is okay
-  end
-
-  facts = repo.facts
-  facts.each do |fact_set|
-    boxname = Controlrepo_beaker.facts_to_vagrant_box(fact_set)
-    platform = Controlrepo_beaker.facts_to_platform(fact_set)
+  repo.facts.each do |fact_set|
+    node_name = File.basename(repo.facts_files[repo.facts.index(fact_set)],'.json')
+    boxname = Controlrepo::Beaker.facts_to_vagrant_box(fact_set)
+    platform = Controlrepo::Beaker.facts_to_platform(fact_set)
     response = Net::HTTP.get(URI.parse("https://atlas.hashicorp.com/api/v1/box/#{boxname}"))
     url = 'URL goes here'
 
-    unless response =~ /404 Not Found/
+    if response =~ /Not Found/i
+      comment_out = true
+    else
+      comment_out = false
       box_info = JSON.parse(response)
       box_info['current_version']['providers'].each do |provider|
-        if provider['name'] == 'virtualbox'
+        if  provider['name'] == 'virtualbox'
           url = provider['original_url']
         end
       end
     end
 
-    # Use an ERB template to write the files
+    # Use an ERB template
     template_dir = File.expand_path('../../templates',File.dirname(__FILE__))
     fixtures_template = File.read(File.expand_path('./nodeset.yaml.erb',template_dir))
-    output_file = File.expand_path("spec/acceptance/nodesets/#{fact_set['fqdn']}.yml",repo.root)
-    if File.exists?(output_file) == false
-      File.write(output_file,ERB.new(fixtures_template, nil, '-').result(binding))
-      puts "Created #{output_file}"
-    else
-      puts "#{output_file} already exists, not going to overwrite because scared"
-    end
+    puts ERB.new(fixtures_template, nil, '-').result(binding)
   end
+
 end
 
 task :controlrepo_autotest_prep do
@@ -121,6 +121,7 @@ task :controlrepo_autotest_prep do
       end
     end
   end
+  binding.pry
   File.write("#{@repo.temp_environmentpath}/#{@config.environment}/hiera.yaml",hiera_config.to_yaml)
 
   @config.create_fixtures_symlinks(@repo)

data/lib/controlrepo/testconfig.rb

@@ -2,6 +2,7 @@ require 'controlrepo/class'
 require 'controlrepo/node'
 require 'controlrepo/group'
 require 'controlrepo/test'
+require 'git'
 
 class Controlrepo
   class TestConfig
@@ -99,26 +100,33 @@ class Controlrepo
       puppetcode.join("\n")
     end
 
+    def checkout_branch(working_dir, branch) 
+      Dir.chdir(working_dir)     
+      g = Git.open(working_dir)
+      
+      # if we are already on the right branch do nothing
+      if ! g.branch.current == @environment then
+        if g.branches.include? branch
+          g.branch(@environment).checkout
+        else
+          puts "Unable to checkout requested environment #{@environment}: branch not found"
+        end
+      end
+    end
+
     def r10k_deploy_local(repo = Controlrepo.new)
       require 'controlrepo'
       tempdir = Dir.mktmpdir('r10k')
       repo.tempdir = tempdir
-
-      # Read in the config and change all the directories, then create them
-      r10k_config = repo.r10k_config
-      r10k_config[:cachedir] = "#{tempdir}#{r10k_config[:cachedir]}"
-      FileUtils::mkdir_p(r10k_config[:cachedir])
-      r10k_config[:sources].map do |name,source_settings|
-        source_settings["basedir"] = "#{tempdir}#{source_settings["basedir"]}"
-        FileUtils::mkdir_p(source_settings["basedir"])
-        # Yes, I realise this is going to set it many times
-        repo.temp_environmentpath = source_settings["basedir"]
-      end
-      File.write("#{tempdir}/r10k.yaml",r10k_config.to_yaml)
+      temp_code_dir = "#{tempdir}/etc/puppetlabs/code/environments/#{@environment}"
+      repo.temp_environmentpath = temp_code_dir.chomp("/#{@environment}")
+      FileUtils.mkdir_p(temp_code_dir)
+      FileUtils.cp_r("#{Dir.pwd}/.", temp_code_dir)
+      checkout_branch(temp_code_dir, @environment)
 
       # Pull the trigger!
-      Dir.chdir(tempdir) do
-        `r10k deploy environment #{@environment} -p --color --config #{tempdir}/r10k.yaml --verbose`
+      Dir.chdir(temp_code_dir) do
+        system("r10k puppetfile install --verbose")
       end
 
       # Return tempdir for use
@@ -190,4 +198,4 @@ class Controlrepo
     #       with the output from the templated tests, us ethe better one
     #       bearing in minf that beaker has logger options that could help
   end
-end
+end

data/templates/acceptance_test_spec.rb.erb

@@ -34,7 +34,7 @@ describe "Acceptance Testing" do
         OPTIONS.each do |opt,val|
           if opt == :HOSTS
             val.each do |k,v|
-              if k == :<%= node.name %>
+              if k == :'<%= node.name %>'
                 current_opts[:HOSTS] = {k => v}
               end
             end

data/templates/controlrepo.yaml.erb

@@ -0,0 +1,38 @@
+# Classes to be tested
+classes:
+<% repo.roles.each do |role| -%>
+  - <%= role %>
+<% end -%>
+
+# Nodes to tests classes on, this refers to a 'factset' or 'nodeset'
+# depending on weather you are running 'spec' or 'acceptance' tests
+nodes:
+<% repo.facts_files.each do |file| -%>
+  - <%= File.basename(file,'.json') %>
+<% end -%>
+
+# You can group classes here to save typing
+class_groups:
+
+# You can group nodes here to save typing
+# We have created a 'non_windows_nodes' group because we can't
+# give you Windows vagrant boxes to test with because licensing,
+# we can give you fact sets though so go crazy with spec testing!
+node_groups:
+  windows_nodes:
+<% repo.facts_files.each do |file| -%>
+<% if File.basename(file,'.json') =~ /Windows/i -%>
+    - <%= File.basename(file,'.json') %>
+<% end -%>
+<% end -%>
+  non_windows_nodes:
+    include: 'all_nodes'
+    exclude: 'windows_nodes'
+
+test_matrix:
+  - all_nodes:
+      classes: 'all_classes'
+      tests: 'spec'
+  - non_windows_nodes: 
+      classes: 'all_classes'
+      tests: 'acceptance'

data/templates/nodeset.yaml.erb

@@ -1,9 +1,9 @@
-HOSTS:
-  <%= fact_set['fqdn'] %>:
-    roles:
-      - agent
-    type: aio
-    platform: <%= platform %>
-    box: <%= boxname %>
-    box_url: <%= url %>
-    hypervisor: vagrant_virtualbox
+<% if comment_out then prefix = '#' end-%>
+<%= prefix %>  <%= node_name %>:
+<%= prefix %>    roles:
+<%= prefix %>      - agent
+<%= prefix %>    type: aio
+<%= prefix %>    platform: <%= platform %>
+<%= prefix %>    box: <%= boxname %>
+<%= prefix %>    box_url: <%= url %>
+<%= prefix %>    hypervisor: vagrant_virtualbox