emeril 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6302d107f9d6cf6b6b69b14bd4f6f0514d50fe6
-  data.tar.gz: 1e89c4e9dfdba1758ce8d4cba37cf513bb0e3afb
+  metadata.gz: ea38c2a413453dc993a0f7c379b00e67755630eb
+  data.tar.gz: dac57f07727c206a5f4a1dd717282b0340fec835
 SHA512:
-  metadata.gz: e8b707e4affd40fe9520dc2ed28717b761abab6ff7d020cebebc6f07d5059327ecbcc7409466b42dc8c7801c679feded3e4e54e16bbd34e9455ec9ae9b05081b
-  data.tar.gz: 987c6de17c5bfbcc63fdde1607dfe3f4a002cc095b291856bfd7f65bb9801ba7dd6bf0fd60e26e211fc09bd095ab3d610b5542cd93ee4ed0f44b6fe17d54b016
+  metadata.gz: 6f720829a5ceda4b62888507ff8e0ca3e0aa74a6490e3fae7e0708c34893756f2ac22ad73322b6ea0e172b94ec66fed495af3ddc6038c5bfe613168c8264483a
+  data.tar.gz: e3af47e245b8334ba4c0ba6aba34009766b0bea2183e5ecdcea4879be52c0cfc1f4d4464e135a79bed108f4d93454d9f131f2c2fd481f6155ce04d2235c78be3

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/CaseIndentation:
+  IndentWhenRelativeTo: end

data/.travis.yml

@@ -1,22 +1,34 @@
 language: ruby
 
 rvm:
-- 2.0.0
-- 1.9.3
-- 1.9.2
-- ruby-head
+  - 2.1
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2
+  - ruby-head
 
 env:
-- "CHEF_VERSION="
-- "CHEF_VERSION='~> 11.6.0'"
-- "CHEF_VERSION='~> 11.4.4'"
-- "CHEF_VERSION='~> 10.26'"
+  - "CHEF_VERSION="
+  - "CHEF_VERSION='~> 11.14.2'"
+  - "CHEF_VERSION='~> 11.4.4'"
+  - "CHEF_VERSION='~> 10.26'"
+
+bundler_args: --without guard
 
 matrix:
   allow_failures:
-  - rvm: ruby-head
+    - rvm: ruby-head
   exclude:
-  - rvm: 2.0.0
-    env: "CHEF_VERSION='~> 11.4.4'"
-  - rvm: 2.0.0
-    env: "CHEF_VERSION='~> 10.26'"
+    - rvm: 2.1
+      env: "CHEF_VERSION='~> 11.4.4'"
+    - rvm: 2.1
+      env: "CHEF_VERSION='~> 10.26'"
+    - rvm: 2.0.0
+      env: "CHEF_VERSION='~> 11.4.4'"
+    - rvm: 2.0.0
+      env: "CHEF_VERSION='~> 10.26'"
+
+addons:
+  code_climate:
+    repo_token:
+      secure: "Apwuy7PdnWsOjQqkVYIfZQIcECns0D+eNecRmG0dQguBbgnQfG9xMMGIwuLshubhs9rPqAac/Bg9ZyIjWBa57V/ehaQg7BTzaN8K76R98lgrQ4Ub3bYoCU91zc554g4sgKMf5K8P5f1NLYGEyDb5+QP4oeafF1UDxwVHL17hHq0="

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.8.0 / 2014-08-06
+
+### Bug fixes
+
+* Pull request [#4][]: Support Chef 11.6.2. ([@webframp][])
+
+### Improvements
+
+* Pull request [#6][]: Add Supermarket friendliness (it previously worked fine, but now is directly using Supermarket). ([@fnichol][])
+* Pull request [#5][]: Update testing and project health dependencies and coding style. ([@fnichol][])
+
+
 ## 0.7.0 / 2013-08-26
 
 ### Breaking Changes
@@ -38,6 +50,10 @@ The initial release, **BAM**!
 <!--- The following link definition list is generated by PimpMyChangelog --->
 [#1]: https://github.com/fnichol/emeril/issues/1
 [#2]: https://github.com/fnichol/emeril/issues/2
+[#4]: https://github.com/fnichol/emeril/issues/4
+[#5]: https://github.com/fnichol/emeril/issues/5
+[#6]: https://github.com/fnichol/emeril/issues/6
 [@capen]: https://github.com/capen
 [@fnichol]: https://github.com/fnichol
 [@thbishop]: https://github.com/thbishop
+[@webframp]: https://github.com/webframp

data/Gemfile

@@ -2,7 +2,16 @@ source 'https://rubygems.org'
 
 gemspec
 
+group :guard do
+  gem 'guard-minitest'
+  gem 'guard-rubocop'
+  gem 'guard-cane'
+  gem 'guard-yard'
+end
+
 group :test do
   # allow CI to override the version of Chef for matrix testing
   gem 'chef', (ENV['CHEF_VERSION'] || '>= 0.10.10')
+
+  gem 'codeclimate-test-reporter', require: nil
 end

data/Guardfile

@@ -1,10 +1,23 @@
-guard 'minitest' do
-  watch(%r|^spec/(.*)_spec\.rb|)
-  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/unit/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+ignore %r{^\.gem/}
+
+group :red_green_refactor, halt_on_fail: true do
+  guard :minitest do
+    watch(%r|^spec/(.*)_spec\.rb|)
+    watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/unit/#{m[1]}#{m[2]}_spec.rb" }
+    watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+  end
+
+  guard :cane do
+    watch(%r|.*\.rb|)
+    watch('.cane')
+  end
+
+  guard :rubocop, all_on_start: false, keep_failed: false, cli: "-r finstyle" do
+    watch(%r{.+\.rb$})
+    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  end
 end
 
-guard 'cane' do
-  watch(%r|.*\.rb|)
-  watch('.cane')
+guard :yard, port: "8808" do
+  watch(%r{lib/.+\.rb})
 end

data/README.md

@@ -3,7 +3,9 @@
 [![Gem Version](https://badge.fury.io/rb/emeril.png)](http://badge.fury.io/rb/emeril)
 [![Build Status](https://travis-ci.org/fnichol/emeril.png?branch=master)](https://travis-ci.org/fnichol/emeril)
 [![Code Climate](https://codeclimate.com/github/fnichol/emeril.png)](https://codeclimate.com/github/fnichol/emeril)
+[![Test Coverage](https://codeclimate.com/github/fnichol/emeril/badges/coverage.svg)](https://codeclimate.com/github/fnichol/emeril)
 [![Dependency Status](https://gemnasium.com/fnichol/emeril.png)](https://gemnasium.com/fnichol/emeril)
+[![Inline docs](http://inch-ci.org/github/fnichol/emeril.png?branch=master)](http://inch-ci.org/github/fnichol/emeril)
 
 Kick it up a notch! Emeril is a library that helps you release your Chef
 cookbooks from Rake, Thor, or a Ruby library. If `rake release` is all you
@@ -27,7 +29,7 @@ Need more details? Read on…
 ## <a name="screencast"></a> Screencast
 
 Here is a short screencast demonstating how Emeril can be used to release
-a cookbook to the Community Site.
+a cookbook to the Supermarket site.
 
 [![Emeril screencast](https://raw.github.com/fnichol/emeril/master/images/emeril-vid.png)](http://vimeo.com/fnichol/emeril)
 
@@ -38,7 +40,7 @@ Emeril has 2 primary tasks and goals:
 1. Tag a Git commit with a semantic version tag with the form `"v1.2.5"` (by
    default)
 2. Optionally publish a versioned release of the cookbook to the
-   [Community Site][community_site]
+   [Supermarket site][supermarket_site]
 
 The Git tagging is currently accomplished via shell out, so Git must be
 installed on your system.
@@ -95,9 +97,9 @@ file with some required attributes set.
 
 There are 2 configuration items you need:
 
-1. Your [Community Site][community_site] username, chosen at signup time.
-2. The file path to your [Community Site][community_site] user certificate.
-   When you sign up to the Community Site, the site will provide this key to
+1. Your [Supermarket site][supermarket_site] username, chosen at signup time.
+2. The file path to your [Supermarket site][supermarket_site] user certificate.
+   When you sign up to the Supermarket site, the site will provide this key to
    you as a `*.pem` file.
 
 The easiest way to get setup is to add both of these items to your default
@@ -140,14 +142,14 @@ Emeril::RakeTasks.new do |t|
 end
 ```
 
-If your cookbook is not on the Community Site, you can skip the publishing step
-with the block form:
+If your cookbook is not on the Supermarket site, you can skip the publishing
+step with the block form:
 
 ```ruby
 require 'emeril/rake_tasks'
 
 Emeril::RakeTasks.new do |t|
-  t.config[:publish_to_community] = false
+  t.config[:publish_to_supermarket] = false
 end
 ```
 
@@ -178,14 +180,14 @@ Emeril::ThorTasks.new do |t|
 end
 ```
 
-If your cookbook is not on the Community Site, you can skip the publishing step
-with the block form:
+If your cookbook is not on the Supermarket site, you can skip the publishing
+step with the block form:
 
 ```ruby
 require 'emeril/thor_tasks'
 
 Emeril::ThorTasks.new do |t|
-  t.config[:publish_to_community] = false
+  t.config[:publish_to_supermarket] = false
 end
 ```
 
@@ -203,7 +205,7 @@ same code as the default Rake and Thor tasks, use the following:
 require 'chef/knife'
 Chef::Knife.new.configure_chef
 
-# Perform the git tagging and share to the Community Site
+# Perform the git tagging and share to the Supermarket site
 require 'emeril'
 Emeril::Releaser.new(logger: Chef::Log).run
 ```
@@ -225,10 +227,17 @@ Emeril::Releaser.new(logger: Chef::Log).run
   [commit][ex3]. Emeril will tag and release your cookbook based on the
   last Git commit which is presumably your *version-bump-and-changelog*
   commit.
+* **"What about adding support for X, Y, or Z?"** That's possible, but Emeril
+  has one primary focus: releasing your cookbook in an atomic and declarative
+  fashion. We can get the job done with a small amount of code--less than 400
+  LOC. There are other tools that are more wholistic and workflow oriented
+  and you are encouraged to check them out (noted below).
+* **"That Chef dependency looks bulky, yo."** Hmm, that's not a question. Do
+  you you Knife? Congratulations, you have the Chef gem already! Are you using
+  the ChefDK package? You are good to go!
 * **"How do I change the category for my cookbook?"** Emeril will maintain
-  the category used on the Community Site across releases. By default, new
-  cookbooks will be put in the `"Other"` category. For now you can change
-  the category directly on the Community Site, done! Otherwise, check out
+  the category used on the Supermarket site across releases. By default, new
+  cookbooks will be put in the `"Other"` category. Otherwise, check out
   the [Rake](#usage-rake) and [Thor](#usage-thor) sections for further
   configuration help.
 * **"Why is Emeril complaining that I'm missing the name attribute in my
@@ -245,6 +254,9 @@ Emeril::Releaser.new(logger: Chef::Log).run
 * [knife community site share][knife_share] - with some extra/manual git
   tagging, correct directory structure, and workflow. Ships with the
   [Chef gem][chef_gem].
+* [Stove][stove] - a more workflow oriented with JIRA and GitHub
+  support, version bumping, and more by
+  [Seth Vargo](https://github.com/sethvargo).
 
 ## <a name="development"></a> Development
 
@@ -278,7 +290,7 @@ MIT (see [LICENSE.txt][license])
 [berkshelf_site]:   http://berkshelf.com/
 [changelog_wikipedia]: http://en.wikipedia.org/wiki/Changelog
 [chef_gem]:         https://github.com/opscode/chef
-[community_site]:   http://community.opscode.com/
+[supermarket_site]: https://supermarket.getchef.com/
 [ex1]:              https://github.com/fnichol/chef-ruby_build/commit/c940b5e9cd40eaba10d6285de6648f4d25fe959d
 [ex2]:              https://github.com/fnichol/chef-homesick/commit/80e558ff921f1c59698f6942214c0224a24392d7
 [ex3]:              https://github.com/fnichol/chef-openoffice/commit/bf84aba0690a6b155b499b06df953be19a3aead1
@@ -290,3 +302,4 @@ MIT (see [LICENSE.txt][license])
 [knife_share]:      http://docs.opscode.com/knife_cookbook_site.html#share
 [publisher_class]:  https://github.com/fnichol/emeril/blob/master/lib/emeril/publisher.rb
 [semver_site]:      http://semver.org/
+[stove]:            http://sethvargo.github.io/stove/

data/Rakefile

@@ -1,30 +1,35 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'cane/rake_task'
-require 'tailor/rake_task'
+# -*- encoding: utf-8 -*-
+
+require "bundler/gem_tasks"
+require "rake/testtask"
+require "cane/rake_task"
 
 Rake::TestTask.new(:unit) do |t|
   t.libs.push "lib"
-  t.test_files = FileList['spec/unit/**/*_spec.rb']
+  t.test_files = FileList["spec/unit/**/*_spec.rb"]
   t.verbose = true
 end
 
 Rake::TestTask.new(:integration) do |t|
   t.libs.push "lib"
-  t.test_files = FileList['spec/integration/**/*_spec.rb']
+  t.test_files = FileList["spec/integration/**/*_spec.rb"]
   t.verbose = true
 end
 
 desc "Run all test suites"
 task :test => [:unit, :integration]
 
+require "finstyle"
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:style) do |task|
+  task.options << "--display-cop-names"
+end
+
 desc "Run cane to check quality metrics"
 Cane::RakeTask.new do |cane|
-  cane.canefile = './.cane'
+  cane.canefile = "./.cane"
 end
 
-Tailor::RakeTask.new
-
 desc "Display LOC stats"
 task :stats do
   puts "\n## Production Code Stats"
@@ -34,6 +39,6 @@ task :stats do
 end
 
 desc "Run all quality tasks"
-task :quality => [:cane, :tailor, :stats]
+task :quality => [:cane, :style, :stats]
 
 task :default => [:test, :quality]

data/emeril.gemspec

@@ -1,39 +1,42 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'emeril/version'
+require "emeril/version"
+require "English"
 
 Gem::Specification.new do |spec|
   spec.name          = "emeril"
   spec.version       = Emeril::VERSION
   spec.authors       = ["Fletcher Nichol"]
   spec.email         = ["fnichol@nichol.ca"]
-  spec.description   = %q{Release Chef cookbooks}
+  spec.description   = "Release Chef cookbooks"
   spec.summary       = spec.description
-  spec.homepage      = "https://github.com/fnichol/emeril"
+  spec.homepage      = "http://fnichol.github.io/emeril/"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 1.9.2'
+  spec.required_ruby_version = ">= 1.9.2"
 
-  spec.add_dependency 'chef', '> 0.10.10'
+  spec.add_dependency "chef", "> 0.10.10"
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'guard-minitest'
-  spec.add_development_dependency 'mocha'
-  spec.add_development_dependency 'fakefs'
-  spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "fakefs"
+  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "webmock"
 
-  spec.add_development_dependency 'cane'
-  spec.add_development_dependency 'guard-cane'
-  spec.add_development_dependency 'tailor'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'countloc'
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "countloc"
+
+  # style and complexity libraries are tightly version pinned as newer releases
+  # may introduce new and undesireable style choices which would be immediately
+  # enforced in CI
+  spec.add_development_dependency "finstyle",  "1.1.0"
+  spec.add_development_dependency "cane",      "2.6.2"
 end

data/lib/emeril.rb

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 
-require 'emeril/category'
-require 'emeril/git_tagger'
-require 'emeril/metadata_chopper'
-require 'emeril/publisher'
-require 'emeril/releaser'
-require 'emeril/version'
+require "emeril/category"
+require "emeril/git_tagger"
+require "emeril/metadata_chopper"
+require "emeril/publisher"
+require "emeril/releaser"
+require "emeril/version"
 
 module Emeril
 end

data/lib/emeril/category.rb

@@ -1,7 +1,8 @@
 # -*- encoding: utf-8 -*-
 
-require 'net/http'
-require 'json'
+require "net/https"
+require "json"
+require "uri"
 
 module Emeril
 
@@ -18,9 +19,12 @@ module Emeril
     #   on the Community site
     #
     def self.for_cookbook(cookbook)
-      path = "/api/v1/cookbooks/#{cookbook}"
-      response = Net::HTTP.get_response("cookbooks.opscode.com", path)
-      JSON.parse(response.body)['category']
+      uri = URI("https://supermarket.getchef.com/api/v1/cookbooks/#{cookbook}")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      request = Net::HTTP::Get.new(uri.request_uri)
+      response = http.request(request)
+      JSON.parse(response.body)["category"]
     end
   end
 end

data/lib/emeril/git_tagger.rb

@@ -1,16 +1,18 @@
 # -*- encoding: utf-8 -*-
 
-require 'emeril/logging'
+require "English"
+
+require "emeril/logging"
 
 module Emeril
 
   # Exception class raised when a git repo is not clean.
   #
-  class GitNotCleanError < StandardError ; end
+  class GitNotCleanError < StandardError; end
 
   # Exception class raised when a git push does not return successfully.
   #
-  class GitPushError < StandardError ; end
+  class GitPushError < StandardError; end
 
   # Applies a version tag on a git repository and pushes it to the origin
   # remote.
@@ -61,7 +63,7 @@ module Emeril
     attr_reader :logger, :source_path, :tag_prefix, :version
 
     def already_tagged?
-      if sh_with_code('git tag')[0].split(/\n/).include?(version_tag)
+      if sh_with_code("git tag")[0].split(/\n/).include?(version_tag)
         info("Tag #{version_tag} has already been created.")
         true
       end
@@ -73,36 +75,38 @@ module Emeril
 
     def git_push
       perform_git_push
-      perform_git_push ' --tags'
+      perform_git_push " --tags"
       info("Pushed git commits and tags.")
     end
 
     def guard_clean
-      clean? or raise GitNotCleanError,
-        "There are files that need to be committed first."
+      if !clean?
+        raise GitNotCleanError,
+          "There are files that need to be committed first."
+      end
     end
 
-    def perform_git_push(options = '')
+    def perform_git_push(options = "")
       cmd = "git push origin master #{options}"
       out, code = sh_with_code(cmd)
       if code != 0
         raise GitPushError,
-          "Couldn't git push. `#{cmd}' failed with the following output:" +
+          "Couldn't git push. `#{cmd}' failed with the following output:" \
             "\n\n#{out}\n"
       end
     end
 
     def sh_with_code(cmd, &block)
       cmd << " 2>&1"
-      outbuf = ''
+      outbuf = ""
       debug(cmd)
       Dir.chdir(source_path) {
         outbuf = `#{cmd}`
-        if $? == 0
+        if $CHILD_STATUS == 0
           block.call(outbuf) if block
         end
       }
-      [outbuf, $?]
+      [outbuf, $CHILD_STATUS]
     end
 
     def tag_version