ridley 4.5.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbb2fb90b80fa9b068ca5a5e90e8268aedfc254f
-  data.tar.gz: f5e1dee0ac3228d73f0daae9415f12e3f9c43fb1
+  metadata.gz: e4e00238e54e9232413052abc2f81f5ab712a2bd
+  data.tar.gz: 69cda3ec682d77f62c716c83717b904c928efcb5
 SHA512:
-  metadata.gz: c844f53dedd4b07e5d4b220b4b714ca32cc04c223be9f804dad9d1759bf2a25fb6f394ab9909bea95546ad7c645919295cdcd54a6490d4a5e5102c7baf573743
-  data.tar.gz: b9e0752f9070cab371ff752e764a8952dfc8558bb3ccf35b2b9dd137047de05fb61b144d3236c039c1cee098e9638cbda82005a7c705c3e3a1bc65c9e2e6ed3c
+  metadata.gz: 6e3edc7d191b8d3d97874ba964158d09e0451ced2a61e4c48423b3c169c6ffa8909a27096b16a859de8ef71c1f7363da81237cd04cffbd57f15843ffef5b2f11
+  data.tar.gz: 31fdbcbbf0d04f1adbcd8fc2bbfb6d335f6b465969cdd9b3a7de22c034b1c0b0aadce205016c4959f95b03dfe34848df62b94c94547445a0b027ff459749987a

data/lib/ridley/chef/cookbook/metadata.rb

@@ -49,6 +49,10 @@ module Ridley::Chef
       VERSION          = 'version'.freeze
       SOURCE_URL       = 'source_url'.freeze
       ISSUES_URL       = 'issues_url'.freeze
+      PRIVACY          = "privacy".freeze
+      CHEF_VERSIONS    = "chef_versions".freeze
+      OHAI_VERSIONS    = "ohai_versions".freeze
+      GEMS             = "gems".freeze
 
       COMPILED_FILE_NAME = "metadata.json".freeze
       RAW_FILE_NAME      = "metadata.rb".freeze
@@ -58,8 +62,8 @@ module Ridley::Chef
         :maintainer_email, :license, :platforms, :dependencies,
         :recommendations, :suggestions, :conflicting, :providing,
         :replacing, :attributes, :groupings, :recipes, :version,
-        :source_url, :issues_url
-      ]
+        :source_url, :issues_url, :privacy, :chef_versions, :ohai_versions,
+        :gems ]
 
       include Ridley::Mixin::ParamsValidate
       include Ridley::Mixin::FromFile
@@ -77,6 +81,13 @@ module Ridley::Chef
       attr_reader :recipes
       attr_reader :version
 
+      # @return [Array<Gem::Dependency>] Array of supported Chef versions
+      attr_reader :chef_versions
+      # @return [Array<Gem::Dependency>] Array of supported Ohai versions
+      attr_reader :ohai_versions
+      # @return [Array<Array>] Array of gems to install with *args as an Array
+      attr_reader :gems
+
       # Builds a new Chef::Cookbook::Metadata object.
       #
       # === Parameters
@@ -108,6 +119,10 @@ module Ridley::Chef
         @version         = Semverse::Version.new("0.0.0")
         @source_url      = ''
         @issues_url      = ''
+        @privacy = false
+        @chef_versions = []
+        @ohai_versions = []
+        @gems = []
 
         if cookbook
           @recipes = cookbook.fully_qualified_recipe_names.inject({}) do |r, e|
@@ -125,6 +140,12 @@ module Ridley::Chef
         end
       end
 
+      # Ensure that we don't have to update Ridley every time we add
+      # a new metadata field to Chef
+      def method_missing(method_sym, *args)
+        Ridley::Logging.logger.warn "Ignoring unknown metadata"
+      end
+
       # Sets the cookbooks maintainer, or returns it.
       #
       # === Parameters
@@ -346,6 +367,39 @@ module Ridley::Chef
         @replacing[cookbook]
       end
 
+      # Metadata DSL to set a valid chef_version.  May be declared multiple times
+      # with the result being 'OR'd such that if any statements match, the version
+      # is considered supported.  Uses Gem::Requirement for its implementation.
+      #
+      # @param version_args [Array<String>] Version constraint in String form
+      # @return [Array<Gem::Dependency>] Current chef_versions array
+      def chef_version(*version_args)
+        @chef_versions << Gem::Dependency.new("chef", *version_args) unless version_args.empty?
+        @chef_versions
+      end
+
+      # Metadata DSL to set a valid ohai_version.  May be declared multiple times
+      # with the result being 'OR'd such that if any statements match, the version
+      # is considered supported.  Uses Gem::Requirement for its implementation.
+      #
+      # @param version_args [Array<String>] Version constraint in String form
+      # @return [Array<Gem::Dependency>] Current ohai_versions array
+      def ohai_version(*version_args)
+        @ohai_versions << Gem::Dependency.new("ohai", *version_args) unless version_args.empty?
+        @ohai_versions
+      end
+
+      # Metadata DSL to set a gem to install from the cookbook metadata.  May be declared
+      # multiple times.  All the gems from all the cookbooks are combined into one Gemfile
+      # and depsolved together.  Uses Bundler's DSL for its implementation.
+      #
+      # @param args [Array<String>] Gem name and options to pass to Bundler's DSL
+      # @return [Array<Array>] Array of gem statements as args
+      def gem(*args)
+        @gems << args unless args.empty?
+        @gems
+      end
+
       # Adds a description for a recipe.
       #
       # === Parameters
