stove 4.1.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 157cfee1ba9ff810a7840cb9ac6d0f2ab396e2cc
-  data.tar.gz: 622404eec72bb2764aa17ed7a5999fccec3f8ef1
+  metadata.gz: 6a5b3636377d2a72d01138c74bc0d1a02c4019b5
+  data.tar.gz: f2252e862624ad4862bec9da34fc2160d0aa6995
 SHA512:
-  metadata.gz: cafeed9abaed34c86f05a216f2ecfc989fdc7850045a46cf4a60b406faddea45e2b6f91595997082efecd4e998cbe7c46a10725c1c12f5fef2efd2fee1d98e1d
-  data.tar.gz: 2acc399900e35283104df76c578024671bb2f05a2e94ecb50d7f37c82e3e6827f918b2253094ae8f4976132014465b43c414f87297c5b5aa54c7f9a8f3bdaf47
+  metadata.gz: 86a17cf2099b2771ea197c6c0614fbf494ee3f8304ed143281ef127efaf27dc27376fb860e4598d79e7f267251a9cf9ca438c7fb6ccbd346dcb0deb734497184
+  data.tar.gz: c40bf883da00c1b1dc2c7a6fab8355f625320f438989a284b1ef4e43f4720364883cda41e22d30b2a7ff3287a1bbc65f9d10a8e45b08c80a1404efdce4e216f0

data/.travis.yml

@@ -3,10 +3,9 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
 
 branches:
   only:

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 This is the Changelog for the Stove gem.
 
+## v5.0.0 (2017-03-22)
+
+- Enable pushing extended metadata for Chef 12 by default
+- Add gem metadata to the extended metadata whitelist
+- Use git porcelain vs. -s to avoid having local git configs interfere with stove functionality
+- Only populate the extended metadata if the fields are actually present in the metadata
+- Support for Ruby 2.0 has been dropped as Ruby 2.0 has been EOL'd
+
 ## v4.1.1 (2016-06-02)
 
 - Don't delete the metadata.json file if there isn't a metadata.rb

data/Gemfile

@@ -1,2 +1,5 @@
 source 'https://rubygems.org'
 gemspec
+
+# this maintains compatiblity with Ruby 2.1
+gem 'rack', '< 2'

data/lib/stove/cli.rb

@@ -118,8 +118,8 @@ module Stove
           options[:key] = v
         end
 
-        opts.on('--extended-metadata', 'Include non-backwards compatible metadata keys such as `issues_url`') do
-          options[:extended_metadata] = true
+        opts.on('--[no-]extended-metadata', 'Include non-backwards compatible metadata keys such as `issues_url`') do |v|
+          options[:extended_metadata] = v
         end
 
         opts.on('--no-ssl-verify', 'Turn off ssl verify') do
@@ -174,7 +174,7 @@ module Stove
         :endpoint          => nil,
         :username          => Config.username,
         :key               => Config.key,
-        :extended_metadata => false,
+        :extended_metadata => true,
         :ssl_verify        => true,
 
         # Git options

data/lib/stove/cookbook/metadata.rb

@@ -54,6 +54,14 @@ module Stove
             end
           EOM
         end
+
+        def def_meta_gems(field, instance_variable)
+          class_eval <<-EOM, __FILE__, __LINE__ + 1
+            def #{field}(thing)
+              @#{instance_variable} << thing
+            end
+          EOM
+        end
       end
 
       DEFAULT_VERSION = '>= 0.0.0'.freeze
@@ -79,6 +87,7 @@ module Stove
       def_attribute :issues_url
       def_attribute :chef_version
       def_attribute :ohai_version
+      def_attribute :gem
 
       def_meta_cookbook :supports,   :platforms
       def_meta_cookbook :depends,    :dependencies
@@ -91,11 +100,13 @@ module Stove
       def_meta_setter :recipe,    :recipes
       def_meta_setter :grouping,  :groupings
       def_meta_setter :attribute, :attributes
+      def_meta_gems   :gem,       :gems
 
       attr_reader :cookbook
       attr_reader :platforms
       attr_reader :dependencies
       attr_reader :recommendations
