berkshelf 2.0.13 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bebc07cff3e9517a026f6f35d680dc70c9160738
-  data.tar.gz: 65b4d4bd48f63e4dd7b82fb81841a4d4dd3f0477
+  metadata.gz: 17e52bf99ab83485dbf6a146715598c65e87be9f
+  data.tar.gz: 52422a0e9b000b2b0859d2061ea8dab038d266e8
 SHA512:
-  metadata.gz: e2bbb1c832261038572c797c851239873027cdaa342379d3363e64ac71de0ae0ce0dadba34fc92f4c0e27600761dd8d32159e84e43abad9a05ace571529a1f21
-  data.tar.gz: 060f7bbd784bcf0ea046b2117c7d28989603179faf0b7142af5259f364ad72da13c0941762332658e789e8f498686945daee074918a1d9f1acb82db5a1607781
+  metadata.gz: 5f8a56671024af1c5015c0436e3b85e503dde1d542d036ff96a76a6acfb385657744786891b48c1b61130e003ce1babbbb64af1e2a382f001adbf06e753073e0
+  data.tar.gz: daa8720298464b606992fc3e690b15c345fd78aaa60f5a5f4d6ba5176f4e602c01bafd04f373c6705464befba679fe3c01233c6aac5ed5ec57b47639663ba142

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.14
+
+* Backport changes from master to allow detecting cookbooks by metadata.json
+
 # 2.0.13
 
 * Lock transitive dependency on Faraday

data/lib/berkshelf/core_ext/file.rb

@@ -1,13 +1,13 @@
 class File
   class << self
-    # Returns true or false if the given path is a Chef Cookbook
+    # Returns true or false if the given path contains a Chef Cookbook
     #
     # @param [#to_s] path
     #   path of directory to reflect on
     #
     # @return [Boolean]
     def cookbook?(path)
-      File.exists?(File.join(path, 'metadata.rb'))
+      File.exists?(File.join(path, "metadata.json")) || File.exists?(File.join(path, "metadata.rb"))
     end
     alias_method :chef_cookbook?, :cookbook?
   end

data/lib/berkshelf/core_ext/pathname.rb

@@ -1,20 +1,18 @@
 class Pathname
-  # Returns true or false if the path of the instantiated
-  # Pathname or a parent directory contains a Tryhard Pack
-  # data directory.
+  # Returns true or false if the path contains a "metadata.json" or a "metadata.rb" file.
   #
   # @return [Boolean]
   def cookbook?
-    self.join('metadata.rb').exist?
+    join("metadata.json").exist? || join("metadata.rb").exist?
   end
   alias_method :chef_cookbook?, :cookbook?
 
-  # Ascend the directory structure from the given path to find a
-  # the root of a Chef Cookbook. If no Cookbook is found, nil is returned
+  # Ascend the directory structure from the given path to find  the root of a
+  # Cookbook. If no Cookbook is found, nil is returned.
   #
   # @return [Pathname, nil]
   def cookbook_root
-    self.ascend do |potential_root|
+    ascend do |potential_root|
       if potential_root.cookbook?
         return potential_root
       end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "2.0.13"
+  VERSION = "2.0.14"
 end

data/spec/unit/berkshelf/core_ext/pathname_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Pathname do
+  describe "#cookbook?" do
+    let(:cookbook_path) { tmp_path }
+    let(:metadata_rb) { tmp_path.join("metadata.rb") }
+    let(:metadata_json) { tmp_path.join("metadata.json") }
+
+    subject { Pathname.new(cookbook_path) }
+
+    context "when the path contains a metadata.json file" do
+      before { FileUtils.touch(metadata_json) }
+      its(:cookbook?) { should be_true }
+    end
+
+    context "when the path contains a metadata.rb file" do
+      before { FileUtils.touch(metadata_rb) }
+      its(:cookbook?) { should be_true }
+    end
+
+    context "when the path does not contain a metadata.json or metadata.rb file" do
+      before { FileUtils.rm_f(metadata_rb) && FileUtils.rm_f(metadata_json) }
+      its(:cookbook?) { should be_false }
+    end
+  end
+
+  describe "#cookbook_root" do
+    let(:root_path) { fixtures_path.join("cookbooks", "example_cookbook") }
+    let(:cookbook_path) { root_path }
+    subject { Pathname.new(cookbook_path) }
+
+    context "when in the root of a cookbook" do
+      its(:cookbook_root) { should eql(root_path) }
+    end
+
+    context "when in the structure of a cookbook" do
+      let(:cookbook_path) { root_path.join("recipes") }
+      its(:cookbook_root) { should eql(root_path) }
+    end
+
+    context "when not within the structure of a cookbook" do
+      let(:cookbook_path) { "/" }
+      its(:cookbook_root) { should be_nil }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.14
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -637,6 +637,7 @@ files:
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
 - spec/unit/berkshelf/core_ext/file_utils_spec.rb
+- spec/unit/berkshelf/core_ext/pathname_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/errors_spec.rb
 - spec/unit/berkshelf/formatters/null_spec.rb
@@ -676,7 +677,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
@@ -777,6 +778,7 @@ test_files:
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
 - spec/unit/berkshelf/core_ext/file_utils_spec.rb
+- spec/unit/berkshelf/core_ext/pathname_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/errors_spec.rb
 - spec/unit/berkshelf/formatters/null_spec.rb
@@ -796,4 +798,3 @@ test_files:
 - spec/unit/berkshelf/ui_spec.rb
 - spec/unit/berkshelf_spec.rb
 - spec/unit/chef/config_spec.rb
-has_rdoc: