community-zero 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 226abd2ceb30453c56003b2de236ec47e8af77cf
-  data.tar.gz: a409e38004737aeefe6ac90a62b49ac791873244
+  metadata.gz: 261644b167527ab9276b97f3a237633de68b7816
+  data.tar.gz: f600d118f314c8d6eeb35b1be7d18379f9e988bd
 SHA512:
-  metadata.gz: 262caaa1ddf67dddec56af33b02814933a6ae76ba2cf94b3b178f0018b4b4c13f6c276a2967a145dab616cdec3219f5d04c627fc2792709ab82d690ab9669da7
-  data.tar.gz: 4bf09520b70db219d1181719ea16fb714c92874db45889482453b5012aa3704557d8f50e6a4c48698928744029927224c1ab69c575ca9156b9441d7c3d09659b
+  metadata.gz: b8bb6605790682958e1b824b5e9672b459bc0981d62387a5511f91243b8daa07cf40fe20cf76cb79900f83c72ceacf646904922b29fb4d8429174204447d26f2
+  data.tar.gz: 16f5b7bc429553f540c48ab9268d666402a7d5bfd2894b4676c00c41a5291dace4495355ac432e18507ec947005b22fd1ed3ba194e614eb112d7972bf7c8380b

data/lib/community_zero/chef/metadata.rb

@@ -15,17 +15,36 @@
 # limitations under the License.
 #
 
+require 'json'
+
 module CommunityZero
   # A quick, short metadata parser.
   #
   # @author Seth Vargo <sethvargo@gmail.com>
   class Metadata
-    # Create a new metadata class.
+    # Create a new metadata class from the JSON.
     #
     # @param [String] content
-    #   the contents of the file to convert to a metadata entry.
-    def initialize(content)
-      instance_eval(content)
+    #   the raw JSON content to parse into metadata
+    #
+    def self.from_json(content)
+      json = JSON.parse(content)
+
+      new.tap do |instance|
+        json.each do |k,v|
+          instance.send(k, v)
+        end
+      end
+    end
+
+    # Create a new metadata class from the raw Ruby.
+    #
+    # @param [String] content
+    #   the contents of the file to convert to a metadata entry
+    def self.from_ruby(content)
+      new.tap do |instance|
+        instance.instance_eval(content)
+      end
     end
 
     def method_missing(m, *args, &block)

data/lib/community_zero/endpoints/cookbooks_endpoint.rb

@@ -49,7 +49,7 @@ module CommunityZero
       cookbook = JSON.parse(params['cookbook'], symbolize_names: true)
       tarball = params['tarball']
 
-      metadata = Metadata.new(read_tarball(tarball))
+      metadata = find_metadata(tarball)
 
       if store.find(metadata.name, metadata.version)
         respond(401,
@@ -86,20 +86,21 @@ module CommunityZero
       #
       # @param [Tempfile] tarball
       #   the temporarily uploaded file
-      def read_tarball(tarball)
+      #
+      # @return [Metadata]
+      def find_metadata(tarball)
         gzip = Zlib::GzipReader.new(tarball[:tempfile])
         tar = Gem::Package::TarReader.new(gzip)
-        metadata = nil
 
         tar.each do |entry|
-          if entry.full_name =~ /metadata\.rb$/
-            metadata = entry.read
-            break
+          if entry.full_name =~ /metadata\.json$/
+            return Metadata.from_json(entry.read)
+          elsif entry.full_name =~ /metadata\.rb$/
+            return Metadata.from_ruby(entry.read)
           end
         end
+      ensure
         tar.close
-
-        return metadata
       end
 
   end

data/lib/community_zero/version.rb

@@ -16,5 +16,5 @@
 #
 
 module CommunityZero
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: community-zero
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Self-contained, easy-setup, fast-start in-memory Chef Community Site
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef Community Site for