ridley 0.10.1 → 0.10.2

data/lib/ridley/chef.rb

@@ -5,6 +5,7 @@ module Ridley
   # site, and Chef Cookbooks
   module Chef
     autoload :Cookbook, 'ridley/chef/cookbook'
+    autoload :Chefignore, 'ridley/chef/chefignore'
     autoload :Digester, 'ridley/chef/digester'
   end
 end

data/lib/ridley/chef/chefignore.rb

@@ -0,0 +1,76 @@
+module Ridley::Chef
+  # Borrowed and modified from:
+  # {https://raw.github.com/opscode/chef/62f9b0e3be8e22eef092163c331b7d3f8d350f94/lib/chef/cookbook/chefignore.rb}
+  #
+  # Copyright:: Copyright (c) 2011 Opscode, Inc.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+  class Chefignore
+    class << self
+      # Traverse a path in relative context to find a Chefignore file
+      #
+      # @param [String] path
+      #   path to traverse
+      #
+      # @return [String, nil]
+      def find_relative_to(path)
+        [
+          File.join(path, FILENAME),
+          File.join(path, 'cookbooks', FILENAME)
+        ].find { |f| File.exists?(f) }
+      end
+    end
+
+    FILENAME                = "chefignore".freeze
+    COMMENTS_AND_WHITESPACE = /^\s*(?:#.*)?$/
+
+    attr_reader :ignores
+
+    def initialize(ignore_file_or_repo)
+      @ignore_file = find_ignore_file(ignore_file_or_repo)
+      @ignores     = parse_ignore_file
+    end
+
+    def remove_ignores_from(file_list)
+      Array(file_list).inject([]) do |unignored, file|
+        ignored?(file) ? unignored : unignored << file
+      end
+    end
+
+    def ignored?(file_name)
+      @ignores.any? { |glob| File.fnmatch?(glob, file_name) }
+    end
+
+    private
+
+      def parse_ignore_file
+        ignore_globs = []
+
+        if File.exist?(@ignore_file) && File.readable?(@ignore_file)
+          File.foreach(@ignore_file) do |line|
+            ignore_globs << line.strip unless line =~ COMMENTS_AND_WHITESPACE
+          end
+        end
+
+        ignore_globs
+      end
+
+      def find_ignore_file(path)
+        if File.basename(path) =~ /#{FILENAME}/
+          path
+        else
+          File.join(path, FILENAME)
+        end
+      end
+  end
+end

data/lib/ridley/chef/cookbook.rb

@@ -96,6 +96,7 @@ module Ridley::Chef
         root_files: Array.new
       )
       @frozen        = false
+      @chefignore    = Ridley::Chef::Chefignore.new(@path)
 
       load_files
     end
@@ -207,7 +208,12 @@ module Ridley::Chef
 
     private
 
+      # @return [Array]
       attr_reader :files
+      # @return [Ridley::Chef::Chefignore]
+      attr_reader :chefignore
+
+      def_delegator :chefignore, :ignored?
 
       def load_files
         load_shallow(:recipes, 'recipes', '*.rb')
@@ -225,6 +231,7 @@ module Ridley::Chef
         [].tap do |files|
           Dir.glob(path.join('*'), File::FNM_DOTMATCH).each do |file|
             next if File.directory?(file)
+            next if ignored?(file)
             @files << file
             @manifest[:root_files] << file_metadata(:root_files, file)
           end
@@ -236,6 +243,7 @@ module Ridley::Chef
           file_spec = path.join(category_dir, '**', glob)
           Dir.glob(file_spec, File::FNM_DOTMATCH).each do |file|
             next if File.directory?(file)
+            next if ignored?(file)
             @files << file
             @manifest[category] << file_metadata(category, file)
           end
@@ -245,6 +253,7 @@ module Ridley::Chef
       def load_shallow(category, *path_glob)
         [].tap do |files|
           Dir[path.join(*path_glob)].each do |file|
+            next if ignored?(file)
             @files << file
             @manifest[category] << file_metadata(category, file)
           end

data/lib/ridley/sandbox_uploader.rb

@@ -94,7 +94,7 @@ module Ridley
     # @return [Hash, nil]
     def upload(chk_id, path)
       checksum = self.checksum(chk_id)
-      
+
       unless checksum[:needs_upload]
         return nil
       end
@@ -109,6 +109,12 @@ module Ridley
       upload_path = url.path
       url.path    = ""
 
+      # versions prior to OSS Chef 11 will strip the port to upload the file to in the checksum
+      # url returned. This will ensure we are uploading to the proper location.
+      if client.connection.foss?
+        url.port = URI(client.connection.server_url).port
+      end
+
       begin
         Faraday.new(url, client.options.slice(*Connection::VALID_OPTIONS)) do |c|
           c.response :chef_response

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

data/spec/fixtures/chefignore

