stove 2.0.0.beta.1 → 2.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e3e8effc89249cc85ef1bbb409edc1b17ae623b
-  data.tar.gz: a01bd5570bc5651d738a5e31c36ed032e3ce1c75
+  metadata.gz: 1d576bd5d791bfa1f3a6119bc0a2da2ba5576d8a
+  data.tar.gz: 951ed197d25bb581336f69da68d8509baf1f678a
 SHA512:
-  metadata.gz: 2cae616ad8cd9526e80365f4590640152afa2c411eac9a5c3b0c6028afcb7a710e3cf6549947b0e19ffd18eb16872cec997a3cdafbab172c2d79ff69ba0f0a6c
-  data.tar.gz: ef5adf673f387952bba98a73d5ea8875fb1bb9610feb9841c15d02b431934fff20124b82cbcd845995aa940589de110c6f1de3b9f8aaad23a3838842b6792c69
+  metadata.gz: 8504c7fc94657dcff042bdc86458099fb30a30e9d9b279c145df1f443aa7286a37474b4f7a00211b56199759a336dcc016f14e22a96c241d940ea891d4359693
+  data.tar.gz: 6f3a76458636021f386cb1d47b939f1864bf8e43d76a6a23b160803ade0f52ef956430bd0ef0f1afd3eec2f6624af69e0ba478dd681f051f996715c38beeca9a

data/CHANGELOG.md

@@ -18,6 +18,7 @@ v2.0.0 (unreleased)
 - Improve rake task to automatically perfom a minor bump when no version if given
 - Persist data across the cookbook object
 - Use singleton classes to save memory and loadtime
+- Force a non-broken version of log4r
 
 v1.1.0
 ------

data/README.md

@@ -78,15 +78,16 @@ You can always use the `--help` flag to get information:
 Usage: bake x.y.z
 
 Actions:
-        --no-bump                    Perform a version bump the local version automatically
-        --no-changelog               Generate and prompt for a CHANGELOG
-        --no-dev                     Bump a minor version release for development purposes
-        --no-upload                  Upload the cookbook to the community site
+        --[no-]bump                  [Don't] Perform a version bump the local version automatically
+        --[no-]changelog             [Don't] Generate and prompt for a CHANGELOG
+        --[no-]dev                   [Don't] Bump a minor version release for development purposes
+        --[no-]upload                [Don't] Execute upload stages of enabled plugins
 
 Plugins:
-        --no-git                     Tag and push to a git remote
-        --no-github                  Publish the release to GitHub
-        --no-jira                    Resolve JIRA issues
+        --[no-]community             [Don't] Upload to the community site
+        --[no-]git                   [Don't] Tag and push to a git remote
+        --[no-]github                [Don't] Publish the release to GitHub
+        --[no-]jira                  [Don't] Resolve JIRA issues
 
 Global Options:
         --locale [LANGUAGE]          Change the language to output messages

data/features/actions/changelog.feature

@@ -32,6 +32,13 @@ Feature: Changelog
     * I successfully run `bake 1.0.0 --changelog --bump`
     * the file "CHANGELOG.md" should contain "v1.0.0"
 
+  Scenario: With a hyphenated cookbook name
+    * I have a cookbook named "bacon-maple-bars"
+    * the environment variable "EDITOR" is "cat"
+    * I successfully run `bake 1.0.0 --changelog --bump`
+    * the file "CHANGELOG.md" should contain "bacon-maple-bars Changelog"
+    * the file "CHANGELOG.md" should contain "v1.0.0"
+
   Scenario: With the git plugin
     * I have a cookbook named "bacon" with git support
     * the environment variable "EDITOR" is "cat"

data/features/actions/upload.feature

@@ -5,42 +5,20 @@ Feature: Upload
     * I have a cookbook named "bacon"
     * I am using the community server
 
-  Scenario: When the configuration does not exist
-    * I run `bake --upload`
-    * it should fail with "configuration for the Chef community site does not exist"
-
-  Scenario: When the username does not exist
-    * the Stove config at "community._" is ""
-    * I run `bake --upload`
-    * it should fail with "does not contain a username"
-
-  Scenario: When the key does not exist
-    * the Stove config at "community.username" is "bobo"
-    * I run `bake --upload`
-    * it should fail with "does not contain a key"
-
-  Scenario: When the category does not exist
-    * the Stove config at "community.username" is "bobo"
-    * the Stove config at "community.key" is "../../features/support/stove.pem"
-    * I run `bake --upload`
-    * it should fail with "You did not specify a category"
-
-  Scenario: In isolation
-    * the Stove config at "community.username" is "bobo"
-    * the Stove config at "community.key" is "../../features/support/stove.pem"
-    * the community server has the cookbook:
-      | bacon | 1.2.3 | Application |
-    * I successfully run `bake --upload`
-
   Scenario: With the git plugin
     * I have a cookbook named "bacon" with git support
     * the Stove config at "community.username" is "bobo"
     * the Stove config at "community.key" is "../../features/support/stove.pem"
     * the community server has the cookbook:
       | bacon | 1.2.3 | Application |
-    * I successfully run `bake --git --upload`
+    * I successfully run `bake --git --upload --community`
     * the git remote should have the tag "v0.0.0"
 
+  Scenario: With the git plugin and the upload action disabled
+    * I have a cookbook named "bacon" with git support
+    * I successfully run `bake --git --no-upload`
+    * the git remote should not have the tag "v0.0.0"
+
   @wip
   Scenario: With the GitHub plugin
 

data/features/plugins/community.feature

@@ -0,0 +1,40 @@
+Feature: Community
+  Background:
+    * the Stove config is empty
+    * the CLI options are all off
+    * I have a cookbook named "bacon"
+    * I am using the community server
+
+  Scenario: When the configuration does not exist
+    * I run `bake --upload --community`
+    * it should fail with "configuration for the Chef community site does not exist"
+
+  Scenario: When the username does not exist
+    * the Stove config at "community._" is ""
+    * I run `bake --upload --community`
+    * it should fail with "does not contain a username"
+
+  Scenario: When the key does not exist
+    * the Stove config at "community.username" is "bobo"
+    * I run `bake --upload --community`
+    * it should fail with "does not contain a key"
+
+  Scenario: When the category does not exist
+    * the Stove config at "community.username" is "bobo"
+    * the Stove config at "community.key" is "../../features/support/stove.pem"
+    * I run `bake --upload --community`
+    * it should fail with "You did not specify a category"
+
+  Scenario: In isolation
+    * the Stove config at "community.username" is "bobo"
+    * the Stove config at "community.key" is "../../features/support/stove.pem"
+    * the community server has the cookbook:
+      | bacon | 1.2.3 | Application |
+    * I successfully run `bake --upload --community`
+
+  Scenario: When the community plugin is explicitly disabled
+    * the Stove config at "community.username" is "bobo"
+    * the Stove config at "community.key" is "../../features/support/stove.pem"
+    * I successfully run `bake --upload --no-community`
+    * the community server will not have the cookbook:
+      | bacon | | |

data/features/plugins/git.feature

@@ -22,3 +22,8 @@ Feature: git Plugin
     * the remote repository has additional commits
     * I run `bake --git`
     * it should fail with "out of sync with the remote repository"
+
+  Scenario: When a git upload should be done
+    * I have a cookbook named "bacon" with git support
+    * I successfully run `bake --upload --git`
+    * the git remote should have the tag "v0.0.0"

data/features/step_definitions/cookbook_steps.rb

@@ -1,12 +1,12 @@
-Given /^I have a cookbook named "(\w+)" at version "([\d\.]+)"$/ do |name, version|
+Given /^I have a cookbook named "([\w\-]+)" at version "([\d\.]+)"$/ do |name, version|
   create_cookbook(name, version)
 end
 
-Given /^I have a cookbook named "(\w+)"$/ do |name|
+Given /^I have a cookbook named "([\w\-]+)"$/ do |name|
   create_cookbook(name, '0.0.0')
 end
 
-Given /^I have a cookbook named "(\w+)" with git support$/ do |name|
+Given /^I have a cookbook named "([\w\-]+)" with git support$/ do |name|
   create_cookbook(name, '0.0.0', git: true)
 end
 
@@ -23,8 +23,8 @@ def create_cookbook(name, version, options = {})
   cd(name)
 
   write_file('CHANGELOG.md', <<-EOH.gsub(/^ {4}/, ''))
-    Changelog
-    =========
+    #{name} Changelog
+    =================
 
     v#{version} (#{Time.now.to_date})
     ----------------------------

data/lib/stove/actions/bump.rb

@@ -8,7 +8,7 @@ module Stove
     end
 
     validate(:incremented) do
-      version = Gem::Version.new(options[:version])
+      version = Gem::Version.new(options[:version].dup)
       Gem::Requirement.new("> #{cookbook.version}").satisfied_by?(version)
     end
 

data/lib/stove/actions/changelog.rb

@@ -9,7 +9,7 @@ module Stove
 
     validate(:format) do
       lines = File.read('CHANGELOG.md')
-      lines.match(/^[\w\s]+\n=+(.*\n)+v[0-9\.]+(\ \(.+\))?\n\-+/)
+      lines.match(/^[\w\s\-]+\n=+(.*\n)+v[0-9\.]+(\ \(.+\))?\n\-+/)
     end
 
     validate(:editor) do

data/lib/stove/actions/upload.rb

@@ -1,27 +1,11 @@
 module Stove
   class Action::Upload < Action::Base
     id 'upload'
-    description 'Upload the cookbook to the community site'
-
-    validate(:configuration) do
-      Config.has_key?(:community)
-    end
-
-    validate(:username) do
-      Config[:community].has_key?(:username)
-    end
-
-    validate(:key) do
-      Config[:community].has_key?(:key)
-    end
-
-    validate(:category) do
-      !cookbook.category.nil?
-    end
+    description 'Publish the release to enabled plugin destinations'
 
     def run
-      log.info('Uploading to the Chef community site')
-      Community.upload(cookbook)
+      log.debug('Running upload hooks...')
+      log.info('Done!')
     end
   end
 end

data/lib/stove/cli.rb

@@ -36,6 +36,11 @@ module Stove
       # no cookbook at the given path
       cookbook = Cookbook.new(options[:path])
 
+      # Set the category on the cookbook object if one was given
+      if category = options.delete(:category)
+        cookbook.category = category
+      end
+
       # Now execute the actual runners (validations and errors might occur)
       Runner.run(cookbook, options)
 

data/lib/stove/config.rb

@@ -55,7 +55,7 @@ module Stove
         if value.is_a?(Hash)
           [key, sanitize(value)]
         else
-          if key =~ /acecss|token|password/
+          if key =~ /access|token|password/
             [key, '[FILTERED]']
           else
             [key, value]

data/lib/stove/cookbook.rb

@@ -37,6 +37,14 @@ module Stove
     #
     attr_reader :metadata
 
+    #
+    # Set the category for this cookbook
+    #
+    # @param [String]
+    #   the name of the category (values are restricted by the Community Site)
+    #
+    attr_writer :category
+
     #
     # The changeset for this cookbook. This is written by the changelog
     # generator and read by various plugins.

data/lib/stove/plugins/community.rb

@@ -0,0 +1,26 @@
+module Stove
+  class Plugin::Community < Plugin::Base
+    id 'community'
+    description 'Publish the release to the Chef community site'
+
+    validate(:configuration) do
+      Config.has_key?(:community)
+    end
+
+    validate(:username) do
+      Config[:community].has_key?(:username)
+    end
+
+    validate(:key) do
+      Config[:community].has_key?(:key)
+    end
+
+    validate(:category) do
+      !cookbook.category.nil?
+    end
+
+    after(:upload, 'Publishing the release to the Chef community site') do
+      Community.upload(cookbook)
+    end
+  end
+end

data/lib/stove/plugins/github.rb

@@ -99,8 +99,7 @@ module Stove
       @repo_url = $1.to_s
                     .strip
                     .gsub(/\.git$/, '')
-                    .gsub(':', '/')
-                    .gsub('@', '://')
+                    .gsub(/^\S+@(\S+):/, 'https://\1/')
                     .gsub('git://', 'https://')
       @repo_url
     end

data/lib/stove/version.rb

@@ -1,3 +1,3 @@
 module Stove
-  VERSION = '2.0.0.beta.1'
+  VERSION = '2.0.0.beta.2'
 end

data/lib/stove.rb

@@ -43,10 +43,11 @@ module Stove
   end
 
   module Plugin
-    autoload :Base,   'stove/plugins/base'
-    autoload :Git,    'stove/plugins/git'
-    autoload :GitHub, 'stove/plugins/github'
-    autoload :JIRA,   'stove/plugins/jira'
+    autoload :Base,      'stove/plugins/base'
+    autoload :Community, 'stove/plugins/community'
+    autoload :Git,       'stove/plugins/git'
+    autoload :GitHub,    'stove/plugins/github'
+    autoload :JIRA,      'stove/plugins/jira'
   end
 
   #

data/locales/en.yml

@@ -179,10 +179,9 @@ en:
                 }
               }
 
-
-      # Upload validations
+      # Community validations
       # ---------------------
-      upload:
+      community:
         configuration: >
           The Stove configuration for the Chef community site does not exist! In
           order to perform operations against the Chef community site, you must

data/stove.gemspec

@@ -19,10 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Runtime dependencies
-  spec.add_dependency 'faraday',               '~> 0.8'
-  spec.add_dependency 'faraday_middleware',    '~> 0.9'
+  spec.add_dependency 'faraday',               '~> 0.8.9'
+  spec.add_dependency 'faraday_middleware',    '~> 0.9.0'
   spec.add_dependency 'i18n',                  '~> 0.6'
-  spec.add_dependency 'log4r',                 '~> 1.1'
+
+  # Because log4r doesn't know the meaning of fucking NON-BREAKING bug fixes
+  # in patch releases.
+  spec.add_dependency 'log4r',                 '~> 1.1', '< 1.1.11'
   spec.add_dependency 'minitar',               '~> 0.5'
   spec.add_dependency 'mixlib-authentication', '~> 1.3'
   spec.add_dependency 'octokit',               '~> 2.7'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stove
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.9
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +69,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.1.11
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +219,7 @@ files:
 - features/actions/changelog.feature
 - features/actions/dev.feature
 - features/actions/upload.feature
+- features/plugins/community.feature
 - features/plugins/git.feature
 - features/rake.feature
 - features/step_definitions/cli_steps.rb
@@ -251,6 +258,7 @@ files:
 - lib/stove/mixins/validatable.rb
 - lib/stove/packager.rb
 - lib/stove/plugins/base.rb
+- lib/stove/plugins/community.rb
 - lib/stove/plugins/git.rb
 - lib/stove/plugins/github.rb
 - lib/stove/plugins/jira.rb
@@ -281,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A simple gem for packaging, releasing, and sanity-checking an Opscode community
@@ -292,6 +300,7 @@ test_files:
 - features/actions/changelog.feature
 - features/actions/dev.feature
 - features/actions/upload.feature
+- features/plugins/community.feature
 - features/plugins/git.feature
 - features/rake.feature
 - features/step_definitions/cli_steps.rb