meez 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f7434a503a79a2e35d4ccc19740fa8f62bc5582
-  data.tar.gz: 295d7840a520629cce5844981b00fbd307a49ac3
+  metadata.gz: 7724639e6e8040d470164acd8fb484375a2cd024
+  data.tar.gz: 672f53c838bee77c8bc7af2273d6ba07c0fdb31d
 SHA512:
-  metadata.gz: 4b79c64e1fc5983593d048dd3bc5f6d9ad7a3c4fb56a759ee7da6494db740a6dee09c8bc5a59f8335ab6745d299d96e5b70440e29a4cd87ee34bc39c3c591e77
-  data.tar.gz: 47b61f81aadb8da103f3d5742a35eddd6c1103e993c3a8f5a99e0965fb1ebc9965169c36cc7555ce1f01eb7622c1d5899d8d4706ebbed4cc1f7c633b4ad8af41
+  metadata.gz: 2309e47b1f3aee29d38dd700f2e51fc964e3dde4df268d892323ef8f2c56ae90b9d41d81c6d5d5f3397c5438b2f82ee318ed931acc81eedf1b8286e1ca1d69ed
+  data.tar.gz: fa76d5a3da6e8f6f76725b8836ea6d154ba35d1bedb0cd2d53eda075934c62140ddbf0097e519f8def95d292ca34c049e5c57c0ec1ce0d62ccc35da7b726fd8d

data/Dockerfile

@@ -2,19 +2,15 @@ FROM racker/precise-with-updates
 
 RUN apt-get -yqq update && apt-get -yqq install curl build-essential libxml2-dev libxslt-dev git autoconf wget python-pip
 
-RUN wget -q -O /tmp/chefdk.deb https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.1.0-1_amd64.deb \
+RUN wget -q -O /tmp/chefdk.deb https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.2.1-1_amd64.deb \
 	&& dpkg -i /tmp/chefdk.deb \
 	&& rm /tmp/chefdk.deb
 
-RUN wget -q -O /tmp/vagrant.deb http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.3.5_x86_64.deb \
+RUN wget -q -O /tmp/vagrant.deb http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.6.5_x86_64.deb \
 	&& dpkg -i /tmp/vagrant.deb \
-	&& rm /tmp/vagrant.deb 
+	&& rm /tmp/vagrant.deb
 
 RUN pip install swiftly awscli
 
-ENV PATH /opt/chefdk/embedded/bin:/root/.chefdk/gem/ruby/2.1.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH /opt/chefdk/bin:/opt/chefdk/embedded/bin:/root/.chefdk/gem/ruby/2.1.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 ENV USE_SYSTEM_GECODE 1
-
-ADD Gemfile /tmp/Gemfile
-
-RUN cd /tmp && bundle install && rm Gemfile*

data/Gemfile

@@ -1,20 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'berkshelf', '= 3.1.3'
-gem 'chef', '> 11.12.0'
 gem 'rake', '>= 10.3'
 gem 'rubocop', '= 0.23'
-gem 'foodcritic', '>= 3.0'
-gem 'chefspec', '> 4'
-gem 'serverspec', '>= 1.10'
 gem 'guard', '>= 2.6'
 gem 'guard-rubocop', '>= 1.1'
-gem 'guard-foodcritic', '>= 1.0.2'
-gem 'test-kitchen'
-gem 'kitchen-vagrant'
-gem 'kitchen-docker'
-
-#group :infinite_loop_solver do
-#  gem 'celluloid', '~> 0.14'
-#  gem 'celluloid-io', '~> 0.14'
-#end

data/README.md

@@ -15,6 +15,17 @@ Install
 
 Setting the environment variable `USE_SYSTEM_GECODE=1` will help speed up builds by using the system `gecode` rather than compiling it from scratch.
 
+You may need to install `gecode` on your system: http://www.gecode.org/download.html
+
+for OSX I did
+
+```
+$ cd $( brew --prefix )
+$ git checkout 3c5ca25 Library/Formula/gecode.rb
+$ brew install gecode
+$ brew link gecode
+```
+
 Official
 ----------
 
