stove 5.2.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a7b6e003eaa819a032278c65bdb28317ba36543
-  data.tar.gz: 71ab7d2ff0f46152784c3e4d0d60dec1cf157f01
+  metadata.gz: 390277d48cb42db0d622b67242398c2356a64caa
+  data.tar.gz: 5d62fb5adb3ab6433d2dd3a2cae863833e52ebda
 SHA512:
-  metadata.gz: cf2361dfafbaaca8e631d0b807f6b08c9fb0c1322c0865a7ac1188fc07c1e3ada760b4bd2af1712f2e295b5595d8bd3cc0869e82a534d0f0fd71f97ea953c5c7
-  data.tar.gz: a8a0a61d146ac8c7df835a5ff6613528d69c664e293edbffeca7fd7b8a9c8cf34f642f7a2c2492360615ac0c75b8f42116d96d299ea485ce637156692ed83ec1
+  metadata.gz: 5434acb284472d0f408b3e14215942faa47acb190a88147b1d651a54520d19bdd7e55fa5c6932af26de61f4baadf37c676c7e3413bce4d24c834172789812906
+  data.tar.gz: c9df46d77f1c1b61aa22e865ad1df556d8b34f87927019bdc877b3ec5ba0a0cb84459d0f94bc680c867a4a4a816ad5c9009fdf8f579126d205775c020e9cec15

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 This is the Changelog for the Stove gem.
 
+## v6.0.0
+
+### Breaking Changes
+
+- All references to the Community site have been renamed to Supermarket. This includes the name of the `community` plugin and all `Community` classes references within the code. This should not be a breaking change unless your developing against stove as a library.
+- The long ago deprecated `bake` command has been removed.
+
+### Other Changes
+
+- Git tagging errors now include more useful error messaging.
+- The help command now better describes `--no-git` and `--endpoint` flags.
+- For developers running stove from the git repository, the application now properly loads stove from the repository instead of from an installed gem.
+
 ## v5.2.0 (2017-05-12)
 
 - Support for uploading to Artifactory

data/bin/stove

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'stove'
 Stove::Cli.new(ARGV.dup).execute!

data/features/plugins/community.feature

@@ -1,4 +1,4 @@
-Feature: Community
+Feature: Supermarket
   Background:
     * I have a cookbook named "bacon"
 
@@ -13,25 +13,25 @@ Feature: Community
     * it should fail with "requires a private key"
 
   Scenario: With the default parameters
-    * the community server has the cookbook:
+    * the supermarket has the cookbook:
       | bacon | 1.2.3 |
     * I successfully run `stove --no-git`
-    * the community server will have the cookbooks:
+    * the supermarket will have the cookbooks:
       | bacon | 0.0.0 |
 
   Scenario: Yanking a cookbook
-    * the community server has the cookbooks:
+    * the supermarket has the cookbooks:
       | bacon | 1.2.3 |
     * I successfully run `stove yank -l debug`
-    * the community server will not have the cookbooks:
+    * the supermarket will not have the cookbooks:
       | bacon | 1.2.3 |
     * the output should contain "Successfully yanked bacon!"
 
   Scenario: Yanking a cookbook by name
-    * the community server has the cookbooks:
+    * the supermarket has the cookbooks:
       | eggs | 4.5.6 |
     * I successfully run `stove yank eggs`
-    * the community server will not have the cookbooks:
+    * the supermarket will not have the cookbooks:
       | eggs | 4.5.6 |
     * the output should not contain "Successfully yanked bacon!"
     * the output should contain "Successfully yanked eggs!"

data/features/plugins/git.feature

@@ -1,7 +1,7 @@
 Feature: git Plugin
   Background:
     * I have a cookbook named "bacon"
-    * the community server has the cookbooks:
+    * the supermarket has the cookbooks:
       | bacon | 1.0.0 |
 
   Scenario: When the directory is not a git repository

data/features/step_definitions/community_steps.rb

@@ -1,4 +1,4 @@
-Given /^the community server has the cookbooks?:$/ do |table|
+Given /^the supermarket has the cookbooks?:$/ do |table|
   table.raw.each do |name, version|
     version  ||= '0.0.0'
 
@@ -10,7 +10,7 @@ Given /^the community server has the cookbooks?:$/ do |table|
   end
 end
 
