berkshelf-api 1.4.0 → 2.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -130,22 +130,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +226,7 @@ files:
 - lib/berkshelf/api/cache_builder/worker/chef_server.rb
 - lib/berkshelf/api/cache_builder/worker/file_store.rb
 - lib/berkshelf/api/cache_builder/worker/github.rb
-- lib/berkshelf/api/cache_builder/worker/opscode.rb
+- lib/berkshelf/api/cache_builder/worker/supermarket.rb
 - lib/berkshelf/api/cache_builder/worker.rb
 - lib/berkshelf/api/cache_builder.rb
 - lib/berkshelf/api/cache_manager.rb
@@ -263,7 +247,7 @@ files:
 - lib/berkshelf/api/rest_gateway.rb
 - lib/berkshelf/api/rspec/server.rb
 - lib/berkshelf/api/rspec.rb
-- lib/berkshelf/api/site_connector/opscode.rb
+- lib/berkshelf/api/site_connector/supermarket.rb
 - lib/berkshelf/api/site_connector.rb
 - lib/berkshelf/api/srv_ctl.rb
 - lib/berkshelf/api/version.rb
@@ -278,7 +262,7 @@ files:
 - spec/unit/berkshelf/api/cache_builder/worker/chef_server_spec.rb
 - spec/unit/berkshelf/api/cache_builder/worker/file_store_spec.rb
 - spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb
-- spec/unit/berkshelf/api/cache_builder/worker/opscode_spec.rb
+- spec/unit/berkshelf/api/cache_builder/worker/supermarket_spec.rb
 - spec/unit/berkshelf/api/cache_builder/worker_spec.rb
 - spec/unit/berkshelf/api/cache_builder_spec.rb
 - spec/unit/berkshelf/api/cache_manager_spec.rb
@@ -289,7 +273,7 @@ files:
 - spec/unit/berkshelf/api/mixin/services_spec.rb
 - spec/unit/berkshelf/api/rack_app_spec.rb
 - spec/unit/berkshelf/api/rest_gateway_spec.rb
-- spec/unit/berkshelf/api/site_connector/opscode_spec.rb
+- spec/unit/berkshelf/api/site_connector/supermarket_spec.rb
 - spec/unit/berkshelf/api/srv_ctl_spec.rb
 - bin/berks-api
 homepage: https://github.com/berkshelf/berkshelf-api
@@ -313,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 80644279196753361
+      hash: -144777955995008759
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -331,7 +315,7 @@ test_files:
 - spec/unit/berkshelf/api/cache_builder/worker/chef_server_spec.rb
 - spec/unit/berkshelf/api/cache_builder/worker/file_store_spec.rb
 - spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb
-- spec/unit/berkshelf/api/cache_builder/worker/opscode_spec.rb
+- spec/unit/berkshelf/api/cache_builder/worker/supermarket_spec.rb
 - spec/unit/berkshelf/api/cache_builder/worker_spec.rb
 - spec/unit/berkshelf/api/cache_builder_spec.rb
 - spec/unit/berkshelf/api/cache_manager_spec.rb
@@ -342,6 +326,6 @@ test_files:
 - spec/unit/berkshelf/api/mixin/services_spec.rb
 - spec/unit/berkshelf/api/rack_app_spec.rb
 - spec/unit/berkshelf/api/rest_gateway_spec.rb
-- spec/unit/berkshelf/api/site_connector/opscode_spec.rb
+- spec/unit/berkshelf/api/site_connector/supermarket_spec.rb
 - spec/unit/berkshelf/api/srv_ctl_spec.rb
 has_rdoc: 

data/lib/berkshelf/api/cache_builder/worker/opscode.rb

