ansible_tower_client 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b4033eccf795a162c27652f2edc7153a2e4a231
-  data.tar.gz: ccf4bb477367817aaff6ab888201a85d5b145b4a
+  metadata.gz: acc09f7903cf4344a5aecf388e01e96ec4ddbacb
+  data.tar.gz: 1f9c7426089f8e860848e95a5fc10cb73d7748fd
 SHA512:
-  metadata.gz: 86d98c1afcb527c6c8795e2613d64d313c25df0f8b3a659afc27fcec04432ef16deb5bba25754571e18eb308c00004264a2db6aa0f6717e724c66c67b2243d1c
-  data.tar.gz: 91f5bb1f97fd1092358e3741d3e150a459aa7be27315ec1cdcaefbf9a9f6b87545ce6fd69132868727c219f8c3346d9cbaac1a66aea4e150a3e03879d66e2a90
+  metadata.gz: e2907f826fc08aded95a7db83c5278a410cdc7ac1be5c770d30fc92658c12bb551e8df55073b02afdcb1375c952be321be13da6749135492155bd3bd99639a9c
+  data.tar.gz: a235ecafbf062ed0e5e5bba221383ea808943d3823fb8b2f7fbbc743d8a407ccc06fe6acb9fac6774ae578e92ecb8c9cf550a8e2c866762bda585adfc7674cb0

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ansible_tower_client.gemspec
 gemspec
+
+# HACK: Rails 5 dropped support for Ruby < 2.2.2
+active_support_version = "< 5" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2")
+gem "activesupport", active_support_version

data/README.md

@@ -4,6 +4,8 @@
 [![Build Status](https://travis-ci.org/ManageIQ/ansible_tower_client.svg)](https://travis-ci.org/ManageIQ/ansible_tower_client)
 [![Code Climate](https://codeclimate.com/github/ManageIQ/ansible_tower_client/badges/gpa.svg)](https://codeclimate.com/github/ManageIQ/ansible_tower_client)
 [![Dependency Status](https://gemnasium.com/ManageIQ/ansible_tower_client.svg)](https://gemnasium.com/ManageIQ/ansible_tower_client)
+[![Coverage Status](http://img.shields.io/coveralls/ManageIQ/ansible_tower_client.svg)](https://coveralls.io/r/ManageIQ/ansible_tower_client)
+[![Security](https://hakiri.io/github/ManageIQ/ansible_tower_client/master.svg)](https://hakiri.io/github/ManageIQ/ansible_tower_client/master)
 
 ## Installation
 

data/ansible_tower_client.gemspec

@@ -19,10 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # HACK: Rails 5 dropped support for Ruby < 2.2.2
-  active_support_version = "< 5" if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.2.2")
-  spec.add_runtime_dependency "activesupport", active_support_version
-
+  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"

data/lib/ansible_tower_client.rb

@@ -11,14 +11,17 @@ require "ansible_tower_client/hash_model"
 require "ansible_tower_client/base_model"
 require "ansible_tower_client/collection"
 
-require "ansible_tower_client/ad_hoc_command"
-require "ansible_tower_client/group"
-require "ansible_tower_client/host"
-require "ansible_tower_client/inventory"
-require "ansible_tower_client/inventory_source"
-require "ansible_tower_client/inventory_update"
-require "ansible_tower_client/job"
-require "ansible_tower_client/job_template"
+require "ansible_tower_client/base_models/ad_hoc_command"
+require "ansible_tower_client/base_models/group"
+require "ansible_tower_client/base_models/host"
+require "ansible_tower_client/base_models/inventory"
+require "ansible_tower_client/base_models/inventory_source"
+require "ansible_tower_client/base_models/inventory_update"
+require "ansible_tower_client/base_models/job"
+require "ansible_tower_client/base_models/job_template"
+
+require "ansible_tower_client/v2/job_template_v2"
+
 require "more_core_extensions/all"
 require "active_support/inflector"
 

data/lib/ansible_tower_client/api.rb

@@ -5,36 +5,48 @@ module AnsibleTowerClient
       @instance = connection
     end
 
-    def hosts
-      Collection.new(self, Host)
+    def config
+      JSON.parse(get("config").body)
+    end
+
+    def version
+      @version ||= config["version"]
+    end
+
+    def verify_credentials
+      JSON.parse(get("me").body).fetch_path("results", 0, "username")
+    end
+
+    def ad_hoc_commands
+      Collection.new(self, ad_hoc_command_class)
     end
 
     def groups
-      Collection.new(self, Group)
+      Collection.new(self, group_class)
+    end
+
+    def hosts
+      Collection.new(self, host_class)
     end
 
     def inventories
-      Collection.new(self, Inventory)
+      Collection.new(self, inventory_class)
     end
 
     def inventory_sources
-      Collection.new(self, InventorySource)
+      Collection.new(self, inventory_source_class)
     end
 
     def inventory_updates
-      Collection.new(self, InventoryUpdate)
-    end
-
-    def job_templates
-      Collection.new(self, JobTemplate)
+      Collection.new(self, inventory_update_class)
     end
 
-    def ad_hoc_commands
-      Collection.new(self, AdHocCommand)
+    def jobs
+      Collection.new(self, job_class)
     end
 
-    def jobs
-      Collection.new(self, Job)
+    def job_templates
+      Collection.new(self, job_template_class)
     end
 
     def method_missing(method_name, *args, &block)
@@ -50,5 +62,45 @@ module AnsibleTowerClient
     def respond_to_missing?(method, _include_private = false)
       instance.respond_to?(method)
     end
+
+    # Object class accessors patched for the appropriate version of the API
+
+    def ad_hoc_command_class
+      @ad_hoc_command_class ||= AnsibleTowerClient::AdHocCommand
+    end
+
+    def group_class
+      @group_class ||= AnsibleTowerClient::Group
+    end
+
+    def host_class
+      @host_class ||= AnsibleTowerClient::Host
+    end
+
+    def inventory_class
+      @inventory_class ||= AnsibleTowerClient::Inventory
+    end
+
+    def inventory_source_class
+      @inventory_source_class ||= AnsibleTowerClient::InventorySource
+    end
+
+    def inventory_update_class
+      @inventory_update_class ||= AnsibleTowerClient::InventoryUpdate
+    end
+
+    def job_class
+      @job_class ||= AnsibleTowerClient::Job
+    end
+
+    def job_template_class
+      @job_template_class ||= begin
+        if Gem::Version.new(version).between?(Gem::Version.new(2), Gem::Version.new(3))
+          AnsibleTowerClient::JobTemplateV2
+        else
+          AnsibleTowerClient::JobTemplate
+        end
+      end
+    end
   end
 end

data/lib/ansible_tower_client/base_model.rb

@@ -2,6 +2,10 @@ module AnsibleTowerClient
   class BaseModel < HashModel
     attr_reader :api
 
+    def self.base_class
+      superclass == AnsibleTowerClient::BaseModel ? self : superclass.base_class
+    end
+
     # Constructs and returns a new JSON wrapper class. Pass in a plain
     # JSON string and it will automatically give you accessor methods
     # that make it behave like a typical Ruby object. You may also pass

data/lib/ansible_tower_client/{ad_hoc_command.rb → base_models/ad_hoc_command.rb}

@@ -9,4 +9,3 @@ module AnsibleTowerClient
     end
   end
 end
-

data/lib/ansible_tower_client/{inventory_source.rb → base_models/inventory_source.rb}

@@ -5,14 +5,14 @@ module AnsibleTowerClient
     end
 
     def can_update?
-      response = api.get("#{related['update']}").body
+      response = api.get(related['update'].to_s).body
 
       updatable = JSON.parse(response)
       updatable['can_update']
     end
 
     def update
-      response = api.post("#{related['update']}").body
+      response = api.post(related['update'].to_s).body
 
       update = JSON.parse(response)
       api.inventory_updates.find(update['inventory_update'])

data/lib/ansible_tower_client/base_models/job_template.rb

@@ -0,0 +1,28 @@
+module AnsibleTowerClient
+  class JobTemplate < BaseModel
+    def launch(options = {})
+      launch_url = "#{url}launch/"
+      response   = api.post(launch_url, options).body
+      job        = JSON.parse(response)
+      api.jobs.find(job['job'])
+    end
+
+    def survey_spec
+      spec_url = related['survey_spec']
+      return nil unless spec_url
+      api.get(spec_url).body
+    end
+
+    def survey_spec_hash
+      survey_spec.nil? ? {} : hashify(:survey_spec)
+    end
+
+    def extra_vars_hash
+      extra_vars.empty? ? {} : hashify(:extra_vars)
+    end
+
+    def self.endpoint
+      "job_templates".freeze
+    end
+  end
+end

data/lib/ansible_tower_client/collection.rb

@@ -30,8 +30,7 @@ module AnsibleTowerClient
     private
 
     def class_from_type(type)
-      camelized = type.split("_").collect(&:capitalize).join
-      AnsibleTowerClient.const_get(camelized)
+      api.send("#{type}_class")
     end
 
     def fetch_more_results(next_page)

data/lib/ansible_tower_client/connection.rb

@@ -25,17 +25,5 @@ module AnsibleTowerClient
     def api
       @api ||= Api.new(connection)
     end
-
-    def config
-      JSON.parse(api.get("config").body)
-    end
-
-    def version
-      config["version"]
-    end
-
-    def verify_credentials
-      JSON.parse(api.get("me").body).fetch_path("results", 0, "username")
-    end
   end
 end

data/lib/ansible_tower_client/{job_template.rb → v2/job_template_v2.rb}

@@ -1,5 +1,5 @@
 module AnsibleTowerClient
-  class JobTemplate < BaseModel
+  class JobTemplateV2 < JobTemplate
     def launch(options = {})
       launch_url = "#{url}launch/"
       options = options.dup
@@ -12,24 +12,6 @@ module AnsibleTowerClient
       api.jobs.find(job['job'])
     end
 
-    def survey_spec
-      spec_url = related['survey_spec']
-      return nil unless spec_url
-      api.get(spec_url).body
-    end
-
-    def survey_spec_hash
-      survey_spec.nil? ? {} : hashify(:survey_spec)
-    end
-
-    def extra_vars_hash
-      extra_vars.empty? ? {} : hashify(:extra_vars)
-    end
-
-    def self.endpoint
-      "job_templates".freeze
-    end
-
     private
 
     def with_temporary_changes(in_limit)

data/lib/ansible_tower_client/version.rb

@@ -1,3 +1,3 @@
 module AnsibleTowerClient
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansible_tower_client
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -156,23 +156,24 @@ files:
 - bin/console
 - bin/setup
 - lib/ansible_tower_client.rb
-- lib/ansible_tower_client/ad_hoc_command.rb
 - lib/ansible_tower_client/api.rb
 - lib/ansible_tower_client/base_model.rb
+- lib/ansible_tower_client/base_models/ad_hoc_command.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
+- lib/ansible_tower_client/base_models/inventory_source.rb
+- lib/ansible_tower_client/base_models/inventory_update.rb
+- lib/ansible_tower_client/base_models/job.rb
+- lib/ansible_tower_client/base_models/job_template.rb
 - lib/ansible_tower_client/collection.rb
 - lib/ansible_tower_client/connection.rb
 - lib/ansible_tower_client/exception.rb
-- lib/ansible_tower_client/group.rb
 - lib/ansible_tower_client/hash_model.rb
-- lib/ansible_tower_client/host.rb
-- lib/ansible_tower_client/inventory.rb
-- lib/ansible_tower_client/inventory_source.rb
-- lib/ansible_tower_client/inventory_update.rb
-- lib/ansible_tower_client/job.rb
-- lib/ansible_tower_client/job_template.rb
 - lib/ansible_tower_client/logging.rb
 - lib/ansible_tower_client/middleware/raise_tower_error.rb
 - lib/ansible_tower_client/null_logger.rb
+- lib/ansible_tower_client/v2/job_template_v2.rb
 - lib/ansible_tower_client/version.rb
 homepage: https://github.com/ManageIQ/ansible_tower_client
 licenses: