berkshelf-api 1.3.1 → 1.4.0

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# 1.4.0
+
+* Enhancements
+  * Always return JSON to native HTTP clients
+  * Listen host can now be passed to cli with the `-h` flag
+  * berkshelf-api user will now be created as a system user
+  * Update many dependent gems
+
+* Bug fixes
+  * Fix race condition when creating the user's home directory in cookbook
+  * Gracefully handle results from the community site which are empty
+
+* Backwards incompatible changes
+  * Renamed cookbook from `berkshelf-api` to `berkshelf-api-server`
+
+# 1.3.1
+
+* Enhancements
+  * Fix cookbook issue when installing on `> Ubuntu 12.04`
+
 # 1.3.0
 
 * Enhancements

data/README.md

@@ -12,9 +12,9 @@ The API server can be installed in two ways; from a Chef Cookbook (recommended)
 
 #### Basic
 
-1. Select a [release](https://github.com/berkshelf/berkshelf-api/releases) and download it's cookbooks artifact (`cookbooks.tar.gz`).
+1. Select a [release](https://github.com/berkshelf/berkshelf-api/releases) and download its cookbooks artifact (`cookbooks.tar.gz`).
 2. Upload the cookbooks to your Chef Server if you're using Chef Client or just give them to Chef Solo if that's your thing.
-3. Add "recipe[berkshelf-api::default]" to your node's run_list and run Chef.
+3. Add "recipe[berkshelf-api-server::default]" to your node's run_list and run Chef.
 
 #### Express
 
@@ -30,15 +30,43 @@ Bootstrap a server into that environment
 
 Install the cookbooks into your environment
 
-    $ blo in https://github.com/berkshelf/berkshelf-api/releases/download/v1.2.1/cookbooks.tar.gz
+    $ blo in https://github.com/berkshelf/berkshelf-api/releases/download/v1.3.1/cookbooks.tar.gz
 
 Add the recipe to your new node's run_list
 
-    $ knife node run_list add i-c8cd9ac1 "recipe[berkshelf-api::default]"
+    $ knife node run_list add i-c8cd9ac1 "recipe[berkshelf-api-server::default]"
+
+Edit the environment to configure the API server
+
+    $ knife environment edit berks-api-production
+
+And add your configuration to the `node[:berkshelf_api][:config]` attribute
+
+```json
+"default_attributes": {
+  "berkshelf_api": {
+    "config": {
+      "endpoints": [
+        {
+          "type": "chef_server",
+          "options": {
+            "url": "https://api.opscode.com/organizations/vialstudios",
+            "client_key": "/etc/berkshelf/api-server/client.pem",
+            "client_name": "berkshelf"
+          }
+        }
+      ]
+    },
+    "host":"your.fqdn.here"
+  }
+}
+```
+
+> 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
 
-    $ blo up berks-api-production berkshelf-api 1.2.1
+    $ blo up berks-api-production berkshelf-api-server latest
 
 ### Gem install
 
@@ -137,6 +165,11 @@ A local directory containing cookbooks.
 }
 ```
 
+## Getting Help
+
+* If you have an issue: report it on the [issue tracker](https://github.com/berkshelf/berkshelf/issues)
+* If you have a question: visit the #chef or #berkshelf channel on irc.freenode.net
+
 # Authors and Contributors
 
 * Jamie Winsor (<jamie@vialstudios.com>)

data/lib/berkshelf/api/endpoint.rb

@@ -7,6 +7,8 @@ module Berkshelf::API
       # Force inbound requests to be JSON
       def call(env)
         env['CONTENT_TYPE'] = 'application/json'
+        # If coming from a browser or other naive HTTP client, we want JSON back
+        env['HTTP_ACCEPT'] = 'application/json' if !env['HTTP_ACCEPT'] || env['HTTP_ACCEPT'].include?('text/html')
         super
       end
     end

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

@@ -60,9 +60,15 @@ module Berkshelf::API
         cookbooks = Array.new
 
         while count > 0
-          cookbooks += connection.get("cookbooks?start=#{start}&items=#{count}").body["items"]
-          start += 100
-          count -= 100
+          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"] }

data/lib/berkshelf/api/srv_ctl.rb

@@ -12,6 +12,10 @@ module Berkshelf
           options = Hash.new
 
           OptionParser.new("Usage: #{filename} [options]") do |opts|
+            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

data/lib/berkshelf/api/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module API
-    VERSION = "1.3.1"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,6 +127,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +185,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +193,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -307,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1558079963441890328
+      hash: 80644279196753361
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23