ridley 0.12.1 → 0.12.2

data/lib/ridley.rb

@@ -5,16 +5,16 @@ silence_warnings do
   # Requiring winrm before all other gems because of https://github.com/WinRb/WinRM/issues/39
   require 'winrm'
 end
-require 'chozo'
+
+require 'active_support/inflector'
+require 'addressable/uri'
 require 'celluloid'
+require 'chozo'
 require 'faraday'
-require 'addressable/uri'
-require 'multi_json'
-require 'solve'
-require 'active_support/inflector'
 require 'forwardable'
-require 'thread'
+require 'multi_json'
 require 'pathname'
+require 'solve'
 
 if jruby?
   require 'json/pure'
@@ -22,26 +22,28 @@ else
   require 'json/ext'
 end
 
-require 'ridley/version'
-require 'ridley/errors'
-
 JSON.create_id = nil
 
 # @author Jamie Winsor <reset@riotgames.com>
 module Ridley
   CHEF_VERSION = '11.4.0'.freeze
 
-  autoload :Bootstrapper, 'ridley/bootstrapper'
-  autoload :Client, 'ridley/client'
-  autoload :Connection, 'ridley/connection'
-  autoload :Chef, 'ridley/chef'
-  autoload :ChefObject, 'ridley/chef_object'
-  autoload :DSL, 'ridley/dsl'
-  autoload :Logging, 'ridley/logging'
-  autoload :Mixin, 'ridley/mixin'
-  autoload :Resource, 'ridley/resource'
-  autoload :SandboxUploader, 'ridley/sandbox_uploader'
-  autoload :HostConnector, 'ridley/host_connector'
+  require_relative 'ridley/mixin'
+  require_relative 'ridley/bootstrap_bindings'
+  require_relative 'ridley/bootstrapper'
+  require_relative 'ridley/chef_object'
+  require_relative 'ridley/chef_objects'
+  require_relative 'ridley/client'
+  require_relative 'ridley/connection'
+  require_relative 'ridley/chef'
+  require_relative 'ridley/host_connector'
+  require_relative 'ridley/logging'
+  require_relative 'ridley/middleware'
+  require_relative 'ridley/resource'
+  require_relative 'ridley/resources'
+  require_relative 'ridley/sandbox_uploader'
+  require_relative 'ridley/version'
+  require_relative 'ridley/errors'
 
   class << self
     extend Forwardable
@@ -68,8 +70,3 @@ module Ridley
 end
 
 Celluloid.logger = Ridley.logger
-
-require 'ridley/bootstrap_bindings'
-require 'ridley/middleware'
-require 'ridley/chef_objects'
-require 'ridley/resources'

data/lib/ridley/bootstrap_bindings.rb

@@ -1,5 +1,3 @@
-require 'ridley/mixin/bootstrap_binding'
-
 Dir["#{File.dirname(__FILE__)}/bootstrap_bindings/*.rb"].sort.each do |path|
-  require "ridley/bootstrap_bindings/#{File.basename(path, '.rb')}"
+  require_relative "bootstrap_bindings/#{File.basename(path, '.rb')}"
 end

data/lib/ridley/bootstrapper.rb

@@ -1,8 +1,9 @@
+require_relative 'bootstrapper/context'
+require_relative 'logging'
+
 module Ridley
   # @author Jamie Winsor <reset@riotgames.com>
   class Bootstrapper
-    autoload :Context, 'ridley/bootstrapper/context'
-
     include Celluloid
     include Ridley::Logging
 

data/lib/ridley/chef.rb

@@ -4,8 +4,8 @@ module Ridley
   # Classes and modules used for integrating with a Chef Server, the Chef community
   # site, and Chef Cookbooks
   module Chef
-    autoload :Cookbook, 'ridley/chef/cookbook'
-    autoload :Chefignore, 'ridley/chef/chefignore'
-    autoload :Digester, 'ridley/chef/digester'
+    require_relative 'chef/cookbook'
+    require_relative 'chef/chefignore'
+    require_relative 'chef/digester'
   end
 end

data/lib/ridley/chef/cookbook.rb

@@ -1,8 +1,8 @@
 module Ridley::Chef
   # @author Jamie Winsor <reset@riotgames.com>
   class Cookbook
-    autoload :Metadata, 'ridley/chef/cookbook/metadata'
-    autoload :SyntaxCheck, 'ridley/chef/cookbook/syntax_check'
+    require_relative 'cookbook/metadata'
+    require_relative 'cookbook/syntax_check'
 
     class << self
       # @param [String] filepath

data/lib/ridley/chef_objects.rb

@@ -1,3 +1,3 @@
 Dir["#{File.dirname(__FILE__)}/chef_objects/*.rb"].sort.each do |path|
-  require "ridley/chef_objects/#{File.basename(path, '.rb')}"
+  require_relative "chef_objects/#{File.basename(path, '.rb')}"
 end

data/lib/ridley/chef_objects/cookbook_object.rb

@@ -15,7 +15,7 @@ module Ridley
       :root_files
     ].freeze
 