-Then /^the community server will( not)? have the cookbooks?:$/ do |negate, table|
+Then /^the supermarket will( not)? have the cookbooks?:$/ do |negate, table|
   table.raw.each do |name, version|
     cookbook = CommunityZero::RSpec.store.find(name, version)
 

data/lib/stove.rb

@@ -3,7 +3,7 @@ require 'pathname'
 
 module Stove
   autoload :Artifactory, 'stove/artifactory'
-  autoload :Community,   'stove/community'
+  autoload :Supermarket, 'stove/supermarket'
   autoload :Config,      'stove/config'
   autoload :Cookbook,    'stove/cookbook'
   autoload :Cli,         'stove/cli'
@@ -31,7 +31,7 @@ module Stove
   module Plugin
     autoload :Artifactory, 'stove/plugins/artifactory'
     autoload :Base,        'stove/plugins/base'
-    autoload :Community,   'stove/plugins/community'
+    autoload :Supermarket, 'stove/plugins/supermarket'
     autoload :Git,         'stove/plugins/git'
   end
 

data/lib/stove/cli.rb

@@ -55,7 +55,7 @@ module Stove
       if @argv.first == 'yank'
         name = @argv[1] || Cookbook.new(options[:path]).name
 
-        if Community.yank(name)
+        if Supermarket.yank(name)
           @stdout.puts "Successfully yanked #{name}!"
           @kernel.exit(0)
         else
@@ -101,14 +101,14 @@ module Stove
         opts.separator ''
         opts.separator 'Plugins:'
 
-        opts.on('--no-git', 'Do not use the git plugin') do
+        opts.on('--no-git', 'Do not use the git plugin. Skips tagging if specified.') do
           options[:no_git] = true
         end
 
         opts.separator ''
         opts.separator 'Upload Options:'
 
-        opts.on('--endpoint [URL]', 'Upload URL endpoint') do |v|
+        opts.on('--endpoint [URL]', 'Supermarket endpoint') do |v|
           options[:endpoint] = v
         end
 

data/lib/stove/cookbook.rb

@@ -17,7 +17,7 @@ module Stove
 
     #
     # The name of the cookbook (must correspond to the name of the
-    # cookbook on the community site).
+    # cookbook on the Supermarket).
     #
     # @return [String]
     #
@@ -71,7 +71,7 @@ module Stove
     end
 
     #
-    # Deterine if this cookbook version is released on the community site
+    # Deterine if this cookbook version is released on the Supermarket
     #
     # @warn
     #   This is a fairly expensive operation and the result cannot be
@@ -82,7 +82,7 @@ module Stove
     #   site, false otherwise
     #
     def released?
-      Community.cookbook(name, version)
+      Supermarket.cookbook(name, version)
       true
     rescue ChefAPI::Error::HTTPNotFound
       false

data/lib/stove/cookbook/metadata.rb

@@ -5,7 +5,7 @@ module Stove
     # Borrowed and modified from:
     # {https://raw.github.com/opscode/chef/11.4.0/lib/chef/cookbook/metadata.rb}
     #
-    # Copyright:: Copyright 2008-2010 Opscode, Inc.
+    # Copyright:: Copyright 2008-2017 Chef Software, Inc.
     #
     # Licensed under the Apache License, Version 2.0 (the "License");
     # you may not use this file except in compliance with the License.

data/lib/stove/error.rb

@@ -38,15 +38,16 @@ module Stove
     end
 
     class GitFailed < StoveError; end
+    class GitTaggingFailed < StoveError; end
     class MetadataNotFound < StoveError; end
     class ServerUnavailable < StoveError; end
     class CookbookAlreadyExists < StoveError; end
 
     # Validations
     class ValidationFailed < StoveError; end
-    class CommunityCategoryValidationFailed < ValidationFailed; end
-    class CommunityKeyValidationFailed < ValidationFailed; end
-    class CommunityUsernameValidationFailed < ValidationFailed; end
+    class SupermarketCategoryValidationFailed < ValidationFailed; end
+    class SupermarketKeyValidationFailed < ValidationFailed; end
+    class SupermarketUsernameValidationFailed < ValidationFailed; end
     class GitCleanValidationFailed < ValidationFailed; end
     class GitRepositoryValidationFailed < ValidationFailed; end
     class GitUpToDateValidationFailed < ValidationFailed; end