@@ -1,67 +0,0 @@
-module Berkshelf::API
-  class CacheBuilder
-    module Worker
-      class Opscode < Worker::Base
-        worker_type "opscode"
-
-        finalizer :finalize_callback
-
-        # @param [Hash] options
-        #   see {API::SiteConnector::Opscode.new} for options
-        def initialize(options = {})
-          @connection = Berkshelf::API::SiteConnector::Opscode.pool_link(size: 25, args: [ options ])
-          super
-        end
-
-        # @return [Array<RemoteCookbook>]
-        #  The list of cookbooks this builder can find
-        def cookbooks
-          [].tap do |cookbook_versions|
-            connection.cookbooks.collect do |cookbook|
-              [ cookbook, connection.future(:versions, cookbook) ]
-            end.each do |cookbook, versions|
-              versions.value.each do |version|
-                cookbook_versions << RemoteCookbook.new(cookbook, version, self.class.worker_type, @connection.api_uri, priority)
-              end
-            end
-          end
-        end
-
-        # Return the metadata of the given RemoteCookbook. If the metadata could not be found or parsed
-        # nil is returned.
-        #
-        # @param [RemoteCookbook] remote
-        #
-        # @return [Ridley::Chef::Cookbook::Metadata, nil]
-        def metadata(remote)
-          Dir.mktmpdir('metadata') do |destination|
-            if connection.download(remote.name, remote.version, destination)
-              load_metadata(destination, remote.name)
-            end
-          end
-        end
-
-        private
-
-          attr_accessor :connection
-
-          def finalize_callback
-            connection.terminate if connection && connection.alive?
-          end
-
-          def load_metadata(directory, cookbook)
-            # The community site does not enforce the name of the cookbook contained in the archive
-            # downloaded and extracted. This will just find the first metadata.json and load it.
-            file = Dir["#{directory}/**/*/metadata.json"].first
-            return nil if file.nil?
-
-            metadata = File.read(file)
-            Ridley::Chef::Cookbook::Metadata.from_json(metadata)
-          rescue JSON::ParserError => ex
-            log.warn "Error loading metadata for #{cookbook} from: #{file}"
-            abort MetadataLoadError.new(ex)
-          end
-      end
-    end
-  end
-end

data/lib/berkshelf/api/site_connector/opscode.rb

@@ -1,181 +0,0 @@
-require 'open-uri'
-require 'retryable'
-require 'archive'
-require 'tempfile'
-
-module Berkshelf::API
-  module SiteConnector
-    class Opscode
-      class << self
-        # @param [String] version
-        #
-        # @return [String]
-        def uri_escape_version(version)
-          version.to_s.gsub('.', '_')
-        end
-
-        # @param [String] uri
-        #
-        # @return [String]
-        def version_from_uri(uri)
-          File.basename(uri.to_s).gsub('_', '.')
-        end
-      end
-
-      include Celluloid
-      include Berkshelf::API::Logging
-
-      V1_API = 'http://cookbooks.opscode.com/api/v1'.freeze
-
-      # @return [String]
-      attr_reader :api_uri
-      # @return [Integer]
-      #   how many retries to attempt on HTTP requests
-      attr_reader :retries
-      # @return [Float]
-      #   time to wait between retries
-      attr_reader :retry_interval
-
-      # @option options [String] :url ({V1_API})
-      #   url of community site
-      # @option options [Integer] :retries (5)
-      #   how many download retry attempts to make
-      # @option options [Float] :retry_interval (0.5)
-      #   how long to wait before retrying again
-      def initialize(options = {})
-        options  = { url: V1_API, retries: 5, retry_interval: 0.5 }.merge(options)
-        @api_uri = options[:url]
-
-        @connection = Faraday.new(@api_uri) do |c|
-          c.response :parse_json
-          c.use Faraday::Adapter::NetHttp
-        end
-      end
-
-      # @return [Array<String>]
-      #   A list of cookbook names available on the server
-      def cookbooks
-        start     = 0
-        count     = connection.get("cookbooks").body["total"]
-        cookbooks = Array.new
-
-        while count > 0
-          req = connection.get("cookbooks?start=#{start}&items=#{count}")
-          chunk = req.body["items"]
-          if chunk
-            cookbooks += chunk
-            start += 100
-            count -= 100
-          else
-            log.warn "Didn't get any cookbooks - #{req.body}"
-          end
-        end
-
-        cookbooks.map { |cb| cb["cookbook_name"] }
-      end
-
-      # @param [String] cookbook
-      #   the name of the cookbook to find version for
-      #
-      # @return [Array<String>]
-      #   A list of versions of this cookbook available on the server
-      def versions(cookbook)
-        response = connection.get("cookbooks/#{cookbook}")
-
-        case response.status
-        when (200..299)
-          response.body['versions'].collect do |version_uri|
-            self.class.version_from_uri(version_uri)
-          end
-        else
-          Array.new
-        end
-      end
-
-      # Download the cookbook with the given name and version to the destination. The directory
-      # containing the extracted contents will be returned on success. On failure, nil will
-      # be returned.
-      #
-      # @param [String] cookbook
-      #   The name of the cookbook to download
-      # @param [String] version
-      #   The version of the cookbook to download
-      # @param [String] destination
-      #   The directory to download the cookbook to
-      #
-      # @return [String, nil]
-      def download(name, version, destination = Dir.mktmpdir)
-        log.debug "Downloading #{name}(#{version})"
-        if uri = download_uri(name, version)
-          begin
-            archive = stream(uri)
-            Archive.extract(archive.path, destination)
-            destination
-          rescue => ex
-            log.warn "Error downloading/extracting #{name} (#{version}): #{ex}"
-            nil
-          ensure
-            archive.unlink unless archive.nil?
-          end
-        end
-      end
-
-      # Return the location where a cookbook of the given name and version can be downloaded from
-      #
-      # @param [String] cookbook
-      #   The name of the cookbook
-      # @param [String] version
-      #   The version of the cookbook
-      #
-      # @return [String, nil]
-      def download_uri(name, version)
-        unless cookbook = find(name, version)
-          return nil
-        end
-        cookbook[:file]
-      end
-
-      # @param [String] cookbook
-      #   The name of the cookbook to retrieve
-      # @param [String] version
-      #   The version of the cookbook to retrieve
-      #
-      # @return [Hashie::Mash, nil]
-      def find(name, version)
-        response = connection.get("cookbooks/#{name}/versions/#{self.class.uri_escape_version(version)}")
-
-        case response.status
-        when (200..299)
-          response.body
-        else
-          nil
-        end
-      end
-
-      # Stream the response body of a remote URL to a file on the local file system
-      #
-      # @param [String] target
-      #   a URL to stream the response body from
-      #
-      # @return [Tempfile]
-      def stream(target)
-        local = Tempfile.new('opscode-site-stream')
-        local.binmode
-
-        retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
-          open(target, 'rb', connection.headers) do |remote|
-            local.write(remote.read)
-          end
-        end
-
-        local
-      ensure
-        local.close(false) unless local.nil?
-      end
-
-      private
-
-        attr_reader :connection
-    end
-  end
-end

data/spec/unit/berkshelf/api/cache_builder/worker/opscode_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe Berkshelf::API::CacheBuilder::Worker::Opscode do
-  describe "ClassMethods" do
-    subject { described_class }
-    its(:worker_type) { should eql("opscode") }
-  end
-
-  let(:cookbooks) { ["chicken", "tuna"] }
-  let(:chicken_versions) { ["1.0", "2.0"] }
-  let(:tuna_versions) { ["3.0.0", "3.0.1"] }
-  let(:connection) do
-    connection = double('connection')
-    connection.stub(:cookbooks).and_return(cookbooks)
-    connection
-  end
-
-  subject do
-    Berkshelf::API::CacheManager.start
-    described_class.new
-  end
-
-  it_behaves_like "a human-readable string"
-
-  describe "#cookbooks" do
-    let(:location_type) { described_class.worker_type }
-    let(:location_path) { Berkshelf::API::SiteConnector::Opscode::V1_API}
-
-    it "returns an array of RemoteCookbooks described by the server" do
-      expected_value = [
-        Berkshelf::API::RemoteCookbook.new("chicken", "1.0", location_type, location_path),
-        Berkshelf::API::RemoteCookbook.new("chicken", "2.0", location_type, location_path),
-        Berkshelf::API::RemoteCookbook.new("tuna", "3.0.0", location_type, location_path),
-        Berkshelf::API::RemoteCookbook.new("tuna", "3.0.1", location_type, location_path)
-      ]
-
-      connection.should_receive(:future).with(:versions, "chicken").and_return(double(value: chicken_versions))
-      connection.should_receive(:future).with(:versions, "tuna").and_return(double(value: tuna_versions))
-      subject.should_receive(:connection).at_least(1).times.and_return(connection)
-      expect(subject.cookbooks).to eql(expected_value)
-    end
-  end
-end

data/spec/unit/berkshelf/api/site_connector/opscode_spec.rb

@@ -1,85 +0,0 @@
-require 'spec_helper'
-
-describe Berkshelf::API::SiteConnector::Opscode do
-  let(:connection) { double("connection") }
-  let(:total_response) { double("total", status: 200, body: { "total" => 10 } ) }
-  let(:cookbooks_response) do
-    double("cookbooks", status: 200, body: {
-      "items"=> [
-        {"cookbook_name" => "chicken"},
-        {"cookbook_name" => "tuna"}
-      ]})
-  end
-  let(:chicken_versions_response) do
-    double("chicken_versions", status: 200, body: {
-      "versions" => [
-        "http://www.example.com/api/v1/cookbooks/chicken/versions/1_0",
-        "http://www.example.com/api/v1/cookbooks/chicken/versions/2_0"
-      ]})
-  end
-
-  subject { described_class.new }
-
-  describe "#cookbooks" do
-    it "should fetch all the cookbooks and return a list of their names" do
-      connection.should_receive(:get).
-        with("cookbooks").
-        and_return(total_response)
-
-      connection.should_receive(:get).
-        with("cookbooks?start=0&items=10").
-        and_return(cookbooks_response)
-
-      subject.should_receive(:connection).at_least(1).times.and_return(connection)
-      expect(subject.cookbooks).to eql(["chicken", "tuna"])
-    end
-  end
-
-  describe "#versions" do
-    it "should call the server for the cookbook provied and return a list of available version number" do
-      connection.should_receive(:get).
-        with("cookbooks/chicken").
-        and_return(chicken_versions_response)
-
-      subject.should_receive(:connection).at_least(1).times.and_return(connection)
-      expect(subject.versions("chicken")).to eql(["1.0", "2.0"])
-    end
-  end
-
-  describe "#find" do
-    let(:name) { "nginx" }
-    let(:version) { "1.4.0" }
-    let(:result) { subject.find(name, version) }
-
-    it "returns the cookbook and version information" do
-      expect(result.cookbook).to eq('http://cookbooks.opscode.com/api/v1/cookbooks/nginx')
-      expect(result.version).to eq('1.4.0')
-    end
-
-    context "when the cookbook is not found" do
-      let(:name) { "not_a_real_cookbook_that_anyone_should_ever_make" }
-
-      it "returns nil" do
-        expect(result).to be_nil
-      end
-    end
-  end
-
-  describe "#download" do
-    let(:name) { "chicken" }
-    let(:version) { "1.0.0" }
-    let(:destination) { "location" }
-
-    it "should download then ungzip/tar the cookbook" do
-      response = { file: "http://file" }
-      tempfile = double('tempfile', path: '/some/path', unlink: nil)
-
-      subject.should_receive(:find).with(name, version).and_return(response)
-      subject.should_receive(:stream).with("http://file").and_return(tempfile)
-      Archive.should_receive(:extract).with(tempfile.path, destination)
-
-      subject.download(name, version, destination)
-    end
-  end
-end
-