-    set_chef_id "name"
+    set_chef_id "cookbook_name"
     set_chef_type "cookbook"
     set_chef_json_class "Chef::Cookbook"
 
@@ -167,6 +167,14 @@ module Ridley
       end
     end
 
+    # Reload the attributes of the instantiated resource
+    #
+    # @return [Ridley::CookbookObject]
+    def reload
+      mass_assign(resource.find(self, self.version)._attributes_)
+      self
+    end
+
     def to_s
       "#{name}: #{manifest}"
     end

data/lib/ridley/client.rb

@@ -1,27 +1,5 @@
 module Ridley
   # @author Jamie Winsor <reset@riotgames.com>
-  #
-  # @example
-  #   connection = Ridley::Client.new
-  #   connection.role.all
-  #
-  #   connection.role.find("reset") => Ridley::RoleResource.find(connection, "reset")
-  #
-  # @example instantiating new resources
-  #   connection = Ridley::Connection.new
-  #   connection.role.new(name: "hello") => <#Ridley::RoleResource: @name="hello">
-  #
-  #   New instances of resources can be instantiated by calling new on the Ridley::Context. These messages
-  #   will be send to the Chef resource's class in Ridley and can be treated as a normal Ruby object. Each
-  #   instantiated object will have the connection information contained within so you can do things like
-  #   save a role after changing it's attributes.
-  #
-  #   r = connection.role.new(name: "new-role")
-  #   r.name => "new-role"
-  #   r.name = "other-name"
-  #   r.save
-  #
-  #   connection.role.find("new-role") => <#Ridley::RoleResource: @name="new-role">
   class Client
     class ConnectionSupervisor < ::Celluloid::SupervisionGroup
       def initialize(registry, options)

data/lib/ridley/host_connector.rb

@@ -4,10 +4,10 @@ require 'timeout'
 module Ridley
   # @author Kyle Allan <kallan@riotgames.com>
   module HostConnector
-    autoload :Response, 'ridley/host_connector/response'
-    autoload :ResponseSet, 'ridley/host_connector/response_set'
-    autoload :SSH, 'ridley/host_connector/ssh'
-    autoload :WinRM, 'ridley/host_connector/winrm'
+    require_relative 'host_connector/response'
+    require_relative 'host_connector/response_set'
+    require_relative 'host_connector/ssh'
+    require_relative 'host_connector/winrm'
 
     DEFAULT_SSH_PORT   = 22.freeze
     DEFAULT_WINRM_PORT = 5985.freeze

data/lib/ridley/host_connector/ssh.rb

@@ -4,7 +4,7 @@ module Ridley
   module HostConnector
     # @author Jamie Winsor <reset@riotgames.com>
     class SSH
-      autoload :Worker, 'ridley/host_connector/ssh/worker'
+      require_relative 'ssh/worker'
 
       class << self
         # @param [Ridley::NodeObject, Array<Ridley::NodeObject>] nodes

data/lib/ridley/host_connector/winrm.rb

@@ -2,8 +2,8 @@ module Ridley
   module HostConnector
     # @author Kyle Allan <kallan@riotgames.com>
     class WinRM
-      autoload :CommandUploader, 'ridley/host_connector/winrm/command_uploader'
-      autoload :Worker, 'ridley/host_connector/winrm/worker'
+      require_relative 'winrm/command_uploader'
+      require_relative 'winrm/worker'
 
       class << self
         # @param [Ridley::NodeResource, Array<Ridley::NodeResource>] nodes

data/lib/ridley/middleware.rb

@@ -3,11 +3,11 @@ module Ridley
   module Middleware
     CONTENT_TYPE = 'content-type'.freeze
 
-    require 'ridley/middleware/parse_json'
-    require 'ridley/middleware/chef_response'
-    require 'ridley/middleware/chef_auth'
-    require 'ridley/middleware/follow_redirects'
-    require 'ridley/middleware/retry'
+    require_relative 'middleware/parse_json'
+    require_relative 'middleware/chef_response'
+    require_relative 'middleware/chef_auth'
+    require_relative 'middleware/follow_redirects'
+    require_relative 'middleware/retry'
 
     Faraday.register_middleware :request,
       chef_auth: -> { Ridley::Middleware::ChefAuth }

data/lib/ridley/middleware/chef_auth.rb

@@ -11,12 +11,15 @@ module Ridley
         #
         # @param [String] client_name
         # @param [String] client_key
+        #   the path OR actual client key
         #
         # @option options [String] :host
         #
         # @see {#signing_object} for options
         def authentication_headers(client_name, client_key, options = {})
-          rsa_key = OpenSSL::PKey::RSA.new(File.read(client_key))
+          contents = File.exists?(client_key) ? File.read(client_key) : client_key.to_s
+          rsa_key = OpenSSL::PKey::RSA.new(contents)
+
           headers = signing_object(client_name, options).sign(rsa_key).merge(host: options[:host])
           headers.inject({}) { |memo, kv| memo["#{kv[0].to_s.upcase}"] = kv[1];memo }
         end
@@ -57,7 +60,7 @@ module Ridley
       def call(env)
         signing_options = {
           http_method: env[:method],
-          host: env[:url].host || "localhost",
+          host: "#{env[:url].host}:#{env[:url].port}",
           path: env[:url].path,
           body: env[:body] || ''
         }

data/lib/ridley/mixin.rb

@@ -1,3 +1,3 @@
 Dir["#{File.dirname(__FILE__)}/mixin/*.rb"].sort.each do |path|
-  require "ridley/mixin/#{File.basename(path, '.rb')}"
+  require_relative "mixin/#{File.basename(path, '.rb')}"
 end

data/lib/ridley/resources.rb

@@ -1,3 +1,3 @@
 Dir["#{File.dirname(__FILE__)}/resources/*.rb"].sort.each do |path|
-  require "ridley/resources/#{File.basename(path, '.rb')}"
+  require_relative "resources/#{File.basename(path, '.rb')}"
 end

data/lib/ridley/resources/data_bag_resource.rb

@@ -1,8 +1,8 @@
-require 'ridley/resources/data_bag_item_resource'
-
 module Ridley
   # @author Jamie Winsor <reset@riotgames.com>
   class DataBagResource < Ridley::Resource
+    require_relative 'data_bag_item_resource'
+
     set_resource_path "data"
     represented_by Ridley::DataBagObject
 

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

data/ridley.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   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"
+  s.homepage      = "https://github.com/RiotGames/ridley"
   s.license       = "Apache 2.0"
 
   s.files         = `git ls-files`.split($\)

data/spec/acceptance/cookbook_resource_spec.rb

@@ -6,12 +6,29 @@ describe "Client API operations", type: "acceptance" do
   let(:client_key)  { fixtures_path.join('reset.pem').to_s }
   let(:connection)  { Ridley.new(server_url: server_url, client_name: client_name, client_key: client_key) }
 
+  subject { connection.cookbook }
+
+  describe "downloading a cookbook" do
+    before { subject.upload(fixtures_path.join('example_cookbook')) }
+    let(:name) { "example_cookbook" }
+    let(:version) { "0.1.0" }
+    let(:destination) { tmp_path.join("example_cookbook-0.1.0") }
+
+    context "when the cookbook of the name/version is found" do
+      before { subject.download(name, version, destination) }
+
+      it "downloads the cookbook to the destination" do
+        expect(File.exist?(destination.join("metadata.rb"))).to be_true
+      end
+    end
+  end
+
   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
-      connection.cookbook.upload(path)
-      cookbook = connection.cookbook.find("example_cookbook", "0.1.0")
+      subject.upload(path)
+      cookbook = subject.find("example_cookbook", "0.1.0")
 
       cookbook.attributes.should have(1).item
       cookbook.definitions.should have(1).item

data/spec/unit/ridley/chef_objects/cookbook_object_spec.rb

@@ -90,4 +90,14 @@ describe Ridley::CookbookObject do
       subject.manifest.values.should each be_empty
     end
   end
+
+  describe "#reload" do
+    it "returns the updated self" do
+      other = subject.dup
+      other.version = "1.2.3"
+      resource.should_receive(:find).with(subject, subject.version).and_return(other)
+
+      expect(subject.reload).to eq(other)
+    end
+  end
 end

data/spec/unit/ridley/middleware/chef_auth_spec.rb

@@ -18,6 +18,19 @@ describe Ridley::Middleware::ChefAuth do
         }
         subject.authentication_headers(client_name, client_key, options).should be_a(Hash)
       end
+
+      context "when the :client_key is an actual key" do
+        let(:client_key) { File.read(fixtures_path.join("reset.pem")) }
+
+        it "returns a Hash of authentication headers" do
+          options = {
+            http_method: "GET",
+            host: "https://api.opscode.com",
+            path: "/something.file"
+          }
+          subject.authentication_headers(client_name, client_key, options).should be_a(Hash)
+        end
+      end
     end
   end
 

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

@@ -12,12 +12,6 @@ describe Ridley::CookbookResource do
     let(:version) { "0.1.0" }
     let(:destination) { tmp_path.join("example_cookbook-0.1.0").to_s }
 
-    context "when the cookbook of the name/version is found" do
-      it "downloads the cookbook to the destination" do
-        pending "can't test downloading until https://github.com/jkeiser/chef-zero/issues/5 is fixed"
-      end
-    end
-
     context "when the cookbook of the name/version is not found" do
       before { subject.should_receive(:find).with(name, version).and_return(nil) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -434,7 +434,7 @@ files:
 - spec/unit/ridley/resources/search_resource_spec.rb
 - spec/unit/ridley/sandbox_uploader_spec.rb
 - spec/unit/ridley_spec.rb
-homepage: https://github.com/reset/ridley
+homepage: https://github.com/RiotGames/ridley
 licenses:
 - Apache 2.0
 post_install_message: 
@@ -455,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3737954718774524860
+      hash: 1382072884355944447
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23