chef-api 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 604ea8d7021e718c9a4118755df5097d07c9ae2e
-  data.tar.gz: 7453647507aa0ae5950878b54ff5eb2712d373f5
+  metadata.gz: 1e22717c3690474e0b8d8dc2e49662ae7541c9dd
+  data.tar.gz: b77f6c57956db9b6b9e06ee677171fa26bf39ced
 SHA512:
-  metadata.gz: c5eab0b7d40e618c0cf0fdc7b647e47d96f07edf6327dda10b37087405d9003f7a810d57a6e345ee14cdecf34c9484c864ea36ab006d27dd75fadcb532fbd6ff
-  data.tar.gz: 330478952c1e26868ee4ef6780a973f6b05f67104d15f798f3eaf7b84cfdd0fb70a4a962fb8e5dd88336a0ba1769e432fc91e932a7a0fdf45062fe51ea103da1
+  metadata.gz: 20c1d17608e4670595086eef399b4ee6108f987546f6124c82ffe7e7a3bbd16fce2015bda69e2f860ea4cc1275e07d7ecfd2d88834fb521ebf391dfe230703d8
+  data.tar.gz: dfa5c1c5a75e2f75c1b7dc6c4e0346774aecd664f6ea4103b8d12dd531338f091628b1ac7e7829a3cea59db5b53266f77f55c145c16cee41adee684e6dd5cd3b

data/.travis.yml

@@ -1,8 +1,10 @@
 sudo: false
+dist: trusty
 
 rvm:
   - 2.2.5
   - 2.3.1
+  - 2.4.1
 
 # Don't install local development gems on Travis, use parallel gem downloads
 bundler_args: --without development --jobs 7

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # ChefAPI Changelog
 
+## v0.7.1 (2017-08-06)
+
+- Don't set nil `JSON.create_id` as it's unnecessary in recent versions
+  of the JSON library
+- Avoid ArgumentError when no HOME environment variable is set
+- Add Resource::Organization proxy
+- Update all comments to point to the correct Docs site URLs
+
 ## v0.6.0 (2016-05-05)
 
 - Remove support for Ruby 1.9

data/Gemfile

@@ -7,6 +7,6 @@ end
 
 group :test do
   gem 'chef-zero', '~> 2.0.0'
-  gem 'rake',      '~> 11.0'
+  gem 'rake'
   gem 'rspec',     '~> 3.0'
 end

data/lib/chef-api.rb

@@ -3,9 +3,6 @@ require 'logify'
 require 'pathname'
 require 'chef-api/version'
 
-# Do not inflate JSON objects
-JSON.create_id = nil
-
 module ChefAPI
   autoload :Authentication,  'chef-api/authentication'
   autoload :Boolean,         'chef-api/boolean'

data/lib/chef-api/connection.rb

@@ -7,7 +7,7 @@ module ChefAPI
   #
   # Connection object for the ChefAPI API.
   #
-  # @see http://docs.opscode.com/api_chef_server.html
+  # @see https://docs.chef.io/api_chef_server.html
   #
   class Connection
     class << self
@@ -47,6 +47,7 @@ module ChefAPI
     proxy :roles,          'Resource::Role'
     proxy :search,         'Resource::Search'
     proxy :users,          'Resource::User'
+    proxy :organizations,  'Resource::Organization'
 
     #
     # Create a new ChefAPI Connection with the given options. Any options

data/lib/chef-api/defaults.rb

@@ -1,4 +1,5 @@
 require 'chef-api/version'
+require 'pathname'
 require 'json'
 
 module ChefAPI
@@ -24,8 +25,32 @@ module ChefAPI
       #
       # @return [Hash]
       def config
-        path = File.expand_path(ENV['CHEF_API_CONFIG'] || '~/.chef-api')
-        @config ||= File.exist?(path) ? JSON.parse(File.read(path)) : {}
+        path = config_path
+        @config ||= path.exist? ? JSON.parse(path.read) : {}
+      end
+
+      #
+      # Pathname to configuration file, or a blank Pathname.
+      #
+      # @return [Pathname] an expanded Pathname or a non-existent Pathname
+      def config_path
+        if result = chef_api_config_path
+          Pathname(result).expand_path
+        else
+          Pathname('')
+        end
+      end
+
+      #
+      # String representation of path to configuration file
+      #
+      # @return [String, nil] Path to config file, or nil
+      def chef_api_config_path
+        ENV['CHEF_API_CONFIG'] || if ENV.key?('HOME')
+                                    '~/.chef-api'
+                                  else
+                                    nil
+                                  end
       end
 
       #

data/lib/chef-api/resources/partial_search.rb

@@ -10,7 +10,7 @@ module ChefAPI
 
     class << self
       #
-      # About search : http://docs.opscode.com/essentials_search.html
+      # About search : https://docs.chef.io/chef_search.html
       #
       # @param [String] index
       #   the name of the index to search

data/lib/chef-api/resources/search.rb

@@ -10,7 +10,7 @@ module ChefAPI
 
     class << self
       #
-      # About search : http://docs.opscode.com/essentials_search.html
+      # About search : https://docs.chef.io/chef_search.html
       #
       # @param [String] index
       #   the name of the index to search

data/lib/chef-api/version.rb

@@ -1,3 +1,3 @@
 module ChefAPI
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/unit/defaults_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 module ChefAPI
   describe Defaults do
+    before(:each) do
+      subject.instance_variable_set(:@config, nil)
+    end
+
     context 'without a config file' do
       before(:each) do
         allow(subject).to receive(:config).and_return(Hash.new)
@@ -16,15 +20,32 @@ module ChefAPI
       end
     end
 
+    context 'without a config file and no ENV vars to find it' do
+      around do |example|
+        old_conf = ENV.delete('CHEF_API_CONFIG')
+        old_home = ENV.delete('HOME')
+        example.run
+        ENV['CHEF_API_CONFIG'] = old_conf
+        ENV['HOME'] = old_home
+      end
+
+      it 'returns the default without errors' do
+        expect { subject.config }.not_to raise_error
+      end
+
+      it 'returns the default which is the empty hash' do
+        expect(subject.config).to eq({})
+      end
+    end
+
     context 'with a config file' do
       before(:each) do
-        subject.instance_variable_set(:@config, nil)
-        allow(File).to receive(:exist?).with(anything()).and_return(true)
-        allow(File).to receive(:read).and_return("{\n"\
+        config_content = "{\n"\
             "\"CHEF_API_ENDPOINT\": \"test_endpoint\",\n" \
             "\"CHEF_API_USER_AGENT\": \"test_user_agent\"\n" \
             "}"
-        )
+        path = instance_double(Pathname, read: config_content, exist?: true)
+        allow(subject).to receive(:config_path).and_return(path)
       end
 
       it 'returns the overridden value for endpoint' do

data/spec/unit/resources/base_spec.rb

@@ -20,7 +20,9 @@ module ChefAPI
 
     describe '.collection_path' do
       it 'raises an exception if the collection name is not set' do
-        expect { described_class.collection_path }.to raise_error
+        expect {
+          described_class.collection_path
+        }.to raise_error(ArgumentError, 'collection_path not set for Class')
       end
 
       it 'sets the collection name' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-api
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2017-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logify
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A Chef API client in Ruby