@@ -22,13 +33,6 @@ as of version `0.2.0` this is offered as a `chefdk` plugin.
 
 `chef gem install meez`
 
-Unofficial
--------------
-
-Your results may vary using it outside of `chefdk`
-
-`gem install meez`
-
 
 Usage
 =====
@@ -49,36 +53,39 @@ Options
 
 ```
 $ meez --cookbook-path /tmp --copyright Foo -I apachev2 -m foo@bah.com test
+chef exec meez -o . test
 * Initializing Cookbook
 ** Creating cookbook test
 ** Creating README for cookbook: test
 ** Creating CHANGELOG for cookbook: test
 ** Creating metadata for cookbook: test
-	Rewriting metadata.rb
-	Rewriting recipes/default.rb
+  Rewriting metadata.rb
+  Rewriting recipes/default.rb
 * Initializing Berkshelf
-      create  /tmp/test/Berksfile
-      create  /tmp/test/Thorfile
-      create  /tmp/test/.gitignore
-         run  git init from "/tmp/test"
-      create  /tmp/test/Gemfile
+      create  test/Berksfile
+      create  test/Thorfile
+      create  test/chefignore
+      create  test/.gitignore
+      create  test/Gemfile
 * Initializing Vagrantfile
+  Creating ./test/Vagrantfile from template
 * Initializing Knife
-	Append Gemfile
+adding chef gem to Gemfile
 * Initializing Rakefile
-	 Creating /tmp/test/Rakefile
+  Creating ./test/Rakefile from template
+adding rake gem to Gemfile
 * Initializing Rubocop
-	Append Gemfile
+  Creating ./test/.rubocop.yml from template
+adding rubocop gem to Gemfile
 * Initializing Food Critic
-	Append Gemfile
+adding foodcritic gem to Gemfile
 * Initializing Chef Spec
-	Creating /tmp/test/test/unit/spec/spec_helper.rb
-	Creating /tmp/test/test/unit/spec/default_spec.rb
-	Append Gemfile
+  Creating ./test/test/unit/spec/spec_helper.rb from template
+  Creating ./test/test/unit/spec/default_spec.rb from template
+adding chefspec gem to Gemfile
 * Initializing Server Spec
-	 Creating /tmp/test/test/integration/default/serverspec/spec_helper.rb
-	Creating /tmp/test/test/integration/default/serverspec/default_spec.rb
-	Append Gemfile
+  Creating ./test/test/integration/default/serverspec/spec_helper.rb from template
+  Creating ./test/test/integration/default/serverspec/default_spec.rb from template
 * Initializing Test Kitchen
       create  .kitchen.yml
       append  Rakefile
@@ -89,25 +96,36 @@ $ meez --cookbook-path /tmp --copyright Foo -I apachev2 -m foo@bah.com test
       append  Gemfile
       append  Gemfile
 You must run `bundle install' to fetch any new gems.
+  Creating ./test/.kitchen.yml from template
+* Initializing Guard
+  Creating ./test/Guardfile from template
+adding guard gem to Gemfile
+adding guard-rubocop gem to Gemfile
+adding guard-foodcritic gem to Gemfile
+* Initializing Drone
+  Creating ./test/.drone.yml from template
+* Initializing Docker
+  Creating ./test/Dockerfile from template
 Cookbook test created successfully
 Next steps...
-  $ cd /tmp/test
+  $ cd ./test
   $ export USE_SYSTEM_GECODE=1
-  $ bundle install
-  $ bundle exec berks install
-
+  $ chef exec rake prepare
+  $ chef exec rake test
 $ cd /tmp/test
 $ export USE_SYSTEM_GECODE=1
-$ bundle install
-Fetching gem metadata from https://rubygems.org/
-Fetching additional metadata from https://rubygems.org/
+$ chef exec rake prepare
+chef exec bundle install --path .bundle
+Fetching gem metadata from https://rubygems.org/.......
+Fetching additional metadata from https://rubygems.org/..
 Resolving dependencies...
+Installing rake (10.3.2)
 ...
 ...
 Your bundle is complete!
 $ bundle exec berks install
 Using test (0.1.0) from metadata
