ridley 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13f69167901c68dc582d14374797fd9ac05a8243
-  data.tar.gz: dfe453c2a5f1fdf348f434f857c66ac073240dbd
+  metadata.gz: d49b01c05183839d7cef30131ba300c890180655
+  data.tar.gz: 402b0fbdbf265d4f070803bc80833538ec1dbf72
 SHA512:
-  metadata.gz: 25db0db3e5d24c670389579f8247614339560eb3d783d808ee57a04b5719fe69a6876f1ca19307f8d23008782bf982fb197499ba43a70576e5b347dc3ae1d2ec
-  data.tar.gz: 634da3bea16715f07e06f21a01f00e937e34efb4c09f2f991dfb7e6957e4ec1f0498c67ae645d6e9cc5cf7802a45215d8534e8fbf7d86fb7a0768bd6f8e0d1d3
+  metadata.gz: c00aefbe3246307695bb8dd78c8f97ded171b4e5dc0c7861adfe1f5a8f292558d6ae45d94e37cce0c3a6a8e52892a949e02840d028f7595d24473c6d6a4eca79
+  data.tar.gz: 622d8a1ebf053ead22c1310e46663ec4ee75021b31499198e8cd57dd3b7f2121f7eff6eb6bb8b943c80f79bb4d3c18050a877ad5705f8ffa8562351c2d7b8daa

data/LICENSE

@@ -1,6 +1,6 @@
 Copyright 2012-2013 Riot Games
 
-    Jamie Winsor (<reset@riotgames.com>)
+    Jamie Winsor (<jamie@vialstudios.com>)
     Kyle Allan (<kallan@riotgames.com>)
 
 Licensed under the Apache License, Version 2.0 (the "License");

data/README.md

@@ -6,37 +6,51 @@
 
 A reliable Chef API client with a clean syntax
 
-## Installation
+Installation
+------------
+Add Ridley to your `Gemfile`:
 
-    $ gem install ridley
+```ruby
+gem 'ridley'
+```
 
-## Usage
+And run the `bundle` command to install. Alternatively, you can install the gem directly:
+
+    $ gem install ridley
 
-Require Ridley into your application
+Usage
+-----
+Before you can use Ridley, you must require it in your application:
 
-    require 'ridley'
+```ruby
+require 'ridley'
+```
 
-## Creating a new Ridley client
+### Creating a new Ridley client
 
-    ridley = Ridley.new(
-      server_url: "https://api.opscode.com/organizations/ridley",
-      client_name: "reset",
-      client_key: "/Users/reset/.chef/reset.pem"
-    )
+```ruby
+ridley = Ridley.new(
+  server_url: "https://api.opscode.com/organizations/ridley",
+  client_name: "reset",
+  client_key: "/Users/reset/.chef/reset.pem"
+)
+```
 
 Creating a new instance of Ridley requires the following options:
 
-* server_url
-* client_name
-* client_key
+- server_url
+- client_name
+- client_key
 
 Ridley exposes a number of functions that return resources which you can use to retrieve or create objects on your Chef server. Here is a simple example of getting a list of all the roles on your Chef server.
 
-    ridley = Ridley.new(...)
-    ridley.role.all #=> [
-      #<Ridley::RoleObject chef_id:motherbrain_srv ...>,
-      #<Ridley::RoleObject chef_id:motherbrain_proxy ...>
-    ]
+```ruby
+ridley = Ridley.new(...)
+ridley.role.all #=> [
+  #<Ridley::RoleObject chef_id:motherbrain_srv ...>,
+  #<Ridley::RoleObject chef_id:motherbrain_proxy ...>
+]
+```
 
 For more information scroll down to the Manipulating Chef Resources section of this README.
 
@@ -91,29 +105,35 @@ ridley.role.all #=> [
 
 If you don't want to instantiate and manage a connection object you can use `Ridley.open` to open a connection, do some work, and it will be closed for you after the block executes.
 
-    Ridley.open(server_url: "https://api.opscode.com", ...) do |r|
-      r.node.all
-    end
+```ruby
+Ridley.open(server_url: "https://api.opscode.com", ...) do |r|
+  r.node.all
+end
+```
 
-## Manipulating Chef Resources
+### Manipulating Chef Resources
 
-Resources are access by instance functions on a new instance of Ridley::Client.
+Resources are access by instance functions on a new instance of `Ridley::Client`.
 
-    ridley = Ridley.new(...)
-    ridley.client      #=> Ridley::ClientResource
-    ridley.cookbook    #=> Ridley::CookbookResource
-    ridley.data_bag    #=> Ridley::DataBagResource
-    ridley.environment #=> Ridley::EnvironmentResource
-    ridley.node        #=> Ridley::NodeResource
-    ridley.role        #=> Ridley::RoleResource
-    ridley.sandbox     #=> Ridley::SandboxResource
-    ridley.search      #=> Ridley::SearchResource
+```ruby
+ridley = Ridley.new(...)
+ridley.client      #=> Ridley::ClientResource
+ridley.cookbook    #=> Ridley::CookbookResource
+ridley.data_bag    #=> Ridley::DataBagResource
+ridley.environment #=> Ridley::EnvironmentResource
+ridley.node        #=> Ridley::NodeResource
+ridley.role        #=> Ridley::RoleResource
+ridley.sandbox     #=> Ridley::SandboxResource
+ridley.search      #=> Ridley::SearchResource
+```
 
 DataBagItems are the only exception to this rule. The DataBagItem resource is accessed from a DataBagObject
 
-    data_bag = ridley.data_bag.find("my_data")
-    data_bag.item                 #=> Ridley::DataBagItemResource
-    data_bag.item.find("my_item") #=> Ridley::DataBagItemObject
+```ruby
+data_bag = ridley.data_bag.find("my_data")
+data_bag.item                 #=> Ridley::DataBagItemResource
+data_bag.item.find("my_item") #=> Ridley::DataBagItemObject
+```
 
 ### CRUD
 
@@ -125,115 +145,148 @@ A new Chef Object can be created in a three ways
 
 _With the `#create` function and an attribute hash_
 
-    ridley = Ridley.new(...)
-    ridley.role.create(name: "reset") #=> #<Ridley::RoleObject: chef_id:reset>
+```ruby
+ridley = Ridley.new(...)
+ridley.role.create(name: "reset") #=> #<Ridley::RoleObject: chef_id:reset>
+```
 
 _With the `#create` function and an instance of a Chef Object_
 
-    obj = ridley.role.new
-    obj.name = "reset"
-    ridley.role.create(obj) #=> #<Ridley::RoleObject: chef_id:reset>
+```ruby
+obj = ridley.role.new
+obj.name = "reset"
+ridley.role.create(obj) #=> #<Ridley::RoleObject: chef_id:reset>
+```
 
 _With the `#save` function on an instance of a Chef Object_
 
-    obj = ridley.role.new
-    obj.name = "reset"
-    obj.save #=> #<Ridley::RoleObject: chef_id:reset>
+```ruby
+obj = ridley.role.new
+obj.name = "reset"
+obj.save #=> #<Ridley::RoleObject: chef_id:reset>
+```
 
 Each of these methods produce an identical object on the Chef server. It is up to you on how you'd like to create new resources.
 
-### Read
+#### Read
 
 Most resources have two read functions
 
 - `#all` for listing all the Chef Objects
 - `#find` for retrieving a specific Chef Object
 
-#### Listing
+##### Listing
 
 If you wanted to get a list of all of the roles on your Chef server
 
-    ridley = Ridley.new(...)
-    ridley.role.all #=> [
-      #<Ridley::RoleObject chef_id:motherbrain_srv ...>,
-      #<Ridley::RoleObject chef_id:motherbrain_proxy ...>
-    ]
-
+```ruby
+ridley = Ridley.new(...)
+ridley.role.all #=> [
+  #<Ridley::RoleObject chef_id:motherbrain_srv ...>,
+  #<Ridley::RoleObject chef_id:motherbrain_proxy ...>
+]
+```
 
-#### Finding
+##### Finding
 
 If you want to retrieve a single role from the Chef server
 
-    ridley = Ridley.new(...)
-    ridley.role.find("motherbrain_srv") #=> #<Ridley::RoleObject: chef_id:motherbrain_srv ...>
+```ruby
+ridley = Ridley.new(...)
+ridley.role.find("motherbrain_srv") #=> #<Ridley::RoleObject: chef_id:motherbrain_srv ...>
+```
 
 If the role does not exist on the Chef server then `nil` is returned
 
