berkshelf-api 2.0.0 → 2.1.0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2.1.0
+
+* Enhancements
+  * Added --version flag for displaying version (alias -v)
+  * Build interval for cache builder is now configurable
+
+* Bug Fixes
+  * Supermarket location_path was not correctly set
+
+* Backwards incompatible changes
+  * --verbose alias is now -V. Previously -v.
+
 # 2.0.0
 
 * Enhancements

data/README.md

@@ -55,13 +55,20 @@ And add your configuration to the `node[:berkshelf_api][:config]` attribute
             "client_name": "berkshelf"
           }
         }
-      ]
+      ],
+      "build_interval": 5.0
     },
-    "host":"your.fqdn.here"
+    "host": "your.fqdn.here"
   }
 }
 ```
 
+Options:
+
+  * build_interval - the number of seconds before it refreshes from the endpoints.
+  * endpoints - an array of endpoints to cache
+  * home_path - data directory for the berkshelf-api server
+
 > See configuration endpoints below for a complete list of supported endpoints, and the [api cookbook readme](https://github.com/berkshelf/berkshelf-api/tree/master/cookbook) for all configuration options.
 
 Update the machine you bootstrapped to the latest version of Berkshelf-API

data/lib/berkshelf/api/cache_builder.rb

@@ -4,8 +4,6 @@ module Berkshelf::API
 
     class WorkerSupervisor < Celluloid::SupervisionGroup; end
 
-    BUILD_INTERVAL = 5.0
-
     include Berkshelf::API::GenericServer
     include Berkshelf::API::Logging
     include Berkshelf::API::Mixin::Services
@@ -18,6 +16,7 @@ module Berkshelf::API
       @worker_registry   = Celluloid::Registry.new
       @worker_supervisor = WorkerSupervisor.new(@worker_registry)
       @building          = false
+      @build_interval   = Application.config.build_interval
 
       Application.config.endpoints.each_with_index do |endpoint, index|
         endpoint_options = (endpoint.options || {}).to_hash.deep_symbolize_keys
@@ -32,7 +31,7 @@ module Berkshelf::API
     # Issue a build command to all workers at the scheduled interval
     #
     # @param [Fixnum, Float] interval
-    def build_loop(interval = BUILD_INTERVAL)
+    def build_loop(interval = @build_interval)
       return if @building
 
       loop do

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

@@ -16,7 +16,7 @@ module Berkshelf::API
         def cookbooks
           connection.universe.inject([]) do |list, (name, versions)|
             versions.each do |version, info|
-              list << RemoteCookbook.new(name, version, self.class.worker_type, connection.api_url, priority, info)
+              list << RemoteCookbook.new(name, version, self.class.worker_type, info["location_path"], priority, info)
             end
 
             list
@@ -40,7 +40,6 @@ module Berkshelf::API
         private
 
           attr_accessor :connection
-
       end
     end
   end

data/lib/berkshelf/api/config.rb

@@ -23,6 +23,10 @@ module Berkshelf::API
         }
       ]
 
+    attribute 'build_interval',
+      type: Float,
+      default: 5.0
+
     def endpoints_checksum
       Digest::SHA1.hexdigest(endpoints.collect {|x| x.to_hash }.to_s)
     end

data/lib/berkshelf/api/srv_ctl.rb

@@ -15,12 +15,12 @@ module Berkshelf
             opts.on("-h", "--host HOST", String, "set the listening address") do |h|
               options[:host] = h
             end
-            
+
             opts.on("-p", "--port PORT", Integer, "set the listening port") do |v|
               options[:port] = v
             end
 
-            opts.on("-v", "--verbose", "run with verbose output") do
+            opts.on("-V", "--verbose", "run with verbose output") do
               options[:log_level] = "INFO"
             end
 
@@ -36,6 +36,12 @@ module Berkshelf
               options[:config_file] = v
             end
 
+            opts.on("-v", "--version", "show version") do |v|
+              require 'berkshelf/api/version'
+              puts Berkshelf::API::VERSION
+              exit
+            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 = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

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

@@ -19,5 +19,9 @@ describe Berkshelf::API::Config do
     it "has the Supermarket community site as an endpoint" do
       expect(subject.endpoints.first.type).to eql("supermarket")
     end
+
+    it "has the default build_interval" do
+      expect(subject.build_interval).to eq(5.0)
+    end
   end
 end

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

@@ -20,8 +20,8 @@ describe Berkshelf::API::SrvCtl do
         end
       end
 
-      context "given -v" do
-        let(:args) { ["-v"] }
+      context "given -V" do
+        let(:args) { ["-V"] }
 
         it "sets :log_level to INFO" do
           expect(subject[:log_level]).to eql("INFO")
@@ -44,8 +44,8 @@ describe Berkshelf::API::SrvCtl do
         end
       end
 
-      context "given -v and -d" do
-        let(:args) { ["-v", "-d"] }
+      context "given -V and -d" do
+        let(:args) { ["-V", "-d"] }
 
         it "sets :log_level to DEBUG" do
           expect(subject[:log_level]).to eql("DEBUG")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -144777955995008759
+      hash: 186690400328134402
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23