berkshelf-api 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f15f60522d71ee03d537c45600b4287520edc537
-  data.tar.gz: 4881bdf327b30c38f7ca1be07c5a9d94ee3b5bd2
+  metadata.gz: 213f69bfd58c7200d8d779788f6774828087cf1b
+  data.tar.gz: 8ebeaff3fae7fca72a3e5d1f6a88690c80beb7fd
 SHA512:
-  metadata.gz: b027a279599e8e893fc89fe80278955bdb2333682c6c76935dc06286d8b68261f00ed0bac6b4867f920e5dbcc60ab0fa885e08f1666b08f13c346097c65b53cd
-  data.tar.gz: cf69c2c17c9e784a57dffb3b0b7ea0f2e92fcac349bf2e6ef7fd89e133eae347f8340bd245750c7b9950b44eba53ec3689fd7d671c11adca974c7468a464e541
+  metadata.gz: 7a30703cd2c06d4b43c6e0bf80c4846d74120e13fa105ee5d7573c6818aac8d1bc1d8d71ea9c39e85fe7f48a50955989d13c4131fb9b9d945d1d27f6b1474133
+  data.tar.gz: d3cd8e1029ddd4a73291e50feb24c3d635195a24f0531445250b73eb6a7b45a699dfc00a2f2863c6ba0a49028d95ae65c118dc3e15e0e95300b969a9e4325865

data/README.md

@@ -21,6 +21,38 @@ Ruby 1.9 mode is required on all interpreters.
 
 Ruby 1.9.1 and 1.9.2 are not officially supported. If you encounter problems, please upgrade to Ruby 2.0 or 1.9.3.
 
+## Configuring Endpoints
+
+Which endpoints to index can be configured by editing the JSON configuration file (by default at: `~/.berkshelf/api-server/config.json`).
+
+### Opscode Community Site
+
+  {
+    "endpoints": [
+      {
+        type: "opscode",
+        options: {
+          url: 'http://cookbooks.opscode.com/api/v1'
+        }
+      }
+    ]
+  }
+
+### Chef Server
+
+  {
+    "endpoints": [
+      {
+        "type": "chef_server",
+        "options": {
+          "url": "https://api.opscode.com/organizations/vialstudios",
+          "client_name": "berkshelf",
+          "client_key": "/etc/berkshelf/api-server/client.pem"
+        }
+      }
+    ]
+  }
+
 ## Contributing
 
 1. Fork it

data/lib/berkshelf/api/application.rb

@@ -30,6 +30,7 @@ module Berkshelf::API
 
       def_delegators :registry, :[], :[]=
 
+      # @return [Berkshelf::API::Config]
       def config
         @config ||= begin
           Berkshelf::API::Config.from_file(Berkshelf::API::Config.default_path)
@@ -38,6 +39,37 @@ module Berkshelf::API
         end
       end
 
+      # @param [Berkshelf::API::Config] config
+      def set_config(config)
+        @config = config
+      end
+
+      # Configure the application
+      #
+      # @option options [String] :config_file
+      #   filepath to a configuration file to use
+      # @option options [String, Fixnum] :log_location (STDOUT)
+      # @option options [String, nil] :log_level ("INFO")
+      #   - "DEBUG
+      #   - "INFO"
+      #   - "WARN"
+      #   - "ERROR"
+      #   - "FATAL"
+      #
+      # @raise [Berkshelf::API::ConfigNotFoundError]
+      #
+      # @return [Berkshelf::API::Config]
+      def configure(options = {})
+        unless options[:config_file].nil?
+          set_config Berkshelf::API::Config.from_file(options[:config_file])
+        end
+
+        configure_logger(options)
+        config
+      rescue Buff::Errors::ConfigNotFound => ex
+        raise ConfigNotFoundError, ex
+      end
+
       # @option options [String, Fixnum] :log_location (STDOUT)
       # @option options [String, nil] :log_level ("INFO")
       #   - "DEBUG
@@ -49,6 +81,16 @@ module Berkshelf::API
         Logging.init(level: options[:log_level], location: options[:log_location])
       end
 
+      # @return [String]
+      def home_path
+        ENV['BERKSHELF_API_PATH'] || config.home_path
+      end
+
+      # Retrieve the running instance of the Application
+      #
+      # @raise [Berkshelf::API::NotStartedError]
+      #
+      # @return [Berkshelf::API::Application]
       def instance
         return @instance if @instance
 
@@ -92,7 +134,7 @@ module Berkshelf::API
       # @return [Berkshelf::API::Application]
       def run!(options = {})
         options = { disable_http: false, eager_build: false }.merge(options)
-        configure_logger(options)
+        configure(options)
         @instance = ApplicationSupervisor.new(registry, options)
         cache_builder.async(:build_loop) if options[:eager_build]
         @instance
@@ -105,6 +147,10 @@ module Berkshelf::API
         false
       end
 
+      # Shutdown the running instance
+      #
+      # @raise [Berkshelf::API::NotStartedError]
+      #   if there is no running instance
       def shutdown
         @shutdown = true
         instance.terminate

data/lib/berkshelf/api/cache_builder.rb

@@ -19,7 +19,8 @@ module Berkshelf::API
       @building          = false
 
       Application.config.endpoints.each do |endpoint|
-        @worker_supervisor.supervise(CacheBuilder::Worker[endpoint.type], endpoint.options)
+        endpoint_options = endpoint.options.to_hash.deep_symbolize_keys
+        @worker_supervisor.supervise(CacheBuilder::Worker[endpoint.type], endpoint_options)
       end
     end
 
@@ -27,7 +28,11 @@ module Berkshelf::API
     #
     # @return [Array]
     def build
-      workers.collect { |actor| actor.future(:build) }.map(&:value)
+      workers.collect { |actor| actor.future(:build) }.map do |f|
+        begin
+          f.value
+        rescue; end
+      end
     end
 
     # Issue a build command to all workers at the scheduled interval

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

@@ -7,7 +7,7 @@ module Berkshelf::API
         finalizer :finalize_callback
 
         def initialize(options = {})
-          @connection = Berkshelf::API::SiteConnector::Opscode.pool_link(size: 25)
+          @connection = Berkshelf::API::SiteConnector::Opscode.pool_link(size: 25, args: [ options ])
           super
         end
 

data/lib/berkshelf/api/cache_manager.rb

@@ -1,11 +1,9 @@
 module Berkshelf::API
   class CacheManager
     class << self
-      attr_writer :cache_file
-
       # @return [String]
       def cache_file
-        @cache_file ||= File.expand_path("~/.berkshelf/api-server/cerch")
+        File.join(Application.home_path, "cerch")
       end
     end
 

data/lib/berkshelf/api/config.rb

@@ -5,10 +5,15 @@ module Berkshelf::API
     class << self
       # @return [String]
       def default_path
-        File.expand_path("~/.berkshelf/api-server/config.json")
+        home_path = ENV['BERKSHELF_API_PATH'] || "~/.berkshelf/api-server"
+        File.expand_path(File.join(home_path, "config.json"))
       end
     end
 