-    ridley = Ridley.new(...)
-    ridley.role.find("not_there") #=> nil
+```ruby
+ridley = Ridley.new(...)
+ridley.role.find("not_there") #=> nil
+```
 
-### Update
+#### Update
 
 Updating a resource can be expressed in three ways
 
 _With the `#update` function, the ID of the Object to update, and an attributes hash_
 
-    ridley = Ridley.new(...)
-    ridley.role.update("motherbrain_srv", description: "testing updates") #=>
-      #<Ridley::RoleObject chef_id:motherbrain_srv, description="testing updates" ...>
+```ruby
+ridley = Ridley.new(...)
+ridley.role.update("motherbrain_srv", description: "testing updates") #=> #<Ridley::RoleObject chef_id:motherbrain_srv, description="testing updates" ...>
+```
 
 _With the `#update` function and an instance of a Chef Object_
 
-    obj = ridley.role.find("motherbrain_srv")
-    obj.description = "chef object"
+```ruby
+obj = ridley.role.find("motherbrain_srv")
+obj.description = "chef object"
 
-    ridley.role.update(obj) #=> #<Ridley::RoleObject: chef_id:motherbrain_srv, description="chef object" ...
+ridley.role.update(obj) #=> #<Ridley::RoleObject: chef_id:motherbrain_srv, description="chef object" ...
+```
 
 _With the `#save` function on an instance of a Chef Object_
 
-    obj = ridley.role.find("reset")
-    obj.description = "saving an object"
-    obj.save #=> #<Ridley::RoleObject: chef_id:motherbrain_srv, description="saving an object" ...>
+```ruby
+obj = ridley.role.find("reset")
+obj.description = "saving an object"
+obj.save #=> #<Ridley::RoleObject: chef_id:motherbrain_srv, description="saving an object" ...>
+```
 
-### Destroy
+#### Destroy
 
 Destroying a resource can be express in three ways
 
 _With the `#delete` function and the ID of the Object to destroy_
 
-    ridley = Ridley.new(...)
-    ridley.role.delete("motherbrain_srv") => #<Ridley::RoleObject: chef_id:motherbrain_srv ...>
+```ruby
+ridley = Ridley.new(...)
+ridley.role.delete("motherbrain_srv") => #<Ridley::RoleObject: chef_id:motherbrain_srv ...>
+```
 
 _With the `#delete` function and a Chef Object_
 
-    obj = ridley.role.find("motherbrain_srv")
-    ridley.role.delete(obj) => #<Ridley::RoleObject: chef_id:motherbrain_srv ...>
+```ruby
+obj = ridley.role.find("motherbrain_srv")
+ridley.role.delete(obj) => #<Ridley::RoleObject: chef_id:motherbrain_srv ...>
+```
 
 _With the `#destroy` function on an instance of a Chef Object_
 
-    obj = conn.role.find("motherbrain_srv")
-    obj.destroy #=> true
+```ruby
+obj = conn.role.find("motherbrain_srv")
+obj.destroy #=> true
+```
+
+Client Resource
+---------------
 
-## Client Resource
 ### Regenerating a client's private key
 
 _With the `#regnerate_key` function and the ID of the Client to regenerate_
 
-    ridley = Ridley.new(...)
-    ridley.client.regenerate_key("jamie") #=> #<Ridley::ClientObject: chef_id:"jamie", private_key="**HIDDEN***" ...>
+```ruby
+ridley = Ridley.new(...)
+ridley.client.regenerate_key("jamie") #=> #<Ridley::ClientObject: chef_id:"jamie", private_key="**HIDDEN***" ...>
+```
 
 _With the `#regenerate_key` function on an instance of a Client Object_
 
-    obj = ridley.client.find("jamie")
-    obj.regenerate_key #=> #<Ridley::ClientObject: chef_id:"jamie", private_key="**HIDDEN***" ...>
+```ruby
+obj = ridley.client.find("jamie")
+obj.regenerate_key #=> #<Ridley::ClientObject: chef_id:"jamie", private_key="**HIDDEN***" ...>
+```
+
+Cookbook Resource
+-----------------
 
-## Cookbook Resource
-## Data Bag Resource
+Data Bag Resource
+-----------------
 
 A data bag is managed exactly the same as any other Chef resource
 
-    ridley = Ridley.new(...)
-    ridley.data_bag.create(name: "ridley-test")
+```ruby
+ridley = Ridley.new(...)
+ridley.data_bag.create(name: "ridley-test")
+```
 
 You can create, delete, update, or retrieve a data bag exactly how you would expect if you read through the
 Manipulating Chef Resources portion of this document.
@@ -242,42 +295,53 @@ Unlike a role, node, client, or environment, a data bag is a container for other
 
 ### Creating a Data Bag Item
 
-    ridley   = Ridley.new(...)
-    data_bag = ridley.data_bag.create(name: "ridley-test")
+```ruby
+ridley   = Ridley.new(...)
+data_bag = ridley.data_bag.create(name: "ridley-test")
 
-    data_bag.item.create(id: "appconfig", host: "reset.local", user: "jamie") #=>
-      #<Ridley::DataBagItemObject: chef_id:appconfig, host="reset.local", user="jamie">
+data_bag.item.create(id: "appconfig", host: "reset.local", user: "jamie") #=> #<Ridley::DataBagItemObject: chef_id:appconfig, host="reset.local", user="jamie">
+```
+
+Environment Resource
+--------------------
 
-## Environment Resource
-## Node Resource
 ### Setting Attributes
 
 Setting a default environment attribute is just like setting a node level default attribute
 
-    ridley = Ridley.new(...)
-    production_env = ridley.environment.find("production")
-    production_env.set_default_attribute("my_app.proxy.enabled", false)
-    production_env.save #=> true
+```ruby
+ridley = Ridley.new(...)
+production_env = ridley.environment.find("production")
+production_env.set_default_attribute("my_app.proxy.enabled", false)
+production_env.save #=> true
+```
 
 And the same goes for setting an environment level override attribute
 
-    production_env.set_override_attribute("my_app.proxy.enabled", false)
-    production_env.save #=> true
+```ruby
+production_env.set_override_attribute("my_app.proxy.enabled", false)
+production_env.save #=> true
+```
+
+Node Resource
+-------------
 
 ### Bootstrapping Unix nodes
 
-    ridley = Ridley.new(
-      server_url: "https://api.opscode.com",
-      organization: "vialstudios",
-      validator_client: "vialstudios-validator",
-      validator_path: "/Users/reset/.chef/vialstudios-validator.pem",
-      ssh: {
-        user: "vagrant",
-        password: "vagrant"
-      }
-    )
-
-    ridley.node.bootstrap("33.33.33.10", "33.33.33.11")
+```ruby
+ridley = Ridley.new(
+  server_url: "https://api.opscode.com",
+  organization: "vialstudios",
+  validator_client: "vialstudios-validator",
+  validator_path: "/Users/reset/.chef/vialstudios-validator.pem",
+  ssh: {
+    user: "vagrant",
+    password: "vagrant"
+  }
+)
+
+ridley.node.bootstrap("33.33.33.10", "33.33.33.11")
+```
 
 ### Bootstrapping Windows Nodes
 
@@ -308,44 +372,55 @@ echo "$PSSessionOption = New-PSSessionOption -OpenTimeout 0 -CancelTimeout 0 -Id
 Verify the PowerShell settings by opening up the PowerShell Console and entering `$PSSessionOption` and ensure those values are set, and that there are no errors output.
 
 The following links offer some information about configuring a machine's PowerShell settings:
-* [PowerShell Profiles](http://technet.microsoft.com/en-us/library/ee692764.aspx)
-* [The $PSSessionOptions Preference Variable](http://technet.microsoft.com/library/hh847796.aspx)
-* [Creating a new PSSessionOption](http://technet.microsoft.com/en-us/library/hh849703.aspx)
+- [PowerShell Profiles](http://technet.microsoft.com/en-us/library/ee692764.aspx)
+- [The $PSSessionOptions Preference Variable](http://technet.microsoft.com/library/hh847796.aspx)
+- [Creating a new PSSessionOption](http://technet.microsoft.com/en-us/library/hh849703.aspx)
 
 You may also want to tweak your Windows boxes a bit more ex: turning UAC off, turning off the Windows Firewall.
 
-## Role Resource
+Role Resource
+-------------
+
 ### Role Attributes
 
 Setting role attributes is just like setting node and environment attributes
 
-    ridley = Ridley.new(...)
-    my_app_role = ridley.role.find("my_app")
-    my_app_role.set_default_attribute("my_app.proxy.enabled", false)
-    my_app_role.save #=> true
+```ruby
+ridley = Ridley.new(...)
+my_app_role = ridley.role.find("my_app")
+my_app_role.set_default_attribute("my_app.proxy.enabled", false)
+my_app_role.save #=> true
+```
 
 And the same goes for setting an environment level override attribute
 
-    my_app_role.set_override_attribute("my_app.proxy.enabled", false)
-    my_app_role.save #=> true
+```ruby
+my_app_role.set_override_attribute("my_app.proxy.enabled", false)
+my_app_role.save #=> true
+```
 
-## Sandbox Resource
-## Search Resource
+Sandbox Resource
+----------------
 
-    ridley = Ridley.new(...)
-    ridley.search(:node)
-    ridley.search(:node, "name:ridley-test.local")
+Search Resource
+---------------
 
-Search will return an array of the appropriate Chef Objects if one of the default indices is specified. The indices are
+```ruby
+ridley = Ridley.new(...)
+ridley.search(:node)
+ridley.search(:node, "name:ridley-test.local")
+```
 
-* node
-* role
-* client
-* environment
+Search will return an array of the appropriate Chef Objects if one of the default indices is specified. The indices are
 
-# Authors and Contributors
+-  node
+-  role
+-  client
+-  environment
 
-* Jamie Winsor (<reset@riotgames.com>)
-* Kyle Allan (<kallan@riotgames.com>)
+Authors and Contributors
+------------------------
+- Jamie Winsor (<jamie@vialstudios.com>)
+- Kyle Allan (<kallan@riotgames.com>)
 
 Thank you to all of our [Contributors](https://github.com/RiotGames/ridley/graphs/contributors), testers, and users.

data/lib/ridley/chef/chefignore.rb

@@ -1,76 +1,50 @@
-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
+require 'buff/ignore'
 
-    def remove_ignores_from(file_list)
-      Array(file_list).inject([]) do |unignored, file|
-        ignored?(file) ? unignored : unignored << file
+module Ridley::Chef
+  class Chefignore < Buff::Ignore::IgnoreFile
+    include Ridley::Logging
+
+    # The filename of the chefignore
+    #
+    # @return [String]
+    FILENAME = 'chefignore'.freeze
+
+    # Create a new chefignore
+    #
+    # @param [#to_s] path
+    #   the path to find a chefignore from (default: `Dir.pwd`)
+    def initialize(path = Dir.pwd)
+      ignore = chefignore(path)
+
+      if ignore
+        log.debug "Using Chefignore at '#{ignore}'"
+      else
+        log.debug "Could not find a Chefignore at '#{path}'"
       end
-    end
 
-    def ignored?(file_name)
-      @ignores.any? { |glob| File.fnmatch?(glob, file_name) }
+      super(ignore, base: path)
     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
+      # Find the chefignore file in the current directory
+      #
+      # @return [String, nil]
+      #   the path to the chefignore file or nil if one was not
+      #   found
+      def chefignore(path)
+        Pathname.new(path).ascend do |dir|
+          next unless dir.directory?
+
+          [
+            dir.join(FILENAME),
+            dir.join('cookbooks', FILENAME),
+            dir.join('.chef',     FILENAME),
+          ].each do |possible|
+            return possible.expand_path.to_s if possible.exist?
           end
         end
 
-        ignore_globs
-      end
-
-      def find_ignore_file(path)
-        if File.basename(path) =~ /#{FILENAME}/
-          path
-        else
-          File.join(path, FILENAME)
-        end
+        return nil
       end
   end
 end

data/lib/ridley/chef/cookbook.rb

@@ -96,7 +96,7 @@ module Ridley::Chef
         root_files: Array.new
       )
       @frozen        = false
-      @chefignore    = Ridley::Chef::Chefignore.new(@path)
+      @chefignore    = Ridley::Chef::Chefignore.new(@path) rescue nil
 
       load_files
     end
@@ -210,10 +210,9 @@ module Ridley::Chef
 
       # @return [Array]
       attr_reader :files
-      # @return [Ridley::Chef::Chefignore]
-      attr_reader :chefignore
 
-      def_delegator :chefignore, :ignored?
+      # @return [Ridley::Chef::Chefignore, nil]
+      attr_reader :chefignore
 
       def load_files
         load_shallow(:recipes, 'recipes', '*.rb')
@@ -263,5 +262,13 @@ module Ridley::Chef
       def syntax_checker
         @syntax_checker ||= Cookbook::SyntaxCheck.new(path.to_s)
       end
+
+      # Determine if the given file should be ignored by the chefignore
+      #
+      # @return [Boolean]
+      #   true if it should be ignored, false otherwise
+      def ignored?(file)
+        !!chefignore && chefignore.ignored?(file)
+      end
   end
 end

data/lib/ridley/resources/cookbook_resource.rb

@@ -200,7 +200,7 @@ module Ridley
       end
 
       checksums = cookbook.checksums.dup
-      sandbox   = sandbox_resource.create(checksums.keys)
+      sandbox   = sandbox_resource.create(checksums.keys.sort)
 
       sandbox.upload(checksums)
       sandbox.commit

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

data/ridley.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/ridley/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.authors       = ["Jamie Winsor", "Kyle Allan"]
-  s.email         = ["reset@riotgames.com", "kallan@riotgames.com"]
+  s.email         = ["jamie@vialstudios.com", "kallan@riotgames.com"]
   s.description   = %q{A reliable Chef API client with a clean syntax}
   s.summary       = s.description
   s.homepage      = "https://github.com/RiotGames/ridley"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'varia_model',             '~> 0.1'
   s.add_dependency 'buff-config',             '~> 0.2'
   s.add_dependency 'buff-extensions',         '~> 0.3'
+  s.add_dependency 'buff-ignore',             '~> 1.1'
   s.add_dependency 'buff-shell_out',          '~> 0.1'
   s.add_dependency 'celluloid',               '~> 0.14.0'
   s.add_dependency 'celluloid-io',            '~> 0.14.0'

data/spec/acceptance/cookbook_resource_spec.rb

@@ -26,7 +26,7 @@ describe "Client API operations", type: "acceptance" do
   describe "uploading a cookbook" do
     let(:path) { fixtures_path.join("example_cookbook") }
 
-    it "uploads the entire contents of the cookbook in the given path" do
+    it "uploads the entire contents of the cookbook in the given path, applying chefignore" do
       subject.upload(path)
       cookbook = subject.find("example_cookbook", "0.1.0")
 
@@ -38,7 +38,7 @@ describe "Client API operations", type: "acceptance" do
       cookbook.recipes.should have(1).item
       cookbook.resources.should have(1).item
       cookbook.templates.should have(1).item
-      cookbook.root_files.should have(2).items
+      cookbook.root_files.should have(1).items
     end
   end
 

data/spec/fixtures/chefignore

@@ -1,8 +1,3 @@
-#
-# 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
+README.md
+Guardfile
+ignores/*.rb

data/spec/fixtures/example_cookbook/Guardfile

@@ -0,0 +1 @@
+# This should be ignored by chefignore

data/spec/fixtures/example_cookbook/ignores/magic.rb

@@ -0,0 +1 @@
+# I should never see this file

data/spec/fixtures/example_cookbook/ignores/ok.txt

@@ -0,0 +1 @@
+This one is okay, though

data/spec/fixtures/example_cookbook/metadata.rb

@@ -1,6 +1,6 @@
 name             "example_cookbook"
 maintainer       "Jamie Winsor"
-maintainer_email "reset@riotgames.com"
+maintainer_email "jamie@vialstudios.com"
 license          "Apache 2.0"
 description      "Installs/Configures example_cookbook"
 long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))

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

@@ -1,40 +1,28 @@
 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
+  describe '.initialize' do
+    let(:path) { tmp_path.join('chefignore-test') }
+    before { FileUtils.mkdir_p(path) }
+
+    it 'finds the nearest chefignore' do
+      target = path.join('chefignore').to_s
+      FileUtils.touch(target)
+      expect(described_class.new(path).filepath).to eq(target)
     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 'finds a chefignore in the `cookbooks` directory' do
+      target = path.join('cookbooks', 'chefignore').to_s
+      FileUtils.mkdir_p(path.join('cookbooks'))
+      FileUtils.touch(target)
+      expect(described_class.new(path).filepath).to eq(target)
+    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
+    it 'finds a chefignore in the `.chef` directory' do
+      target = path.join('.chef', 'chefignore').to_s
+      FileUtils.mkdir_p(path.join('.chef'))
+      FileUtils.touch(target)
+      expect(described_class.new(path).filepath).to eq(target)
+    end
   end
 end

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

@@ -116,7 +116,34 @@ describe Ridley::CookbookResource do
   end
 
   describe "#upload" do
-    pending
+    let(:name) { "upload_test" }
+    let(:cookbook_path) { fixtures_path.join('example_cookbook') }
+    let(:sandbox_resource) { double('sandbox_resource') }
+    let(:sandbox) { double('sandbox', upload: nil, commit: nil) }
+
+    before do
+      subject.stub(:sandbox_resource).and_return(sandbox_resource)
+    end
+
+    it 'does not include files that are ignored' do
+      # These are the SHAs for the files. It's not possible to check that
+      # the ignored files weren't uploaded, so we just check that the
+      # non-ignored files are the ONLY thing uploaded
+      sandbox_resource.should_receive(:create).with([
+        "211a3a8798d4acd424af15ff8a2e28a5",
+        "75077ba33d2887cc1746d1ef716bf8b7",
+        "7b1ebd2ff580ca9dc46fb27ec1653bf2",
+        "a39eb80def9804f4b118099697cc2cd2",
+        "b70ba735f3af47e5d6fc71b91775b34c",
+        "cafb6869fca13f5c36f24a60de8fb982",
+        "dbf3a6c4ab68a86172be748aced9f46e",
+        "dc6461b5da25775f3ef6a9cc1f6cff9f",
+        "e77856b411b6dcbb2c76c281091ad922",
+        "e9a2e24281cfbd6be0a6b1af3b6d277e",
+      ]).and_return(sandbox)
+
+      subject.upload(cookbook_path, validate: false)
+    end
   end
 
   describe "#update" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -67,6 +67,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: buff-ignore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: buff-shell_out
   requirement: !ruby/object:Gem::Requirement
@@ -265,7 +279,7 @@ dependencies:
         version: '0.1'
 description: A reliable Chef API client with a clean syntax
 email:
-- reset@riotgames.com
+- jamie@vialstudios.com
 - kallan@riotgames.com
 executables: []
 extensions: []
@@ -353,11 +367,14 @@ files:
 - spec/acceptance/search_resource_spec.rb
 - spec/fixtures/chefignore
 - spec/fixtures/encrypted_data_bag_secret
+- spec/fixtures/example_cookbook/Guardfile
 - spec/fixtures/example_cookbook/README.md
 - spec/fixtures/example_cookbook/attributes/default.rb
 - spec/fixtures/example_cookbook/definitions/bad_def.rb
 - spec/fixtures/example_cookbook/files/default/file.h
 - spec/fixtures/example_cookbook/files/ubuntu/file.h
+- spec/fixtures/example_cookbook/ignores/magic.rb
+- spec/fixtures/example_cookbook/ignores/ok.txt
 - spec/fixtures/example_cookbook/libraries/my_lib.rb
 - spec/fixtures/example_cookbook/metadata.rb
 - spec/fixtures/example_cookbook/providers/defprovider.rb
@@ -449,11 +466,14 @@ test_files:
 - spec/acceptance/search_resource_spec.rb
 - spec/fixtures/chefignore
 - spec/fixtures/encrypted_data_bag_secret
+- spec/fixtures/example_cookbook/Guardfile
 - spec/fixtures/example_cookbook/README.md
 - spec/fixtures/example_cookbook/attributes/default.rb
 - spec/fixtures/example_cookbook/definitions/bad_def.rb
 - spec/fixtures/example_cookbook/files/default/file.h
 - spec/fixtures/example_cookbook/files/ubuntu/file.h
+- spec/fixtures/example_cookbook/ignores/magic.rb
+- spec/fixtures/example_cookbook/ignores/ok.txt
 - spec/fixtures/example_cookbook/libraries/my_lib.rb
 - spec/fixtures/example_cookbook/metadata.rb
 - spec/fixtures/example_cookbook/providers/defprovider.rb