ansible_tower_client 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a288ed349e5e1039eeb1679ac362a14dd04a29881dcba2fefe00d56ad38d37
-  data.tar.gz: '08b1c643d52ef8a8a6469337659a16422430e45e121be392a194df5c3ba28512'
+  metadata.gz: '08f27f29feac6a32266e5c3f567a410d90caf9fb11cce3c3d7c079145784280e'
+  data.tar.gz: 9136eeeab2dc3dbb0ac23dc72905e8e8ee19a0c73a1031693d00519671e7331c
 SHA512:
-  metadata.gz: 8420eccf49a31b14a5aa8fa4c0979e54b54f769aa33986838245cb55d10f7294857a71f7cf0e5d02d070fc6f08bb41bd1b081e9c4070bd287c2350c99eaf54ad
-  data.tar.gz: b4c976cdf183e43c7769642105e6c7695f819d162fc080c93c313a2190b9eac2070df8048815c8cb50db259f7b63fac9e47e29bc116fb51a6c6d94ef041dad96
+  metadata.gz: 49034faefae5375f52d9e45afde8173bfb15430ad1e0ff0bc29b82a6e79ce1c69ea5a557a7fed788fcfecfcaa43822214fec8d088062ee7d0e4cf67c9465885e
+  data.tar.gz: 8f31190deca0df56e1d21429a39e9eae367322d714a912f8a1bbf18deb9daba1b88eb597b790e10c878662e26fd37dbf8cc1c84242b17bb16656d138d4b64030

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - "2.3.1"
-  - "2.4.1"
+  - "2.4.5"
+  - "2.5.3"
 sudo: false
 cache: bundler
-before_install: gem install bundler -v 1.10.3

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.20.0] - 2019-05-22
+### Added
+- Added support for v2 API credential objects [(#123)](https://github.com/ansible/ansible_tower_client_ruby/pull/123)
+
 ## [0.19.1] - 2019-03-25
 ### Fixed
 - Avoid redundant redirects [(#124)](https://github.com/ansible/ansible_tower_client_ruby/pull/124) [(#127)](https://github.com/ansible/ansible_tower_client_ruby/pull/127)
@@ -114,7 +118,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Adjusted project_spec to test on a Project [(#63)](https://github.com/ansible/ansible_tower_client_ruby/pull/63)
 
-[Unreleased]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.19.1...master
+[Unreleased]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.20.0...master
+[0.20.0]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.19.1...v0.20.0
 [0.19.1]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.19.0...v0.19.1
 [0.19.0]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.18.0...v0.19.0
 [0.18.0]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.17.0...v0.18.0

data/ansible_tower_client.gemspec

@@ -1,7 +1,5 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ansible_tower_client/version'
+require_relative 'lib/ansible_tower_client/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "ansible_tower_client"
@@ -17,15 +15,13 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "faraday"
   spec.add_runtime_dependency "faraday_middleware"
   spec.add_runtime_dependency "more_core_extensions", "~> 3.0"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "factory_girl"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "factory_bot", "~> 4.11"
+  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec"
 end

data/lib/ansible_tower_client.rb

@@ -14,6 +14,7 @@ require "ansible_tower_client/collection"
 require "ansible_tower_client/base_models/activity_stream"
 require "ansible_tower_client/base_models/ad_hoc_command"
 require "ansible_tower_client/base_models/credential"
+require "ansible_tower_client/base_models/credential_type"
 require "ansible_tower_client/base_models/group"
 require "ansible_tower_client/base_models/host"
 require "ansible_tower_client/base_models/inventory"

data/lib/ansible_tower_client/api.rb

@@ -35,6 +35,10 @@ module AnsibleTowerClient
       Collection.new(self, credential_class)
     end
 
+    def credential_types
+      Collection.new(self, credential_type_class)
+    end
+
     def groups
       Collection.new(self, group_class)
     end
@@ -149,6 +153,10 @@ module AnsibleTowerClient
       @credential_class ||= AnsibleTowerClient::Credential
     end
 
+    def credential_type_class
+      @credential_type_class ||= AnsibleTowerClient::CredentialType
+    end
+
     def group_class
       @group_class ||= AnsibleTowerClient::Group
     end

data/lib/ansible_tower_client/base_models/credential.rb

@@ -1,7 +1,45 @@
 module AnsibleTowerClient
   class Credential < BaseModel
     def override_raw_attributes
-      { :organization => :organization_id }
+      {
+        :organization    => :organization_id,
+        :credential_type => :credential_type_id,
+      }
+    end
+
+    # https://github.com/ansible/awx/blob/1328fb80a02ef4e37bc021eb07d4be041a41f937/awx/main/models/credential/__init__.py#L76-L90
+    KIND_CHOICES = {
+      'ssh'        => 'Machine',
+      'net'        => 'Network',
+      'scm'        => 'Source Control',
+      'aws'        => 'Amazon Web Services',
+      'vmware'     => 'VMware vCenter',
+      'satellite6' => 'Red Hat Satellite 6',
+      'cloudforms' => 'Red Hat CloudForms',
+      'gce'        => 'Google Compute Engine',
+      'azure_rm'   => 'Microsoft Azure Resource Manager',
+      'openstack'  => 'OpenStack',
+      'rhv'        => 'Red Hat Virtualization',
+      'insights'   => 'Insights',
+      'tower'      => 'Ansible Tower',
+    }.invert
+    KIND_CHOICES.default = 'cloud'
+    KIND_CHOICES.freeze
+
+    # https://github.com/ansible/awx/blob/1328fb80a02ef4e37bc021eb07d4be041a41f937/awx/main/models/credential/__init__.py#L301
+    def kind
+      @data['kind'] ||= begin
+        kind = credential_type.kind
+        kind == 'cloud' ? KIND_CHOICES[credential_type.name] : kind
+      end.to_s
+    end
+
+    def credential_type
+      @credential_type ||= api.credential_types.find(credential_type_id)
+    end
+
+    def vault_password
+      @data['vault_password'] ||= inputs.vault_password.to_s
     end
   end
 end

data/lib/ansible_tower_client/base_models/credential_type.rb

@@ -0,0 +1,4 @@
+module AnsibleTowerClient
+  class CredentialType < BaseModel
+  end
+end

data/lib/ansible_tower_client/base_models/project.rb

@@ -19,8 +19,25 @@ module AnsibleTowerClient
     end
 
     def last_update
-      return if related['last_update'].blank?
-      api.project_updates.find(related['last_update'])
+      return @last_update if defined? @last_update
+      return @last_update = nil unless related.raw_hash.key?('last_update')
+      return @last_update = nil if (update_id = related.last_update).blank?
+
+      if !numberish?(update_id)
+        if raw_hash.key?('summary_fields') && summary_fields.raw_hash.key?('last_update')
+          update_id = summary_fields.last_update.id
+        else
+          /\/(?'update_id'\d+)\/?\z/ =~ update_id
+        end
+      end
+
+      @last_update = update_id && api.project_updates.find(update_id)
+    end
+
+    private
+
+    def numberish?(value)
+      value.kind_of?(Numeric) || value.to_s =~ /\A\d+\z/
     end
   end
 end

data/lib/ansible_tower_client/version.rb

@@ -1,3 +1,3 @@
 module AnsibleTowerClient
-  VERSION = "0.19.1".freeze
+  VERSION = "0.20.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansible_tower_client
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -68,47 +68,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '4.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  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'
+        version: '4.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,7 @@ files:
 - lib/ansible_tower_client/base_models/activity_stream.rb
 - lib/ansible_tower_client/base_models/ad_hoc_command.rb
 - lib/ansible_tower_client/base_models/credential.rb
+- lib/ansible_tower_client/base_models/credential_type.rb
 - lib/ansible_tower_client/base_models/group.rb
 - lib/ansible_tower_client/base_models/host.rb
 - lib/ansible_tower_client/base_models/inventory.rb
@@ -197,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Ansible Tower REST API wrapper gem