teststrap 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa3f126204cfefd2023bcfcfb56123f46a418c3d
-  data.tar.gz: cc755162a6a8f4214d34256996fb2613f5e4cdfc
+  metadata.gz: 2e8a20742384ec36822bdcc0548065605149b145
+  data.tar.gz: b6c0a8868e7d162c2bc0ca93b91ab9d708349202
 SHA512:
-  metadata.gz: 23153b26e84196ccc892f20e9c19e91de6c060989a7dbf5ec3066fcc9f5db6b841c2ffcafc848b2f72b4ca98b26f683c7e6e58c9001af813588d590003df8757
-  data.tar.gz: 3bfdde812cd6b9c25aac2eeba4ebd22fd9e0fce00aa8efcf4b3149ea505945e183e544aea1d28c32dfd9a3340d3b436049e2f2128a5267433125ec75e19734e1
+  metadata.gz: 656da0912ff38bae52f26f6d6192380a14c5620e2a2355cc9acaaabcc2946392c5d8584c4d39507d1af98eead62c09e16d9e6ee7e679c525cfe3672046ba3e5c
+  data.tar.gz: ddf0cd635ec71b7cd507581713cbb257bb81af30d70b450fad9c3ba62fbebb31911c28b86892cd2489bbd50041773bcb73f10efb6eea8b94a6a27f2787285448

data/bin/teststrap

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.push File.expand_path('../../lib', __FILE__)
+$:.push File.expand_path('../../lib', __FILE__)
 
 require 'teststrap'
 

data/generator_files/Gemfile

@@ -1,20 +1,19 @@
 source 'https://rubygems.org'
 
-gem 'json', '1.7.7'
-gem 'berkshelf', '~> 2.0'
-gem 'thor-foodcritic', '~> 1.1'
+gem 'json'
+gem 'berkshelf'
 
-gem 'rubocop', '~> 0.18'
-gem 'strainer', '~> 3.3'
-gem 'foodcritic', '~> 3.0'
+gem 'rubocop'
+gem 'strainer'
+gem 'foodcritic'
 
-gem 'chef', '~> 11.8'
-gem 'chefspec', '~> 3.2'
+gem 'chef'
+gem 'chefspec'
 
 group :integration do
-  gem 'test-kitchen', '~> 1.2'
-  gem 'kitchen-vagrant', '~> 0.14'
-  gem 'serverspec', '~> 0.15'
+  gem 'test-kitchen'
+  gem 'kitchen-vagrant'
+  gem 'serverspec'
 end
 
 group :test do

data/generator_files/README.md

@@ -1,7 +1,7 @@
 # <%= cookbook_name %> cookbook
 
 # Requirements
-  Compatable with Scientific linux 6.
+  Compatible with Scientific linux 6.
 
 # Usage
 

data/generator_files/spec/default_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec_helper'
 require 'chefspec'
 require 'chefspec/berkshelf'
 
-describe '<%= cookbook_name %>::default' do
+describe "<%= cookbook_name %>::default" do
   let(:chef_run) do
     ChefSpec::Runner.new do |node|
     end.converge(described_recipe)

data/generator_files/test/integration/default/serverspec/spec_helper.rb

@@ -1,9 +1,4 @@
 require 'serverspec'
 
-include SpecInfra::Helper::Exec
-include SpecInfra::Helper::DetectOS
-
-RSpec.configure do |c|
-  c.sudo_password = ENV['SUDO_PASSWORD']
-  c.path = '/sbin:/usr/sbin'
-end
+set :backend, :exec
+set :path, '/sbin:/usr/sbin:$PATH'

data/lib/teststrap.rb

@@ -9,28 +9,26 @@ module Teststrap
 
     default_task :generate_tests
 
-    desc 'generate_tests', 'generate test files'
+    desc "generate_tests", "generate test files"
     def generate_tests
       @cookbook_name = current_directory_name
