ridley 0.8.3 → 0.8.5

data/LICENSE

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2012, Jamie Winsor
+Copyright 2012-2013, Riot Games
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,4 +1,5 @@
 # Ridley
+[![Gem Version](https://badge.fury.io/rb/ridley.png)](http://badge.fury.io/rb/ridley)
 [![Build Status](https://secure.travis-ci.org/reset/ridley.png?branch=master)](http://travis-ci.org/reset/ridley)
 [![Dependency Status](https://gemnasium.com/reset/ridley.png?travis)](https://gemnasium.com/reset/ridley)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/reset/ridley)
@@ -349,4 +350,6 @@ And the same goes for setting an environment level override attribute
 
 # Authors and Contributors
 
-* Jamie Winsor (<jamie@vialstudios.com>)
+* Jamie Winsor (<reset@riotgames.com>)
+
+Thank you to all of our [Contributors](https://github.com/RiotGames/ridley/graphs/contributors), testers, and users.

data/lib/ridley.rb

@@ -20,7 +20,7 @@ require 'ridley/errors'
 
 JSON.create_id = nil
 
-# @author Jamie Winsor <jamie@vialstudios.com>
+# @author Jamie Winsor <reset@riotgames.com>
 module Ridley
   CHEF_VERSION = '11.4.0'.freeze
 

data/lib/ridley/bootstrapper.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Bootstrapper
     autoload :Context, 'ridley/bootstrapper/context'
 

data/lib/ridley/bootstrapper/context.rb

@@ -2,7 +2,7 @@ require 'erubis'
 
 module Ridley
   class Bootstrapper
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     class Context
       class << self
         def validate_options(options = {})

data/lib/ridley/chain_link.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   # @api private
   class ChainLink
     attr_reader :parent

data/lib/ridley/chef.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   #
   # Classes and modules used for integrating with a Chef Server, the Chef community
   # site, and Chef Cookbooks

data/lib/ridley/chef/cookbook.rb

@@ -1,5 +1,5 @@
 module Ridley::Chef
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Cookbook
     autoload :Metadata, 'ridley/chef/cookbook/metadata'
     autoload :SyntaxCheck, 'ridley/chef/cookbook/syntax_check'

data/lib/ridley/chef/cookbook/metadata.rb

@@ -1,6 +1,6 @@
 module Ridley::Chef
   class Cookbook
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     #
     # Borrowed and modified from: {https://raw.github.com/opscode/chef/11.4.0/lib/chef/cookbook/metadata.rb}
     #

data/lib/ridley/chef/cookbook/syntax_check.rb

@@ -1,6 +1,6 @@
 module Ridley::Chef
   class Cookbook
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     #
     # Encapsulates the process of validating the ruby syntax of files in Chef
     # cookbooks.

data/lib/ridley/chef/digester.rb

@@ -1,7 +1,7 @@
 require 'digest'
 
 module Ridley::Chef
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   #
   # Borrowed and modified from: {https://github.com/opscode/chef/blob/11.4.0/lib/chef/digester.rb}
   class Digester

data/lib/ridley/client.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   #
   # @example
   #   connection = Ridley::Client.new

data/lib/ridley/connection.rb

@@ -3,7 +3,7 @@ require 'retryable'
 require 'tempfile'
 
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Connection < Faraday::Connection
     include Celluloid
 

data/lib/ridley/errors.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   module Errors
     class RidleyError < StandardError; end
     class InternalError < RidleyError; end

data/lib/ridley/log.rb

@@ -1,7 +1,7 @@
 require 'mixlib/log'
 
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Log
     extend Mixlib::Log
 

data/lib/ridley/logging.rb

@@ -1,7 +1,7 @@
 require 'logger'
 
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   module Logging
     class << self
       # @return [Logger]

data/lib/ridley/middleware.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   module Middleware
     CONTENT_TYPE = 'content-type'.freeze
 

data/lib/ridley/middleware/chef_auth.rb

@@ -2,7 +2,7 @@ require 'mixlib/authentication/signedheaderauth'
 
 module Ridley
   module Middleware
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     class ChefAuth < Faraday::Middleware
       class << self
         include Mixlib::Authentication

data/lib/ridley/middleware/chef_response.rb

@@ -1,6 +1,6 @@
 module Ridley
   module Middleware
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     class ChefResponse < Faraday::Response::Middleware
       class << self
         # Determines if a response from the Chef server was successful

data/lib/ridley/middleware/parse_json.rb

@@ -1,6 +1,6 @@
 module Ridley
   module Middleware
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     class ParseJson < Faraday::Response::Middleware
       include Ridley::Logging
 

data/lib/ridley/middleware/retry.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   #
   # Catches exceptions and retries each request a limited number of times.
   #

data/lib/ridley/mixin/checksum.rb

@@ -1,5 +1,5 @@
 module Ridley::Mixin
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   #
   # Inspired by and dependency-free replacement for
   # {https://github.com/opscode/chef/blob/11.4.0/lib/chef/mixin/checksum.rb}

data/lib/ridley/mixin/shell_out.rb

@@ -1,7 +1,7 @@
 require 'mixlib/shellout'
 
 module Ridley::Mixin
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   module ShellOut
     # @return [Mixlib::ShellOut]
     def shell_out(*command_args)

data/lib/ridley/resource.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Resource
     class << self
       # @return [String, nil]

data/lib/ridley/resources/client_resource.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class ClientResource < Ridley::Resource
     class << self
       # Retrieves a client from the remote connection matching the given chef_id

data/lib/ridley/resources/cookbook_resource.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class CookbookResource < Ridley::Resource
     class << self
       # List all of the cookbooks and their versions present on the remote
@@ -311,7 +311,7 @@ module Ridley
         manifest[filetype].each do |file|
           file_destination = File.join(destination, file[:path].gsub('/', File::SEPARATOR))
           FileUtils.mkdir_p(File.dirname(file_destination))
-          download_file(filetype, file[:name], file_destination)
+          download_file(filetype, file[:path], file_destination)
         end
       end
 
@@ -334,14 +334,14 @@ module Ridley
     #   these types are where the files are stored in your cookbook's structure. For example, a
     #   recipe would be stored in the recipes directory while a root_file is stored at the root
     #   of your cookbook
-    # @param [String] name
-    #   name of the file to download
+    # @param [String] path
+    #   path of the file to download
     # @param [String] destination
     #   where to download the file to
     #
     # @return [nil]
-    def download_file(filetype, name, destination)
-      download_fun(filetype).call(name, destination)
+    def download_file(filetype, path, destination)
+      download_fun(filetype).call(path, destination)
     end
 
     # A hash containing keys for all of the different cookbook filetypes with values
@@ -400,7 +400,7 @@ module Ridley
 
         ->(target, destination) {
           files = collection.call # JW: always chaining .call.find results in a nil value. WHY?
-          file  = files.find { |f| f[:name] == target }
+          file  = files.find { |f| f[:path] == target }
           return nil if file.nil?
 
           destination = File.expand_path(destination)

data/lib/ridley/resources/data_bag_item_resource.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class DataBagItemResource < Ridley::Resource
     class << self
       # @param [Ridley::Client] client
@@ -171,7 +171,7 @@ module Ridley
     def update
       raise Errors::InvalidResource.new(self.errors) unless valid?
 
-      mass_assign(sself.class.update(client, data_bag, self)._attributes_)
+      mass_assign(self.class.update(client, data_bag, self)._attributes_)
       true
     end
 

data/lib/ridley/resources/data_bag_resource.rb

@@ -2,7 +2,7 @@ require 'ridley/resources/data_bag_item_resource'
 require 'ridley/resources/encrypted_data_bag_item_resource'
 
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   # @api private
   class DBIChainLink
     attr_reader :data_bag
@@ -30,7 +30,7 @@ module Ridley
     end
   end
 
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class DataBagResource < Ridley::Resource
     class << self
       # @param [Ridley::Client] client

data/lib/ridley/resources/encrypted_data_bag_item_resource.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class EncryptedDataBagItemResource
     class << self
       # Finds a data bag item and decrypts it.

data/lib/ridley/resources/environment_resource.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class EnvironmentResource < Ridley::Resource
     class << self
       # Delete all of the environments on the client. The '_default' environment

data/lib/ridley/resources/node_resource.rb

@@ -1,5 +1,5 @@
 module Ridley 
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class NodeResource < Ridley::Resource
     class << self
       # @overload bootstrap(client, nodes, options = {})
@@ -54,6 +54,7 @@ module Ridley
       # @param [Ridley::Client] client
       # @param [Ridley::NodeResource, String] target
       #   node or identifier of the node to merge
+      #
       # @option options [Array] :run_list
       #   run list items to merge
       # @option options [Hash] :attributes

data/lib/ridley/resources/role_resource.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class RoleResource < Ridley::Resource
     set_chef_id "name"
     set_chef_type "role"

data/lib/ridley/resources/sandbox_resource.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class SandboxResource
     class << self
       # Create a new Sandbox on the client's Chef Server. A Sandbox requires an

data/lib/ridley/sandbox_uploader.rb

@@ -1,5 +1,5 @@
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   # @api private
   class SandboxUploader
     class << self
@@ -32,7 +32,7 @@ module Ridley
         File.open(path, 'rb') { |f| checksum_io(f, Digest::MD5.new) }
       end
 
-      # Return a base64 encoded checksum of the contents of hte given file. This is the expected
+      # Return a base64 encoded checksum of the contents of the given file. This is the expected
       # format of sandbox checksums given to the Chef Server.
       #
       # @param [String] path

data/lib/ridley/ssh.rb

@@ -1,7 +1,7 @@
 require 'net/ssh'
 
 module Ridley
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class SSH
     autoload :Response, 'ridley/ssh/response'
     autoload :ResponseSet, 'ridley/ssh/response_set'

data/lib/ridley/ssh/response.rb

@@ -1,6 +1,6 @@
 module Ridley
   class SSH
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     class Response
       attr_reader :host
 

data/lib/ridley/ssh/response_set.rb

@@ -1,6 +1,6 @@
 module Ridley
   class SSH
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     class ResponseSet
       class << self
         # Merges the responses of the other ResponseSet with the target ResponseSet

data/lib/ridley/ssh/worker.rb

@@ -1,6 +1,6 @@
 module Ridley
   class SSH
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     # @api private
     class Worker
       include Celluloid

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.8.3"
+  VERSION = "0.8.5"
 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"]
-  s.email         = ["jamie@vialstudios.com"]
+  s.email         = ["reset@riotgames.com"]
   s.description   = %q{A reliable Chef API client with a clean syntax}
   s.summary       = s.description
   s.homepage      = "https://github.com/reset/ridley"

data/spec/fixtures/example_cookbook/metadata.rb

@@ -1,6 +1,6 @@
 name             "example_cookbook"
 maintainer       "Jamie Winsor"
-maintainer_email "jamie@vialstudios.com"
+maintainer_email "reset@riotgames.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/resources/cookbook_resource_spec.rb

@@ -203,8 +203,8 @@ describe Ridley::CookbookResource do
         }
       end
 
-      subject.should_receive(:download_file).with(:recipes, "default.rb", anything)
-      subject.should_receive(:download_file).with(:files, "README", anything)
+      subject.should_receive(:download_file).with(:recipes, "recipes/default.rb", anything)
+      subject.should_receive(:download_file).with(:files, "files/default/plugins/README", anything)
 
       subject.download
     end
@@ -214,7 +214,7 @@ describe Ridley::CookbookResource do
     let(:destination) { tmp_path.join('fake.file').to_s }
 
     before(:each) do
-      subject.stub(:root_files) { [ { name: 'metadata.rb', url: "http://test.it/file" } ] }
+      subject.stub(:root_files) { [ { path: 'metadata.rb', url: "http://test.it/file" } ] }
     end
 
     it "downloads the file from the file's url" do

data/spec/unit/ridley/sandbox_uploader_spec.rb

@@ -36,15 +36,19 @@ describe Ridley::SandboxUploader do
     end
 
     describe "::checksum" do
-      it "returns a string" do
-        subject.checksum(fixtures_path.join('reset.pem')).should be_a(String)
-      end
+      subject { described_class.checksum(path) }
+
+      let(:path) { fixtures_path.join('reset.pem') }
+
+      it { should eq("a0608f1eb43ee4cca510bf95f8d209f7") }
     end
 
     describe "::checksum64" do
-      it "returns a string" do
-        subject.checksum64(fixtures_path.join('reset.pem')).should be_a(String)
-      end
+      subject { described_class.checksum64(path) }
+
+      let(:path) { fixtures_path.join('reset.pem') }
+
+      it { should eq("oGCPHrQ+5MylEL+V+NIJ9w==") }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -269,7 +269,7 @@ dependencies:
         version: '0'
 description: A reliable Chef API client with a clean syntax
 email:
-- jamie@vialstudios.com
+- reset@riotgames.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3451325282232038197
+      hash: -383872580603782424
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24