teststrap 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddab98fc60db906951e8f6eabf22d9e44cf16b2a
-  data.tar.gz: 437f94278b9492efc34a1228527cc59482fe9ca2
+  metadata.gz: 4111e91c3b159c7785f7a2d8065db40301f37b6f
+  data.tar.gz: f8cce3d5304e2baee95ec5fdf51cb27acbe3da09
 SHA512:
-  metadata.gz: c0fba0d48817eb00b7e0c120602c3d332ad516ac6a09de99d50fadb10accdfdb4c0db984e2d08610eed3b1bf9989217ae346ae5e6c0ab4da97afc56102da78d3
-  data.tar.gz: 01d5dd6cd815a983e92c97eda9447a069e4af2a306f85db9e8a69a973502afed49591f066961ad13de7d51d053d88bdbb0445a134b9bf142543073980beba813
+  metadata.gz: 3498204ced986179f7b32e7d874daae8601308f434415e0783d5baef420f27a157ca20e8507cf3d2e738622b9d9b9e53f3202b35c7de02de65958b66f0528840
+  data.tar.gz: ead1beb34f2a6a6a088e10b6e7a1c3828ada2001f87decd50547b597d22af7096e201452bf1576ed731a98b4a25bda9010e1667cb95159d2756338a2484f1c6c

data/generator_files/.kitchen.yml

@@ -3,6 +3,9 @@ driver_plugin: vagrant
 driver_config:
   require_chef_omnibus: true
 
+provisioner:
+  name: chef_zero
+
 platforms:
 - name: sl6-box
   driver_config:
@@ -10,7 +13,8 @@ platforms:
     box_url: http://lyte.id.au/vagrant/sl6-matrix-64-lyte.box
 
 suites:
-- name: default
+- name: <%= cookbook_name %>
   run_list: [ "recipe[<%= cookbook_name %>::default]" ]
   attributes: {
+    "dev_mode": true
   }

data/generator_files/.rubocop.yml

@@ -0,0 +1,6 @@
+inherit_from:
+  - rubocop-disabled.yml
+
+AllCops:
+  Excludes:
+    - vendor/**

data/generator_files/Gemfile

@@ -1,18 +1,22 @@
 source 'https://rubygems.org'
 
 gem 'json', '1.7.7'
-gem 'berkshelf', '~> 2.0.10'
-gem 'thor-foodcritic', '~> 1.1.0'
+gem 'berkshelf', '~> 2.0'
+gem 'thor-foodcritic', '~> 1.1'
 
-gem 'tailor', '~> 1.3.1'
-gem 'strainer', '~> 3.3.0'
-gem 'foodcritic', '~> 3.0.3'
+gem 'rubocop', '~> 0.18'
+gem 'strainer', '~> 3.3'
+gem 'foodcritic', '~> 3.0'
 
-gem 'chef', '~> 11.6.0'
-gem 'chefspec', '~> 3.0.2'
+gem 'chef', '~> 11.8'
+gem 'chefspec', '~> 3.0'
 
 group :integration do
-  gem 'test-kitchen', '~> 1.1.1'
-  gem 'kitchen-vagrant', '~> 0.14.0'
-  gem 'serverspec', '~> 0.13.2'
+  gem 'test-kitchen', '~> 1.1'
+  gem 'kitchen-vagrant', '~> 0.14'
+  gem 'serverspec', '~> 0.15'
+end
+
+group :test do
+  gem 'chef-vault'
 end

data/generator_files/LICENSE

@@ -1,3 +1,3 @@
-Copyright (C) 2013 Casecommons
+Copyright (C) 2014 Casecommons
 
 All rights reserved - Do Not Redistribute

data/generator_files/README.md

@@ -10,7 +10,7 @@
 # Recipes
 
 # Running test(unit and integration test)
-  + Run chefspec, foodcritic and tailor using strainer:
+  + Run chefspec, foodcritic and rubocop using strainer:
 
         bundle install
         bundle exec strainer test

data/generator_files/Strainerfile

@@ -1,3 +1,3 @@
 foodcritic: bundle exec foodcritic -f any $SANDBOX/$COOKBOOK
-tailor: bundle exec tailor $SANDBOX/$COOKBOOK/**/*.rb
-chefspec: bundle exec rspec $SANDBOX/$COOKBOOK/spec/*.rb --color
+rubocop: bundle exec rubocop $SANDBOX/$COOKBOOK/**/*.rb
+chefspec: bundle exec rspec $SANDBOX/$COOKBOOK/spec/**/*.rb --color

data/generator_files/rubocop-disabled.yml