-      puts 'generating testfiles::'
-      copy_file '.gitignore'
-      copy_file '.rubocop.yml'
-      copy_file 'Berksfile'
-      copy_file 'chefignore'
-      copy_file 'Gemfile'
-      copy_file 'LICENSE'
-      copy_file 'rubocop-disabled.yml'
-      copy_file 'Strainerfile'
-      copy_file 'Thorfile'
-      template 'spec/default_spec.rb'
-      template 'spec/chefspec_helper.rb'
-      template 'test/integration/default/serverspec/localhost/default_spec.rb',
-               "test/integration/#{@cookbook_name}/serverspec/localhost/default_spec.rb"
-      template 'test/integration/default/serverspec/spec_helper.rb',
-               "test/integration/#{@cookbook_name}/serverspec/spec_helper.rb"
-      template '.kitchen.yml'
-      template 'metadata.rb'
-      template 'README.md'
+      puts "generating testfiles::"
+      copy_file ".gitignore"
+      copy_file ".rubocop.yml"
+      copy_file "Berksfile"
+      copy_file "chefignore"
+      copy_file "Gemfile"
+      copy_file "LICENSE"
+      copy_file "rubocop-disabled.yml"
+      copy_file "Strainerfile"
+      template "spec/default_spec.rb"
+      template "spec/chefspec_helper.rb"
+      template "test/integration/default/serverspec/default_spec.rb"
+      template "test/integration/default/serverspec/spec_helper.rb"
+      template ".kitchen.yml"
+      template "metadata.rb"
+      template "README.md"
+      remove_file "Thorfile"
     end
 
     no_commands do

data/spec/teststrap_spec.rb

@@ -3,52 +3,57 @@ require 'spec_helper'
 describe Teststrap::Teststrap do
   let(:teststrap) { described_class.new }
 
-  describe 'generate_tests' do
-    FILES = ['Gemfile', 'Berksfile', 'Strainerfile', 'Thorfile', '.gitignore', 'LICENSE']
+  describe "generate_tests" do
+    FILES = [ 'Gemfile',
+              'Berksfile',
+              'Strainerfile',
+              '.gitignore',
+              'LICENSE']
     TEMPLATES = [
       'README.md',
       'metadata.rb',
       '.kitchen.yml',
       'spec/default_spec.rb',
-      'test/integration/default/serverspec/localhost/default_spec.rb',
+      'test/integration/default/serverspec/default_spec.rb',
       'test/integration/default/serverspec/spec_helper.rb'
     ]
 
     before do
-      teststrap.stub(:copy_file)
-      teststrap.stub(:template)
-      teststrap.stub(:current_directory_name)
+      allow(teststrap).to receive(:copy_file)
+      allow(teststrap).to receive(:template)
+      allow(teststrap).to receive(:current_directory_name)
         .and_return('test_cookbook')
     end
 
-    it 'should generate files' do
-
+    it "should generate files" do
       FILES.each do |file|
-        teststrap.should_receive(:copy_file).with(file)
+        expect(teststrap).to receive(:copy_file).with(file)
       end
-
       teststrap.generate_tests
     end
 
-    it 'should generate templates' do
-
+    it "should generate templates" do
       TEMPLATES.each do |template|
-        teststrap.should_receive(:template).with(template)
+        expect(teststrap).to receive(:template).with(template)
       end
+      teststrap.generate_tests
+    end
 
+    it 'removes the thorfile' do
+      expect(teststrap).to receive(:remove_file).with('Thorfile')
       teststrap.generate_tests
     end
   end
 
-  describe 'current_directory_name' do
-    it 'return current working directory name' do
-      Dir.stub('pwd').and_return('test/dir/test_cookbook')
+  describe "current_directory_name" do
+    it "return current working directory name" do
+      allow(Dir).to receive(:pwd).and_return('test/dir/test_cookbook')
       expect(teststrap.current_directory_name).to eq 'test_cookbook'
     end
   end
 
-  describe 'source_root' do
-    it 'return generator file path' do
+  describe "source_root" do
+    it "return generator file path" do
       expect(described_class.source_root)
         .to include 'teststrap/generator_files'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teststrap
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Casecommons
@@ -68,13 +68,12 @@ files:
 - generator_files/LICENSE
 - generator_files/README.md
 - generator_files/Strainerfile
-- generator_files/Thorfile
 - generator_files/chefignore
 - generator_files/metadata.rb
 - generator_files/rubocop-disabled.yml
 - generator_files/spec/chefspec_helper.rb
 - generator_files/spec/default_spec.rb
-- generator_files/test/integration/default/serverspec/localhost/default_spec.rb
+- generator_files/test/integration/default/serverspec/default_spec.rb
 - generator_files/test/integration/default/serverspec/spec_helper.rb
 - lib/teststrap.rb
 - spec/spec_helper.rb
@@ -99,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: cookbook test framework generator

data/generator_files/Thorfile

@@ -1,13 +0,0 @@
-# encoding: utf-8
-
-require 'bundler'
-require 'bundler/setup'
-require 'thor/foodcritic'
-require 'berkshelf/thor'
-
-begin
-  require 'kitchen/thor_tasks'
-  Kitchen::ThorTasks.new
-rescue LoadError
-  puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
-end