+      attr_reader :gems
       attr_reader :suggestions
       attr_reader :conflicting
       attr_reader :providing
@@ -111,6 +122,7 @@ module Stove
         @long_description = ''
         @source_url       = Stove::Mash.new
         @issues_url       = Stove::Mash.new
+        @gems             = []
         @chef_version     = Stove::Mash.new
         @ohai_version     = Stove::Mash.new
         @platforms        = Stove::Mash.new
@@ -190,8 +202,9 @@ module Stove
         }
 
         if extended_metadata
-          hash['source_url']   = self.source_url
-          hash['issues_url']   = self.issues_url
+          hash['source_url']   = self.source_url unless self.source_url.empty?
+          hash['issues_url']   = self.issues_url unless self.issues_url.empty?
+          hash['gems']         = self.gems unless self.gems.empty?
           hash['chef_version'] = self.chef_version
           hash['ohai_version'] = self.ohai_version
         end

data/lib/stove/plugins/git.rb

@@ -8,7 +8,7 @@ module Stove
     end
 
     validate(:clean) do
-      git_null('status -s').strip.empty?
+      git_null('status --porcelain').strip.empty?
     end
 
     validate(:up_to_date) do

data/lib/stove/version.rb

@@ -1,3 +1,3 @@
 module Stove
-  VERSION = '4.1.1'
+  VERSION = '5.0.0'
 end

data/spec/unit/cookbook/metadata_spec.rb

@@ -8,14 +8,58 @@ class Stove::Cookbook
           hash = subject.to_hash(false)
           expect(hash).to_not include('issues_url')
           expect(hash).to_not include('source_url')
+          expect(hash).to_not include('chef')
         end
       end
 
       context 'when the extra metadata is included' do
         it 'includes the new metadata fields' do
+          subject.source_url('http://foo.example.com')
+          subject.issues_url('http://bar.example.com')
+          subject.gem('rspec')
           hash = subject.to_hash(true)
           expect(hash).to include('issues_url')
+          expect(hash['source_url']).to eq 'http://foo.example.com'
           expect(hash).to include('source_url')
+          expect(hash['issues_url']).to eq 'http://bar.example.com'
+          expect(hash).to include('gems')
+          expect(hash['gems']).to eq(['rspec'])
+        end
+      end
+
+      context 'when the extra metadata is not defined' do
+        it 'does not include the new metadata fields' do
+          hash = subject.to_hash(true)
+          expect(hash).not_to include('source_url')
+          expect(hash).not_to include('issues_url')
+          expect(hash).not_to include('gems')
+        end
+      end
+
+      context 'when only some of the extra metadata is defined' do
+        it 'only includes the source_url if issues_url is empty' do
+          subject.source_url('http://foo.example.com')
+          hash = subject.to_hash(true)
+          expect(hash).to include('source_url')
+          expect(hash['source_url']).to eq 'http://foo.example.com'
+          expect(hash).not_to include('issues_url')
+        end
+
+        it 'only includes the issues_url if source_url is empty' do
+          subject.issues_url('http://bar.example.com')
+          hash = subject.to_hash(true)
+          expect(hash).to include('issues_url')
+          expect(hash['issues_url']).to eq 'http://bar.example.com'
+          expect(hash).not_to include('source_url')
+        end
+
+        it 'only includes the gems' do
+          subject.gem('rspec')
+          hash = subject.to_hash(true)
+          expect(hash).to include('gems')
+          expect(hash['gems']).to eq(['rspec'])
+          expect(hash).not_to include('source_url')
+          expect(hash).not_to include('issues_url')
         end
       end
     end

data/stove.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 2.1'
 
   # Runtime dependencies
   spec.add_dependency 'chef-api', '~> 0.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stove
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-api
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A command-line utility for releasing Chef community cookbooks
@@ -214,4 +214,3 @@ test_files:
 - spec/support/generators.rb
 - spec/unit/cookbook/metadata_spec.rb
 - spec/unit/error_spec.rb
-has_rdoc: