stove 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a5b3636377d2a72d01138c74bc0d1a02c4019b5
-  data.tar.gz: f2252e862624ad4862bec9da34fc2160d0aa6995
+  metadata.gz: 86092b84ffa5f03569b57944b56f09c82c0b24a9
+  data.tar.gz: b42a43be5248d0ab029a93abf3a54e906521a88b
 SHA512:
-  metadata.gz: 86a17cf2099b2771ea197c6c0614fbf494ee3f8304ed143281ef127efaf27dc27376fb860e4598d79e7f267251a9cf9ca438c7fb6ccbd346dcb0deb734497184
-  data.tar.gz: c40bf883da00c1b1dc2c7a6fab8355f625320f438989a284b1ef4e43f4720364883cda41e22d30b2a7ff3287a1bbc65f9d10a8e45b08c80a1404efdce4e216f0
+  metadata.gz: 7f694c9b7f8921db5683cfdc2fd326e2458545a54ba5ac9eb9ff17c5ed6e463343404a7f57ba45a55d29b8da43b429d35ca1f3037b79ff7a44ad0436d019807a
+  data.tar.gz: a79d23a0c76f6917ef065a3a8b09afc5e78bcc2218326efb8eef091ee35bc69e300579038818d5e9a8a1e74a0d6d2d0ab7dc46580ad3b8d33145e5795846f0fd

data/.travis.yml

@@ -4,8 +4,8 @@ sudo: false
 
 rvm:
   - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
 
 branches:
   only:

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 This is the Changelog for the Stove gem.
 
+## v5.1.0 (2017-03-31)
+
+- Match Chef's metadata behavior with chef_version and ohai_version to allow version constraints like '>= 12.5', '< 14'
+- Allow having gem version in cookbook metadata.json
+- Better align gem version logic with how Chef handles it
+
 ## v5.0.0 (2017-03-22)
 
 - Enable pushing extended metadata for Chef 12 by default

data/README.md

