ridley 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0abbe5b80f97f621001f5010befbac00b1c33b97
-  data.tar.gz: e4a7eac60ebd38aa964556f1c55ce925d6ea906c
+  metadata.gz: f571021ed99ad605622448d1f79edcb954abfafa
+  data.tar.gz: 3549b22251eba2ecf03e1829531e90d6d32dc50e
 SHA512:
-  metadata.gz: 7ab776183b19fe43d27364ea31a9fa76db3b1d48a9226c8c648c0e5150ef7b34211521d3cf54f53ec1a10445f176c8ce0d07cda25e611d382f9e3a19bbc7a0ec
-  data.tar.gz: 2e832f64e3babcba93153e3325b620a37c64ff8972c4084a2d7dd81dd65a514242472f1f9a0649934e92ec09b3a3b9df21ad9a8044c5d1a2dfe021d6d14fe42d
+  metadata.gz: 83ab54c5ef8ceb4128a6d12d1e6c741b9126b9e13fdc84b5a2cf68cc4eb76047e2bb77a3d28c8c4a3b3803d5ab970fa40b8494c260b552e1d0c60c38f748d71d
+  data.tar.gz: e9662d26e3d80e53f6ee3e710f2cc089f8bfe07c6d32d23d3e337ebdf4bf438e45bf35d435b22c54da6e5b34c25b5e3f8cd2a5d0a5ecc23045526022d892619d

data/lib/ridley/chef/cookbook.rb

@@ -84,21 +84,10 @@ module Ridley::Chef
       @cookbook_name = name
       @path          = Pathname.new(path)
       @metadata      = metadata
-      @files         = Array.new
-      @manifest      = Hashie::Mash.new(
-        recipes: Array.new,
-        definitions: Array.new,
-        libraries: Array.new,
-        attributes: Array.new,
-        files: Array.new,
-        templates: Array.new,
-        resources: Array.new,
-        providers: Array.new,
-        root_files: Array.new
-      )
       @frozen        = false
       @chefignore    = Ridley::Chef::Chefignore.new(@path) rescue nil
 
+      clear_files
       load_files
     end
 
@@ -123,10 +112,16 @@ module Ridley::Chef
     #
     # @param [String] out
     #   directory to output compiled metadata to
+    #
+    # @return [String]
+    #   path to the compiled metadata
     def compile_metadata(out = self.path)
-      File.open(File.join(out, Metadata::COMPILED_FILE_NAME), "w+") do |f|
+      filepath = File.join(out, Metadata::COMPILED_FILE_NAME)
+      File.open(filepath, "w+") do |f|
         f.write(metadata.to_json)
       end
+
+      filepath
     end
 
     # Returns true if the cookbook instance has a compiled metadata file and false if it
@@ -190,6 +185,7 @@ module Ridley::Chef
 
     # Reload the cookbook from the files located on disk at `#path`.
     def reload
+      clear_files
       load_files
     end
 
@@ -239,6 +235,21 @@ module Ridley::Chef
       # @return [Ridley::Chef::Chefignore, nil]
       attr_reader :chefignore
 
+      def clear_files
+        @files    = Array.new
+        @manifest = Hashie::Mash.new(
+          recipes: Array.new,
+          definitions: Array.new,
+          libraries: Array.new,
+          attributes: Array.new,
+          files: Array.new,
+          templates: Array.new,
+          resources: Array.new,
+          providers: Array.new,
+          root_files: Array.new
+        )
+      end
+
       def load_files
         load_shallow(:recipes, 'recipes', '*.rb')
         load_shallow(:definitions, 'definitions', '*.rb')

data/lib/ridley/resources/cookbook_resource.rb

@@ -186,8 +186,8 @@ module Ridley
     #
     # @return [Hash]
     def upload(path, options = {})
-      options   = options.reverse_merge(validate: true, force: false, freeze: false)
-      cookbook  = Ridley::Chef::Cookbook.from_path(path, options.slice(:name))
+      options  = options.reverse_merge(validate: true, force: false, freeze: false)
+      cookbook = Ridley::Chef::Cookbook.from_path(path, options.slice(:name))
 
       unless (existing = find(cookbook.cookbook_name, cookbook.version)).nil?
         if existing.frozen? && options[:force] == false
@@ -201,12 +201,38 @@ module Ridley
         cookbook.validate
       end
 
+      # Compile metadata on upload if it hasn't been compiled already
+      unless cookbook.compiled_metadata?
+        compiled_metadata = cookbook.compile_metadata
+        cookbook.reload
+      end
+
+      # Skip uploading the raw metadata (metadata.rb). The raw metadata is unecessary for the
+      # client, and this is required until compiled metadata (metadata.json) takes precedence over
+      # raw metadata in the Chef-Client.
+      #
+      # We can change back to including the raw metadata in the future after this has been fixed or
+      # just remove these comments. There is no circumstance that I can currently think of where
+      # raw metadata should ever be read by the client.
+      #
+      # - Jamie
+      #
+      # See the following tickets for more information:
+      #   * https://tickets.opscode.com/browse/CHEF-4811
+      #   * https://tickets.opscode.com/browse/CHEF-4810
+      cookbook.manifest[:root_files].reject! do |file|
+        File.basename(file[:name]).downcase == Ridley::Chef::Cookbook::Metadata::RAW_FILE_NAME
+      end
+
       checksums = cookbook.checksums.dup
       sandbox   = sandbox_resource.create(checksums.keys.sort)
 
       sandbox.upload(checksums)
       sandbox.commit
       update(cookbook, options.slice(:force, :freeze))
+    ensure
+      # Destroy the compiled metadata only if it was created
+      File.delete(compiled_metadata) unless compiled_metadata.nil?
     end
 
     # Return a list of versions for the given cookbook present on the remote Chef server

data/lib/ridley/version.rb

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

data/spec/acceptance/cookbook_resource_spec.rb

@@ -18,7 +18,7 @@ describe "Client API operations", type: "acceptance" do
       before { subject.download(name, version, destination) }
 
       it "downloads the cookbook to the destination" do
-        expect(File.exist?(destination.join("metadata.rb"))).to be_true
+        expect(File.exist?(destination.join("metadata.json"))).to be_true
       end
     end
   end
@@ -40,6 +40,14 @@ describe "Client API operations", type: "acceptance" do
       cookbook.templates.should have(1).item
       cookbook.root_files.should have(1).items
     end
+
+    it "does not contain a raw metadata.rb but does contain a compiled metadata.json" do
+      subject.upload(path)
+      cookbook = subject.find("example_cookbook", "0.1.0")
+
+      expect(cookbook.root_files.any? { |f| f[:name] == "metadata.json" }).to be_true
+      expect(cookbook.root_files.any? { |f| f[:name] == "metadata.rb" }).to be_false
+    end
   end
 
   describe "listing cookbooks" do

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

@@ -133,6 +133,7 @@ describe Ridley::CookbookResource do
         "211a3a8798d4acd424af15ff8a2e28a5",
         "75077ba33d2887cc1746d1ef716bf8b7",
         "7b1ebd2ff580ca9dc46fb27ec1653bf2",
+        "83128904bdb43eeeef131535c4a2ce8e",
         "a39eb80def9804f4b118099697cc2cd2",
         "b70ba735f3af47e5d6fc71b91775b34c",
         "cafb6869fca13f5c36f24a60de8fb982",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Jamie Winsor