data/lib/stove/plugins/git.rb

@@ -34,11 +34,13 @@ module Stove
     private
 
     def git(command, errors = true)
+      log.debug("the command matches")
       log.debug("Running `git #{command}', errors: #{errors}")
       Dir.chdir(cookbook.path) do
         response = %x|git #{command}|
 
         if errors && !$?.success?
+          raise Error::GitTaggingFailed.new(command: command) if command =~ /^tag/
           raise Error::GitFailed.new(command: command)
         end
 

data/lib/stove/plugins/supermarket.rb

@@ -0,0 +1,18 @@
+module Stove
+  class Plugin::Supermarket < Plugin::Base
+    id 'supermarket'
+    description 'Publish the release to the Chef Supermarket'
+
+    validate(:username) do
+      Config.username
+    end
+
+    validate(:key) do
+      Config.key
+    end
+
+    run('Publishing the release to the Chef Supermarket') do
+      Supermarket.upload(cookbook, options[:extended_metadata])
+    end
+  end
+end

data/lib/stove/runner.rb

@@ -15,7 +15,7 @@ module Stove
       if Config.artifactory
         run_plugin :artifactory
       else
-        run_plugin :community
+        run_plugin :supermarket
       end
     end
 

data/lib/stove/{community.rb → supermarket.rb}

@@ -1,12 +1,12 @@
 require 'chef-api'
 
 module Stove
-  class Community
+  class Supermarket
     include Mixin::Instanceable
     include Mixin::Optionable
 
     #
-    # The default endpoint where the community site lives.
+    # The default endpoint where the Supermarket lives.
     #
     # @return [String]
     #
@@ -17,19 +17,19 @@ module Stove
     # and version.
     #
     # @example Find a cookbook by name
-    #   Community.cookbook('apache2') #=> {...}
+    #   Supermarket.cookbook('apache2') #=> {...}
     #
     # @example Find a cookbook by name and version
-    #   Community.cookbook('apache2', '1.0.0') #=> {...}
+    #   Supermarket.cookbook('apache2', '1.0.0') #=> {...}
     #
     # @example Find a non-existent cookbook
-    #   Community.cookbook('not-real') #=> Community::BadResponse
+    #   Supermarket.cookbook('not-real') #=> Community::BadResponse
     #
-    # @raise [Community::BadResponse]
-    #   if the given cookbook (or cookbook version) does not exist on the community site
+    # @raise [Supermarket::BadResponse]
+    #   if the given cookbook (or cookbook version) does not exist on the Supermarket
     #
     # @param [String] name
-    #   the name of the cookbook on the community site
+    #   the name of the cookbook on the Supermarket
     # @param [String] version (optional)
     #   the version of the cookbook to find
     #
@@ -63,7 +63,7 @@ module Stove
     end
 
     #
-    # Delete the given cookbook from the community site.
+    # Delete the given cookbook from the supermarket.
     #
     # @param [String] name
     #   the name of the cookbook to delete

data/lib/stove/version.rb

@@ -1,3 +1,3 @@
 module Stove
-  VERSION = '5.2.0'
+  VERSION = '6.0.0'
 end

data/spec/unit/error_spec.rb

@@ -49,12 +49,12 @@ module Stove::Error
     end
   end
 
-  describe CommunityKeyValidationFailed do
+  describe SupermarketKeyValidationFailed do
     it 'raises an exception with the correct message' do
       expect { raise described_class }.to raise_error { |error|
         expect(error).to be_a(described_class)
         expect(error.message).to eq <<-EOH.gsub(/^ {10}/, '')
-          You did not specify the path to a private key! The Chef community site requires a private key for authentication:
+          You did not specify the path to a private key! The Chef Supermarket requires a private key for authentication:
 
               stove --key ~/.chef/sethvargo.pem
         EOH
@@ -62,12 +62,12 @@ module Stove::Error
     end
   end
 
-  describe CommunityUsernameValidationFailed do
+  describe SupermarketUsernameValidationFailed do
     it 'raises an exception with the correct message' do
       expect { raise described_class }.to raise_error { |error|
         expect(error).to be_a(described_class)
         expect(error.message).to eq <<-EOH.gsub(/^ {10}/, '')
-          You did not specify the username to authenticate with! The Chef community site requires a username for authentication:
+          You did not specify the username to authenticate with! The Chef Supermarket requires a username for authentication:
 
               stove --username sethvargo
         EOH

data/templates/errors/git_tagging_failed.erb

@@ -0,0 +1,5 @@
+An error occurred while attempting to tag the release in git by running:
+
+    git <%= @command %>
+
+This often occurs when you've already attempted to release a cookbook with stove. If you would like to try to release again without git tagging use the '--no-git' option

data/templates/errors/supermarket_key_validation_failed.erb

@@ -0,0 +1,3 @@
+You did not specify the path to a private key! The Chef Supermarket requires a private key for authentication:
+
+    stove --key ~/.chef/sethvargo.pem

data/templates/errors/{community_username_validation_failed.erb → supermarket_username_validation_failed.erb}

@@ -1,3 +1,3 @@
-You did not specify the username to authenticate with! The Chef community site requires a username for authentication:
+You did not specify the username to authenticate with! The Chef Supermarket requires a username for authentication:
 
     stove --username sethvargo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stove
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-api
@@ -140,7 +140,6 @@ description: A utility for releasing Chef community cookbooks
 email:
 - sethvargo@gmail.com
 executables:
-- bake
 - stove
 extensions: []
 extra_rdoc_files: []
@@ -152,7 +151,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/bake
 - bin/stove
 - features/plugins/community.feature
 - features/plugins/git.feature
@@ -167,7 +165,6 @@ files:
 - lib/stove.rb
 - lib/stove/artifactory.rb
 - lib/stove/cli.rb
-- lib/stove/community.rb
 - lib/stove/config.rb
 - lib/stove/cookbook.rb
 - lib/stove/cookbook/metadata.rb
@@ -181,10 +178,11 @@ files:
 - lib/stove/packager.rb
 - lib/stove/plugins/artifactory.rb
 - lib/stove/plugins/base.rb
-- lib/stove/plugins/community.rb
 - lib/stove/plugins/git.rb
+- lib/stove/plugins/supermarket.rb
 - lib/stove/rake_task.rb
 - lib/stove/runner.rb
+- lib/stove/supermarket.rb
 - lib/stove/util.rb
 - lib/stove/validator.rb
 - lib/stove/version.rb
@@ -201,16 +199,17 @@ files:
 - stove.gemspec
 - templates/errors/abstract_method.erb
 - templates/errors/artifactory_key_validation_failed.erb
-- templates/errors/community_key_validation_failed.erb
-- templates/errors/community_username_validation_failed.erb
-- templates/errors/cookbook_already_exists.erb
 - templates/errors/git_clean_validation_failed.erb
 - templates/errors/git_failed.erb
 - templates/errors/git_repository_validation_failed.erb
+- templates/errors/git_tagging_failed.erb
 - templates/errors/git_up_to_date_validation_failed.erb
 - templates/errors/metadata_not_found.erb
 - templates/errors/server_unavailable.erb
 - templates/errors/stove_error.erb
+- templates/errors/supermarket_already_exists.erb
+- templates/errors/supermarket_key_validation_failed.erb
+- templates/errors/supermarket_username_validation_failed.erb
 homepage: https://github.com/sethvargo/stove
 licenses:
 - Apache 2.0
@@ -231,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A command-line utility for releasing Chef community cookbooks

data/bin/bake

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-$stderr.puts "The `bake' command is deprecated. Please use `stove' instead!"
-
-require 'stove'
-Stove::Cli.new(ARGV.dup).execute!

data/lib/stove/plugins/community.rb

@@ -1,18 +0,0 @@
-module Stove
-  class Plugin::Community < Plugin::Base
-    id 'community'
-    description 'Publish the release to the Chef community site'
-
-    validate(:username) do
-      Config.username
-    end
-
-    validate(:key) do
-      Config.key
-    end
-
-    run('Publishing the release to the Chef community site') do
-      Community.upload(cookbook, options[:extended_metadata])
-    end
-  end
-end

data/templates/errors/community_key_validation_failed.erb

@@ -1,3 +0,0 @@
-You did not specify the path to a private key! The Chef community site requires a private key for authentication:
-
-    stove --key ~/.chef/sethvargo.pem