@@ -1,35 +1,32 @@
-Stove
-=====
-[![Gem Version](http://img.shields.io/gem/v/stove.svg?style=flat-square)][gem]
-[![Build Status](http://img.shields.io/travis/sethvargo/stove.svg?style=flat-square)][travis]
+# Stove
 
-[gem]: https://rubygems.org/gems/stove
-[travis]: http://travis-ci.org/sethvargo/stove
+[![Gem Version](http://img.shields.io/gem/v/stove.svg?style=flat-square)][gem] [![Build Status](http://img.shields.io/travis/sethvargo/stove.svg?style=flat-square)][travis]
 
 A utility for releasing and managing Chef Cookbooks. It will:
 
 - Tag and push a new release to git
-- Upload the cookbook to a cookbook share (such as Supermarket)
+- Upload the cookbook to a private or public Supermarket
 
+## Why?
 
-Why?
-----
-Existing tools to package cookbooks (such as [Knife Community](https://github.com/miketheman/knife-community) and `knife cookbook site share`) require a dependency on Chef. Because of thier dependency on Chef, they enforce the use of a "cookbook repo". Especially with the evolution of [Berkshelf](https://github.com/RiotGames/berkshelf), cookbooks are individualized artifacts and are often contained in their own repositories. [stove](https://github.com/sethvargo/stove) is **cookbook-centric, rather than Chef-centric**.
+Existing tools to package cookbooks (such as [Knife Community](https://github.com/miketheman/knife-community) and `knife cookbook site share`) require a dependency on Chef. Because of their dependency on Chef, they enforce the use of a "cookbook repo". Especially with the evolution of [Berkshelf](https://github.com/RiotGames/berkshelf), cookbooks are individualized artifacts and are often contained in their own repositories. [stove](https://github.com/sethvargo/stove) is **cookbook-centric, rather than Chef-centric**.
 
+## Installation
 
-Installation
-------------
 1. Add Stove to your project's Gemfile:
 
-        gem 'stove'
+  ```
+  gem 'stove'
+  ```
 
 2. Run the `bundle` command to install:
 
-        $ bundle install --binstubs
+  ```
+  $ bundle install --binstubs
+  ```
 
+## Configuration
 
-Configuration
--------------
 Stove requires your username and private key to upload a cookbook. You can pass these to each command call, or you can set them Stove:
 
 ```bash
@@ -38,29 +35,24 @@ $ stove login --username sethvargo --key ~/.chef/sethvargo.pem
 
 These values will be saved in Stove's configuration file (`~/.stove`) and persisted across your workstation.
 
-The default publishing endpoint is the [Chef Supermarket](https://supermarket.chef.io), but this is configurable. If you want to publish to an internal community site, you can specify the `--endpoint` value:
+The default publishing endpoint is the [Chef Supermarket](https://supermarket.chef.io), but this is configurable. If you want to publish to an internal Supermarket, you can specify the `--endpoint` value:
 
 ```bash
-$ stove --endpoint https://internal-cookbook-store.example.com
+$ stove --endpoint https://internal-supermarket.example.com/api/v1
 ```
 
-or for a private supermarket using the [supermarket](https://supermarket.chef.io/cookbooks/supermarket) cookbook:
+Please note: depending on which version of Chef and which version of Supermarket you are running, you may support the new "extended" metadata fields. By default, Stove writes these new fields when uploading cookbooks, which require Chef 12 or later. If you would like to retain compatibility with Chef 11 you can disable extended metadata with `--no-extended-metadata`:
 
 ```bash
-$ stove --endpoint https://internal-cookbook-store.example.com/api/v1
+$ stove --no-extended-metadata
 ```
 
-Please note: depending on which version of Chef and which version of Supermarket you are running, you may support the new "extended" metadata fields. By default, Stove reads but does not write these new fields when uploading cookbooks because it is not backwards compatible. If you are running Chef 12+ and have the latest version of Supermarket installed, you can specify the `--extended-metadata` flag to include these values in the generated metadata:
-
-```bash
-$ stove --extended-metadata
-```
+## Usage
 
-Usage
------
 There are two ways to use Stove. You can either use the `stove` command directly or use the embedded rake task.
 
 ### Command
+
 Execute the `stove` command from inside the root of a cookbook:
 
 ```bash
@@ -70,6 +62,7 @@ $ bin/stove
 This will package (as a tarball) the cookbook in the current working directory, tag a new version, push to git, and publish to a cookbook share.
 
 ### Rake task
+
 If you are familiar with the Bundler approach to publishing Ruby gems, this approach will feel very familiar. Simply add the following to your `Rakefile`:
 
 ```ruby
@@ -83,24 +76,21 @@ And then use rake to publish the cookbook:
 $ bin/rake publish
 ```
 
+## Contributing
 
-Contributing
-------------
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## See Also
 
-See Also
---------
 - [Knife Community](https://github.com/miketheman/knife-community)
 - [Emeril](https://github.com/fnichol/emeril)
 
+## License & Authors
 
-License & Authors
------------------
 - Author: Seth Vargo (sethvargo@gmail.com)
 
 ```text
@@ -119,3 +109,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ```
+
+[gem]: https://rubygems.org/gems/stove
+[travis]: http://travis-ci.org/sethvargo/stove

data/lib/stove/cookbook/metadata.rb

@@ -57,8 +57,18 @@ module Stove
 
         def def_meta_gems(field, instance_variable)
           class_eval <<-EOM, __FILE__, __LINE__ + 1
-            def #{field}(thing)
-              @#{instance_variable} << thing
+            def #{field}(*args)
+              @#{instance_variable} << args unless args.empty?
+              @#{instance_variable}
+            end
+          EOM
+        end
+
+        def def_meta_version(field)
+          class_eval <<-EOM, __FILE__, __LINE__ + 1
+            def #{field}(*args)
+              @#{field} << args unless args.empty?
+              @#{field}
             end
           EOM
         end
@@ -85,9 +95,8 @@ module Stove
       # these attributes are here.
       def_attribute :source_url
       def_attribute :issues_url
-      def_attribute :chef_version
-      def_attribute :ohai_version
-      def_attribute :gem
+      def_meta_version :chef_version
+      def_meta_version :ohai_version
 
       def_meta_cookbook :supports,   :platforms
       def_meta_cookbook :depends,    :dependencies
@@ -123,8 +132,8 @@ module Stove
         @source_url       = Stove::Mash.new
         @issues_url       = Stove::Mash.new
         @gems             = []
-        @chef_version     = Stove::Mash.new
-        @ohai_version     = Stove::Mash.new
+        @chef_version     = []
+        @ohai_version     = []
         @platforms        = Stove::Mash.new
         @dependencies     = Stove::Mash.new
         @recommendations  = Stove::Mash.new
@@ -205,8 +214,8 @@ module Stove
           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
+          hash['chef_version'] = self.chef_version.map(&:sort)
+          hash['ohai_version'] = self.ohai_version.map(&:sort)
         end
 
         return hash

data/lib/stove/version.rb

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

data/spec/unit/cookbook/metadata_spec.rb

@@ -23,7 +23,7 @@ class Stove::Cookbook
           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'])
+          expect(hash['gems']).to eq([['rspec']])
         end
       end
 
@@ -57,11 +57,120 @@ class Stove::Cookbook
           subject.gem('rspec')
           hash = subject.to_hash(true)
           expect(hash).to include('gems')
-          expect(hash['gems']).to eq(['rspec'])
+          expect(hash['gems']).to eq([['rspec']])
           expect(hash).not_to include('source_url')
           expect(hash).not_to include('issues_url')
         end
       end
     end
+
+    describe '#chef_version' do
+      let(:hash_version) { subject.to_hash(true)['chef_version'] }
+
+      context 'with no chef_version line' do
+        it 'returns []' do
+          expect(subject.chef_version).to eq []
+          expect(hash_version).to eq []
+        end
+      end
+
+      context 'with a single chef_version requirement' do
+        it 'returns [[req]]' do
+          subject.chef_version('>= 12.0')
+          expect(subject.chef_version).to eq [['>= 12.0']]
+          expect(hash_version).to eq [['>= 12.0']]
+        end
+      end
+
+      context 'with a multi-part chef_version requirement' do
+        it 'returns [[req1, req2]]' do
+          subject.chef_version('>= 12.0', '< 14.0')
+          expect(subject.chef_version).to eq [['>= 12.0', '< 14.0']]
+          expect(hash_version).to eq [['< 14.0', '>= 12.0',]]
+        end
+      end
+
+      context 'with multiple chef_version requirements' do
+        it 'returns [[req1], [req2]]' do
+          subject.chef_version('< 12')
+          subject.chef_version('> 14')
+          expect(subject.chef_version).to eq [['< 12'], ['> 14']]
+          expect(hash_version).to eq [['< 12'], ['> 14']]
+        end
+      end
+    end
+
+    describe '#ohai_version' do
+      let(:hash_version) { subject.to_hash(true)['ohai_version'] }
+
+      context 'with no ohai_version line' do
+        it 'returns []' do
+          expect(subject.ohai_version).to eq []
+          expect(hash_version).to eq []
+        end
+      end
+
+      context 'with a single ohai_version requirement' do
+        it 'returns [[req]]' do
+          subject.ohai_version('>= 12.0')
+          expect(subject.ohai_version).to eq [['>= 12.0']]
+          expect(hash_version).to eq [['>= 12.0']]
+        end
+      end
+
+      context 'with a multi-part ohai_version requirement' do
+        it 'returns [[req1, req2]]' do
+          subject.ohai_version('>= 12.0', '< 14.0')
+          expect(subject.ohai_version).to eq [['>= 12.0', '< 14.0']]
+          expect(hash_version).to eq [['< 14.0', '>= 12.0',]]
+        end
+      end
+
+      context 'with multiple ohai_version requirements' do
+        it 'returns [[req1], [req2]]' do
+          subject.ohai_version('< 12')
+          subject.ohai_version('> 14')
+          expect(subject.ohai_version).to eq [['< 12'], ['> 14']]
+          expect(hash_version).to eq [['< 12'], ['> 14']]
+        end
+      end
+    end
+
+    describe '#gem' do
+      let(:hash_gems) { subject.to_hash(true)['gems'] }
+
+      context 'with no gem line' do
+        it 'returns []' do
+          expect(subject.gems).to eq []
+          expect(hash_gems).to be_nil
+        end
+      end
+
+      context 'with a single gem dependency' do
+        it 'returns [[gem]]' do
+          subject.gem('nokogiri')
+          expect(subject.gems).to eq [['nokogiri']]
+          expect(hash_gems).to eq [['nokogiri']]
+        end
+      end
+
+      context 'with a gem dependency with a version specifier' do
+        it 'returns [[gem, ver]]' do
+          subject.gem('nokogiri', '>= 1.2.3')
+          expect(subject.gems).to eq [['nokogiri', '>= 1.2.3']]
+          expect(hash_gems).to eq [['nokogiri', '>= 1.2.3']]
+        end
+      end
+
+      context 'with multiple gem dependencies' do
+        it 'returns [[gem1], [gem2]]' do
+          subject.gem('nokogiri')
+          subject.gem('rack')
+          expect(subject.gems).to eq [['nokogiri'], ['rack']]
+          expect(hash_gems).to eq [['nokogiri'], ['rack']]
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stove
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-api
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A command-line utility for releasing Chef community cookbooks