ridley 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3440ef439aff4fca73a0bb7943c5883b73d4ee6a
-  data.tar.gz: d1f414b2cb9a4f5210f59068bcde449f369013b9
+  metadata.gz: 0abbe5b80f97f621001f5010befbac00b1c33b97
+  data.tar.gz: e4a7eac60ebd38aa964556f1c55ce925d6ea906c
 SHA512:
-  metadata.gz: fe0cdd7ea95cd9a6d6357c9242d1d73300de0777291499f9f61ce254fe1fa914c506a1be30065e8738a52bc8209bc6e5859975fdcf3c59ea0411642263f4dc0f
-  data.tar.gz: a67ccd75c7ff3006a70acd1d93154aab3de632c9a01464749a19d973ade48f2292704f481c08de7e93d603b23aa2c7e912afa083e99762f767bfa9399fa383b7
+  metadata.gz: 7ab776183b19fe43d27364ea31a9fa76db3b1d48a9226c8c648c0e5150ef7b34211521d3cf54f53ec1a10445f176c8ce0d07cda25e611d382f9e3a19bbc7a0ec
+  data.tar.gz: 2e832f64e3babcba93153e3325b620a37c64ff8972c4084a2d7dd81dd65a514242472f1f9a0649934e92ec09b3a3b9df21ad9a8044c5d1a2dfe021d6d14fe42d

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.0.0-p353

data/lib/ridley/chef/cookbook.rb

@@ -33,12 +33,12 @@ module Ridley::Chef
       # @return [Ridley::Chef::Cookbook]
       def from_path(path, options = {})
         path     = Pathname.new(path)
-        metadata = if path.join('metadata.rb').exist?
-          Cookbook::Metadata.from_file(path.join('metadata.rb'))
-        elsif path.join('metadata.json').exist?
-          Cookbook::Metadata.from_json(File.read(path.join('metadata.json')))
+        metadata = if (metadata_file = path.join(Metadata::COMPILED_FILE_NAME)).exist?
+          Cookbook::Metadata.from_json(File.read(metadata_file))
+        elsif (metadata_file = path.join(Metadata::RAW_FILE_NAME)).exist?
+          Cookbook::Metadata.from_file(metadata_file)
         else
-          raise IOError, "no metadata.rb or metadata.json found at #{path}"
+          raise IOError, "no #{Metadata::COMPILED_FILE_NAME} or #{Metadata::RAW_FILE_NAME} found at #{path}"
         end
 
         metadata.name(options[:name].presence || metadata.name.presence || File.basename(path))
@@ -54,6 +54,7 @@ module Ridley::Chef
     attr_reader :cookbook_name
     attr_reader :path
     attr_reader :metadata
+
     # @return [Hashie::Mash]
     #   a Hashie::Mash containing Cookbook file category names as keys and an Array of Hashes
     #   containing metadata about the files belonging to that category. This is used
@@ -117,6 +118,25 @@ module Ridley::Chef
       end
     end
 
+    # Compiles the raw metadata of the cookbook and writes it to a metadata.json file at the given
+    # out path. The default out path is the directory containing the cookbook itself.
+    #
+    # @param [String] out
+    #   directory to output compiled metadata to
+    def compile_metadata(out = self.path)
+      File.open(File.join(out, Metadata::COMPILED_FILE_NAME), "w+") do |f|
+        f.write(metadata.to_json)
+      end
+    end
+
+    # Returns true if the cookbook instance has a compiled metadata file and false if it
+    # does not.
+    #
+    # @return [Boolean]
+    def compiled_metadata?
+      manifest[:root_files].any? { |file| file[:name].downcase == Metadata::COMPILED_FILE_NAME }
+    end
+
     # @param [Symbol] category
     #   the category of file to generate metadata about
     # @param [String] target
@@ -168,6 +188,11 @@ module Ridley::Chef
       "#{cookbook_name}-#{version}"
     end
 
+    # Reload the cookbook from the files located on disk at `#path`.
+    def reload
+      load_files
+    end
+
     def validate
       raise IOError, "No Cookbook found at: #{path}" unless path.exist?
 

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

@@ -30,23 +30,26 @@ module Ridley::Chef
         end
       end
 
-      NAME              = 'name'.freeze
-      DESCRIPTION       = 'description'.freeze
-      LONG_DESCRIPTION  = 'long_description'.freeze
-      MAINTAINER        = 'maintainer'.freeze
-      MAINTAINER_EMAIL  = 'maintainer_email'.freeze
-      LICENSE           = 'license'.freeze
-      PLATFORMS         = 'platforms'.freeze
-      DEPENDENCIES      = 'dependencies'.freeze
-      RECOMMENDATIONS   = 'recommendations'.freeze
-      SUGGESTIONS       = 'suggestions'.freeze
-      CONFLICTING       = 'conflicting'.freeze
-      PROVIDING         = 'providing'.freeze
-      REPLACING         = 'replacing'.freeze
-      ATTRIBUTES        = 'attributes'.freeze
-      GROUPINGS         = 'groupings'.freeze
-      RECIPES           = 'recipes'.freeze
-      VERSION           = 'version'.freeze
+      NAME             = 'name'.freeze
+      DESCRIPTION      = 'description'.freeze
+      LONG_DESCRIPTION = 'long_description'.freeze
+      MAINTAINER       = 'maintainer'.freeze
+      MAINTAINER_EMAIL = 'maintainer_email'.freeze
+      LICENSE          = 'license'.freeze
+      PLATFORMS        = 'platforms'.freeze
+      DEPENDENCIES     = 'dependencies'.freeze
+      RECOMMENDATIONS  = 'recommendations'.freeze
+      SUGGESTIONS      = 'suggestions'.freeze
+      CONFLICTING      = 'conflicting'.freeze
+      PROVIDING        = 'providing'.freeze
+      REPLACING        = 'replacing'.freeze
+      ATTRIBUTES       = 'attributes'.freeze
+      GROUPINGS        = 'groupings'.freeze
+      RECIPES          = 'recipes'.freeze
+      VERSION          = 'version'.freeze
+
+      COMPILED_FILE_NAME = "metadata.json".freeze
+      RAW_FILE_NAME      = "metadata.rb".freeze
 
       COMPARISON_FIELDS = [
         :name, :description, :long_description, :maintainer,
@@ -439,6 +442,11 @@ module Ridley::Chef
         }
       end
 
+      # @return [String]
+      def to_json
+        JSON.fast_generate(to_hash)
+      end
+
       def from_hash(o)
         @name             = o[NAME] if o.has_key?(NAME)
         @description      = o[DESCRIPTION] if o.has_key?(DESCRIPTION)

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/spec/unit/ridley/chef/cookbook_spec.rb

@@ -40,20 +40,44 @@ describe Ridley::Chef::Cookbook do
         end
       end
 
-      context "when a metadata.rb is missing but metadata.json is present" do
+      context "when a metadata.json is missing but metadata.rb is present" do
         let(:cookbook_path) { tmp_path.join("temp_cookbook").to_s }
 
         before do
           FileUtils.mkdir_p(cookbook_path)
-          File.open(File.join(cookbook_path, 'metadata.json'), 'w+') do |f|
-            f.write JSON.fast_generate(name: "rspec_test")
+          File.open(File.join(cookbook_path, 'metadata.rb'), 'w+') do |f|
+            f.write <<-EOH
+              name 'rspec_test'
+            EOH
           end
         end
 
-        it "sets the name of the cookbook from the metadata.json" do
+        it "sets the name of the cookbook from the metadata.rb" do
           subject.from_path(cookbook_path).cookbook_name.should eql("rspec_test")
         end
       end
+
+      context "when a metadata.json and metadata.rb are both present" do
+        let(:cookbook_path) { tmp_path.join("temp_cookbook").to_s }
+
+        before do
+          FileUtils.mkdir_p(cookbook_path)
+
+          File.open(File.join(cookbook_path, 'metadata.json'), 'w+') do |f|
+            f.write JSON.fast_generate(name: "json_metadata")
+          end
+
+          File.open(File.join(cookbook_path, 'metadata.rb'), 'w+') do |f|
+            f.write <<-EOH
+              name 'ruby_metadata'
+            EOH
+          end
+        end
+
+        it "prefers the metadata.json" do
+          subject.from_path(cookbook_path).cookbook_name.should eql("json_metadata")
+        end
+      end
     end
 
     describe "::checksum" do
@@ -82,6 +106,63 @@ describe Ridley::Chef::Cookbook do
     end
   end
 
+  describe "#compile_metadata" do
+    let(:cookbook_path) { tmp_path.join("temp_cookbook").to_s }
+    subject { described_class.from_path(cookbook_path) }
+    before do
+      FileUtils.mkdir_p(cookbook_path)
+      File.open(File.join(cookbook_path, "metadata.rb"), "w+") do |f|
+        f.write <<-EOH
+          name "rspec_test"
+          version "1.2.3"
+        EOH
+      end
+    end
+
+    it "compiles the raw metadata.rb into a metadata.json file in the path of the cookbook" do
+      expect(subject.compiled_metadata?).to be_false
+      subject.compile_metadata
+      subject.reload
+      expect(subject.compiled_metadata?).to be_true
+      expect(subject.cookbook_name).to eql("rspec_test")
+      expect(subject.version).to eql("1.2.3")
+    end
+
+    context "when given an output path to write the metadata to" do
+      let(:out_path) { tmp_path.join("outpath") }
+      before { FileUtils.mkdir_p(out_path) }
+
+      it "writes the compiled metadata to a metadata.json file at the given out path" do
+        subject.compile_metadata(out_path)
+        expect(File.exist?(File.join(out_path, "metadata.json"))).to be_true
+      end
+    end
+  end
+
+  describe "#compiled_metadata?" do
+    let(:cookbook_path) { tmp_path.join("temp_cookbook").to_s }
+    subject { described_class.from_path(cookbook_path) }
+    before do
+      FileUtils.mkdir_p(cookbook_path)
+      FileUtils.touch(File.join(cookbook_path, "metadata.rb"))
+    end
+
+    context "when a metadata.json file is present" do
+      before do
+        File.open(File.join(cookbook_path, 'metadata.json'), 'w+') do |f|
+          f.write JSON.fast_generate(name: "json_metadata")
+        end
+      end
+
+      its(:compiled_metadata?) { should be_true }
+    end
+
+    context "when a metadata.json file is not present" do
+      before { FileUtils.rm_f(File.join(cookbook_path, "metadata.json")) }
+      its(:compiled_metadata?) { should be_false }
+    end
+  end
+
   describe "#manifest" do
     it "returns a Mash with a key for each cookbook file category" do
       [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -416,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A reliable Chef API client with a clean syntax