puppet-retrospec 0.7.3 → 0.8.0

data/lib/retrospec/puppet_module.rb

@@ -84,7 +84,9 @@ module Utilities
           end
         end
         # switch back to current parser, since we rely on the AST parser
-        Puppet[:parser] = 'current' if future_parser
+        # unless the user enabled the future parser.
+        # Note: some functionality does not currently work with future_parser
+        Puppet[:parser] = 'current' unless future_parser
       end
       dir
     end

data/lib/retrospec/templates/clone-hook

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+require 'open-uri'
+
+@template_dir    = ARGV[0] || File.join(ENV['HOME'], '.retrospec_templates')
+@template_repo   = ARGV[1] || 'https://github.com/nwops/retrospec-templates'
+@template_branch = ARGV[2] || 'master'
+
+def create_repo(template_dir, git_url, branch)
+  # check if repo already exists
+  unless git_exists?(template_dir)
+    puts `git clone -b #{branch} #{git_url} #{template_dir}`
+  end
+end
+
+def git_exists?(template_dir)
+  File.exists? File.join(template_dir,'.git','config')
+end
+
+def origin_exists?(template_dir)
+  `git -C #{template_dir} remote show origin`
+  $?.success?
+end
+
+def update_templates(git_url, dest, branch='master')
+  create_repo(dest, git_url, branch)
+  puts `git -C #{dest} pull`
+  dest
+end
+
+def connected?
+  open("http://www.google.com/") rescue false
+end
+
+# sometimes I work on an airplane and don't care to clone everything all the time
+# so lets check for connectivity first
+if connected?
+  update_templates(@template_repo, @template_dir, @template_branch)
+end

data/lib/retrospec/version.rb

@@ -1,3 +1,3 @@
 module Puppet_Retrospec
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

data/puppet-retrospec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "puppet-retrospec"
-  s.version = "0.7.3"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corey Osman"]
-  s.date = "2015-07-28"
+  s.date = "2015-09-04"
   s.description = "Retrofits and generates valid puppet rspec test code to existing modules"
   s.email = "corey@logicminds.biz"
   s.executables = ["retrospec"]
@@ -35,33 +35,7 @@ Gem::Specification.new do |s|
     "lib/retrospec/puppet_module.rb",
     "lib/retrospec/resource.rb",
     "lib/retrospec/spec_object.rb",
-    "lib/retrospec/templates/acceptance_spec_test.erb",
-    "lib/retrospec/templates/module_files/.fixtures.yml",
-    "lib/retrospec/templates/module_files/.gitignore.erb",
-    "lib/retrospec/templates/module_files/.travis.yml",
-    "lib/retrospec/templates/module_files/Gemfile",
-    "lib/retrospec/templates/module_files/README.markdown",
-    "lib/retrospec/templates/module_files/Rakefile",
-    "lib/retrospec/templates/module_files/Vagrantfile",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/centos-59-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/centos-64-x64-pe.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/centos-64-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/centos-66-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/debian-607-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/debian-70rc1-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/debian-73-i386.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/debian-73-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/default.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/fedora-18-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/sles-11sp1-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml",
-    "lib/retrospec/templates/module_files/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml",
-    "lib/retrospec/templates/module_files/spec/shared_contexts.rb",
-    "lib/retrospec/templates/module_files/spec/spec_helper.rb",
-    "lib/retrospec/templates/module_files/spec/spec_helper_acceptance.rb",
-    "lib/retrospec/templates/resource_spec_file.erb",
+    "lib/retrospec/templates/clone-hook",
     "lib/retrospec/type_code.rb",
     "lib/retrospec/variable_store.rb",
     "lib/retrospec/version.rb",
@@ -82,11 +56,8 @@ Gem::Specification.new do |s|
     "spec/unit/resource_spec.rb",
     "spec/unit/type_code_spec.rb",
     "spec/unit/variable_store_spec.rb",
-    "vendor/gems/puppet-3.7.3/COMMITTERS.md",
-    "vendor/gems/puppet-3.7.3/CONTRIBUTING.md",
     "vendor/gems/puppet-3.7.3/Gemfile",
     "vendor/gems/puppet-3.7.3/LICENSE",
-    "vendor/gems/puppet-3.7.3/README.md",
     "vendor/gems/puppet-3.7.3/Rakefile",
     "vendor/gems/puppet-3.7.3/bin/extlookup2hiera",
     "vendor/gems/puppet-3.7.3/bin/puppet",
