puppet-retrospec 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2279ea888d5856785a212030a1ccc64f3c9a9bee
-  data.tar.gz: 2dd9b3b1eebfd028c2f5178cc4ebeb529fc43fc7
+  metadata.gz: 1b5058097bcc5d5c96332495e617db07cea74805
+  data.tar.gz: 0a8f3072a91d5f72ff391c90d920336af8daa5d6
 SHA512:
-  metadata.gz: 62a92f5626a16fa76d52352b7fc13b8cb74dc83b55f1d96745898218db324f416e9742678104854ef1b087f8a3008604c77e206eb6f34dab6baf7b3dd5821a33
-  data.tar.gz: a0865d754512aba83d3e35df1bf936cf0a931a6bc9939a8873b5d20f5d219eabaafc58d7266e4cbf7371fab4f86e56a4353e8d2d6863a5b3f06e204408c6327d
+  metadata.gz: c44aa9a6c8db80d14842a06662722da2a0d35c5bc1da46b843e61a71dff7222e1d13e14af74393d008ace304c9811e8e16f4b61cb8929090cd89dc61ace9200a
+  data.tar.gz: db3a54af5802009798cda488a5649e47ccf8678627e3d32f5fe064a2967108e6de90107ff61f98dfd26b7d0f04839da97f8b57d8d06a5b0f2e7a13015ce6d2e9

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/retrospec.rb

@@ -5,11 +5,12 @@ require 'fileutils'
 require 'retrospec/resource'
 require 'retrospec/conditional'
 require 'retrospec/variable_store'
+require 'retrospec/module_utilities'
 
 class Retrospec
+  include PuppetModule::Utilities
+
   attr_reader :module_path
-  attr_reader :tmp_module_path
-  attr_accessor :module_name
   attr_reader :template_dir
 
   # module path is the relative or absolute path to the module that should retro fitted
@@ -27,7 +28,7 @@ class Retrospec
     end
     @enable_beaker_tests = opts[:enable_beaker_tests]
     @module_path = validate_module_dir(module_path)
-    tmp_module_path # this is required to finish initialization
+    create_tmp_module_path(module_path) # this is required to finish initialization
   end
 
   def enable_beaker_tests?
@@ -99,47 +100,6 @@ class Retrospec
     end
   end
 
-  def types
-    @types ||= search_module || []
-  end
-
-  # puts a symlink in that module directory that points back to the user supplied module path
-  def tmp_module_path
-    if @tmp_module_path.nil?
-      # create a link where source is the current repo and dest is /tmp/modules/module_name
-      path = File.join(tmp_modules_dir, module_dir_name)
-      FileUtils.ln_s(module_path, path)
-      @tmp_module_path = path
-    end
-    @tmp_module_path
-  end
-
-  # the directory name of the module
-  # usually this is the same as the module name but it can be namespaced sometimes
-  def module_dir_name
-    @module_dir_name ||= File.basename(module_path)
-  end
-
-  # returns the name of the module  ie. mysql::config  => mysql
-  def module_name
-    begin
-      @module_name ||= types.first.name.split('::').first
-    rescue
-      @module_name = module_dir_name
-    end
-  end
-
-  # creates a tmp module directory so puppet can work correctly
-  def tmp_modules_dir
-    if @modules_dir.nil?
-      dir = Dir.mktmpdir
-      tmp_modules_path = File.expand_path(File.join(dir, 'modules'))
-      FileUtils.mkdir_p(tmp_modules_path)
-      @modules_dir = tmp_modules_path
-    end
-    @modules_dir
-  end
-
   # Creates an associated spec file for each type and even creates the subfolders for nested classes one::two::three
   def safe_create_resource_spec_files(type,template='resource_spec_file.erb')
     @parameters = type.arguments
@@ -161,11 +121,6 @@ class Retrospec
     file_path
   end
 
-  # creates a puppet environment given a module path and environment name
-  def puppet_environment
-    @puppet_environment ||= Puppet::Node::Environment.create('production', [tmp_modules_dir])
-  end
-
   # generates a file path for spec tests based on the resource name.  An added option
   # is to generate directory names for each parent resource as a default option
   # at this time acceptance tests follow this same test directory layout until best
@@ -214,32 +169,6 @@ class Retrospec
 
   private
 
-  # creates a puppet resource request to be used indirectly
-  def request(key, method)
-    instance = Puppet::Indirector::Indirection.instance(:resource_type)
-    indirection_name = 'test'
-    @request = Puppet::Indirector::Request.new(indirection_name, method, key, instance)
-    @request.environment = puppet_environment
-    @request
-  end
-
-  # creates an instance of the resource type parser
-  def resource_type_parser
-    @resource_type_parser ||= Puppet::Indirector::ResourceType::Parser.new
-  end
-
-  # returns the resource type ofject given a resource name ie. tomcat::connector
-  def find_resource(resource_name)
-    request = request(resource_name, 'find')
-    resource_type_parser.find(request)
-  end
-
-  # returns the resource types found in the module
-  def search_module(pattern='*')
-    request = request(pattern, 'search')
-    resource_type_parser.search(request)
-  end
-
   # processes a directory and expands to its full path, assumes './'
   # returns the validated dir
   def validate_module_dir(dir)

data/lib/retrospec/module_utilities.rb

@@ -0,0 +1,80 @@
+module PuppetModule
+    module Utilities
+
+      # puts a symlink in that module directory that points back to the user supplied module path
+      def create_tmp_module_path(module_path)
+        path = File.join(tmp_modules_dir, module_dir_name)
+        unless File.exists?(path)
+          # create a link where source is the current repo and dest is /tmp/modules/module_name
+          FileUtils.ln_s(module_path, path)
+        end
+        path
+      end
+
+      def tmp_module_path
+        @tmp_module_path ||= File.join(tmp_modules_dir, module_dir_name)
+      end
+
+      # the directory name of the module
+      # usually this is the same as the module name but it can be namespaced sometimes
+      def module_dir_name
+        @module_dir_name ||= File.basename(module_path)
+      end
+
+      # returns the name of the module  ie. mysql::config  => mysql
+      def module_name
+        begin
+          @module_name ||= types.first.name.split('::').first
+        rescue
+          @module_name = module_dir_name
+        end
+      end
+
+      # creates a tmp module directory so puppet can work correctly
+      def tmp_modules_dir
+        if @tmp_modules_dir.nil?
+          dir = Dir.mktmpdir
+          tmp_path = File.expand_path(File.join(dir, 'modules'))
+          FileUtils.mkdir_p(tmp_path)
+          @tmp_modules_dir = tmp_path
+        end
+        @tmp_modules_dir
+      end
+
+      # creates a puppet environment given a module path and environment name
+      def puppet_environment
+        @puppet_environment ||= Puppet::Node::Environment.create('production', [tmp_modules_dir])
+      end
+
+      # creates a puppet resource request to be used indirectly
+      def request(key, method)
+        instance = Puppet::Indirector::Indirection.instance(:resource_type)
+        indirection_name = 'test'
+        @request = Puppet::Indirector::Request.new(indirection_name, method, key, instance)
+        @request.environment = puppet_environment
+        @request
+      end
+
+      # creates an instance of the resource type parser
+      def resource_type_parser
+        @resource_type_parser ||= Puppet::Indirector::ResourceType::Parser.new
+      end
+
+      # returns the resource type object given a resource name ie. tomcat::connector
+      def find_resource(resource_name)
+        request = request(resource_name, 'find')
+        resource_type_parser.find(request)
+      end
+
+      # returns the resource types found in the module
+      def search_module(pattern='*')
+        request = request(pattern, 'search')
+        resource_type_parser.search(request)
+      end
+
+      # TODO we need to parse the types and find all the types that inherit other types and then order them so we can load the files first
+      def types
+        @types ||= search_module || []
+      end
+    end
+end

data/puppet-retrospec.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: puppet-retrospec 0.5.0 ruby lib
+# stub: puppet-retrospec 0.5.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "puppet-retrospec"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Corey Osman"]
-  s.date = "2015-02-09"
+  s.date = "2015-02-16"
   s.description = "Retrofits and generates valid puppet rspec test code to existing modules"
   s.email = "corey@logicminds.biz"
   s.executables = ["retrospec"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/retrospec.rb",
     "lib/retrospec/conditional.rb",
     "lib/retrospec/helpers.rb",
+    "lib/retrospec/module_utilities.rb",
     "lib/retrospec/resource.rb",
     "lib/retrospec/templates/acceptance_spec_test.erb",
     "lib/retrospec/templates/fixtures_file.erb",

data/spec/unit/puppet-retrospec_spec.rb

@@ -116,7 +116,7 @@ describe "puppet-retrospec" do
   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'))
-    path = tomcat.tmp_module_path
+    path = tomcat.create_tmp_module_path(@opts[:module_path])
     tomcat.safe_create_spec_helper
     expect(File.exists?(filepath)).to eq(true)
   end
@@ -124,7 +124,7 @@ describe "puppet-retrospec" do
   it 'should create proper shared context file' do
     tomcat = Retrospec.new(@opts[:module_path], @opts)
     filepath = File.expand_path(File.join(@path, 'spec', 'shared_contexts.rb'))
-    path = tomcat.tmp_module_path
+    path = tomcat.create_tmp_module_path(@opts[:module_path])
     tomcat.safe_make_shared_context
     expect(File.exists?(filepath)).to eq(true)
   end
@@ -181,9 +181,9 @@ describe "puppet-retrospec" do
   it 'should create a link in the temp modules directory' do
     tomcat = Retrospec.new(@opts[:module_path], @opts)
     path = tomcat.tmp_modules_dir
-    tomcat.tmp_module_path
-    File.exists?(tomcat.tmp_module_path).should eq(true)
-    tomcat.tmp_module_path.should eq(File.join(path, tomcat.module_name))
+    tmp_path = tomcat.create_tmp_module_path(@opts[:module_path])
+    expect(File.exists?(tmp_path)).to eq(true)
+    expect(tmp_path).to eq(File.join(path, tomcat.module_name))
   end
 
   it 'should create a file from a template' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-retrospec
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -199,6 +199,7 @@ files:
 - lib/retrospec.rb
 - lib/retrospec/conditional.rb
 - lib/retrospec/helpers.rb
+- lib/retrospec/module_utilities.rb
 - lib/retrospec/resource.rb
 - lib/retrospec/templates/acceptance_spec_test.erb
 - lib/retrospec/templates/fixtures_file.erb