ridley 0.0.2 → 0.0.3

data/Guardfile

@@ -1,3 +1,6 @@
+notification :off
+interactor :coolline
+
 guard 'spork' do
   watch('Gemfile')
   watch('spec/spec_helper.rb')     { :rspec }
@@ -10,7 +13,7 @@ guard 'yard', stdout: '/dev/null', stderr: '/dev/null' do
   watch(%r{ext/.+\.c})
 end
 
-guard 'rspec', version: 2, cli: "--color --drb --format Fuubar", all_on_start: false, all_after_pass: false, notification: false do
+guard 'rspec', version: 2, cli: "--color --drb --format Fuubar", all_on_start: false, all_after_pass: false do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^spec/acceptance/.+_spec\.rb$})
   

data/README.md

@@ -1,5 +1,6 @@
 # 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)
 
 A reliable Chef API client with a clean syntax

data/Thorfile

@@ -11,17 +11,17 @@ class Default < Thor
   include Thor::RakeCompat
   Bundler::GemHelper.install_tasks
 
-  desc "build", "Build berkshelf-#{Ridley::VERSION}.gem into the pkg directory"
+  desc "build", "Build ridley-#{Ridley::VERSION}.gem into the pkg directory"
   def build
     Rake::Task["build"].execute
   end
 
-  desc "install", "Build and install berkshelf-#{Ridley::VERSION}.gem into system gems"
+  desc "install", "Build and install ridley-#{Ridley::VERSION}.gem into system gems"
   def install
     Rake::Task["install"].execute
   end
 
-  desc "release", "Create tag v#{Ridley::VERSION} and build and push berkshelf-#{Ridley::VERSION}.gem to Rubygems"
+  desc "release", "Create tag v#{Ridley::VERSION} and build and push ridley-#{Ridley::VERSION}.gem to Rubygems"
   def release
     Rake::Task["release"].execute
   end

data/lib/ridley.rb

@@ -9,6 +9,7 @@ require 'forwardable'
 require 'set'
 require 'thread'
 
+require 'ridley/version'
 require 'ridley/errors'
 
 # @author Jamie Winsor <jamie@vialstudios.com>

data/lib/ridley/connection.rb

@@ -5,6 +5,18 @@ module Ridley
       def sync(options, &block)
         new(options).sync(&block)
       end
+      
+      # @raise [ArgumentError]
+      #
+      # @return [Boolean]
+      def validate_options(options)
+        missing = (REQUIRED_OPTIONS - options.keys)
+
+        unless missing.empty?
+          missing.collect! { |opt| "'#{opt}'" }
+          raise ArgumentError, "Missing required option(s): #{missing.join(', ')}"
+        end
+      end
     end
 
     extend Forwardable
@@ -39,8 +51,15 @@ module Ridley
     DEFAULT_THREAD_COUNT = 8
 
     # @option options [String] :server_url
+    #   URL to the Chef API
     # @option options [String] :client_name
+    #   name of the client used to authenticate with the Chef API
     # @option options [String] :client_key
+    #   filepath to the client's private key used to authenticate with
+    #   the Chef API
+    # @option options [String] :organization
+    #   the Organization to connect to. This is only used if you are connecting to
+    #   private Chef or hosted Chef
     # @option options [Integer] :thread_count
     # @option options [Hash] :params
     #   URI query unencoded key/value pairs
@@ -53,14 +72,12 @@ module Ridley
     # @option options [URI, String, Hash] :proxy
     #   URI, String, or Hash of HTTP proxy options
     def initialize(options = {})
-      options[:thread_count] ||= DEFAULT_THREAD_COUNT
-
-      validate_options(options)
+      self.class.validate_options(options)
 
-      @client_name  = options[:client_name]
-      @client_key   = options[:client_key]
-      @organization = options[:organization]
-      @thread_count = options[:thread_count]
+      @client_name  = options.fetch(:client_name)
+      @client_key   = options.fetch(:client_key)
+      @organization = options.fetch(:organization, nil)
+      @thread_count = options.fetch(:thread_count, DEFAULT_THREAD_COUNT)
 
       faraday_options = options.slice(:params, :headers, :request, :ssl, :proxy)
       uri_hash = Addressable::URI.parse(options[:server_url]).to_hash.slice(:scheme, :host, :port)
@@ -69,7 +86,7 @@ module Ridley
         uri_hash[:port] = (uri_hash[:scheme] == "https" ? 443 : 80)
       end
 
-      if organization
+      unless organization.nil?
         uri_hash[:path] = "/organizations/#{organization}"
       end
 
@@ -119,13 +136,5 @@ module Ridley
       def method_missing(method, *args, &block)
         @self_before_instance_eval.send(method, *args, &block)
       end
-
-      def validate_options(options)
-        missing = REQUIRED_OPTIONS - options.keys
-        unless missing.empty?
-          missing.collect! { |opt| "'#{opt}'" }
-          raise ArgumentError, "missing required option(s): #{missing.join(', ')}"
-        end
-      end
   end
 end

data/lib/ridley/errors.rb

@@ -47,7 +47,7 @@ module Ridley
 
       def initialize(env)
         @env = env
-        @errors = Array(env[:body][:error]) || []
+        @errors = env[:body].is_a?(Hash) ? Array(env[:body][:error]) : []
 
         if errors.empty?
           @message = env[:body] || "no content body"

data/lib/ridley/middleware/chef_auth.rb

@@ -23,7 +23,7 @@ module Ridley
           user_id: client_name
         )
         authentication_headers = sign_obj.sign(client_key)
-        env[:request_headers] = env[:request_headers].merge(authentication_headers).merge(default_headers)
+        env[:request_headers] = default_headers.merge(env[:request_headers]).merge(authentication_headers)
         env[:request_headers] = env[:request_headers].merge('Content-Length' => env[:body].bytesize.to_s) if env[:body]
 
         Ridley.log.debug(env)

data/lib/ridley/middleware/parse_json.rb

@@ -24,7 +24,7 @@ module Ridley
         #
         # @return [Hash]
         def parse(body)
-          MultiJson.load(body, symbolize_keys: true)
+          MultiJson.decode(body, symbolize_keys: true)
         end
 
         # Extracts the type of the response from the response headers

data/lib/ridley/resource.rb

@@ -255,7 +255,7 @@ module Ridley
     #
     # @return [Object]
     def from_json(json, options = {})
-      self.attributes = MultiJson.load(json, options)
+      self.attributes = MultiJson.decode(json, options)
       self
     end
 
@@ -272,7 +272,7 @@ module Ridley
     #
     # @return [String]
     def to_json(options = {})
-      MultiJson.dump(self.attributes, options)
+      MultiJson.encode(self.attributes, options)
     end
     alias_method :as_json, :to_json
 

data/lib/ridley/resources/cookbook.rb

@@ -3,6 +3,32 @@ module Ridley
   class Cookbook    
     include Ridley::Resource
 
+    class << self
+      # Save a new Cookbook Version of the given name, version with the
+      # given manifest of files and checksums.
+      #
+      # @param [Ridley::Connection] connection
+      # @param [String] name
+      # @param [String] version
+      # @param [String] manifest
+      #   a JSON blob containing file names, file paths, and checksums for each
+      #   that describe the cookbook version being uploaded.
+      #
+      # @option options [Boolean] :freeze
+      # @option options [Boolean] :force
+      #
+      # @return [Hash]
+      def save(connection, name, version, manifest, options = {})
+        freeze = options.fetch(:freeze, false)
+        force  = options.fetch(:force, false)
+
+        url = "cookbooks/#{name}/#{version}"
+        url << "?force=true" if force
+
+        connection.put(url, manifest)
+      end
+    end
+
     set_chef_id "name"
     set_chef_type "cookbook"
     set_chef_json_class "Chef::Cookbook"

data/lib/ridley/resources/data_bag_item.rb

@@ -167,7 +167,7 @@ module Ridley
     #
     # @return [String]
     def to_json(options = {})
-      MultiJson.dump(self.attributes, options)
+      MultiJson.encode(self.attributes, options)
     end
     alias_method :as_json, :to_json
 

data/lib/ridley/resources/sandbox.rb

