knife-skeleton 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e21bf5141891cd7df596fa29fb4e3eaace5db13
-  data.tar.gz: 2606421903e6d939ec21d5cab9d2b117b4ee037c
+  metadata.gz: 7e38c8fc5c6113d220180199fa12ad52f0452df8
+  data.tar.gz: 86fe00f3afd711cb4c9503d31a051f0db739325d
 SHA512:
-  metadata.gz: 86aef585240e3d1cba71f0eea5888a6f6304b5847eb6711cd08e945ebc970c209b8812b66e977d37f187c875f5f523a531763e74746ae130e51282786fefa785
-  data.tar.gz: ce1f1d4ca6ea9b7af009e99d95bb82e2fb7025356b6bab26882468079d8c7122177fcb374c09e080bd1783b9efa980f5c7a7289362ec05fbbc97f47586bcdc7e
+  metadata.gz: f5dbd18a218c3296a41455abcfd1d1001acb482ce683b087626ae86229265c1896ed9ed1c9b43c1813966a856a73fe792b4673a419284837bcf02c8a02fea48a
+  data.tar.gz: 8bfcbeee06106d91094ec8ed972f628cf7b888d844a54118e8f33d6ec9fcb609091dc8e2e6b947fd3edbae9ae6c2d12bddbfbef80f1ad88537a6c76e7e368fc1

data/.rubocop.yml

@@ -16,3 +16,6 @@ ClassLength:
 ParameterLists:
   Exclude:
     - lib/**/*
+Metrics/AbcSize:
+  Exclude:
+    - lib/**/*

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.0
 
 script: bundle exec rake

data/Gemfile

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 source 'https://rubygems.org/'
 
 gemspec

data/files/Berksfile

@@ -1,4 +1,4 @@
-site :opscode
+source 'https://supermarket.getchef.com'
 
 metadata
 

data/files/Gemfile

@@ -1,16 +1,16 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 source 'https://rubygems.org'
 
-gem 'chef', '~> 11.12.2'
-gem 'berkshelf', '~> 2.0.16'
+gem 'chef'
+gem 'berkshelf'
 
 group :integration do
   gem 'rubocop'
-  gem 'strainer', '~> 3.4.0'
-  gem 'test-kitchen', '~> 1.2.1'
+  gem 'rake'
+  gem 'test-kitchen'
   gem 'kitchen-vagrant'
   gem 'kitchen-openstack'
   gem 'serverspec'
   gem 'chefspec'
-  gem 'foodcritic', '~> 4.0.0'
+  gem 'foodcritic'
 end

data/files/Rakefile

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+def bundle_exec(command)
+  sh "bundle exec #{command}"
+end
+
+task :vendor do
+  sh 'test -d cookbooks && rm -r cookbooks || exit 0'
+  bundle_exec 'berks vendor cookbooks'
+end
+
+namespace :test do
+  desc 'Tests suites runner'
+
+  task :checkstyle do
+    Rake::Task['test:foodcritic'].invoke
+    Rake::Task['test:rubocop'].invoke
+  end
+
+  task :specs do
+    Rake::Task['test:chefspec'].invoke
+  end
+
+  task :foodcritic do
+    bundle_exec 'foodcritic -f any .'
+  end
+
+  task :rubocop do
+    bundle_exec :rubocop
+  end
+
+  task :chefspec do
+    bundle_exec 'rspec spec --color --format documentation'
+  end
+
+  task :kitchen do
+    bundle_exec 'kitchen test'
+  end
+end
+
+task default: ['test:checkstyle', 'test:specs']

data/files/travis.yml

@@ -2,6 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-before_script:
-  - bundle exec berks install
-script: bundle exec strainer test --except kitchen
+  - 2.1.0

data/knife_skeleton.gemspec

@@ -1,12 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 require File.expand_path('../lib/knife_skeleton/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.authors       = ['Pierre Rambaud', 'Antoine Rouyer']
   s.email         = ['pierre.rambaud@numergy.com', 'antoine.rouyer@numergy.com']
   s.description   = <<-eos
-Knife plugin to create skeleton with rubocop, chefspec, kitchen,
-strainer, etc...
+Knife plugin to create skeleton with rubocop, chefspec, kitchen, etc...
 eos
   s.summary       = s.description
   s.homepage      = 'https://github.com/Numergy/knife-skeleton'
@@ -19,7 +18,9 @@ eos
   s.require_paths = ['lib']
   s.version       = KnifeSkeleton::VERSION
 
-  s.add_dependency 'chef', '~> 11'
+  s.required_ruby_version = '>=2.0.0'
+
+  s.add_dependency 'chef'
   s.add_dependency 'erubis', '~> 2.7'
 
   s.add_development_dependency 'rake', '~> 10'

data/lib/chef/knife/cookbook_create_extension.rb

@@ -196,7 +196,7 @@ eos
           .gitignore
           .rubocop.yml
           .travis.yml
-          Strainerfile
+          Rakefile
         ).each do |file_name|
           copy_file(cookbook_path, cookbook_name, file_name)
         end

data/lib/knife_skeleton/version.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Knife skeleton version
 module KnifeSkeleton
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/spec/chef/knife/knife_cookbook_create_extension_spec.rb

@@ -170,7 +170,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.ui.should_receive(:msg).with("** Create '.travis.yml'")
       @knife.ui.should_receive(:msg).with("** Create '.rubocop.yml'")
       @knife.ui.should_receive(:msg).with("** Create '.kitchen.yml'")
-      @knife.ui.should_receive(:msg).with("** Create 'Strainerfile'")
+      @knife.ui.should_receive(:msg).with("** Create 'Rakefile'")
       @knife.ui.should_receive(:msg).with("** Create 'CHANGELOG.md'")
       @knife.ui.should_receive(:msg).with("** Create 'metadata.rb'")
       @knife.ui.should_receive(:msg).with("** Create 'README.md'")
@@ -191,7 +191,7 @@ describe Chef::Knife::CookbookCreate do
       @knife.ui.should_receive(:warn).with("'.rubocop.yml' already exists")
       @knife.ui.should_receive(:warn).with("'.kitchen.yml' already exists")
       @knife.ui.should_receive(:warn).with("'.travis.yml' already exists")
-      @knife.ui.should_receive(:warn).with("'Strainerfile' already exists")
+      @knife.ui.should_receive(:warn).with("'Rakefile' already exists")
       @knife.ui.should_receive(:warn).with("'metadata.rb' already exists")
       @knife.ui.should_receive(:warn).with("'CHANGELOG.md' already exists")
       @knife.ui.should_receive(:warn).with("'README.md' already exists")
@@ -231,7 +231,7 @@ describe Chef::Knife::CookbookCreate do
         .rubocop.yml
         .travis.yml
         .kitchen.yml
-        Strainerfile
+        Rakefile
         CHANGELOG.md
         README.md
         attributes/default.rb

data/templates/spec/default_spec.rb.erb

@@ -3,7 +3,7 @@
 require_relative 'spec_helper'
 
 describe '<%= cookbook_name %>::default' do
-  subject { ChefSpec::Runner.new.converge(described_recipe) }
+  subject { ChefSpec::ServerRunner.new.converge(described_recipe) }
 
   # Write full examples using the `expect` syntax
   it 'does includes recipes' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-skeleton
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pierre Rambaud
@@ -9,109 +9,108 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.25'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
 description: |
-  Knife plugin to create skeleton with rubocop, chefspec, kitchen,
-  strainer, etc...
+  Knife plugin to create skeleton with rubocop, chefspec, kitchen, etc...
 email:
 - pierre.rambaud@numergy.com
 - antoine.rouyer@numergy.com
@@ -119,16 +118,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - files/Berksfile
 - files/Gemfile
-- files/Strainerfile
+- files/Rakefile
 - files/gitignore
 - files/licenses/apachev2
 - files/licenses/gplv2
@@ -167,12 +166,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -180,8 +179,7 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Knife plugin to create skeleton with rubocop, chefspec, kitchen, strainer,
-  etc...
+summary: Knife plugin to create skeleton with rubocop, chefspec, kitchen, etc...
 test_files:
 - spec/chef/knife/knife_cookbook_create_extension_spec.rb
 - spec/knife_skeleton/template_spec.rb

data/files/Strainerfile

@@ -1,6 +0,0 @@
-# Strainerfile
-rubocop: bundle exec rubocop $SANDBOX/$COOKBOOK
-knife: bundle exec knife cookbook test $COOKBOOK
-foodcritic: bundle exec foodcritic -f any $SANDBOX/$COOKBOOK
-chefspec: bundle exec rspec $SANDBOX/$COOKBOOK/spec --color
-kitchen: bundle exec kitchen test