@@ -1341,13 +1312,9 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<facter>, ["< 3", "> 1.6"])
-      s.add_runtime_dependency(%q<hiera>, ["~> 1.0"])
       s.add_runtime_dependency(%q<trollop>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.14"])
       s.add_development_dependency(%q<puppet>, ["= 3.7.3"])
-      s.add_development_dependency(%q<facter>, ["< 3", "> 1.6"])
-      s.add_development_dependency(%q<hiera>, ["~> 1.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.7"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -1358,13 +1325,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<pry-stack_explorer>, [">= 0"])
       s.add_development_dependency(%q<pry-coolline>, [">= 0"])
     else
-      s.add_dependency(%q<facter>, ["< 3", "> 1.6"])
-      s.add_dependency(%q<hiera>, ["~> 1.0"])
       s.add_dependency(%q<trollop>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.14"])
       s.add_dependency(%q<puppet>, ["= 3.7.3"])
-      s.add_dependency(%q<facter>, ["< 3", "> 1.6"])
-      s.add_dependency(%q<hiera>, ["~> 1.0"])
       s.add_dependency(%q<yard>, ["~> 0.7"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -1376,13 +1339,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry-coolline>, [">= 0"])
     end
   else
-    s.add_dependency(%q<facter>, ["< 3", "> 1.6"])
-    s.add_dependency(%q<hiera>, ["~> 1.0"])
     s.add_dependency(%q<trollop>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.14"])
     s.add_dependency(%q<puppet>, ["= 3.7.3"])
-    s.add_dependency(%q<facter>, ["< 3", "> 1.6"])
-    s.add_dependency(%q<hiera>, ["~> 1.0"])
     s.add_dependency(%q<yard>, ["~> 0.7"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/spec/unit/puppet-retrospec_spec.rb

@@ -14,13 +14,12 @@ describe "puppet-retrospec" do
     FileUtils.rm_rf(fixture_modules_path) if ENV['RETROSPEC_CLEAN_UP_TEST_MODULES'] =~ /true/
     install_module('puppetlabs-tomcat')
     @path = File.join(fixture_modules_path, 'tomcat')
-
   end
 
   before :each do
     clean_up_spec_dir(@path)
     @opts = {:module_path => @path, :enable_beaker_tests => false,
-             :enable_user_templates => false, :template_dir => nil }
+             :enable_user_templates => false, :template_dir => '/tmp/.retrospec_templates' }
   end
 
   it 'should run without errors using new' do
@@ -73,66 +72,6 @@ describe "puppet-retrospec" do
     expect(File.exists?(File.join(spec_path, 'acceptance', 'nodesets', 'default.yml'))).to eq(false)
   end
 
-  it 'should create a local templates directory when flag is on' do
-    @opts[:enable_user_templates] = true
-    FakeFS do
-      user_directory = Helpers.default_user_template_dir
-      FileUtils.mkdir_p(File.join(Helpers.gem_template_dir, 'module_files', 'spec', 'acceptance','nodesets'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files', '.fixtures.yml'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'resource_spec_file.erb'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files', 'spec','shared_contexts.rb'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files', 'spec','spec_helper.rb'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files','Gemfile'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files','Rakefile'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files', 'spec', 'acceptance','nodesets', 'default.yml'))
-      FileUtils.mkdir_p('/modules/tomcat/manifests')
-      #FileUtils.open('/modules/tomcat/manifests/init.pp', 'w') {|f| f.write("class tomcat(){}")}
-      @opts[:module_path] = '/modules/tomcat'
-      Retrospec.new(@opts[:module_path], @opts)
-      expect(File.exists?(user_directory)).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files', '.fixtures.yml'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','Gemfile'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'resource_spec_file.erb'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','spec','shared_contexts.rb'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','spec','spec_helper.rb'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','spec','acceptance','nodesets'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','spec','acceptance','nodesets','default.yml'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','Rakefile'))).to eq(true)
-
-    end
-  end
-
-  it 'should create the user supplied templates directory when variable is set' do
-    @opts[:template_dir] = '/tmp/my_templates'
-    FakeFS do
-      FileUtils.mkdir_p(File.join(Helpers.gem_template_dir, 'module_files', 'spec', 'acceptance','nodesets'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files', '.fixtures.yml'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'resource_spec_file.erb'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files', 'spec','shared_contexts.rb'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files', 'spec','spec_helper.rb'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files','Gemfile'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files','Rakefile'))
-      FileUtils.touch(File.join(Helpers.gem_template_dir, 'module_files', 'spec', 'acceptance','nodesets', 'default.yml'))
-      FileUtils.mkdir_p('/modules/tomcat/manifests')
-      #FileUtils.open('/modules/tomcat/manifests/init.pp', 'w') {|f| f.write("class tomcat(){}")}
-      @opts[:module_path] = '/modules/tomcat'
-      r = Retrospec.new(@opts[:module_path], @opts)
-      user_directory = r.template_dir
-      expect(user_directory).to eq('/tmp/my_templates')
-      expect(File.exists?(user_directory)).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files', '.fixtures.yml'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','Gemfile'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'resource_spec_file.erb'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','spec','shared_contexts.rb'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','spec','spec_helper.rb'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','spec','acceptance','nodesets'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','spec','acceptance','nodesets','default.yml'))).to eq(true)
-      expect(File.exists?(File.join(user_directory, 'module_files','Rakefile'))).to eq(true)
-
-    end
-
-  end
-
   it 'should create proper spec helper file' do
     tomcat = Retrospec.new(@opts[:module_path], @opts)
     filepath = File.expand_path(File.join(@path, 'spec', 'spec_helper.rb'))
@@ -169,7 +108,7 @@ describe "puppet-retrospec" do
 
   it 'should create acceptance spec helper file' do
     opts = {:module_path => @path, :enable_beaker_tests => true,
-             :enable_user_templates => false, :template_dir => nil }
+             :template_dir => '/tmp/my_templates' }
     tomcat = Retrospec.new(@opts[:module_path], opts)
     filepath = File.expand_path(File.join(@path, 'spec', 'spec_helper_acceptance.rb'))
     tomcat.safe_create_module_files
@@ -178,7 +117,7 @@ describe "puppet-retrospec" do
 
   it 'should not create acceptance spec helper file' do
     opts = {:module_path => @path, :enable_beaker_tests => false,
-            :enable_user_templates => false, :template_dir => nil }
+             :template_dir => '/tmp/my_templates' }
     filepath = File.expand_path(File.join(@path, 'spec', 'spec_helper_acceptance.rb'))
     tomcat = Retrospec.new(@opts[:module_path], opts)
     tomcat.safe_create_module_files
@@ -187,7 +126,7 @@ describe "puppet-retrospec" do
 
   it 'should create 15 nodesets' do
     opts = {:module_path => @path, :enable_beaker_tests => true,
-            :enable_user_templates => false, :template_dir => nil }
+            :template_dir =>  '/tmp/my_templates' }
     tomcat = Retrospec.new(@opts[:module_path], opts)
     filepath = File.expand_path(File.join(@path, 'spec', 'acceptance', 'nodesets', 'default.yml'))
     tomcat.safe_create_module_files

metadata

@@ -1,49 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puppet-retrospec
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: facter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - '>'
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - '>'
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: hiera
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -86,40 +52,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.7.3
-- !ruby/object:Gem::Dependency
-  name: facter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - '>'
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - '>'
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: hiera
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -272,33 +204,7 @@ files:
 - lib/retrospec/puppet_module.rb
 - lib/retrospec/resource.rb
 - lib/retrospec/spec_object.rb
-- lib/retrospec/templates/acceptance_spec_test.erb
-- lib/retrospec/templates/module_files/.fixtures.yml
-- lib/retrospec/templates/module_files/.gitignore.erb
-- lib/retrospec/templates/module_files/.travis.yml
-- lib/retrospec/templates/module_files/Gemfile
-- lib/retrospec/templates/module_files/README.markdown
-- lib/retrospec/templates/module_files/Rakefile
-- lib/retrospec/templates/module_files/Vagrantfile
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/centos-59-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/centos-64-x64-pe.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/centos-64-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/centos-66-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/debian-607-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/debian-70rc1-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/debian-73-i386.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/debian-73-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/default.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/fedora-18-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/sles-11sp1-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
-- lib/retrospec/templates/module_files/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-- lib/retrospec/templates/module_files/spec/shared_contexts.rb
-- lib/retrospec/templates/module_files/spec/spec_helper.rb
-- lib/retrospec/templates/module_files/spec/spec_helper_acceptance.rb
-- lib/retrospec/templates/resource_spec_file.erb
+- lib/retrospec/templates/clone-hook
 - lib/retrospec/type_code.rb
 - lib/retrospec/variable_store.rb
 - lib/retrospec/version.rb
@@ -319,11 +225,8 @@ files:
 - spec/unit/resource_spec.rb
 - spec/unit/type_code_spec.rb
 - spec/unit/variable_store_spec.rb
-- vendor/gems/puppet-3.7.3/COMMITTERS.md
-- vendor/gems/puppet-3.7.3/CONTRIBUTING.md
 - vendor/gems/puppet-3.7.3/Gemfile
 - vendor/gems/puppet-3.7.3/LICENSE
-- vendor/gems/puppet-3.7.3/README.md
 - vendor/gems/puppet-3.7.3/Rakefile
 - vendor/gems/puppet-3.7.3/bin/extlookup2hiera
 - vendor/gems/puppet-3.7.3/bin/puppet

data/lib/retrospec/templates/acceptance_spec_test.erb

@@ -1,24 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe '<%= @type.name -%> <%= @type.type %>' do
-  describe 'running puppet code' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { '<%= @type.name %>':
-      <%- @parameters.each do |k,v| -%>
-        <%- if v.nil? -%>
-        <%= "#{k}  => 'place_value_here'," %>
-        <%- else -%>
-        <%= "##{k} => #{variable_value(v)}," %>
-        <%- end -%>
-      <%- end -%>
-      }
-      EOS
-
-    # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-  end
-end

data/lib/retrospec/templates/module_files/.fixtures.yml

@@ -1,8 +0,0 @@
-fixtures:
-    symlinks:
-      <%= module_name %>: "#{source_dir}"
-    repositories:
-      stdlib:
-        repo: https://github.com/puppetlabs/puppetlabs-stdlib.git
-        ref: 4.3.2
-    forge_modules:

data/lib/retrospec/templates/module_files/.gitignore.erb

@@ -1,8 +0,0 @@
-.*.sw?
-pkg
-spec/fixtures
-.rspec_system
-.vagrant
-.bundle
-vendor
-.idea