@@ -390,7 +444,8 @@ module Ridley::Chef
             :recipes => { :kind_of => [ Array ], :default => [] },
             :default => { :kind_of => [ String, Array, Hash, Symbol, Numeric, TrueClass, FalseClass ] },
             :source_url => { :kind_of => String },
-            :issues_url => { :kind_of => String }
+            :issues_url => { :kind_of => String },
+            :privacy => { :kind_of => [ TrueClass, FalseClass ] },
           }
         )
         options[:required] = remap_required_attribute(options[:required]) unless options[:required].nil?
@@ -414,6 +469,40 @@ module Ridley::Chef
         @groupings[name]
       end
 
+      # Convert an Array of Gem::Dependency objects (chef_version/ohai_version) to an Array.
+      #
+      # Gem::Dependencey#to_s is not useful, and there is no #to_json defined on it or its component
+      # objets, so we have to write our own rendering method.
+      #
+      # [ Gem::Dependency.new(">= 12.5"), Gem::Dependency.new(">= 11.18.0", "< 12.0") ]
+      #
+      # results in:
+      #
+      # [ [ ">= 12.5" ], [ ">= 11.18.0", "< 12.0" ] ]
+      #
+      # @param deps [Array<Gem::Dependency>] Multiple Gem-style version constraints
+      # @return [Array<Array<String>]] Simple object representation of version constraints (for json)
+      def gem_requirements_to_array(*deps)
+        deps.map do |dep|
+          dep.requirement.requirements.map do |op, version|
+            "#{op} #{version}"
+          end.sort
+        end
+      end
+
+      # Convert an Array of Gem::Dependency objects (chef_version/ohai_version) to a hash.
+      #
+      # This is the inverse of #gem_requirements_to_array
+      #
+      # @param what [String] What version constraint we are constructing ('chef' or 'ohai' presently)
+      # @param array [Array<Array<String>]] Simple object representation of version constraints (from json)
+      # @return [Array<Gem::Dependency>] Multiple Gem-style version constraints
+      def gem_requirements_from_array(what, array)
+        array.map do |dep|
+          Gem::Dependency.new(what, *dep)
+        end
+      end
+
       def to_hash
         {
           NAME             => self.name,
@@ -434,7 +523,11 @@ module Ridley::Chef
           RECIPES          => self.recipes,
           VERSION          => self.version,
           SOURCE_URL       => self.source_url,
-          ISSUES_URL       => self.issues_url
+          ISSUES_URL       => self.issues_url,
+          PRIVACY          => self.privacy,
+          CHEF_VERSIONS    => gem_requirements_to_array(*self.chef_versions),
+          OHAI_VERSIONS    => gem_requirements_to_array(*self.ohai_versions),
+          GEMS             => self.gems,
         }
       end
 
@@ -466,6 +559,10 @@ module Ridley::Chef
         @version          = o[VERSION] if o.has_key?(VERSION)
         @source_url       = o[SOURCE_URL] if o.has_key?(SOURCE_URL)
         @issues_url       = o[ISSUES_URL] if o.has_key?(ISSUES_URL)
+        @privacy          = o[PRIVACY] if o.has_key?(PRIVACY)
+        @chef_versions    = gem_requirements_from_array("chef", o[CHEF_VERSIONS]) if o.has_key?(CHEF_VERSIONS)
+        @ohai_versions    = gem_requirements_from_array("ohai", o[OHAI_VERSIONS]) if o.has_key?(OHAI_VERSIONS)
+        @gems             = o[GEMS] if o.has_key?(GEMS)
         self
       end
 
@@ -503,6 +600,23 @@ module Ridley::Chef
         )
       end
 
+      #
+      # Sets the cookbook's privacy flag, or returns it.
+      #
+      # === Parameters
+      # privacy<TrueClass,FalseClass>:: Whether this cookbook is private or not
+      #
+      # === Returns
+      # privacy<TrueClass,FalseClass>:: Whether this cookbook is private or not
+      #
+      def privacy(arg = nil)
+        set_or_return(
+          :privacy,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ],
+        )
+      end
+
       private
 
         # Verify that the given array is an array of strings

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "4.5.0"
+  VERSION = "4.5.1"
 end

data/spec/unit/ridley/resources/cookbook_resource_spec.rb

@@ -131,7 +131,7 @@ describe Ridley::CookbookResource do
       # non-ignored files are the ONLY thing uploaded
       sandbox_resource.should_receive(:create).with([
         "211a3a8798d4acd424af15ff8a2e28a5",
-        "64ac6346672c6bea4ade983e3d58cd14",
+        "5f025b0817442ec087c4e0172a6d1e67",
         "75077ba33d2887cc1746d1ef716bf8b7",
         "7b1ebd2ff580ca9dc46fb27ec1653bf2",
         "84e12365e6f4ebe7db6a0e6a92473b16",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable