berkshelf-api 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00fbbdefda724c9caf02b454baeddf35e2da8744
-  data.tar.gz: b71657d7e5e315e63c82d543d93eaefae3f6348c
+  metadata.gz: ce86ff18c66c5969773219d3ca52057c3a26f7e9
+  data.tar.gz: bc4ec3d58c036d345bcd87a2ecc0e884b9747137
 SHA512:
-  metadata.gz: c871060bd3057105ddcd5266c29ad8947eb1e42c5b2c91048076da25c564c1bdeefb46270adadec74f0f8d3429974a4d90e89b62bbfe8752735e0bfcf40e6af8
-  data.tar.gz: 905361134b015f6c4d8ccd4cbbbdb7d767bd79866ed3a8bcc72cd68bb65e6321332616ce7d93383af1ebf5a84a5baf53a7abef56604e8eeb79acaffa3c7971bc
+  metadata.gz: 9843ba1124acbebff0cdf228974e21b92737396dc5bcd7e91dd5cae4b40a915f551970ccadd3555ae49b5c36c4827a283011329b7a7adc56fdac5a2ebd48faae
+  data.tar.gz: 45e259721177024b33d2a80fc74c289ac2082ac1f19c1c79922cac06741880dc6c6400e171cd3a216124e3d5945b03e6fb06ad1401960b01a28b33b3fa13eab8

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# master
+
+* Enhancements
+  *
+
+* Bug Fixes
+  *
+
+# 1.1.1
+
+* Enhancements
+  * Added /status endpoint to REST API
+
+* Bug Fixes
+  * Github cache builder will autopaginate to get all repos
+  * Fix dependency issues with Faraday
+
 # 1.1.0
 
 * Enhancements

data/berkshelf-api.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'reel', '>= 0.4.0'
   spec.add_dependency 'grape', '~> 0.5.0'
   spec.add_dependency 'hashie', '>= 2.0.4'
-  spec.add_dependency 'faraday'
+  spec.add_dependency 'faraday', '~> 0.8.0'
   spec.add_dependency 'retryable', '~> 1.3.3'
   spec.add_dependency 'archive', '= 0.0.2'
   spec.add_dependency 'buff-config', '~> 0.1'

data/lib/berkshelf/api/application.rb

@@ -28,6 +28,7 @@ module Berkshelf::API
       include Berkshelf::API::Logging
       include Berkshelf::API::Mixin::Services
 
+      attr_reader :start_time
       def_delegators :registry, :[], :[]=
 
       # @return [Berkshelf::API::Config]
@@ -113,6 +114,7 @@ module Berkshelf::API
       # @option options [Boolean] :disable_http (false)
       #   run the application without the rest gateway
       def run(options = {})
+        @start_time = Time.now.utc
         loop do
           supervisor = run!(options)
 

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

@@ -17,7 +17,7 @@ module Berkshelf::API
         #   authentication token for accessing the Github organization. This is necessary
         #   since Github throttles unauthenticated API requests
         def initialize(options = {})
-          @connection   = Octokit::Client.new(access_token: options[:access_token])
+          @connection   = Octokit::Client.new(access_token: options[:access_token], auto_paginate: true)
           @organization = options[:organization]
           super(options)
         end

data/lib/berkshelf/api/endpoint/v1.rb

@@ -19,6 +19,16 @@ module Berkshelf::API
           status 503
         end
       end
+
+      desc "health check"
+      get 'status' do
+        {
+          status: 'ok',
+          version: Berkshelf::API::VERSION,
+          cache_status: cache_manager.warmed? ? 'ok' : 'warming',
+          uptime: Time.now.utc - Application.start_time,
+        }
+      end
     end
   end
 end

data/lib/berkshelf/api/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module API
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/spec/unit/berkshelf/api/endpoint/v1_spec.rb

@@ -4,28 +4,50 @@ describe Berkshelf::API::Endpoint::V1 do
   include Rack::Test::Methods
   include Berkshelf::API::Mixin::Services
 
-  before { Berkshelf::API::CacheManager.start }
   let(:app) { described_class.new }
+  let(:cache_warm) { false }
+
+  before do
+    Berkshelf::API::CacheManager.start
+    cache_manager.set_warmed if cache_warm
+  end
+
+  subject { last_response }
 
   describe "GET /universe" do
-    context "the cache has been warmed" do
-      before { cache_manager.set_warmed; get '/universe' }
+    before { get '/universe' }
+    let(:app_cache) { cache_manager.cache }
 
-      subject { last_response }
-      let(:app_cache) { cache_manager.cache }
+    context "the cache has been warmed" do
+      let(:cache_warm) { true }
 
       its(:status) { should be(200) }
       its(:body) { should eq(app_cache.to_json) }
     end
 
     context "the cache is still warming" do
-      before { get '/universe' }
-
-      subject { last_response }
-      let(:app_cache) { cache_manager.cache }
-
       its(:status) { should be(503) }
       its(:headers) { should have_key("Retry-After") }
     end
   end
+
+  describe "GET /status" do
+    before do
+      Berkshelf::API::Application.stub(:start_time) { Time.at(0) }
+      Time.stub(:now) { Time.at(100) }
+      get '/status'
+    end
+
+    context "the cache has been warmed" do
+      let(:cache_warm) { true }
+
+      its(:status) { should be(200) }
+      its(:body) { should eq({status: 'ok', version: Berkshelf::API::VERSION, cache_status: 'ok', uptime: 100.0}.to_json) }
+    end
+
+    context "the cache is still warming" do
+      its(:status) { should be(200) }
+      its(:body) { should eq({status: 'ok', version: Berkshelf::API::VERSION, cache_status: 'warming', uptime: 100.0}.to_json) }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -85,16 +85,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement