emeril 0.7.0 → 0.8.0

data/spec/fixtures/vcr_cassettes/nonexistant_cookbook.yml

@@ -2,13 +2,15 @@
 http_interactions:
 - request:
     method: get
-    uri: http://cookbooks.opscode.com/api/v1/cookbooks/fooboobunnyyaya
+    uri: https://supermarket.getchef.com/api/v1/cookbooks/fooboobunnyyaya
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - "*/*"
       User-Agent:
       - Ruby
   response:
@@ -16,23 +18,33 @@ http_interactions:
       code: 404
       message: Not Found
     headers:
-      Server:
-      - ngx_openresty
-      Date:
-      - Sun, 19 May 2013 03:06:33 GMT
+      Cache-Control:
+      - no-cache
       Content-Type:
-      - text/html; charset=utf-8
+      - application/json; charset=utf-8
+      Date:
+      - Wed, 06 Aug 2014 03:19:56 GMT
+      Server:
+      - nginx/1.4.6 (Ubuntu)
+      Status:
+      - 404 Not Found
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Request-Id:
+      - 34ff1dfe-184b-4ab7-9e16-feea9b3579d1
+      X-Runtime:
+      - '0.006077'
+      X-Xss-Protection:
+      - 1; mode=block
       Content-Length:
-      - '71'
+      - '87'
       Connection:
       - keep-alive
-      Status:
-      - 404 Not Found
-      Cache-Control:
-      - no-cache
     body:
-      encoding: US-ASCII
-      string: ! '{"error_code":"NOT_FOUND","error_messages":["Resource does not exist"]}'
+      encoding: UTF-8
+      string: '{"error_messages":["Resource does not exist."],"error_code":"NOT_FOUND"}'
     http_version: 
-  recorded_at: Sun, 19 May 2013 03:06:36 GMT
-recorded_with: VCR 2.5.0
+  recorded_at: Wed, 06 Aug 2014 03:19:56 GMT
+recorded_with: VCR 2.9.2

data/spec/integration/new_release_spec.rb

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../spec_helper'
-require 'vcr'
+require_relative "../spec_helper"
+require "vcr"
 
-require 'chef/knife'
-require 'emeril'
+require "chef/knife"
+require "emeril"
 
 VCR.configure do |config|
+  config.ignore_hosts "codeclimate.com"
   config.cassette_library_dir = "spec/fixtures/vcr_cassettes"
   config.hook_into :webmock
 
@@ -26,23 +27,25 @@ describe "Releasing and publishing a cookbook" do
 
   before do
     @saved = Hash.new
-    %w{node_name client_key}.map(&:to_sym).each do |attr|
+    %w[node_name client_key].map(&:to_sym).each do |attr|
       @saved[attr] = Chef::Config[attr]
     end
 
     Chef::Config[:node_name] = ENV["CHEF_NODE_NAME"] || "opsycodesy"
     Chef::Config[:client_key] = ENV["CHEF_CLIENT_KEY"] || make_client_key!
+    Chef::Config[:cache_options][:path] =
+      File.join(File.dirname(cookbook_path), "cache")
   end
 
   after do
-    %w{node_name client_key}.map(&:to_sym).each do |attr|
+    %w[node_name client_key].map(&:to_sym).each do |attr|
       Chef::Config[attr] = @saved.delete(attr)
     end
 
-    FileUtils.remove_dir(cookbook_path)
+    FileUtils.remove_dir(File.dirname(cookbook_path))
   end
 
-  let(:cookbook_path)  { File.join(Dir.mktmpdir, "emeril")}
+  let(:cookbook_path) { File.join(Dir.mktmpdir, "emeril") }
 
   let(:logger) do
     if ENV["DEBUG"]
@@ -56,14 +59,14 @@ describe "Releasing and publishing a cookbook" do
   end
 
   it "releases a new cookbook" do
-    make_cookbook!(version: "1.2.3")
+    make_cookbook!(:version => "1.2.3")
 
-    VCR.use_cassette('new_release') do
-      Emeril::Releaser.new(logger: logger, source_path: cookbook_path).run
+    VCR.use_cassette("new_release") do
+      Emeril::Releaser.new(:logger => logger, :source_path => cookbook_path).run
     end
 
     # tag was pushed to the remote
-    git_tag = run_cmd("git tag", in: "#{File.dirname(cookbook_path)}/remote")
+    git_tag = run_cmd("git tag", :in => "#{File.dirname(cookbook_path)}/remote")
     git_tag.chomp.must_equal "v1.2.3"
   end
 end

data/spec/integration/skip_publish_spec.rb

@@ -1,16 +1,20 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../spec_helper'
-require 'vcr'
+require_relative "../spec_helper"
+require "vcr"
 
-require 'chef/knife'
-require 'emeril'
+require "chef/knife"
+require "emeril"
+
+VCR.configure do |config|
+  config.ignore_hosts "codeclimate.com"
+end
 
 describe "Releasing and but not publishing a cookbook" do
 
   include Emeril::SpecCommon
 
-  let(:cookbook_path)  { File.join(Dir.mktmpdir, "emeril")}
+  let(:cookbook_path) { File.join(Dir.mktmpdir, "emeril") }
 
   let(:logger) do
     if ENV["DEBUG"]
@@ -24,31 +28,35 @@ describe "Releasing and but not publishing a cookbook" do
   end
 
   it "releases a new cookbook" do
-    make_cookbook!(version: "4.5.6")
+    make_cookbook!(:version => "4.5.6")
 
-    VCR.use_cassette('new_release') do
+    VCR.use_cassette("new_release") do
       Emeril::Releaser.new(
-        logger: logger, source_path: cookbook_path, publish_to_community: false
+        :logger                 => logger,
+        :source_path            => cookbook_path,
+        :publish_to_supermarket => false
       ).run
     end
 
     # tag was pushed to the remote
-    git_tag = run_cmd("git tag", in: "#{File.dirname(cookbook_path)}/remote")
+    git_tag = run_cmd("git tag", :in => "#{File.dirname(cookbook_path)}/remote")
     git_tag.chomp.must_equal "v4.5.6"
   end
 
   it "releases a new cookbook with a custom git tag prefix" do
-    make_cookbook!(version: "1.0.0")
+    make_cookbook!(:version => "1.0.0")
 
-    VCR.use_cassette('new_release') do
+    VCR.use_cassette("new_release") do
       Emeril::Releaser.new(
-        logger: logger, source_path: cookbook_path, publish_to_community: false,
-        tag_prefix: "release-"
+        :logger                 => logger,
+        :source_path            => cookbook_path,
+        :publish_to_supermarket => false,
+        :tag_prefix             => "release-"
       ).run
     end
 
     # tag was pushed to the remote
-    git_tag = run_cmd("git tag", in: "#{File.dirname(cookbook_path)}/remote")
+    git_tag = run_cmd("git tag", :in => "#{File.dirname(cookbook_path)}/remote")
     git_tag.chomp.must_equal "release-1.0.0"
   end
 end

data/spec/spec_helper.rb

@@ -1,23 +1,26 @@
 # -*- encoding: utf-8 -*-
 
-gem 'minitest'
+gem "minitest"
 
-if ENV['SIMPLECOV']
-  require 'simplecov'
-  SimpleCov.adapters.define 'gem' do
-    command_name 'Specs'
+if ENV["CODECLIMATE_REPO_TOKEN"]
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+elsif ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.adapters.define "gem" do
+    command_name "Specs"
 
-    add_filter '.gem/'
-    add_filter '/spec/'
+    add_filter ".gem/"
+    add_filter "/spec/"
 
-    add_group 'Libraries', '/lib/'
+    add_group "Libraries", "/lib/"
   end
-  SimpleCov.start 'gem'
+  SimpleCov.start "gem"
 end
 
-require 'fakefs/safe'
-require 'minitest/autorun'
-require 'mocha/setup'
+require "fakefs/safe"
+require "minitest/autorun"
+require "mocha/setup"
 
 # Nasty hack to redefine IO.read in terms of File#read for fakefs
 class IO
@@ -26,10 +29,11 @@ class IO
   end
 end
 
-require 'chef'
-require 'chef/cookbook_site_streaming_uploader'
+require "chef"
+require "chef/cookbook_site_streaming_uploader"
 class Chef
   class CookbookSiteStreamingUploader
+    # Backwards compat
     class MultipartStream
       alias_method :read_original, :read
 
@@ -42,35 +46,16 @@ end
 
 module Emeril
 
+  # Common spec helpers
   module SpecCommon
 
     def make_cookbook!(opts = {})
       FileUtils.mkdir_p("#{cookbook_path}/recipes")
       remote_dir = File.join(File.dirname(cookbook_path), "remote")
 
-      File.open("#{cookbook_path}/metadata.rb", "wb") do |f|
-        f.write <<-METADATA_RB.gsub(/^ {10}/, '')
-          name             "#{opts.fetch(:name, "emeril")}"
-          maintainer       "Michael Bluth"
-          maintainer_email "michael@bluth.com"
-          license          "Apache 2.0"
-          description      "Doing stuff!"
-          long_description "Doing stuff!"
-          version          "#{opts.fetch(:version, "4.1.1")}"
-        METADATA_RB
-      end
-      File.open("#{cookbook_path}/recipes/default.rb", "wb") do |f|
-        f.write <<-DEFAULT_RB.gsub(/^ {10}/, '')
-          directory "/tmp/yeah"
-
-          package "bash"
-        DEFAULT_RB
-      end
-      File.open("#{cookbook_path}/README.md", "wb") do |f|
-        f.write <<-README.gsub(/^ {10}/, '')
-          # The beast of the beasts
-        README
-      end
+      create_metadata(opts)
+      create_recipe
+      create_readme
 
       run_cmd [
         %{git init},
@@ -92,5 +77,39 @@ module Emeril
     def run_cmd(cmd, opts = {})
       %x{cd #{opts.fetch(:in, cookbook_path)} && #{cmd}}
     end
+
+    private
+
+    def create_metadata(opts)
+      File.open("#{cookbook_path}/metadata.rb", "wb") do |f|
+        f.write <<-METADATA_RB.gsub(/^ {10}/, "")
+          name             "#{opts.fetch(:name, "emeril")}"
+          maintainer       "Michael Bluth"
+          maintainer_email "michael@bluth.com"
+          license          "Apache 2.0"
+          description      "Doing stuff!"
+          long_description "Doing stuff!"
+          version          "#{opts.fetch(:version, "4.1.1")}"
+        METADATA_RB
+      end
+    end
+
+    def create_recipe
+      File.open("#{cookbook_path}/recipes/default.rb", "wb") do |f|
+        f.write <<-DEFAULT_RB.gsub(/^ {10}/, "")
+          directory "/tmp/yeah"
+
+          package "bash"
+        DEFAULT_RB
+      end
+    end
+
+    def create_readme
+      File.open("#{cookbook_path}/README.md", "wb") do |f|
+        f.write <<-README.gsub(/^ {10}/, "")
+          # The beast of the beasts
+        README
+      end
+    end
   end
 end

data/spec/unit/emeril/category_spec.rb

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../../spec_helper'
-require 'vcr'
+require_relative "../../spec_helper"
+require "vcr"
 
-require 'emeril/category'
+require "emeril/category"
 
 VCR.configure do |config|
-  config.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
+  config.ignore_hosts "codeclimate.com"
+  config.cassette_library_dir = "spec/fixtures/vcr_cassettes"
   config.hook_into :webmock
 end
 
@@ -14,14 +15,14 @@ describe Emeril::Category do
 
   describe ".for_cookbook" do
     it "returns a category string for a known cookbook" do
-      VCR.use_cassette('known_cookbook') do
-        Emeril::Category.for_cookbook('mysql').must_equal 'Databases'
+      VCR.use_cassette("known_cookbook") do
+        Emeril::Category.for_cookbook("mysql").must_equal "Databases"
       end
     end
 
     it "returns nil for a nonexistant cookbook" do
-      VCR.use_cassette('nonexistant_cookbook') do
-        Emeril::Category.for_cookbook('fooboobunnyyaya').must_be_nil
+      VCR.use_cassette("nonexistant_cookbook") do
+        Emeril::Category.for_cookbook("fooboobunnyyaya").must_be_nil
       end
     end
   end

data/spec/unit/emeril/git_tagger_spec.rb

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../../spec_helper'
-require 'tmpdir'
-require 'logger'
+require_relative "../../spec_helper"
+require "tmpdir"
+require "logger"
 
-require 'emeril/git_tagger'
+require "emeril/git_tagger"
 
 describe Emeril::GitTagger do
 
@@ -39,7 +39,7 @@ describe Emeril::GitTagger do
 
     it "tags the repo" do
       git_tagger.run
-      run_cmd(%{git tag}).must_match /^v4.1.1$/
+      run_cmd(%{git tag}).must_match(/^v4.1.1$/)
     end
 
     it "disables the tag prefix" do
@@ -50,7 +50,7 @@ describe Emeril::GitTagger do
         :tag_prefix => false
       ).run
 
-      run_cmd(%{git tag}).must_match /^4.1.1$/
+      run_cmd(%{git tag}).must_match(/^4.1.1$/)
     end
 
     it "uses a custom tag prefix" do
@@ -61,7 +61,7 @@ describe Emeril::GitTagger do
         :tag_prefix => "version-"
       ).run
 
-      run_cmd(%{git tag}).must_match /^version-4.1.1$/
+      run_cmd(%{git tag}).must_match(/^version-4.1.1$/)
     end
 
     it "pushes the tag to the remote" do

data/spec/unit/emeril/metadata_chopper_spec.rb

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../../spec_helper'
+require_relative "../../spec_helper"
 
-require 'emeril/metadata_chopper'
+require "emeril/metadata_chopper"
 
 describe Emeril::MetadataChopper do
 
@@ -56,7 +56,7 @@ describe Emeril::MetadataChopper do
 
   def stub_metadata!(name = "foobar", version = "5.2.1")
     File.open("/tmp/metadata.rb", "wb") do |f|
-      f.write <<-METADATA_RB.gsub(/^ {8}/, '')
+      f.write <<-METADATA_RB.gsub(/^ {8}/, "")
         name             "#{name}"
         maintainer       "Michael Bluth"
         maintainer_email "michael@bluth.com"

data/spec/unit/emeril/publisher_spec.rb

@@ -1,14 +1,15 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../../spec_helper'
-require 'chef/knife'
-require 'chef/config'
+require_relative "../../spec_helper"
+require "chef/knife"
+require "chef/config"
 
-require 'emeril/publisher'
+require "emeril/publisher"
 
+# Dummy Knife plugin
 class DummyKnife < Emeril::Publisher::SharePlugin
 
-  def run ; end
+  def run; end
 end
 
 describe Emeril::Publisher do
@@ -17,7 +18,7 @@ describe Emeril::Publisher do
   let(:category)      { "Utilities" }
 
   let(:publisher) do
-    if ENV['DEBUG']
+    if ENV["DEBUG"]
       logger = Logger.new(STDOUT)
       logger.level = Logger::DEBUG
     else
@@ -35,7 +36,7 @@ describe Emeril::Publisher do
 
   before do
     @saved = Hash.new
-    %w{node_name client_key}.map(&:to_sym).each do |attr|
+    %w[node_name client_key].map(&:to_sym).each do |attr|
       @saved[attr] = Chef::Config[attr]
     end
 
@@ -44,7 +45,7 @@ describe Emeril::Publisher do
   end
 
   after do
-    %w{node_name client_key}.map(&:to_sym).each do |attr|
+    %w[node_name client_key].map(&:to_sym).each do |attr|
       Chef::Config[attr] = @saved.delete(attr)
     end
   end
@@ -133,7 +134,7 @@ describe Emeril::Publisher do
       it "calls super if logger is nil" do
         ui_without_logger.msg("yo")
 
-        stdout.string.must_match /^yo$/
+        stdout.string.must_match(/^yo$/)
       end
     end
 
@@ -148,7 +149,7 @@ describe Emeril::Publisher do
       it "calls super if logger is nil" do
         ui_without_logger.err("yolo")
 
-        stderr.string.must_match /^yolo$/
+        stderr.string.must_match(/^yolo$/)
       end
     end
 
@@ -163,7 +164,7 @@ describe Emeril::Publisher do
       it "calls super if logger is nil" do
         ui_without_logger.err("caution")
 
-        stderr.string.must_match /^caution$/
+        stderr.string.must_match(/^caution$/)
       end
     end
 
@@ -178,7 +179,7 @@ describe Emeril::Publisher do
       it "calls super if logger is nil" do
         ui_without_logger.fatal("die")
 
-        stderr.string.must_match /die$/
+        stderr.string.must_match(/die$/)
       end
     end
 
@@ -197,10 +198,9 @@ describe Emeril::Publisher do
 
   def make_cookbook!
     FileUtils.mkdir_p("#{cookbook_path}/recipes")
-    remote_dir = File.join(File.dirname(cookbook_path), "remote")
 
     File.open("#{cookbook_path}/metadata.rb", "wb") do |f|
-      f.write <<-METADATA_RB.gsub(/^ {8}/, '')
+      f.write <<-METADATA_RB.gsub(/^ {8}/, "")
         name             "#{name}"
         maintainer       "Michael Bluth"
         maintainer_email "michael@bluth.com"
@@ -211,7 +211,7 @@ describe Emeril::Publisher do
       METADATA_RB
     end
     File.open("#{cookbook_path}/recipes/default.rb", "wb") do |f|
-      f.write <<-DEFAULT_RB.gsub(/^ {8}/, '')
+      f.write <<-DEFAULT_RB.gsub(/^ {8}/, "")
         directory "/tmp/yeah"
 
         package "bash"