@@ -0,0 +1,11 @@
+Documentation:
+  Enabled: false
+
+LineLength:
+  Enabled: false
+
+MethodLength:
+  Enabled: false
+
+RegexpLiteral:
+  Enabled: false

data/generator_files/spec/chefspec_helper.rb

@@ -1,11 +1,9 @@
-def mock_encrypted_databag(bag, key, return_value)
-  stub_data_bag_item('encryption_keys', 'databag_encryption_key').
-    and_return({ 'id' => 'databag_encryption_key', 'key' => 'secret' })
-
-  allow(Chef::EncryptedDataBagItem).to receive(:load_secret).
-    and_return('secret')
+require 'chefspec'
+require 'chefspec/berkshelf'
+require 'chef-vault'
 
-  expect(Chef::EncryptedDataBagItem).to receive(:load).
-    with(bag, key, 'secret').
+def mock_encrypted_databag(bag, key, return_value)
+  allow(ChefVault::Item).to receive(:load).
+    with(bag, key).
     and_return(return_value)
 end

data/generator_files/spec/default_spec.rb

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

data/generator_files/test/integration/default/serverspec/localhost/default_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-# http://serverspec.org/ for details
+
 describe '<%= cookbook_name %>::default' do
   it '' do
     pending

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

@@ -5,4 +5,5 @@ include SpecInfra::Helper::DetectOS
 
 RSpec.configure do |c|
   c.sudo_password = ENV['SUDO_PASSWORD']
+  c.path = '/sbin:/usr/sbin'
 end

data/lib/teststrap.rb

@@ -14,10 +14,12 @@ module Teststrap
       @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"
@@ -29,25 +31,6 @@ module Teststrap
       template "README.md"
     end
 
-    desc "encrypt [data_path] [secret_path]", "encrypt plain databag item to encrypted databag item"
-    def encrypt(data_path, secret_path)
-      if !File.exist?(data_path)
-        puts "file: #{data_path} doesn't exists"
-        return nil
-      end
-
-      if !File.exist?(secret_path)
-        puts "secret key file: #{secret_path} doesn't exists"
-        return nil
-      end
-
-      plain_data = JSON.parse(File.read(data_path))
-      secret = Chef::EncryptedDataBagItem.load_secret(secret_path)
-      encrypted_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(plain_data, secret)
-      puts JSON.pretty_generate(encrypted_data)
-      return encrypted_data
-    end
-
     no_commands do
       def current_directory_name
         Dir.pwd.split('/').last

data/spec/teststrap_spec.rb

@@ -53,15 +53,4 @@ describe Teststrap::Teststrap do
         .to include 'teststrap/generator_files'
     end
   end
-
-  describe "encrypt" do
-    it "encrypt data file with secret key" do
-      directory = File.dirname(__FILE__)
-      data_path = File.expand_path('test/data.json', directory)
-      secret_path = File.expand_path('test/secret', directory)
-      key = teststrap.encrypt(data_path, secret_path)
-      expect(key["id"]).to eq "user"
-      expect(key["password"]["cipher"]).to eq "aes-256-cbc"
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teststrap
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Casecommons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 11.6.0
+        version: '11.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 11.6.0
+        version: '11.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
 description: A test generator for cookbook
 email: casebook-dev@googlegroups.com
 executables:
@@ -59,26 +59,26 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/teststrap.rb
+- bin/teststrap
+- generator_files/.gitignore
+- generator_files/.kitchen.yml
+- generator_files/.rubocop.yml
 - generator_files/Berksfile
-- generator_files/chefignore
 - generator_files/Gemfile
 - generator_files/LICENSE
-- generator_files/metadata.rb
 - 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/Strainerfile
 - generator_files/test/integration/default/serverspec/localhost/default_spec.rb
 - generator_files/test/integration/default/serverspec/spec_helper.rb
-- generator_files/Thorfile
-- generator_files/.kitchen.yml
-- generator_files/.gitignore
+- lib/teststrap.rb
 - spec/spec_helper.rb
-- spec/test/data.json
-- spec/test/secret
 - spec/teststrap_spec.rb
-- bin/teststrap
 homepage: https://github.com/CaseCommonsDevOps/teststrap
 licenses:
 - MIT
@@ -99,12 +99,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: cookbook test framework generator
 test_files:
 - spec/spec_helper.rb
-- spec/test/data.json
-- spec/test/secret
 - spec/teststrap_spec.rb
+has_rdoc: 

data/spec/test/data.json

@@ -1,4 +0,0 @@
-{
-  "id": "user",
-  "password": "1234"
-}

data/spec/test/secret

@@ -1 +0,0 @@
-secret