-$ bundle exec rake -T
+$ chef exec rake -T
 rake integration                  # Run Test Kitchen integration tests
 rake kitchen:all                  # Run all test instances
 rake kitchen:default-ubuntu-1204  # Run default-ubuntu-1204 test instance

data/bin/meez

@@ -11,7 +11,7 @@ options = {
 }
 
 opt_parser = OptionParser.new do |opt|
-  opt.banner = 'Usage: meez [options] <cookbook name>'
+  opt.banner = 'Usage: chef exec meez [options] <cookbook name>'
   opt.separator ''
   opt.separator 'Options'
   opt.on('-o', '--cookbook-path PATH', 'The directory where the cookbook will be created') do |path|
@@ -35,7 +35,7 @@ opt_parser = OptionParser.new do |opt|
   end
   opt.on('-v', '--version', 'version') do
     options[:version] = true
-    puts 'meez version 0.2.2'
+    puts 'meez version 0.2.7'
   end
 end
 
@@ -50,9 +50,8 @@ unless options[:help] || options[:version]
     puts 'Next steps...'
     puts "  $ cd #{File.join(options[:path], cookbook_name)}"
     puts '  $ export USE_SYSTEM_GECODE=1'
-    puts '  $ bundle install'
-    puts '  $ bundle exec berks install'
-    puts '  $ bundle exec rake'
+    puts '  $ chef exec rake prepare'
+    puts '  $ chef exec rake test'
   else
     puts 'Need to specify a cookbook'
     puts opt_parser

data/lib/meez/meez.rb

@@ -82,7 +82,7 @@ class Meez
       skip_vagrant: true
     ).invoke_all
     contents = File.read(File.join(path, 'Gemfile'))
-    newgemfile = contents.gsub("\ngem 'berkshelf'\n", "\ngem 'berkshelf', '>= 3.1.3'\n")
+    newgemfile = contents.gsub("\ngem 'berkshelf'\n", "\ngem 'berkshelf', '> 3.1'\n")
     File.open(File.join(path, 'Gemfile'), 'w') { |f| f.write(newgemfile) }
   end
 
@@ -111,7 +111,7 @@ class Meez
     write_template('chefspec/spec_helper.rb.erb', spec_path, cookbook_name, options)
     write_template('chefspec/default_spec.rb.erb', spec_path, cookbook_name, options)
     gitignore(path, '.coverage/*')
-    add_gem(path, 'chefspec', '> 4')
+    add_gem(path, 'chefspec')
   end
 
   def self.init_rakefile(cookbook_name, options)
@@ -125,19 +125,19 @@ class Meez
     puts '* Initializing Rubocop'
     path = File.join(options[:path], cookbook_name)
     write_template('.rubocop.yml.erb', path, cookbook_name, options)
-    add_gem(path, 'rubocop', '= 0.23')
+    add_gem(path, 'rubocop')
   end
 
   def self.init_knife(cookbook_name, options)
     puts '* Initializing Knife'
     path = File.join(options[:path], cookbook_name)
-    add_gem(path, 'chef', '> 11.12')
+    add_gem(path, 'chef', '> 11')
   end
 
   def self.init_foodcritic(cookbook_name, options)
     puts '* Initializing Food Critic'
     path = File.join(options[:path], cookbook_name)
-    add_gem(path, 'foodcritic', '>= 3.0')
+    add_gem(path, 'foodcritic')
   end
 
   def self.init_serverspec(cookbook_name, options)
@@ -147,7 +147,6 @@ class Meez
     FileUtils.mkdir_p(spec_path)
     write_template('serverspec/spec_helper.rb.erb', spec_path, cookbook_name, options)
     write_template('serverspec/default_spec.rb.erb', spec_path, cookbook_name, options)
-    add_gem(path, 'serverspec', '>= 1.10')
   end
 
   def self.init_guard(cookbook_name, options)

data/meez.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q(meez)
-  s.version = '0.2.6'
+  s.version = '0.2.7'
   s.date = %q(2014-01-08)
   s.summary = 'Initializes a chef cookbook with TDD framework'
   s.description = <<EOF

data/templates/.drone.yml.erb

@@ -3,6 +3,6 @@ env:
   - CI=drone
   - USE_SYSTEM_GECODE=1
 script:
-  - bundle install
-  - bundle exec berks install
-  - bundle exec rake style spec
+  - rake prepare:chefdk
+  - chef exec rake prepare
+  - chef exec rake style unit

data/templates/.rubocop.yml.erb

@@ -1,10 +1,4 @@
 # Rubocop,  we're buddies and all,  but we're going to have to disagree on the following -
 
-SingleSpaceBeforeFirstArg:
-  Enabled: false
-
-UnusedBlockArgument:
-  Enabled: false
-
 WordArray:
   MinSize: 5

data/templates/Rakefile.erb

@@ -1,40 +1,72 @@
 # Encoding: utf-8
-require 'bundler/setup'
+
+namespace :prepare do
+
+  desc 'Install ChefDK'
+  task :chefdk do
+    begin
+      gem 'chef-dk', '0.2.1'
+    rescue Gem::LoadError
+      puts 'ChefDK not found.  Installing it for you...'
+      sh %{wget -O /tmp/meez_chefdk.deb https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.2.1-1_amd64.deb}
+      sh %{sudo dpkg -i /tmp/meez_chefdk.deb}
+    end
+  end
+
+  task :bundle do
+    if ENV['CI']
+      sh %{chef exec bundle install --path=.bundle --jobs 1 --retry 3 --verbose}
+    else
+      sh %{chef exec bundle install --path .bundle}
+    end
+  end
+
+  task :berks do
+    sh %{chef exec berks install}
+  end
+
+end
+
+desc 'Install required Gems and Cookbooks'
+task prepare: ['prepare:bundle', 'prepare:berks']
 
 namespace :style do
-  require 'rubocop/rake_task'
-  desc 'Run Ruby style checks'
-  RuboCop::RakeTask.new(:ruby)
+  task :rubocop do
+    sh %{chef exec rubocop}
+  end
 
-  require 'foodcritic'
-  desc 'Run Chef style checks'
-  FoodCritic::Rake::LintTask.new(:chef)
+  task :foodcritic do
+    sh %{chef exec foodcritic .}
+  end
 end
 
 desc 'Run all style checks'
-task style: ['style:chef', 'style:ruby']
-
-require 'kitchen'
-desc 'Run Test Kitchen integration tests'
-task :integration do
-  Kitchen.logger = Kitchen.default_file_logger
-  Kitchen::Config.new.instances.each do |instance|
-    instance.test(:always)
+task style: ['style:foodcritic', 'style:rubocop']
+
+namespace :integration do
+  task :kitchen do
+    sh %{chef exec kitchen test}
   end
 end
 
-require 'rspec/core/rake_task'
-desc 'Run ChefSpec unit tests'
-RSpec::Core::RakeTask.new(:spec) do |t, args|
-  t.rspec_opts = 'test/unit/spec'
+task integration: ['integration:kitchen']
+
+namespace :unit do
+  task :chefspec do
+    sh %{chef exec rspec test/unit/spec}
+  end
 end
 
+desc 'Run all unit tests'
+task unit: ['unit:chefspec']
+task spec: ['unit']
+
+# Run all tests
+desc 'Run all tests'
+task test: ['style', 'unit', 'integration']
+
 # The default rake task should just run it all
-task default: ['style', 'spec', 'integration']
+desc 'Install required Gems and Cookbook then run all tests'
+task default: ['prepare', 'test' ]
+
 
-begin
-  require 'kitchen/rake_tasks'
-  Kitchen::RakeTasks.new
-  rescue LoadError
-  puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
-end

data/templates/chefspec/default_spec.rb.erb

@@ -8,7 +8,7 @@ describe '<%= cookbook_name %>::default' do
     let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
 
     it 'writes some chefspec code' do
-      pending 'todo'
+      skip 'todo'
     end
 
   end

data/templates/serverspec/default_spec.rb.erb

@@ -3,5 +3,5 @@
 require_relative 'spec_helper'
 
 describe 'default' do
-  it { pending 'write some tests' }
+  it { skip 'write some tests' }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meez
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Paul Czarkowski