ridley 0.10.2 → 0.11.0.rc1

data/spec/unit/ridley/sandbox_uploader_spec.rb

@@ -1,16 +1,16 @@
 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: {},
-      connection: connection
+  let(:client_name) { "reset" }
+  let(:client_key) { fixtures_path.join('reset.pem') }
+  let(:connection) do
+    double('connection',
+      client_name: client_name,
+      client_key: client_key,
+      options: {}
     )
   end
-
+  let(:resource) { double('resource', connection: connection) }
   let(:checksums) do
     {
       "oGCPHrQ+5MylEL+V+NIJ9w==" => {
@@ -20,22 +20,10 @@ describe Ridley::SandboxUploader do
     }
   end
 
-  let(:sandbox) do
-    Ridley::SandboxResource.new(client, checksums: checksums)
-  end
+  let(:sandbox) { Ridley::SandboxObject.new(resource, checksums: checksums) }
 
   describe "ClassMethods" do
     subject { described_class }
-    describe "::upload" do
-      it "terminates the uploader after upload" do
-        uploader = double('uploader', alive?: true)
-        Ridley::SandboxUploader.should_receive(:pool).with(size: 12, args: [sandbox]).and_return(uploader)
-        uploader.should_receive(:multi_upload).with(checksums)
-        uploader.should_receive(:terminate)
-
-        subject.upload(sandbox, checksums)
-      end
-    end
 
     describe "::checksum" do
       subject { described_class.checksum(path) }
@@ -54,24 +42,12 @@ describe Ridley::SandboxUploader do
     end
   end
 
-  subject { described_class.new(sandbox) }
-
-  describe "#multi_upload" do
-    it "sends an upload command for each pair of checksum/path" do
-      subject.should_receive(:upload).with(checksums.first[0], checksums.first[1])
-
-      subject.multi_upload(checksums)
-    end
-  end
+  subject { described_class.new(client_name, client_key, {}) }
 
   describe "#upload" 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
         {
@@ -85,7 +61,7 @@ describe Ridley::SandboxUploader do
       it "uploads each checksum to their target URL" do
         stub_request(:put, checksums[chk_id][:url])
 
-        subject.upload(chk_id, path)
+        subject.upload(sandbox, chk_id, path)
       end
     end
 
@@ -99,32 +75,11 @@ describe Ridley::SandboxUploader do
       end
 
       let(:sandbox) do
-        Ridley::SandboxResource.new(client, checksums: checksums)
+        Ridley::SandboxObject.new(double, checksums: checksums)
       end
 
       it "returns nil" 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)
+        subject.upload(sandbox, chk_id, path).should be_nil
       end
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.10.2
-  prerelease: 
+  version: 0.11.0.rc1
+  prerelease: 7
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -308,11 +308,20 @@ 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
 - lib/ridley/chef/digester.rb
+- lib/ridley/chef_object.rb
+- lib/ridley/chef_objects.rb
+- lib/ridley/chef_objects/client_object.rb
+- lib/ridley/chef_objects/cookbook_object.rb
+- lib/ridley/chef_objects/data_bag_item_obect.rb
+- lib/ridley/chef_objects/data_bag_object.rb
+- lib/ridley/chef_objects/environment_object.rb
+- lib/ridley/chef_objects/node_object.rb
+- lib/ridley/chef_objects/role_object.rb
+- lib/ridley/chef_objects/sandbox_object.rb
 - lib/ridley/client.rb
 - lib/ridley/connection.rb
 - lib/ridley/errors.rb
@@ -342,12 +351,11 @@ files:
 - lib/ridley/resources/cookbook_resource.rb
 - lib/ridley/resources/data_bag_item_resource.rb
 - lib/ridley/resources/data_bag_resource.rb
-- lib/ridley/resources/encrypted_data_bag_item_resource.rb
 - lib/ridley/resources/environment_resource.rb
 - lib/ridley/resources/node_resource.rb
 - lib/ridley/resources/role_resource.rb
 - lib/ridley/resources/sandbox_resource.rb
-- lib/ridley/resources/search.rb
+- lib/ridley/resources/search_resource.rb
 - lib/ridley/sandbox_uploader.rb
 - lib/ridley/version.rb
 - ridley.gemspec
@@ -360,7 +368,6 @@ 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
@@ -386,9 +393,17 @@ 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/chef_object_spec.rb
+- spec/unit/ridley/chef_objects/client_object_spec.rb
+- spec/unit/ridley/chef_objects/cookbook_object_spec.rb
+- spec/unit/ridley/chef_objects/data_bag_item_object_spec.rb
+- spec/unit/ridley/chef_objects/data_bag_object_spec.rb
+- spec/unit/ridley/chef_objects/environment_object_spec.rb
+- spec/unit/ridley/chef_objects/node_object_spec.rb
+- spec/unit/ridley/chef_objects/role_object_spec.rb
+- spec/unit/ridley/chef_objects/sandbox_object_spec.rb
 - spec/unit/ridley/client_spec.rb
 - spec/unit/ridley/connection_spec.rb
 - spec/unit/ridley/errors_spec.rb
@@ -412,7 +427,7 @@ files:
 - spec/unit/ridley/resources/node_resource_spec.rb
 - spec/unit/ridley/resources/role_resource_spec.rb
 - spec/unit/ridley/resources/sandbox_resource_spec.rb
-- spec/unit/ridley/resources/search_spec.rb
+- 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
@@ -431,12 +446,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2279939140045068051
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -453,7 +465,6 @@ 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
@@ -479,9 +490,17 @@ 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/chef_object_spec.rb
+- spec/unit/ridley/chef_objects/client_object_spec.rb
+- spec/unit/ridley/chef_objects/cookbook_object_spec.rb
+- spec/unit/ridley/chef_objects/data_bag_item_object_spec.rb
+- spec/unit/ridley/chef_objects/data_bag_object_spec.rb
+- spec/unit/ridley/chef_objects/environment_object_spec.rb
+- spec/unit/ridley/chef_objects/node_object_spec.rb
+- spec/unit/ridley/chef_objects/role_object_spec.rb
+- spec/unit/ridley/chef_objects/sandbox_object_spec.rb
 - spec/unit/ridley/client_spec.rb
 - spec/unit/ridley/connection_spec.rb
 - spec/unit/ridley/errors_spec.rb
@@ -505,7 +524,7 @@ test_files:
 - spec/unit/ridley/resources/node_resource_spec.rb
 - spec/unit/ridley/resources/role_resource_spec.rb
 - spec/unit/ridley/resources/sandbox_resource_spec.rb
-- spec/unit/ridley/resources/search_spec.rb
+- spec/unit/ridley/resources/search_resource_spec.rb
 - spec/unit/ridley/sandbox_uploader_spec.rb
 - spec/unit/ridley_spec.rb
 has_rdoc: 

data/lib/ridley/chef/chefignore.rb

@@ -1,76 +0,0 @@
-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/resources/encrypted_data_bag_item_resource.rb

@@ -1,55 +0,0 @@
-module Ridley
-  # @author Jamie Winsor <reset@riotgames.com>
-  class EncryptedDataBagItemResource
-    class << self
-      # Finds a data bag item and decrypts it.
-      #
-      # @param [Ridley::Client] client
-      # @param [Ridley::DataBagResource] data_bag
-      # @param [String, #chef_id] object
-      #
-      # @return [nil, Ridley::DataBagItemResource]
-      def find(client, data_bag, object)
-        find!(client, data_bag, object)
-      rescue Errors::HTTPNotFound
-        nil
-      end
-
-      # Finds a data bag item and decrypts it. Throws an exception if the item doesn't exist.
-      #
-      # @param [Ridley::Client] client
-      # @param [Ridley::DataBagResource] data_bag
-      # @param [String, #chef_id] object
-      #
-      # @raise [Errors::HTTPNotFound]
-      #   if a resource with the given chef_id is not found
-      #
-      # @return [nil, Ridley::DataBagItemResource]
-      def find!(client, data_bag, object)
-        data_bag_item = DataBagItemResource.find!(client, data_bag, object)
-        data_bag_item.decrypt
-        new(client, data_bag, data_bag_item.attributes)
-      end
-    end
-
-    attr_reader :data_bag
-    attr_reader :attributes
-
-    # @param [Ridley::Client] client
-    # @param [Ridley::DataBagResource] data_bag
-    # @param [#to_hash] attributes
-    def initialize(client, data_bag, attributes = {})
-      @client     = client
-      @data_bag   = data_bag
-      @attributes = attributes
-    end
-
-    def to_s
-      self.attributes
-    end
-
-    private
-
-      attr_reader :client
-  end
-end

data/lib/ridley/resources/search.rb

@@ -1,101 +0,0 @@
-module Ridley
-  class Search
-    class << self
-      # Returns an array of possible search indexes to be search on
-      #
-      # @param [Ridley::Client] client
-      #
-      # @example
-      #
-      #   Search.indexes(client) => [ :client, :environment, :node, :role ]
-      #
-      # @return [Array<String, Symbol>]
-      def indexes(client)
-        client.connection.get("search").body.collect { |name, _| name }
-      end
-    end
-
-    # @return [Ridley::Client]
-    attr_reader :client
-    attr_reader :index
-    attr_reader :query
-    
-    attr_accessor :sort
-    attr_accessor :rows
-    attr_accessor :start
-
-    # @param [Ridley::Client] client
-    # @param [#to_sym] index
-    # @param [#to_s] query
-    #
-    # @option options [String] :sort
-    #   a sort string such as 'name DESC'
-    # @option options [Integer] :rows
-    #   how many rows to return
-    # @option options [Integer] :start
-    #   the result number to start from
-    def initialize(client, index, query, options = {})
-      @client = client
-      @index  = index.to_sym
-      @query  = query
-      @sort   = options[:sort]
-      @rows   = options[:rows]
-      @start  = options[:start]
-    end
-
-    # Executes the built up query on the search's client
-    #
-    # @example
-    #   Search.new(client, :role)
-    #   search.run => 
-    #     {
-    #       total: 1,
-    #       start: 0,
-    #       rows: [
-    #         {
-    #           name: "ridley-test-role",
-    #           default_attributes: {},
-    #           json_class: "Chef::Role",
-    #           env_run_lists: {},
-    #           run_list: [],
-    #           description: "a test role for Ridley!",
-    #           chef_type: "role",
-    #           override_attributes: {}
-    #         }
-    #       ]
-    #     }
-    #
-    # @return [Hash]
-    def run
-      response = client.connection.get(query_uri, query_options).body
-
-      case index
-      when :node
-        response[:rows].collect { |row| Ridley::NodeResource.new(client, row) }
-      when :role
-        response[:rows].collect { |row| Ridley::RoleResource.new(client, row) }
-      when :client
-        response[:rows].collect { |row| Ridley::ClientResource.new(client, row) }
-      when :environment
-        response[:rows].collect { |row| Ridley::EnvironmentResource.new(client, row) }
-      else
-        response[:rows]
-      end
-    end
-
-    private
-
-      def query_uri
-        File.join("search", self.index.to_s)
-      end
-
-      def query_options
-        {}.tap do |options|
-          options[:q]     = self.query unless self.query.nil?
-          options[:sort]  = self.sort unless self.sort.nil?
-          options[:rows]  = self.rows unless self.rows.nil?
-          options[:start] = self.start unless self.start.nil?
-        end
-      end
-    end
-end