stove 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8523b3a26a8c2df2b1db61f884976dff941ccd6
-  data.tar.gz: 35b2772379fa8aa342ea127044c8b49a2f4b19c5
+  metadata.gz: 81f9d1281c571d2ef3fb23ea93ceb2b1d435ea60
+  data.tar.gz: 7762c7e2004f355e7ad385754e1813573c84f727
 SHA512:
-  metadata.gz: 94696e97b331ed3be0e81843e072b830ef0ddd6c4408fcd729eef208fae383694edc83282d5ed618b1fb4541ddcc9e24f1eefd3dd62e26773718b4ec8eebadd6
-  data.tar.gz: 0916263e890e2947b6cdf5f67e88810f61d1e7d84c42c560d440d832739cea4527b142c9549484ac9b40169ee24c680304b89b5203a0798fbb79b73b024a04de
+  metadata.gz: b338e1852007ae23bd882c39b4592aa7a470fa856cb64b3d400cf326010149d85a7cb9a52df29bc2b801411a9d50df1c3d30ee03115dcdb802d316f2e131cf9f
+  data.tar.gz: d546ac3c3d3f3b5b9c7a7924f657fcf9f3ddbcc97ec64f8a1caef324c48f4774b97b4b069f87e535e0b6ed8cd28e72ee14af38ed44c040366a76239900f31eb0

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This is the Changelog for the Stove gem.
 
+## v4.1.0 (2016-06-02)
+
+- Support uploading cookbooks to Supermarket that lack a metadata.rb, but have a metadata.json
+
 ## v4.0.0 (2016-05-05)
 
 - This version of stove now requires Ruby 2.0 or later

data/lib/stove/cookbook/metadata.rb

@@ -142,10 +142,13 @@ module Stove
 
       def from_file(path)
         path = path.to_s
+        path_json = File.join(File.dirname(path), 'metadata.json')
 
         if File.exist?(path) && File.readable?(path)
           self.instance_eval(IO.read(path), path, 1)
           self
+        elsif File.exist?(path_json) && File.readable?(path_json)
+          metadata_from_json(path_json)
         else
           raise Error::MetadataNotFound.new(path: path)
         end
@@ -198,6 +201,14 @@ module Stove
 
       private
 
+      def metadata_from_json(path)
+        json = JSON.parse(IO.read(path))
+        json.keys.each do |key|
+          set_or_return(key.to_sym, json[key])
+        end
+        self
+      end
+
       def set_or_return(symbol, arg)
         iv_symbol = "@#{symbol.to_s}".to_sym
 

data/lib/stove/rake_task.rb

@@ -9,7 +9,7 @@ module Stove
     def initialize(name = nil)
       yield self if block_given?
 
-      desc 'Publish this cookbook' unless ::Rake.application.last_comment
+      desc 'Publish this cookbook' unless ::Rake.application.last_description
       task(name || :publish) do |t, args|
         Cli.new(stove_opts || []).execute!
       end

data/lib/stove/version.rb

@@ -1,3 +1,3 @@
 module Stove
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stove
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-api