ridley 4.1.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d868df34840cd47fd59e935cd829407bc0bf528d
-  data.tar.gz: 60b9b0e0f5b2214df516d92b6e5f9e5238879408
+  metadata.gz: c13d1d47eeb614454e357f42ed41e60d16fe1287
+  data.tar.gz: 2e48d517a5fd6d1aa51327eb2c050207132b315e
 SHA512:
-  metadata.gz: 66474151072d89a2ecaa988a66c185eabbbc4b50b0b072fd8fd33baf931b3d0008c1f027951efb5ca386c8dc372a317b7163f720704ac4bdd7245aca0474584e
-  data.tar.gz: 7c07e8dceef19387f4e8bda86cef751c9a14cd12f3d72d99b112a1381a55a7bf577ac30896ce3f03e91dff5cd02f9efbd00bab1448f0a6a5c1f7e4149ea758ba
+  metadata.gz: a7f9d49e3cff824cfdc0725ae925ffb205024474b037a44b3dcbcde037f63d8c6bd95cdc346191f10592a6d4ea72404c72aaea959d63566fa051e8e8d5ca0c98
+  data.tar.gz: 0d0234d3ef23f7942e18c3c54c4c1f0528870259cf9fa89a5d5b5b3ce58d1f9faba59330394d1248335cba20f20adeb45d8e9c3805765a17b06d9abbc8f61e2b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 4.2.0
+
+* Enhancements
+  * Support 'root_default' files
+
 # 4.1.2
 
 * Fixed: permission denied errors on Windows while uploading cookbooks

data/Rakefile

@@ -0,0 +1 @@
+require 'bundler/gem_tasks'

data/lib/ridley/chef/cookbook.rb

@@ -170,7 +170,7 @@ module Ridley::Chef
       case category
       when :files, :templates
         relpath = target.relative_path_from(path).to_s
-        relpath.slice(/(.+)\/(.+)\/.+/, 2)
+        relpath.slice(/(.+)\/(.+)\/.+/, 2) || 'root_default'
       else
         'default'
       end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "4.1.2"
+  VERSION = "4.2.0"
 end

data/ridley.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'json',                    '>= 1.7.7'
   s.add_dependency 'mixlib-authentication',   '>= 1.3.0'
   s.add_dependency 'net-http-persistent',     '>= 2.8'
-  s.add_dependency 'retryable',               '>= 2.0.0'
+  s.add_dependency 'retryable',               '~> 2.0'
   s.add_dependency 'semverse',                '~> 1.1'
 
   s.add_development_dependency 'buff-ruby_engine', '~> 0.1'

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

@@ -261,6 +261,45 @@ describe Ridley::Chef::Cookbook do
     end
   end
 
+  describe "#file_specificity" do
+    let(:category) { :templates }
+    let(:relpath) { 'default.rb' }
+    let(:file) { subject.path.join(category.to_s, relpath) }
+    before(:each) { @specificity = subject.file_specificity(category, file) }
+
+    context "given a recipe file" do
+      let(:category) { :recipes }
+
+      it "has a specificity of 'default'" do
+        @specificity.should eql("default")
+      end
+    end
+
+    context "given a template 'default/config.erb'" do
+      let(:relpath) { 'default/config.erb' }
+
+      it "has a specificity of 'default'" do
+        @specificity.should eql("default")
+      end
+    end
+
+    context "given a template 'centos/config.erb'" do
+      let(:relpath) { 'centos/config.erb' }
+
+      it "has a specificity of 'centos'" do
+        @specificity.should eql("centos")
+      end
+    end
+
+    context "given a template 'config.erb'" do
+      let(:relpath) { 'config.erb' }
+
+      it "has a specificity of 'root_default'" do
+        @specificity.should eql("root_default")
+      end
+    end
+  end
+
   describe "#to_hash" do
     subject { cookbook.to_hash }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -217,16 +217,16 @@ dependencies:
   name: retryable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: semverse
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +270,7 @@ files:
 - Guardfile
 - LICENSE
 - README.md
+- Rakefile
 - Thorfile
 - lib/ridley.rb
 - lib/ridley/chef.rb