pe_rbac 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56e58098a25e422d8137e4efadf5b370379528ae
-  data.tar.gz: ae014b2b5aaab17146877eeac905852a8459d81e
+  metadata.gz: 503aa91d25ea3f71e9e459d699ba276b157ed71a
+  data.tar.gz: ad6d237d94f56cea3db6a25d899e724a442326f2
 SHA512:
-  metadata.gz: e3f574eac122619ffb1d0ee39c4a041762af5c7b9ee14c625051658f5c06fdaa54f73b6f76205bb8c644931e26d46cf704d4ebc70b771fb3c1de9627fcaf2318
-  data.tar.gz: b5c016384239f66d858660140d31d46f5d64b8aeab8d3225dbc419c0383314a9a6d5ee190b45593452504854b21050a506295f7c3d6d26da220e1e79b3a9cfc6
+  metadata.gz: cf191ff1d1b9cc99a622d6092cd740f4c96393a226e23e6cbeee44feafd6627746d185b3b69eedcbbb0e9673e316c3deaacc731fb5c088a00e196f1bdba0ba43
+  data.tar.gz: 8a20606fb82623317e05c1529da42d6cca1055ca515a94e768e3b6ea96c22ddf8e3355d92df91411608a4bd721c1b156d540a60bb75274cc0a3055bb7d9545d3

data/.gitignore

@@ -8,3 +8,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.idea

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/GeoffWilliams/pe_rbac.svg?branch=master)](https://travis-ci.org/GeoffWilliams/pe_rbac)
+[![Build Status](https://travis-ci.org/declarativesystems/pe_rbac.svg?branch=master)](https://travis-ci.org/declarativesystems/pe_rbac)
 # PeRbac
 
 This gem lets you drive the Puppet Enterprise RBAC API from the command line or ruby.  While you can of-course do the same thing using the [pltraining/rbac](https://forge.puppet.com/pltraining/rbac) forge module, this requires that you have:
@@ -16,11 +16,6 @@ Since this is often not the case, this gem provides a command line to do things
 
 ## Installation
 
-Gem dependencies need G++ amongst other things.  Easiest way to proceed:
-```
-yum groupinstall 'Development Tools'
-```
-
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -80,10 +75,4 @@ After checking out the repo, run `bin/setup` to install dependencies. You can al
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/GeoffWilliams/pe_rbac.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+Bug reports and pull requests are welcome on GitHub at https://github.com/declarativesystems/pe_rbac.

data/lib/pe_rbac/action.rb

@@ -1,5 +1,6 @@
 #
-# Copyright 2016 Geoff Williams for Puppet Inc.
+# Copyright 2017 Declarative Systems PTY LTD
+# Copyright 2016 Puppet Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/pe_rbac/core.rb

@@ -1,5 +1,6 @@
 #
-# Copyright 2016 Geoff Williams for Puppet Inc.
+# Copyright 2017 Declarative Systems PTY LTD
+# Copyright 2016 Puppet Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +15,8 @@
 # limitations under the License.
 
 require 'escort'
+require 'excon'
+
 module PeRbac
   module Core
     @@ssldir = '/etc/puppetlabs/puppet/ssl'
@@ -74,23 +77,24 @@ module PeRbac
         _payload=nil
       end
       begin
-        result = RestClient::Request.execute(
-          method: method,
-          url: url,
-          ssl_ca_file: conf[:cacert],
-          ssl_client_cert: OpenSSL::X509::Certificate.new(File.read(conf[:cert])),
-          ssl_client_key: OpenSSL::PKey::RSA.new(File.read(conf[:key])),
-          ssl_version: :TLSv1_2,
-          headers: {:content_type => :json, :accept => :json},
-          payload: _payload,
-        )
-      rescue RestClient::ExceptionWithResponse => e
-        Escort::Logger.error.error url
-        Escort::Logger.error.error _payload
-        Escort::Logger.error.error e.response
+        connection = Excon.new(url,
+                               client_cert: conf[:cert],
+                               client_key: conf[:key],
+                               ssl_ca_file: conf[:cacert],
+                               ssl_version: :TLSv1_2)
+        result = connection.request(method: method,
+                                    headers: {content_type: "application/json", accept: "application/json"},
+                                    body: _payload)
+        if result.status >= 300
+          # There doesn't seem to be a built-in way to check for error codes
+          # without individually specifying each allowable 'good' status (:expect..)
+          # so lets just check for anything that smells bad
+          result = false
+        end
+      rescue Excon::Error => e
+        Escort::Logger.error.error "Error (#{e.message}) for: #{url}, #{_payload}"
         result = false
       end
-
       result
     end
 

data/lib/pe_rbac/permission.rb

@@ -1,5 +1,6 @@
 #
-# Copyright 2016 Geoff Williams for Puppet Inc.
+# Copyright 2017 Declarative Systems PTY LTD
+# Copyright 2016 Puppet Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/pe_rbac/role.rb

@@ -1,5 +1,6 @@
 #
-# Copyright 2016 Geoff Williams for Puppet Inc.
+# Copyright 2017 Declarative Systems PTY LTD
+# Copyright 2016 Puppet Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/pe_rbac/user.rb

@@ -1,5 +1,6 @@
 #
-# Copyright 2016 Geoff Williams for Puppet Inc.
+# Copyright 2017 Declarative Systems PTY LTD
+# Copyright 2016 Puppet Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+require 'json'
 require 'pe_rbac/core'
 require 'pe_rbac/action'
 

data/lib/pe_rbac/version.rb

@@ -1,5 +1,6 @@
 #
-# Copyright 2016 Geoff Williams for Puppet Inc.
+# Copyright 2017 Declarative Systems PTY LTD
+# Copyright 2016 Puppet Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
 # limitations under the License.
 
 module PeRbac
-  VERSION = "0.5.0"
+  VERSION = "1.0.0"
 end

data/lib/pe_rbac.rb

@@ -1,5 +1,6 @@
 #
-# Copyright 2016 Geoff Williams for Puppet Inc.
+# Copyright 2017 Declarative Systems PTY LTD
+# Copyright 2016 Puppet Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,11 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "pe_rbac/version"
-require 'restclient'
-require 'socket'
-require 'json'
-
 module PeRbac
   BASE_URI = '/rbac-api/v1'
 

data/pe_rbac.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Ruby API for Puppet Enterprise RBAC}
   spec.description   = %q{Programatically do stuff with Puppet Enterprise RBAC}
   spec.homepage      = "https://github.com/geoffwilliams/pe_rbac"
-  spec.license       = "Apache 2.0"
+  spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -32,8 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "facter", "2.4.6"
 
 
-  spec.add_runtime_dependency "rest-client", "2.0.0"
+  spec.add_runtime_dependency "excon", "0.59.0"
   spec.add_runtime_dependency "escort", "0.4.0"
-  spec.add_runtime_dependency "json", "2.0.3"
-
+  spec.add_runtime_dependency "json_pure", "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pe_rbac
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,19 +137,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.6
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.59.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.59.0
 - !ruby/object:Gem::Dependency
   name: escort
   requirement: !ruby/object:Gem::Requirement
@@ -165,19 +165,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0
 description: Programatically do stuff with Puppet Enterprise RBAC
 email:
 - geoff@geoffwilliams.me.uk
@@ -207,7 +207,7 @@ files:
 - pe_rbac.gemspec
 homepage: https://github.com/geoffwilliams/pe_rbac
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []