control_spec_helper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85c0b9b72a42803e64e735178baa10091aa89782
-  data.tar.gz: 1414e84d2bb520b8310533b2f3fe2504c18d4127
+  metadata.gz: 18bbd384c54c74eb7500a318c068b5d43b60a85f
+  data.tar.gz: d44d869e7c98330024040ee22388f61e9ded4138
 SHA512:
-  metadata.gz: b5ea6ca1108204d0e87dbf83bcf8bce8ffa07a9681904c67415092e2388745054191168e80397a4d28c8eb7ebaffc84e024065dcff2e923f54de806a97a8f7c4
-  data.tar.gz: deff607652448f633a89bb1fa03b0de77aac9ffe87482cf4aaf43ff8c96494e454d1922fc739118c8e4d79990ca8a5e0ecd9dd72ae493544b76ca12aed2b24fe
+  metadata.gz: ae8ce1c9f36c360f110b9dfc358d5510e96a096904a5533810c2fc8f6eb5715e168e1b86c7187a7c0647bc194d14d361ecde8aad959caa58ca0376ae3efe4f85
+  data.tar.gz: 3a19bee071a8bf631ec03279da5848819cd0768858cf81b8cf654c32f6ffbf25b24cfe98a3274dcb47c4a71a704344ed2c1357fe291dc47e3315805485ea6dc7

data/.gitignore

@@ -1,3 +1,7 @@
-Gemfile.lock
 pkg/
 .*.sw
+*.swp
+fixtures/puppet-control/*
+*.*~
+.bundle/*
+vendor/*

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--tty

data/.rubocop.yml

@@ -0,0 +1,13 @@
+AllCops:
+  Exclude:
+    - 'fixtures/**/*'
+Metrics/AbcSize:
+  Severity: warning
+Metrics/CyclomaticComplexity:
+  Severity: warning
+Metrics/LineLength:
+  Severity: warning
+Metrics/ModuleLength:
+  Severity: warning
+Metrics/PerceivedComplexity:
+  Severity: warning

data/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/Gemfile.lock

@@ -0,0 +1,109 @@
+PATH
+  remote: .
+  specs:
+    control_spec_helper (0.0.2)
+      mocha (~> 1.1)
+      puppet (~> 4.0)
+      puppet-lint (~> 1.1)
+      puppet-syntax (~> 2.1)
+      rake (~> 11.0)
+      rspec-puppet (~> 2.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (2.2.8)
+    ast (2.2.0)
+    coderay (1.1.1)
+    colored (1.2)
+    cri (2.6.1)
+      colored (~> 1.2)
+    diff-lcs (1.2.5)
+    facter (2.4.6)
+      CFPropertyList (~> 2.2.6)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.10.0)
+      faraday (>= 0.7.4, < 0.10)
+    git (1.3.0)
+    hiera (3.1.2)
+      json_pure
+    json_pure (1.8.3)
+    log4r (1.1.10)
+    metaclass (0.0.4)
+    method_source (0.8.2)
+    minitar (0.5.4)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.11.3)
+    multipart-post (2.0.0)
+    net-ssh (3.1.1)
+    parser (2.3.1.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    puppet (4.4.2)
+      CFPropertyList (~> 2.2.6)
+      facter (> 2.0, < 4)
+      hiera (>= 2.0, < 4)
+      json_pure
+    puppet-lint (1.1.0)
+    puppet-syntax (2.1.0)
+      rake
+    puppet_forge (2.1.5)
+      faraday (~> 0.9.0)
+      faraday_middleware (>= 0.9.0, < 0.11.0)
+      minitar
+      semantic_puppet (~> 0.1.0)
+    r10k (2.2.2)
+      colored (= 1.2)
+      cri (~> 2.6.1)
+      log4r (= 1.1.10)
+      minitar
+      multi_json (~> 1.10)
+      puppet_forge (~> 2.1.5)
+      semantic_puppet (~> 0.1.0)
+    rainbow (2.1.0)
+    rake (11.1.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-puppet (2.4.0)
+      rspec
+    rspec-support (3.4.1)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.0)
+    semantic_puppet (0.1.1)
+    slop (3.6.0)
+    unicode-display_width (1.0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  control_spec_helper!
+  git (~> 1.3)
+  net-ssh (~> 3.1)
+  pry (~> 0.10)
+  r10k (~> 2.2)
+  rubocop (~> 0.39)
+
+BUNDLED WITH
+   1.11.2

data/Rakefile

@@ -2,14 +2,18 @@ require 'rake'
 require 'rake/packagetask'
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
+require 'git'
+require 'net/ssh'
+require './lib/slalom'
 
 task :default do
-    sh %{rake -T}
+  sh %(rake -T)
 end
 
 require 'fileutils'
 
 RSpec::Core::RakeTask.new(:spec)
+Rake::Task[:spec].enhance ['fixtures:prep']
 
 def version
   require 'control_spec_helper/version'
@@ -17,20 +21,95 @@ def version
 end
 
 namespace :package do
-  desc "Create the gem"
+  desc 'Create the gem'
   task :gem do
-    spec = Gem::Specification.load("control_spec_helper.gemspec")
-    Dir.mkdir("pkg") rescue nil
-    if Gem::Version.new(`gem -v`) >= Gem::Version.new("2.0.0.a")
+    spec = Gem::Specification.load('control_spec_helper.gemspec')
+    begin
+      Dir.mkdir('pkg')
+    rescue => e
+      puts e
+    end
+    if Gem::Version.new(`gem -v`) >= Gem::Version.new('2.0.0.a')
       Gem::Package.build(spec)
     else
       Gem::Builder.new(spec).build
     end
-    FileUtils.move("control_spec_helper-#{version}.gem", "pkg")
+    FileUtils.move("control_spec_helper-#{version}.gem", 'pkg')
   end
 end
 
-desc "Cleanup pkg directory"
+desc 'Run rubocop against tree'
+task :rubocop do
+  puts `rubocop`
+end
+
+desc 'Cleanup pkg directory'
 task :clean do
-  FileUtils.rm_rf("pkg")
+  FileUtils.rm_rf('pkg')
+end
+
+namespace :fixtures do
+  desc 'Prepare fixtures directory'
+  task :create do
+    FileUtils.mkdir('fixtures') unless File.directory?('fixtures')
+  end
+
+  desc 'Remove fixtures directory'
+  task :clean do
+    FileUtils.rm_rf('fixtures')
+  end
+
+  desc 'Prepare fixtures repository'
+  task prep: [:create, 'package:gem'] do
+    begin
+      unless File.exist?('fixtures/puppet-control')
+        puts 'Cloning puppet_control repository...'
+        Git.clone('https://github.com/slalompdx/puppet-control.git',
+                  'puppet-control',
+                  path: 'fixtures',
+                  branch: 'fixture')
+      end
+      Bundler.with_clean_env do
+        Dir.chdir("#{File.dirname(__FILE__)}/fixtures/puppet-control") do
+          puts 'Copying control_spec_helper into fixtures'
+          FileUtils.mkdir(
+            "#{File.dirname(__FILE__)}/fixtures/puppet-control/csh"
+          ) unless File.exist?(
+            "#{File.dirname(__FILE__)}/fixtures/puppet-control/csh"
+          )
+          FileUtils.cp(
+            "#{File.dirname(__FILE__)}/pkg/control_spec_helper-#{version}.gem",
+            "#{File.dirname(__FILE__)}/fixtures/puppet-control/csh"
+          )
+          FileUtils.mkdir_p("#{File.dirname(__FILE__)}/fixtures/"\
+            'puppet-control/vendor/gems')
+          `gem unpack \
+            #{File.dirname(__FILE__)}/fixtures/puppet-control/csh/*.gem \
+            --target=./fixtures/puppet-control/vendor/gems/`
+          puts 'Bringing up test VM...'
+          IO.popen('unset RUBYLIB ; vagrant up') do |io|
+            io.each { |s| print s }
+          end
+          c = vagrant_ssh_config
+          Net::SSH.start(
+            c['HostName'],
+            c['User'],
+            port: c['Port'],
+            password: 'vagrant'
+          ) do |ssh|
+            puts 'Installing control_spec_helper gem...'
+            ssh.exec!(
+              'cd /vagrant && gem install ./csh/*.gem --no-ri --no-rdoc'
+            )
+            puts 'Running bundle install...'
+            ssh.exec!('cd /vagrant && bundle install')
+            puts 'Installing vagrant...'
+            puts ssh.exec!('sudo rpm -ivh https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1_x86_64.rpm')
+          end
+        end
+      end
+    ensure
+      `bundle config --delete local.control_spec_helper`
+    end
+  end
 end

data/control_spec_helper.gemspec

@@ -1,26 +1,33 @@
 # -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "control_spec_helper/version"
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'control_spec_helper/version'
 
 Gem::Specification.new do |s|
-  s.name        = "control_spec_helper"
+  s.name        = 'control_spec_helper'
   s.version     = ControlSpecHelper::Version::STRING
-  s.authors     = ["Slalom Consulting"]
-  s.email       = ["eric.shamow@slalom.com"]
-  s.homepage    = "http://github.com/eshamow/control_spec_helper"
-  s.summary     = "Standard tasks and configuration for control repo spec tests"
-  s.description = "Contains rake tasks and a standard spec_helper for running spec tests on puppet control repo"
+  s.authors     = ['Slalom Consulting']
+  s.email       = ['eric.shamow@slalom.com']
+  s.homepage    = 'http://github.com/eshamow/control_spec_helper'
+  s.summary     = 'Standard tasks and configuration for control repo spec tests'
+  s.description = 'Contains rake tasks and a standard spec_helper for ' \
+                  'running spec tests on puppet control repo'
   s.licenses    = 'Apache-2.0'
 
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables = `git ls-files -- bin/*`.split("\n")
+                                         .map { |f| File.basename(f) }
 
   # Runtime dependencies, but also probably dependencies of requiring projects
-  s.add_runtime_dependency 'rake'
-  s.add_runtime_dependency 'rspec-puppet'
-  s.add_runtime_dependency 'puppet-lint'
-  s.add_runtime_dependency 'puppet-syntax'
-  s.add_runtime_dependency 'mocha'
-  s.add_development_dependency 'pry'
+  s.add_runtime_dependency 'rake', '~> 11.0'
+  s.add_runtime_dependency 'rspec-puppet', '~> 2.4'
+  s.add_runtime_dependency 'puppet', '~> 4.0'
+  s.add_runtime_dependency 'puppet-lint', '~> 1.1'
+  s.add_runtime_dependency 'puppet-syntax', '~> 2.1'
+  s.add_runtime_dependency 'mocha', '~> 1.1'
+  s.add_development_dependency 'pry', '~> 0.10'
+  s.add_development_dependency 'git', '~> 1.3'
+  s.add_development_dependency 'rubocop', '~> 0.39'
+  s.add_development_dependency 'r10k', '~> 2.2'
+  s.add_development_dependency 'net-ssh', '~> 3.1'
 end

data/ext/spec_helper_control.rb

@@ -6,7 +6,7 @@ else
   require 'beaker-rspec/spec_helper'
   require 'beaker-rspec/helpers/serverspec'
 
-  UNSUPPORTED_PLATFORMS = %w(Suse windows AIX Solaris Debian)
+  UNSUPPORTED_PLATFORMS = %w(Suse windows AIX Solaris Debian).freeze
 
   RSpec.configure do |c|
     # Project root
@@ -30,9 +30,12 @@ else
         shell 'chown vagrant /controlrepo'
         install_package(host, 'zlib-devel')
         install_package(host, 'openssl-devel')
-        %x{scp -i ~/.vagrant.d/insecure_private_key -o StrictHostKeyChecking=no -r #{proj_root}  vagrant@#{host.connection.ip}:/}
-        #scp_to host, proj_root, '/controlrepo'
-        shell 'cd /controlrepo && gem install ./control_spec_helper-0.0.1.gem && bundle install && rake r10k'
+        shell 'scp -i ~/.vagrant.d/insecure_private_key -o ' \
+          "StrictHostKeyChecking=no -r #{proj_root} " \
+          "vagrant@#{host.connection.ip}:/"
+        # scp_to host, proj_root, '/controlrepo'
+        shell 'cd /controlrepo && gem install ./control_spec_helper-0.0.1.gem' \
+          '&& bundle install && rake r10k'
         shell 'mkdir -p /etc/facter/facts.d'
         role = ENV['role'].sub(/^role::/, '')
         shell "echo \"role=#{role}\" > /etc/facter/facts.d/role.txt"
@@ -48,7 +51,7 @@ else
         EOS
 
         modulepath = '/controlrepo/dist:/controlrepo/modules'
-        apply_manifest(pp, :modulepath => modulepath, :catch_failures => true)
+        apply_manifest(pp, modulepath: modulepath, catch_failures: true)
       end
     end
   end

data/lib/control_spec_helper/control_spec_helper.rb

@@ -1,7 +1,12 @@
-# rubocop:disable Style/DotPosition, Style/HashSyntax
+# rubocop:disable Metrics/ModuleLength
 
+# Test control repositories, similar to puppetlabs_spec_helper
 module ControlSpecHelper
-  attr_writer :basepath, :basebranch
+  attr_writer :basepath, :basebranch, :root
+
+  def file_name
+    __FILE__
+  end
 
   def basepath
     @basepath ||= 'site'
@@ -12,7 +17,7 @@ module ControlSpecHelper
   end
 
   def debug(msg)
-    puts "DEBUG: #{msg}" if ENV['debug']
+    $stderr.puts "DEBUG: #{msg}" unless ENV['debug'].nil?
   end
 
   def puppet_cmd
@@ -28,46 +33,51 @@ module ControlSpecHelper
   end
 
   def role_path
-    File.join(project_root, @basepath, 'role')
+    @role_path || File.join(project_root, basepath, 'role')
   end
 
   def profile_path
-    File.join(project_root, @basepath, 'profile')
+    @profile_path || File.join(project_root, basepath, 'profile')
   end
 
   def diff_from_base
-    `git diff #{@basebranch} --cached --diff-filter=ACMR --name-only`.split("\n")
+    `git diff #{@basebranch} --cached --diff-filter=ACMR --name-only`
+      .split("\n")
   end
 
   def diff_roles
-    diff_from_base.
-      select { |file| file.match(%r{site/role/manifests}) }.
-      map { |path| class_from_path(path) }
+    diff_from_base
+      .select { |file| file.match(%r{site/role/manifests}) }
+      .map { |path| class_from_path(path) }
   end
 
   def diff_profile
-    diff_from_base.
-      select { |file| file.match(%r{site/profile/manifests}) }.
-      map { |path| class_from_path(path) }
+    diff_from_base
+      .select { |file| file.match(%r{site/profile/manifests}) }
+      .map { |path| class_from_path(path) }
   end
 
+  # This is for role and profile modules only
   def class_from_path(path)
     return nil unless path =~ /manifests.+\.pp$/
 
-    (path.sub(project_root + '/', '').
-      sub(/\.pp$/, '').
-      split('/') - %w(site manifests)).
-      join('::')
+    (path.sub(project_root + '/', '')
+      .sub(/\.pp$/, '')
+      .split('/') - %w(site manifests))
+      .join('::')
   end
 
   def roles_that_include(klass)
+    roles = ''
     Dir.chdir(role_path) do
       debug("cd to #{role_path}")
-      `git grep -l #{klass}`.split("\n").
-        map { |path| class_from_path(File.join(role_path, path)) }.
-        compact
+      roles = `git grep -l #{klass}`
+              .split("\n")
+              .map { |path| class_from_path(File.join(role_path, path)) }
+              .compact
     end
     debug "cd to #{Dir.pwd}"
+    roles
   end
 
   # TODO: this could be much more accurate if we compiled catalogs for all roles
@@ -80,14 +90,13 @@ module ControlSpecHelper
 
   def spec_from_class(klass)
     test = if klass =~ /profile/
-             { :path => 'profile', :type => nil }
+             { path: 'profile', type: nil }
            elsif klass =~ /role/
-             { :path => 'role', :type => 'acceptance' }
+             { path: 'role', type: 'acceptance' }
            else
-             fail ArgumentError
+             raise ArgumentError
            end
-
-    path = [project_root, @basepath, test[:path], 'spec', test[:type]].compact
+    path = [project_root, basepath, test[:path], 'spec', test[:type]].compact
     File.join(path << (klass.split('::') - [test[:path]])) + '_spec.rb'
   end
 
@@ -100,25 +109,32 @@ module ControlSpecHelper
     debug "cd to #{Dir.pwd}"
   end
 
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/MethodLength
   def profile_fixtures
     Dir.chdir(profile_path) do
+      debug(ENV['debug'])
       debug("cd to #{profile_path}")
-      profile_ln = './spec/fixtures/modules/profile'
+      profile_ln = "#{File.dirname(file_name)}/spec/fixtures/modules/profile"
 
-      FileUtils.mkpath './spec/fixtures/modules/'
-      File.symlink(profile_path, profile_ln) unless File.exists?(profile_ln)
+      FileUtils.mkpath "#{File.dirname(file_name)}/spec/fixtures/modules/"
+      File.symlink(profile_path, profile_ln) unless File.exist?(profile_ln)
 
-      Dir.glob('../../modules/*').each do |folder|
+      Dir.glob("#{File.dirname(file_name)}/../../modules/*").each do |folder|
         next unless File.directory?(folder)
-        old_path = File.join(File.dirname(__FILE__), folder)
-        new_path = File.join("./spec/fixtures/modules/#{File.basename(folder)}")
+        old_path = File.join(File.dirname(file_name), folder)
+        new_path = "#{File.dirname(file_name)}/spec/fixtures/modules/" \
+          "#{File.basename(folder)}"
 
         File.symlink(old_path, new_path) unless File.symlink?(new_path)
       end
     end
     debug "cd to #{Dir.pwd}"
   end
+  # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize
 
+  # rubocop:disable Metrics/AbcSize
   def spec_clean
     Dir.chdir(project_root) do
       debug("cd to #{project_root}")
@@ -128,9 +144,10 @@ module ControlSpecHelper
       abort if fixtures == '' || !fixtures
       abort if modules == '' || !modules
 
-      `rm -rf #{fixtures}/*`
-      `rm -rf #{modules}/*`
+      FileUtils.rm_rf(fixtures)
+      FileUtils.rm_rf(modules)
     end
     debug "cd to #{Dir.pwd}"
   end
+  # rubocop:enable Metrics/AbcSize
 end