+    attribute 'home_path',
+      type: String,
+      default: File.expand_path("~/.berkshelf/api-server")
+
     attribute 'endpoints',
       type: Array,
       default: [

data/lib/berkshelf/api/cucumber.rb

@@ -2,7 +2,7 @@ require_relative 'rspec'
 
 World(Berkshelf::API::RSpec)
 
-Given(/^the Berkshelf API server cache is up to date$/) do
+Given(/^the Berkshelf API server's cache is up to date$/) do
   cache_builder.build
 end
 

data/lib/berkshelf/api/errors.rb

@@ -1,8 +1,11 @@
 module Berkshelf::API
   class APIError < StandardError; end
+
   # Thrown when an actor was expected to be running but wasn't
   class NotStartedError < APIError; end
+
   class SaveNotFoundError < APIError; end
   class InvalidSaveError < APIError; end
   class MetadataLoadError < APIError; end
+  class ConfigNotFoundError < APIError; end
 end

data/lib/berkshelf/api/rest_gateway.rb

@@ -26,7 +26,7 @@ module Berkshelf::API
     finalizer :finalize_callback
 
     # @option options [String] :host ('0.0.0.0')
-    # @option options [Integer] :port (26100)
+    # @option options [Integer] :port (26200)
     # @option options [Boolean] :quiet (false)
     # @option options [Integer] :workers (10)
     def initialize(options = {})

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

@@ -39,11 +39,11 @@ module Berkshelf::API
       # @param [Faraday::Connection] connection
       #   Optional parameter for setting the connection object
       #   This should only be set manually for testing
-      def initialize(uri = V1_API, options = {})
-        options  = { retries: 5, retry_interval: 0.5 }.merge(options)
-        @api_uri = uri
+      def initialize(options = {})
+        options  = { url: V1_API, retries: 5, retry_interval: 0.5 }.merge(options)
+        @api_uri = options[:url]
 
-        @connection = Faraday.new(uri) do |c|
+        @connection = Faraday.new(@api_uri) do |c|
           c.response :parse_json
           c.use Faraday::Adapter::NetHttp
         end

data/lib/berkshelf/api/srv_ctl.rb

@@ -28,6 +28,10 @@ module Berkshelf
               options[:log_location] = '/dev/null'
             end
 
+            opts.on("-c", "--config FILE", String, "path to a configuration file to use") do |v|
+              options[:config_file] = v
+            end
+
             opts.on_tail("-h", "--help", "show this message") do
               puts opts
               exit

data/lib/berkshelf/api/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module API
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/spec/spec_helper.rb

@@ -25,7 +25,7 @@ Spork.prefork do
     config.before do
       Celluloid.shutdown
       Celluloid.boot
-      Berkshelf::API::CacheManager.cache_file = tmp_path.join('cerch').to_s
+      ENV['BERKSHELF_API_PATH'] = tmp_path.join('api-server').to_s
       clean_tmp_path
     end
   end

data/spec/unit/berkshelf/api/application_spec.rb

@@ -6,6 +6,33 @@ describe Berkshelf::API::Application do
 
     its(:registry) { should be_a(Celluloid::Registry) }
 
+    describe "::configure" do
+      let(:options) { Hash.new }
+      subject(:configure) { described_class.configure(options) }
+      before { @original = described_class.config }
+      after  { described_class.set_config(@original) }
+
+      context "given a value for :config_file" do
+        let(:filepath) { tmp_path.join('rspec-config.json') }
+        before { options[:config_file] = filepath }
+
+        it "sets the configuration from the contents of the file" do
+          generated = Berkshelf::API::Config.new(filepath)
+          generated.endpoints = [ { what: "this" } ]
+          generated.save
+          configure
+
+          expect(described_class.config.endpoints).to have(1).item
+        end
+
+        context "if the file cannot be found or loaded" do
+          it "raises a ConfigNotFoundError" do
+            expect { configure }.to raise_error(Berkshelf::API::ConfigNotFoundError)
+          end
+        end
+      end
+    end
+
     describe "::run!" do
       include Berkshelf::API::Mixin::Services
 

data/spec/unit/berkshelf/api/srv_ctl_spec.rb

@@ -51,6 +51,14 @@ describe Berkshelf::API::SrvCtl do
           expect(subject[:log_level]).to eql("DEBUG")
         end
       end
+
+      context "given -c" do
+        let(:args) { ["-c", "/path/to/config"] }
+
+        it "sets :config_file to the given value" do
+          expect(subject[:config_file]).to eql("/path/to/config")
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley