puppetdb-ruby 0.0.1 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 282cff2e55783d3ee94a952746316ba91305e2a5
+  data.tar.gz: 2b6a524d1dc2c13d0525082e326052b3af1f275b
+SHA512:
+  metadata.gz: bbac872da30cebe0f3f00e8262d8bb4451774b46cf0e66ef2c0934e4f8135446d296fc2b7a63647e07fd49adc3d3e7974f6c412c3eefed9601d32a293289faff
+  data.tar.gz: 2f6088df22bb0c7bf550d4f0eb1f6ce85b3d64893c1a8ae93a15031d3c1c471624b27f273fde1cb33596f7cdcb1249ebfa7e057395f84f729eec3f7cc956af9f

data/CHANGELOG.md

@@ -0,0 +1,33 @@
+# Change log
+
+All notable changes to this project will be documented in this file.
+Each new release typically also includes the latest modulesync defaults.
+These should not impact the functionality of the module.
+
+## [v1.0.0](https://github.com/voxpupuli/puppetdb-ruby/tree/v1.0.0) (2017-08-01)
+**Implemented enhancements:**
+
+- Preparatory cleanup for refactor [\#21](https://github.com/voxpupuli/puppetdb-ruby/pull/21) ([dhollinger](https://github.com/dhollinger))
+- Allow usage of unauthenticated PuppetDB over SSL [\#14](https://github.com/voxpupuli/puppetdb-ruby/pull/14) ([cassianoleal](https://github.com/cassianoleal))
+
+**Closed issues:**
+
+- Refactor to support v4 endpoints [\#20](https://github.com/voxpupuli/puppetdb-ruby/issues/20)
+- API V4 Example [\#13](https://github.com/voxpupuli/puppetdb-ruby/issues/13)
+- 'summarize-by' parameter not supported [\#9](https://github.com/voxpupuli/puppetdb-ruby/issues/9)
+- Thanks! [\#6](https://github.com/voxpupuli/puppetdb-ruby/issues/6)
+- Only GET requests supported [\#4](https://github.com/voxpupuli/puppetdb-ruby/issues/4)
+
+**Merged pull requests:**
+
+- Update Docs for Release 1.0.0 [\#23](https://github.com/voxpupuli/puppetdb-ruby/pull/23) ([dhollinger](https://github.com/dhollinger))
+- Add command API support [\#19](https://github.com/voxpupuli/puppetdb-ruby/pull/19) ([bekbulatov](https://github.com/bekbulatov))
+- \(maint\) Transfer ownership to Vox Pupuli [\#18](https://github.com/voxpupuli/puppetdb-ruby/pull/18) ([rlinehan](https://github.com/rlinehan))
+- "Voxpupulify" [\#17](https://github.com/voxpupuli/puppetdb-ruby/pull/17) ([nibalizer](https://github.com/nibalizer))
+- Add Contributing Guidelines [\#7](https://github.com/voxpupuli/puppetdb-ruby/pull/7) ([rlinehan](https://github.com/rlinehan))
+- Feature/fix readme [\#3](https://github.com/voxpupuli/puppetdb-ruby/pull/3) ([robinbowes](https://github.com/robinbowes))
+- Update README with correct initialization of client [\#1](https://github.com/voxpupuli/puppetdb-ruby/pull/1) ([ccaum](https://github.com/ccaum))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -3,54 +3,126 @@
 a simple gem for interacting with the
 [PuppetDB](https://github.com/puppetlabs/puppetdb) API.
 
+This library was migrated from [puppetlabs](https://github.com/puppetlabs)
+ownership to VoxPupuli on 19 October 2016.
+
 ## Installation
 
+Installing from Ruby CLI:
+```
 gem install puppetdb-ruby
+```
+
+Include in Gemfile:
+``` ruby
+gem 'puppetdb-ruby'
+```
 
 ## Usage
 
+Require the puppetdb gem in your ruby code.
+
 ```ruby
 require 'puppetdb'
 
 # Defaults to latest API version.
+```
 
-# non-ssl
-client = PuppetDB::Client({:server => 'http://localhost:8080'})
+#### Create a new connection:
 
-# ssl
-client = PuppetDB::Client({
+Non-SSL:
+``` ruby
+client = PuppetDB::Client.new({:server => 'http://localhost:8080'})
+```
+
+SSL:
+``` ruby
+client = PuppetDB::Client.new({
     :server => 'https://localhost:8081',
     :pem    => {
-        :key     => "keyfile",
-        :cert    => "certfile",
-        :ca_file => "cafile"
+        'key'     => "keyfile",
+        'cert'    => "certfile",
+        'ca_file' => "cafile"
     }})
+```
+
+#### Query API usage
+
+The Query Feature allows the user to request data from PuppetDB using the Query endpoints. It defaults to the latest version of the Query Endpoint.
+
+Currently, `puppetdb-ruby` only supports the [AST Query Language](https://docs.puppet.com/puppetdb/5.0/api/query/v4/ast.html). 
+
+Support for the [PQL Query Language](https://docs.puppet.com/puppetdb/5.0/api/query/tutorial-pql.html) is planned for a future release.
+
+Example:
+``` ruby
+response = client.request(
+  'nodes',
+  [:and,
+    [:'=', ['fact', 'kernel'], 'Linux'],
+    [:>, ['fact', 'uptime_days'], 30]
+  ],
+  {:limit => 10}
+)
 
-response = client.request([:and,
-                 [:'=', ['fact', 'kernel'], 'Linux'],
-                 [:>, ['fact', 'uptime_days'], 30]]], {:limit => 10})
 nodes = response.data
 
 # queries are composable
 
-uptime = PuppetDB::Query[:>, ['fact', 'uptime_days'], 30]
-redhat = PuppetDB::Query[:'=', ['fact', 'osfamily'], 'RedHat']
-debian = PuppetDB::Query[:'=', ['fact', 'osfamily'], 'Debian']
+uptime = PuppetDB::Query[:>, [:fact, 'uptime_days'], 30]
+redhat = PuppetDB::Query[:'=', [:fact, 'osfamily'], 'RedHat']
+debian = PuppetDB::Query[:'=', [:fact, 'osfamily'], 'Debian']
 
 client.request uptime.and(debian)
 client.request uptime.and(redhat)
 client.request uptime.and(debian.or(redhat))
 ```
 
-## tests
+See the [PuppetDB API Docs](https://docs.puppet.com/puppetdb/5.0/api/index.html) for more.
 
+#### Command API Usage
+
+The Command Feature allows the user to execute REST Commands against the PuppetDB Command API Endpoints. It defaults to the latest version of the Command Endpoint.
+
+The command method takes three arguments:
+
+* `command`: a string identifying the command
+* `payload`: a valid JSON object of any sort. It’s up to an individual handler function to determine how to interpret that object.
+* `version`: a JSON integer describing what version of the given command you’re attempting to invoke. The version of the command also indicates the version of the wire format to use for the command.
+
+Example:
+``` ruby
+client.command(
+  'deactivate node',
+  {'certname' => 'test1', 'producer_timestamp' => '2015-01-01'},
+  3
+)
+```
+
+See the PuppetDB [Commands Endpoint Docs](https://docs.puppet.com/puppetdb/5.0/api/command/v1/commands.html) for more information.
+
+## Tests
+
+```
 bundle install
 bundle exec rspec
+```
+
+## Issues & Contributions
+
+File issues or feature requests using [GitHub
+issues](https://github.com/voxpupuli/puppetdb-ruby/issues).
+
+If you are interested in contributing to this project, please see the
+[Contribution Guidelines](CONTRIBUTING.md)
 
 ## Authors
 
+This module was donated to VoxPupuli by Puppet Inc on 10-19-2016.
+
 Nathaniel Smith <nathaniel@puppetlabs.com>
 Lindsey Smith <lindsey@puppetlabs.com>
+Ruth Linehan <ruth@puppetlabs.com>
 
 ## License
 

data/lib/puppetdb.rb

@@ -1,3 +1,6 @@
-require File.join(File.dirname(__FILE__), 'puppetdb', 'client')
-require File.join(File.dirname(__FILE__), 'puppetdb', 'response')
-require File.join(File.dirname(__FILE__), 'puppetdb', 'query')
+require 'puppetdb/version'
+require 'puppetdb/client'
+require 'puppetdb/query'
+require 'puppetdb/response'
+
+module PuppetDB; end

data/lib/puppetdb/client.rb

@@ -2,7 +2,7 @@ require 'httparty'
 require 'logger'
 
 module PuppetDB
-  class APIError < Exception
+  class APIError < RuntimeError
     attr_reader :code, :response
     def initialize(response)
       @response = response
@@ -27,85 +27,105 @@ module PuppetDB
       untouched = hash[key]
       return untouched if untouched
 
-      sym = hash[key.to_sym()]
+      sym = hash[key.to_sym]
       return sym if sym
 
-      str = hash[key.to_s()]
+      str = hash[key.to_s]
       return str if str
 
       nil
     end
 
     def hash_includes?(hash, *sought_keys)
-      sought_keys.each {|x| return false unless hash.include?(x)}
+      sought_keys.each { |x| return false unless hash.include?(x) }
       true
     end
 
     def debug(msg)
-      if @logger
-        @logger.debug(msg)
-      end
+      @logger.debug(msg) if @logger
     end
 
-    def initialize(settings, version=3)
-      @version = version
+    def initialize(settings, query_api_version = 4, command_api_version = 1)
+      @query_api_version = query_api_version
+      @command_api_version = command_api_version
 
       server = hash_get(settings, 'server')
       pem    = hash_get(settings, 'pem')
 
       scheme = URI.parse(server).scheme
 
-      unless ['http', 'https'].include? scheme
-        error_msg = "Configuration error: :server must specify a protocol of either http or https"
+      unless %w[http https].include? scheme
+        error_msg = 'Configuration error: :server must specify a protocol of either http or https'
         raise error_msg
       end
 
       @use_ssl = scheme == 'https'
-      if @use_ssl
-        unless pem && hash_includes?(pem, 'key', 'cert', 'ca_file')
+      if @use_ssl && pem
+        unless hash_includes?(pem, 'key', 'cert', 'ca_file')
           error_msg = 'Configuration error: https:// specified but pem is missing or incomplete. It requires cert, key, and ca_file.'
           raise error_msg
         end
 
-        self.class.default_options = {:pem => pem}
+        self.class.default_options = { pem: pem }
         self.class.connection_adapter(FixSSLConnectionAdapter)
       end
 
-      self.class.base_uri(server + '/v' + version.to_s())
+      self.class.base_uri(server)
     end
 
     def raise_if_error(response)
-      if response.code.to_s() =~ /^[4|5]/
-        raise APIError.new(response)
-      end
+      raise APIError, response if response.code.to_s =~ %r{^[4|5]}
     end
 
-    def request(endpoint, query, opts={})
+    def request(endpoint, query, opts = {})
       query = PuppetDB::Query.maybe_promote(query)
-      json_query = query.build()
+      json_query = query.build
 
-      path = "/" + endpoint
+      path = "/pdb/query/v#{@query_api_version}/" + endpoint
 
-      filtered_opts = {'query' => json_query}
-      opts.each do |k,v|
+      filtered_opts = { 'query' => json_query }
+      opts.each do |k, v|
         if k == :counts_filter
           filtered_opts['counts-filter'] = JSON.dump(v)
         else
-          filtered_opts[k.to_s.sub("_", "-")] = v
+          filtered_opts[k.to_s.sub('_', '-')] = v
         end
       end
 
       debug("#{path} #{json_query} #{opts}")
 
-      ret = self.class.get(path, :query => filtered_opts)
+      ret = self.class.get(path, body: filtered_opts)
       raise_if_error(ret)
 
       total = ret.headers['X-Records']
-      if total.nil?
-        total = ret.parsed_response.length
-      end
+      total = ret.parsed_response.length if total.nil?
 
       Response.new(ret.parsed_response, total)
     end
+
+    def command(command, payload, version)
+      path = "/pdb/cmd/v#{@command_api_version}"
+
+      query = {
+        'command' => command,
+        'version' => version,
+        'certname' => payload['certname']
+      }
+
+      debug("#{path} #{query} #{payload}")
+
+      ret = self.class.post(
+        path,
+        query: query,
+        body: payload.to_json,
+        headers: {
+          'Accept'       => 'application/json',
+          'Content-Type' => 'application/json'
+        }
+      )
+      raise_if_error(ret)
+
+      Response.new(ret.parsed_response)
+    end
   end
 end

data/lib/puppetdb/query.rb

@@ -4,7 +4,7 @@ module PuppetDB
   class Query
     attr_reader :sexpr
 
-    def initialize(query=[])
+    def initialize(query = [])
       @sexpr = query
     end
 
@@ -16,7 +16,7 @@ module PuppetDB
       return Query.new(query) unless query.class == Query
       query
     end
-    
+
     def empty?
       @sexpr.empty?
     end
@@ -28,11 +28,11 @@ module PuppetDB
       # of the non-empty operand. If both operands are empty, the
       # empty query is returned. If both operands are non-empty, the
       # compose continues.
-      if query.empty? && !self.empty?
+      if query.empty? && !empty?
         Query.new(@sexpr)
-      elsif self.empty? && !query.empty?
-        Query.new(query.sexpr())
-      elsif self.empty? && query.empty?
+      elsif empty? && !query.empty?
+        Query.new(query.sexpr)
+      elsif empty? && query.empty?
         Query.new([])
       else
         yield query
@@ -40,15 +40,15 @@ module PuppetDB
     end
 
     def and(query)
-      compose(query) { |q| Query.new([:and, @sexpr, q.sexpr()]) }
+      compose(query) { |q| Query.new([:and, @sexpr, q.sexpr]) }
     end
 
     def or(query)
-      compose(query) { |q| Query.new([:or, @sexpr, q.sexpr()]) }
+      compose(query) { |q| Query.new([:or, @sexpr, q.sexpr]) }
     end
 
     def push(query)
-      compose(query) { |q| Query.new(@sexpr.dup.push(q.sexpr())) }
+      compose(query) { |q| Query.new(@sexpr.dup.push(q.sexpr)) }
     end
 
     def build

data/lib/puppetdb/response.rb

@@ -2,7 +2,7 @@ module PuppetDB
   class Response
     attr_reader :data, :total_records
 
-    def initialize(data, total_records=nil)
+    def initialize(data, total_records = nil)
       @data = data
       @total_records = total_records
     end

data/lib/puppetdb/version.rb

@@ -0,0 +1,3 @@
+module PuppetDB
+  VERSION = '1.0.0'.freeze
+end

metadata

@@ -1,73 +1,151 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
+- Vox Pupuli
 - Nathaniel Smith
 - Lindsey Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.48.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.48.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.15.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.15.1
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email: info@puppetlabs.com
+email: voxpupuli@groups.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Gemfile
+- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/puppetdb.rb
 - lib/puppetdb/client.rb
 - lib/puppetdb/query.rb
 - lib/puppetdb/response.rb
-- spec/spec_helper.rb
-- spec/unit/client_spec.rb
-- spec/unit/query_spec.rb
-homepage: https://github.com/puppetlabs/puppetdb-ruby
+- lib/puppetdb/version.rb
+homepage: https://github.com/voxpupuli/puppetdb-ruby
 licenses:
 - apache
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple Ruby client library for PuppetDB API
 test_files: []

data/.gitignore

@@ -1,3 +0,0 @@
-vendor
-.bundle
-Gemfile.lock

data/Gemfile

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gem "httparty"
-
-group :test do
-  gem 'rspec'
-  gem 'mocha'
-end

data/spec/spec_helper.rb

@@ -1,3 +0,0 @@
-RSpec.configure do |conf|
-  conf.mock_framework = :mocha
-end

data/spec/unit/client_spec.rb

@@ -1,179 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'puppetdb')
-
-def make_mock_response
-  m = mock()
-  m.stubs(:code).returns(200)
-  m.expects(:parsed_response).returns(['foo'])
-  m
-end
-
-def make_mock_query
-  m = mock()
-  m.expects(:build)
-  m.expects(:summarize_by).returns(m)
-  m
-end
-
-def expect_include_total(mock_query)
-  mock_query.expects(:include_total).with(true)
-  mock_query
-end
-
-describe 'raise_if_error' do
-  settings = {'server' => 'http://localhost:8080'}
-
-  it 'works with 4xx' do
-    response = mock()
-    response.stubs(:code).returns(400)
-
-    lambda { PuppetDB::Client.new(settings).raise_if_error(response) }.should raise_error
-  end
-
-  it 'works with 5xx' do
-    response = mock()
-    response.stubs(:code).returns(500)
-
-    lambda { PuppetDB::Client.new(settings).raise_if_error(response) }.should raise_error
-  end
-
-  it 'ignores 2xx' do
-    response = mock()
-    response.stubs(:code).returns(200)
-
-    lambda { PuppetDB::Client.new(settings).raise_if_error(response) }.should_not raise_error
-  end
-
-  it 'ignores 3xx' do
-    response = mock()
-    response.stubs(:code).returns(300)
-
-    lambda { PuppetDB::Client.new(settings).raise_if_error(response) }.should_not raise_error
-  end
-end
-
-describe 'SSL support' do
-  describe 'when http:// is specified' do
-    it 'does not use ssl' do
-      settings = {
-        'server' => 'http://localhost:8080'
-      }
-
-      r = PuppetDB::Client.new(settings)
-      expect(r.use_ssl).to eq(false)
-    end
-  end
-
-  describe 'when https:// is specified' do
-    it 'uses ssl' do
-      settings = {
-        'server' => 'https://localhost:8081',
-        'pem' => {
-          'cert'    => 'foo',
-          'key'     => 'bar',
-          'ca_file' => 'baz'
-        }
-      }
-
-      r = PuppetDB::Client.new(settings)
-      expect(r.use_ssl).to eq(true)
-    end
-
-    it 'does not tolerate lack of pem' do
-      settings = {
-        :server => 'https://localhost:8081'
-      }
-
-      lambda { PuppetDB::Client.new(settings) }.should raise_error
-    end
-
-    it 'does not tolerate lack of key' do
-      settings = {
-        'server' => 'https://localhost:8081',
-        'pem'    => {
-          'cert' => 'foo',
-          'ca_file' => 'bar'
-        }
-      }
-
-      lambda { PuppetDB::Client.new(settings) }.should raise_error
-    end
-
-    it 'does not tolerate lack of cert' do
-      settings = {
-        'server' => 'https://localhost:8081',
-        'pem'    => {
-          'key' => 'foo',
-          'ca_file' => 'bar'
-        }
-      }
-
-      lambda { PuppetDB::Client.new(settings) }.should raise_error
-    end
-
-    it 'does not tolerate lack of ca_file' do
-      settings = {
-        'server' => 'https://localhost:8081',
-        'pem'    => {
-          'key' => 'foo',
-          'cert' => 'bar'
-        }
-      }
-
-      lambda { PuppetDB::Client.new(settings) }.should raise_error
-    end
-  end
-
-  describe 'when a protocol is missing from config file' do
-    it 'raises an exception' do
-      settings = {
-        'server' => 'localhost:8080'
-      }
-
-      lambda { PuppetDB::Client.new(settings) }.should raise_error
-    end
-  end
-end
-
-describe 'request' do
-  settings = {:server => 'http://localhost'}
-
-  it 'works with array instead of Query' do
-    client = PuppetDB::Client.new(settings)
-
-    mock_response = mock()
-    mock_response.expects(:code).returns(200)
-    mock_response.expects(:headers).returns({'X-Records' => 0})
-    mock_response.expects(:parsed_response).returns([])
-
-    PuppetDB::Client.expects(:get).returns(mock_response).at_least_once.with() do |path, opts|
-      opts[:query] == {'query' => '[1,2,3]'}
-    end
-    client.request('/foo', [1,2,3])
-  end
-
-  it 'processes options correctly' do
-    client = PuppetDB::Client.new(settings)
-
-    mock_response = mock()
-    mock_response.expects(:code).returns(200)
-    mock_response.expects(:headers).returns({'X-Records' => 0})
-    mock_response.expects(:parsed_response).returns([])
-
-    PuppetDB::Client.expects(:get).returns(mock_response).at_least_once.with() do |path, opts|
-      opts == {
-        :query => {
-          'query'         => '[1,2,3]',
-          'limit'         => 10,
-          'counts-filter' => '[4,5,6]',
-          'foo-bar'       => 'foo'
-      }}
-    end
-
-    client.request('/foo', PuppetDB::Query[1,2,3], {
-                     :limit => 10,
-                     :counts_filter => [4,5,6],
-                     :foo_bar => "foo"
-                   })
-  end
-end

data/spec/unit/query_spec.rb

@@ -1,179 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'puppetdb')
-
-def make_mock_response
-  m = mock()
-  m.stubs(:code).returns(200)
-  m.expects(:parsed_response).returns(['foo'])
-  m
-end
-
-def make_mock_query
-  m = mock()
-  m.expects(:build)
-  m.expects(:summarize_by).returns(m)
-  m
-end
-
-def expect_include_total(mock_query)
-  mock_query.expects(:include_total).with(true)
-  mock_query
-end
-
-describe 'raise_if_error' do
-  settings = {'server' => 'http://localhost:8080'}
-
-  it 'works with 4xx' do
-    response = mock()
-    response.stubs(:code).returns(400)
-
-    lambda { PuppetDB::Client.new(settings).raise_if_error(response) }.should raise_error
-  end
-
-  it 'works with 5xx' do
-    response = mock()
-    response.stubs(:code).returns(500)
-
-    lambda { PuppetDB::Client.new(settings).raise_if_error(response) }.should raise_error
-  end
-
-  it 'ignores 2xx' do
-    response = mock()
-    response.stubs(:code).returns(200)
-
-    lambda { PuppetDB::Client.new(settings).raise_if_error(response) }.should_not raise_error
-  end
-
-  it 'ignores 3xx' do
-    response = mock()
-    response.stubs(:code).returns(300)
-
-    lambda { PuppetDB::Client.new(settings).raise_if_error(response) }.should_not raise_error
-  end
-end
-
-describe 'SSL support' do
-  describe 'when http:// is specified' do
-    it 'does not use ssl' do
-      settings = {
-        'server' => 'http://localhost:8080'
-      }
-
-      r = PuppetDB::Client.new(settings)
-      expect(r.use_ssl).to eq(false)
-    end
-  end
-
-  describe 'when https:// is specified' do
-    it 'uses ssl' do
-      settings = {
-        'server' => 'https://localhost:8081',
-        'pem' => {
-          'cert'    => 'foo',
-          'key'     => 'bar',
-          'ca_file' => 'baz'
-        }
-      }
-
-      r = PuppetDB::Client.new(settings)
-      expect(r.use_ssl).to eq(true)
-    end
-
-    it 'does not tolerate lack of pem' do
-      settings = {
-        :server => 'https://localhost:8081'
-      }
-
-      lambda { PuppetDB::Client.new(settings) }.should raise_error
-    end
-
-    it 'does not tolerate lack of key' do
-      settings = {
-        'server' => 'https://localhost:8081',
-        'pem'    => {
-          'cert' => 'foo',
-          'ca_file' => 'bar'
-        }
-      }
-
-      lambda { PuppetDB::Client.new(settings) }.should raise_error
-    end
-
-    it 'does not tolerate lack of cert' do
-      settings = {
-        'server' => 'https://localhost:8081',
-        'pem'    => {
-          'key' => 'foo',
-          'ca_file' => 'bar'
-        }
-      }
-
-      lambda { PuppetDB::Client.new(settings) }.should raise_error
-    end
-
-    it 'does not tolerate lack of ca_file' do
-      settings = {
-        'server' => 'https://localhost:8081',
-        'pem'    => {
-          'key' => 'foo',
-          'cert' => 'bar'
-        }
-      }
-
-      lambda { PuppetDB::Client.new(settings) }.should raise_error
-    end
-  end
-
-  describe 'when a protocol is missing from config file' do
-    it 'raises an exception' do
-      settings = {
-        'server' => 'localhost:8080'
-      }
-
-      lambda { PuppetDB::Client.new(settings) }.should raise_error
-    end
-  end
-end
-
-describe 'request' do
-  settings = {:server => 'http://localhost'}
-
-  it 'works with array instead of Query' do
-    client = PuppetDB::Client.new(settings)
-
-    mock_response = mock()
-    mock_response.expects(:code).returns(200)
-    mock_response.expects(:headers).returns({'X-Records' => 0})
-    mock_response.expects(:parsed_response).returns([])
-
-    PuppetDB::Client.expects(:get).returns(mock_response).at_least_once.with() do |path, opts|
-      opts[:query] == {'query' => '[1,2,3]'}
-    end
-    client.request('/foo', [1,2,3])
-  end
-
-  it 'processes options correctly' do
-    client = PuppetDB::Client.new(settings)
-
-    mock_response = mock()
-    mock_response.expects(:code).returns(200)
-    mock_response.expects(:headers).returns({'X-Records' => 0})
-    mock_response.expects(:parsed_response).returns([])
-
-    PuppetDB::Client.expects(:get).returns(mock_response).at_least_once.with() do |path, opts|
-      opts == {
-        :query => {
-          'query'         => '[1,2,3]',
-          'limit'         => 10,
-          'counts-filter' => '[4,5,6]',
-          'foo-bar'       => 'foo'
-      }}
-    end
-
-    client.request('/foo', PuppetDB::Query[1,2,3], {
-                     :limit => 10,
-                     :counts_filter => [4,5,6],
-                     :foo_bar => "foo"
-                   })
-  end
-end