@@ -0,0 +1,106 @@
+module Ridley
+  class Sandbox
+    class << self
+      # @param [Ridley::Connection] connection
+      # @param [Array] checksums
+      #
+      # @return [Ridley::Sandbox]
+      def create(connection, checksums = [])
+        sumhash = { checksums: Hash.new }.tap do |chks|
+          Array(checksums).each { |chk| chks[:checksums][chk] = nil }
+        end
+
+        attrs = connection.post("sandboxes", sumhash.to_json).body
+        new(connection, attrs[:sandbox_id], attrs[:checksums])
+      end
+
+      # Checksum the file at the given filepath for a Chef API.
+      #
+      # @param [String] path
+      #
+      # @return [String]
+      def checksum(path)
+        File.open(path, 'rb') { |f| checksum_io(f, Digest::MD5.new) }
+      end
+
+      # Checksum and encode the file at the given filepath for uploading
+      #
+      # @param [String] path
+      #
+      # @return [String]
+      #   a base64 encoded checksum
+      def checksum64(path)
+        Base64.encode64([checksum(path)].pack("H*")).strip
+      end
+
+      # @param [String] io
+      # @param [Object] digest
+      #
+      # @return [String]
+      def checksum_io(io, digest)
+        while chunk = io.read(1024 * 8)
+          digest.update(chunk)
+        end
+        digest.hexdigest
+      end
+    end
+
+    attr_reader :sandbox_id
+    attr_reader :checksums
+
+    def initialize(connection, id, checksums)
+      @connection = connection
+      @sandbox_id = id
+      @checksums = checksums
+    end
+
+    def checksum(chk_id)
+      checksums.fetch(chk_id.to_sym)
+    end
+
+    # @param [String] chk_id
+    # @param [String] path
+    #
+    # @return [Hash, nil]
+    def upload(chk_id, path)
+      checksum = self.checksum(chk_id)
+      
+      unless checksum[:needs_upload]
+        return nil
+      end
+
+      headers  = {
+        'Content-Type' => 'application/x-binary',
+        'content-md5' => self.class.checksum64(path)
+      }
+      contents = File.open(path, 'rb') { |f| f.read }
+
+      Faraday.put(checksum[:url], contents, headers)
+    end
+
+    def commit
+      connection.put("sandboxes/#{sandbox_id}", { is_completed: true }.to_json).body
+    end
+
+    def to_s
+      "#{sandbox_id}: #{checksums}"
+    end
+
+    private
+
+      attr_reader :connection
+  end
+
+  module DSL
+    # Coerces instance functions into class functions on Ridley::Sandbox. This coercion
+    # sends an instance of the including class along to the class function.
+    #
+    # @see Ridley::Context
+    #
+    # @return [Ridley::Context]
+    #   a context object to delegate instance functions to class functions on Ridley::Sandbox
+    def sandbox
+      Context.new(Ridley::Sandbox, self)
+    end
+  end
+end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/ridley.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'mixlib-authentication'
   s.add_runtime_dependency 'addressable'
   s.add_runtime_dependency 'faraday'
-  s.add_runtime_dependency 'multi_json'
+  s.add_runtime_dependency 'multi_json', '>= 1.0.4'
   s.add_runtime_dependency 'activemodel'
 
   s.add_development_dependency 'rake'

data/spec/acceptance/sandbox_resource_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe "Sandbox API operations", type: "acceptance" do
+  let(:server_url) { "https://api.opscode.com" }
+  let(:client_name) { "reset" }
+  let(:client_key) { "/Users/reset/.chef/reset.pem" }
+  let(:organization) { "ridley" }
+
+  let(:connection) do
+    Ridley.connection(
+      server_url: server_url,
+      client_name: client_name,
+      client_key: client_key,
+      organization: organization
+    )
+  end
+
+  before(:all) { WebMock.allow_net_connect! }
+  after(:all) { WebMock.disable_net_connect! }
+
+  let(:checksums) do
+    [
+      Ridley::Sandbox.checksum(fixtures_path.join("recipe_one.rb")),
+      Ridley::Sandbox.checksum(fixtures_path.join("recipe_two.rb"))
+    ]
+  end
+
+  describe "creating a new sandbox" do
+    it "returns an instance of Ridley::Sandbox" do
+      connection.sandbox.create(checksums).should be_a(Ridley::Sandbox)
+    end
+
+    it "contains a value for sandbox_id" do
+      connection.sandbox.create(checksums).sandbox_id.should_not be_nil
+    end
+
+    it "returns an instance with the same amount of checksums given to create" do
+      connection.sandbox.create(checksums).checksums.should have(2).items
+    end
+  end
+end

data/spec/acceptance/search_resource_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Role API operations", type: "acceptance" do
+describe "Search API operations", type: "acceptance" do
   let(:server_url) { "https://api.opscode.com" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }

data/spec/fixtures/recipe_one.rb

@@ -0,0 +1 @@
+testfile

data/spec/fixtures/recipe_two.rb

@@ -0,0 +1 @@
+testfile two

data/spec/support/shared_examples/ridley_resource.rb

@@ -208,13 +208,13 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
 
   describe "#to_json" do
     it "serializes the objects attributes using MultiJson" do
-      MultiJson.should_receive(:dump).with(subject.attributes, kind_of(Hash))
+      MultiJson.should_receive(:encode).with(subject.attributes, kind_of(Hash))
 
       subject.to_json
     end
 
     it "returns the seralized value" do
-      MultiJson.stub(:dump).and_return("{}")
+      MultiJson.stub(:encode).and_return("{}")
 
       subject.to_json.should eql("{}")
     end

data/spec/unit/ridley/connection_spec.rb

@@ -68,7 +68,7 @@ describe Ridley::Connection do
             client_name: client_name,
             client_key: client_key
           )
-        }.should raise_error(ArgumentError, "missing required option(s): 'server_url'")
+        }.should raise_error(ArgumentError, "Missing required option(s): 'server_url'")
       end
 
       it "raises if a value for client_name is not given" do
@@ -77,7 +77,7 @@ describe Ridley::Connection do
             server_url: server_url,
             client_key: client_key
           )
-        }.should raise_error(ArgumentError, "missing required option(s): 'client_name'")
+        }.should raise_error(ArgumentError, "Missing required option(s): 'client_name'")
       end
 
       it "raises if a value for client_key is not given" do
@@ -86,7 +86,7 @@ describe Ridley::Connection do
             server_url: server_url,
             client_name: client_name
           )
-        }.should raise_error(ArgumentError, "missing required option(s): 'client_key'")
+        }.should raise_error(ArgumentError, "Missing required option(s): 'client_key'")
       end
     end
 

data/spec/unit/ridley/errors_spec.rb

@@ -30,5 +30,13 @@ describe Ridley::Errors do
         end
       end
     end
+
+    context "with an HTML error payload" do
+      subject { Ridley::Errors::HTTPError.new(:body => "<html><body><h1>Redirected</h1></body></html>") }
+
+      it "has an HTML body" do
+        subject.message.should eq("<html><body><h1>Redirected</h1></body></html>")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -363,6 +363,7 @@ files:
 - lib/ridley/resources/environment.rb
 - lib/ridley/resources/node.rb
 - lib/ridley/resources/role.rb
+- lib/ridley/resources/sandbox.rb
 - lib/ridley/resources/search.rb
 - lib/ridley/version.rb
 - ridley.gemspec
@@ -373,7 +374,10 @@ files:
 - spec/acceptance/environment_resource_spec.rb
 - spec/acceptance/node_resource_spec.rb
 - spec/acceptance/role_resource_spec.rb
+- spec/acceptance/sandbox_resource_spec.rb
 - spec/acceptance/search_resource_spec.rb
+- spec/fixtures/recipe_one.rb
+- spec/fixtures/recipe_two.rb
 - spec/fixtures/reset.pem
 - spec/spec_helper.rb
 - spec/support/each_matcher.rb
@@ -414,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2920625488512692680
+      hash: -1393828720209258724
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -429,7 +433,10 @@ test_files:
 - spec/acceptance/environment_resource_spec.rb
 - spec/acceptance/node_resource_spec.rb
 - spec/acceptance/role_resource_spec.rb
+- spec/acceptance/sandbox_resource_spec.rb
 - spec/acceptance/search_resource_spec.rb
+- spec/fixtures/recipe_one.rb
+- spec/fixtures/recipe_two.rb
 - spec/fixtures/reset.pem
 - spec/spec_helper.rb
 - spec/support/each_matcher.rb