@@ -0,0 +1,8 @@
+#
+# The ignore file allows you to skip files in cookbooks with the same name that appear
+# later in the search path.
+#
+
+recipes/ignoreme.rb
+  # comments can be indented
+ignored

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

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Ridley::Chef::Chefignore do
+  describe "ClassMethods" do
+    subject { described_class }
+
+    describe "::find_relative_to" do
+      let(:path) { tmp_path.join('chefignore-test') }
+      before(:each) { FileUtils.mkdir_p(path) }
+
+      it "finds a chefignore file in a 'cookbooks' directory relative to the given path" do
+        FileUtils.touch(path.join('chefignore'))
+        subject.find_relative_to(path)
+      end
+
+      it "finds a chefignore file relative to the given path" do
+        FileUtils.mkdir_p(path.join('cookbooks'))
+        FileUtils.touch(path.join('cookbooks', 'chefignore'))
+        subject.find_relative_to(path)
+      end
+    end
+  end
+
+  subject { described_class.new(File.join(fixtures_path)) }
+
+  it "loads the globs in the chefignore file" do
+    subject.ignores.should =~ %w[recipes/ignoreme.rb ignored]
+  end
+
+  it "removes items from an array that match the ignores" do
+    file_list = %w[ recipes/ignoreme.rb recipes/dontignoreme.rb ]
+    subject.remove_ignores_from(file_list).should == %w[recipes/dontignoreme.rb]
+  end
+
+  it "determines if a file is ignored" do
+    subject.ignored?('ignored').should be_true
+    subject.ignored?('recipes/ignoreme.rb').should be_true
+    subject.ignored?('recipes/dontignoreme.rb').should be_false
+  end
+end

data/spec/unit/ridley/sandbox_uploader_spec.rb

@@ -1,11 +1,13 @@
 require 'spec_helper'
 
 describe Ridley::SandboxUploader do
+  let(:connection) { double('chef-conn') }
   let(:client) do
     double('client',
       client_name: 'reset',
       client_key: fixtures_path.join('reset.pem'),
-      options: {}
+      options: {},
+      connection: connection
     )
   end
 
@@ -66,6 +68,10 @@ describe Ridley::SandboxUploader do
     let(:chk_id) { "oGCPHrQ+5MylEL+V+NIJ9w==" }
     let(:path) { fixtures_path.join('reset.pem').to_s }
 
+    before do
+      connection.stub(foss?: false)
+    end
+
     context "when the checksum needs uploading" do
       let(:checksums) do
         {
@@ -100,5 +106,26 @@ describe Ridley::SandboxUploader do
         subject.upload(chk_id, path).should be_nil
       end
     end
+
+    context "when the connection is an open source server connection with a non-80 port" do
+      before do
+        connection.stub(foss?: true, server_url: "http://localhost:8889")
+      end
+
+      let(:checksums) do
+        {
+          chk_id => {
+            url: "http://localhost/sandboxes/bd091b150b0a4578b97771af6abf3e05",
+            needs_upload: true
+          }
+        }
+      end
+
+      it "does not strip the port from the target to upload to" do
+        stub_request(:put, "http://localhost:8889/sandboxes/bd091b150b0a4578b97771af6abf3e05")
+
+        subject.upload(chk_id, path)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -308,6 +308,7 @@ files:
 - lib/ridley/bootstrapper/context.rb
 - lib/ridley/chain_link.rb
 - lib/ridley/chef.rb
+- lib/ridley/chef/chefignore.rb
 - lib/ridley/chef/cookbook.rb
 - lib/ridley/chef/cookbook/metadata.rb
 - lib/ridley/chef/cookbook/syntax_check.rb
@@ -359,6 +360,7 @@ files:
 - spec/acceptance/role_resource_spec.rb
 - spec/acceptance/sandbox_resource_spec.rb
 - spec/acceptance/search_resource_spec.rb
+- spec/fixtures/chefignore
 - spec/fixtures/encrypted_data_bag_secret
 - spec/fixtures/example_cookbook/README.md
 - spec/fixtures/example_cookbook/attributes/default.rb
@@ -384,6 +386,7 @@ files:
 - spec/unit/ridley/bootstrap_bindings/windows_template_binding_spec.rb
 - spec/unit/ridley/bootstrapper/context_spec.rb
 - spec/unit/ridley/bootstrapper_spec.rb
+- spec/unit/ridley/chef/chefignore_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
 - spec/unit/ridley/client_spec.rb
@@ -433,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1173467066893192737
+      hash: -2279939140045068051
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -450,6 +453,7 @@ test_files:
 - spec/acceptance/role_resource_spec.rb
 - spec/acceptance/sandbox_resource_spec.rb
 - spec/acceptance/search_resource_spec.rb
+- spec/fixtures/chefignore
 - spec/fixtures/encrypted_data_bag_secret
 - spec/fixtures/example_cookbook/README.md
 - spec/fixtures/example_cookbook/attributes/default.rb
@@ -475,6 +479,7 @@ test_files:
 - spec/unit/ridley/bootstrap_bindings/windows_template_binding_spec.rb
 - spec/unit/ridley/bootstrapper/context_spec.rb
 - spec/unit/ridley/bootstrapper_spec.rb
+- spec/unit/ridley/chef/chefignore_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
 - spec/unit/ridley/client_spec.rb