stove 3.2.7 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e408d2205fca9b0b14a446ae29746f36b39b9411
-  data.tar.gz: 4c3f9baa7f8de64aa63b484264db3aed57cdf7b4
+  metadata.gz: d1321201c0ae5405d1c8a7a2ff1fce2e5d9a8777
+  data.tar.gz: 91c2389af99096b58e475e04336fd9e167db1daa
 SHA512:
-  metadata.gz: 108c86f18357afa93cdcb735f8dbc2a8fa688a4d2fe44aff21132469862e667b424eb4a7586b89d22d47602853d52b9ebbf616743e4e116df0e75ce8a58a3a3b
-  data.tar.gz: db000dddde6faf57a6073c23d3322c6c800565bbab6a60ac4166c13b56453fb95a708096f50992a34734b66e3a11be3a355ce4da2878a8ecd51413c54d0981c9
+  metadata.gz: e49d40340be589603949541d819dd0c69eaf3112b38c33f96da174a18fdc3fc0c4e02b7ede71364b923c25d530b2d9b6f7062e074984da2a3ad8a180d6034f17
+  data.tar.gz: 2d3558666277963543bfc65ceabe70765fabcd52edcf2c8fedc0db1ceea570f0005cde5c1751a65b870ec274ada11a4669871cf04969dc5f5a78a630a5bbec5f

data/.travis.yml

@@ -1,3 +1,7 @@
+language: ruby
+cache: bundler
+sudo: false
+
 rvm:
   - 1.9.3
   - 2.0.0

data/CHANGELOG.md

@@ -2,6 +2,13 @@ Stove CHANGELOG
 ===============
 This is the Changelog for the Stove gem.
 
+v3.2.8 (2015-11-19)
+-------------------
+- Add endpoint config to the .stove config file for users of private Supermarkets
+- Add option --no-ssl-verify to skip SSL verification
+- Add chef_version and ohai_version metadata when extended-metadata is enabled
+- Add CONTRIBUTING.md, MAINTAINERS.md and .foodcritic to the file whitelist
+
 v3.2.7 (2015-04-16)
 -------------------
 - Use chef.io instead of getchef.com

data/lib/stove/cli.rb

@@ -27,6 +27,7 @@ module Stove
 
         Config.username = options[:username]
         Config.key      = options[:key]
+        Config.endpoint = options[:endpoint] unless options[:endpoint].nil?
         Config.save
 
         @stdout.puts "Successfully saved config to `#{Config.__path__}'!"
@@ -35,9 +36,10 @@ module Stove
       end
 
       # Override configs
-      Config.endpoint = options[:endpoint] if options[:endpoint]
-      Config.username = options[:username] if options[:username]
-      Config.key      = options[:key]      if options[:key]
+      Config.endpoint   = options[:endpoint] if options[:endpoint]
+      Config.username   = options[:username] if options[:username]
+      Config.key        = options[:key]      if options[:key]
+      Config.ssl_verify = options[:ssl_verify]
 
       # Set the log level
       Stove.log_level = options[:log_level]
@@ -120,6 +122,10 @@ module Stove
           options[:extended_metadata] = true
         end
 
+        opts.on('--no-ssl-verify', 'Turn off ssl verify') do
+          options[:ssl_verify] = false
+        end
+
         opts.separator ''
         opts.separator 'Git Options:'
 
@@ -169,6 +175,7 @@ module Stove
         :username          => Config.username,
         :key               => Config.key,
         :extended_metadata => false,
+        :ssl_verify        => true,
 
         # Git options
         :remote => 'origin',

data/lib/stove/community.rb

@@ -86,9 +86,10 @@ module Stove
     #
     def connection
       @connection ||= ChefAPI::Connection.new do |conn|
-        conn.endpoint = ENV['STOVE_ENDPOINT'] || Config.endpoint || DEFAULT_ENDPOINT
-        conn.client   = ENV['STOVE_USERNAME'] || Config.username
-        conn.key      = ENV['STOVE_KEY']      || Config.key
+        conn.endpoint   = ENV['STOVE_ENDPOINT']      || Config.endpoint || DEFAULT_ENDPOINT
+        conn.client     = ENV['STOVE_USERNAME']      || Config.username
+        conn.key        = ENV['STOVE_KEY']           || Config.key
+        conn.ssl_verify = ENV['STOVE_NO_SSL_VERIFY'] || Config.ssl_verify
       end
     end
   end

data/lib/stove/cookbook/metadata.rb

@@ -77,6 +77,8 @@ module Stove
       # these attributes are here.
       def_attribute :source_url
       def_attribute :issues_url
+      def_attribute :chef_version
+      def_attribute :ohai_version
 
       def_meta_cookbook :supports,   :platforms
       def_meta_cookbook :depends,    :dependencies
@@ -109,6 +111,8 @@ module Stove
         @long_description = ''
         @source_url       = Stove::Mash.new
         @issues_url       = Stove::Mash.new
+        @chef_version     = Stove::Mash.new
+        @ohai_version     = Stove::Mash.new
         @platforms        = Stove::Mash.new
         @dependencies     = Stove::Mash.new
         @recommendations  = Stove::Mash.new
@@ -183,8 +187,10 @@ module Stove
         }
 
         if extended_metadata
-          hash['source_url'] = self.source_url
-          hash['issues_url'] = self.issues_url
+          hash['source_url']   = self.source_url
+          hash['issues_url']   = self.issues_url
+          hash['chef_version'] = self.chef_version
+          hash['ohai_version'] = self.ohai_version
         end
 
         return hash

data/lib/stove/packager.rb

@@ -8,16 +8,19 @@ module Stove
     include Logify
 
     ACCEPTABLE_FILES = [
+      '.foodcritic',
       'README.*',
       'CHANGELOG.*',
+      'CONTRIBUTING.md',
+      'MAINTAINERS.md',
       'metadata.json',
       'attributes/*.rb',
       'definitions/*.rb',
       'files/**/*',
-      'libraries/*.rb',
-      'providers/*.rb',
+      'libraries/**/*.rb',
+      'providers/**/*.rb',
       'recipes/*.rb',
-      'resources/*.rb',
+      'resources/**/*.rb',
       'templates/**/*',
     ].freeze
 

data/lib/stove/version.rb

@@ -1,3 +1,3 @@
 module Stove
-  VERSION = '3.2.7'
+  VERSION = '3.2.8'
 end

data/spec/integration/cookbook_spec.rb

@@ -16,6 +16,7 @@ module Stove
         end
 
         expect(structure).to eq(%w(
+          basic/.foodcritic
           basic/CHANGELOG.md
           basic/README.md
           basic/attributes/default.rb

data/spec/support/generators.rb

@@ -20,6 +20,11 @@ module Stove
         FileUtils.mkdir_p(root.join('templates', 'default'))
 
         # Files
+        File.open(root.join('.foodcritic'), 'wb') do |f|
+          f.write <<-EOH.gsub(/^ {11}/, '')
+            ~FC031 ~FC045
+          EOH
+        end
         File.open(root.join('metadata.rb'), 'wb') do |f|
           f.write <<-EOH.gsub(/^ {11}/, '')
             name '#{cookbook_name}'

data/stove.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'chef-api', '~> 0.5'
   spec.add_dependency 'logify',   '~> 0.2'
 
-  spec.add_development_dependency 'aruba',          '~> 0.6'
+  spec.add_development_dependency 'aruba',          '~> 0.6.0'
   spec.add_development_dependency 'bundler',        '~> 1.6'
   spec.add_development_dependency 'community-zero', '~> 2.0'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stove
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-api
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A command-line utility for releasing Chef community cookbooks
@@ -214,3 +214,4 @@ test_files:
 - spec/support/generators.rb
 - spec/unit/cookbook/metadata_spec.rb
 - spec/unit/error_spec.rb
+has_rdoc: