ansible_tower_client 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b745ac89684afcf6633ca64b8a8e8e16615c22c9
-  data.tar.gz: 5bad31a0e9ad53ff33c2e25d59d474638dae7a16
+  metadata.gz: f98b1405077eafacead17dc58b4ee20535e263dd
+  data.tar.gz: 9a1043e6af5bd81554f5c1f499b2b0a5b5bd7265
 SHA512:
-  metadata.gz: 0eb05bf1f05c2091be7034346c0b4d400348b21adbafa6ede16e13ca1d7b8c43c6fdc59c7fba23299db3aae90f574cf298ca6f2fd8ba61a921d7a992388f90f9
-  data.tar.gz: de27338f770e7153fe5926a2824c187143ae6d6b672ba6d68e48a5af1fa5bca82b660ddf183fc3cc0d9d182138b08c399043ce0170afef1dd34f78a9c9166d70
+  metadata.gz: c7ed7d56555c0b60b8590d5455eba86aa53ca65c083b3ebd331acd1c627dbe99b38f06a99782d8e9d7c7cb9b9f16cd103fca955bf3996b6cc626d6d497a3f19e
+  data.tar.gz: 807c37a2d965f77c1f9ddbe0cec24e7c26ba2f5c53f48b9b37d4b710e1bdbc95747c59425117a62731474952c32399c1dbacd8f28ab778a96fb3a2de9f048c5e

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [0.6.0] - 2017-02-02
+### Added
+- Refactor `#endpoint` [(#64)](https://github.com/ansible/ansible_tower_client_ruby/pull/64)
+- Expose playbooks off of projects [(#62)](https://github.com/ansible/ansible_tower_client_ruby/pull/62)
+
+### Changed
+- Allow for alternative resource paths [(#66)](https://github.com/ansible/ansible_tower_client_ruby/pull/66)
+- Raise UnlicensedFeatureError when we receive HTTP 402 [(#65)](https://github.com/ansible/ansible_tower_client_ruby/pull/65)
+
+### Fixed
+- Adjusted project_spec to test on a Project [(#63)](https://github.com/ansible/ansible_tower_client_ruby/pull/63)

data/lib/ansible_tower_client/api.rb

@@ -69,6 +69,8 @@ module AnsibleTowerClient
 
     def method_missing(method_name, *args, &block)
       if instance.respond_to?(method_name)
+        path = build_path_to_resource(args.shift)
+        args.unshift(path)
         logger.debug { "#{self.class.name} Sending <#{method_name}> with <#{args.inspect}>" }
         instance.send(method_name, *args, &block).tap do |response|
           logger.debug { "#{self.class.name} Response:\n#{JSON.parse(response.body).pretty_inspect}" }
@@ -143,5 +145,13 @@ module AnsibleTowerClient
     def project_class
       @project_class ||= AnsibleTowerClient::Project
     end
+
+    private
+
+    def build_path_to_resource(original)
+      return original unless %r{\/?api\/v1\/(.*)} =~ original
+      return original if instance.url_prefix.path == "/"
+      File.join(instance.url_prefix.path, Regexp.last_match[1])
+    end
   end
 end

data/lib/ansible_tower_client/base_model.rb

@@ -6,6 +6,10 @@ module AnsibleTowerClient
       superclass == AnsibleTowerClient::BaseModel ? self : superclass.base_class
     end
 
+    def self.endpoint
+      base_class.to_s.split(/::/)[1].tableize.to_s.freeze
+    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/base_models/ad_hoc_command.rb

@@ -3,9 +3,5 @@ module AnsibleTowerClient
     def relaunch
       api.post("#{url}relaunch/")
     end
-
-    def self.endpoint
-      "ad_hoc_commands".freeze
-    end
   end
 end

data/lib/ansible_tower_client/base_models/credential.rb

@@ -1,7 +1,4 @@
 module AnsibleTowerClient
   class Credential < BaseModel
-    def self.endpoint
-      "credentials".freeze
-    end
   end
 end

data/lib/ansible_tower_client/base_models/group.rb

@@ -1,9 +1,5 @@
 module AnsibleTowerClient
   class Group < BaseModel
-    def self.endpoint
-      "groups".freeze
-    end
-
     def children
       Collection.new(api).find_all_by_url(related["children"])
     end

data/lib/ansible_tower_client/base_models/host.rb

@@ -1,9 +1,5 @@
 module AnsibleTowerClient
   class Host < BaseModel
-    def self.endpoint
-      "hosts".freeze
-    end
-
     def groups
       Collection.new(api).find_all_by_url(related["groups"])
     end

data/lib/ansible_tower_client/base_models/inventory.rb

@@ -1,9 +1,5 @@
 module AnsibleTowerClient
   class Inventory < BaseModel
-    def self.endpoint
-      "inventories".freeze
-    end
-
     def inventory_sources
       Collection.new(api).find_all_by_url(related['inventory_sources'])
     end

data/lib/ansible_tower_client/base_models/inventory_source.rb

@@ -1,9 +1,5 @@
 module AnsibleTowerClient
   class InventorySource < BaseModel
-    def self.endpoint
-      "inventory_sources".freeze
-    end
-
     def can_update?
       response = api.get(related['update'].to_s).body
 

data/lib/ansible_tower_client/base_models/inventory_update.rb

@@ -1,7 +1,4 @@
 module AnsibleTowerClient
   class InventoryUpdate < BaseModel
-    def self.endpoint
-      "inventory_updates".freeze
-    end
   end
 end

data/lib/ansible_tower_client/base_models/job.rb

@@ -1,9 +1,5 @@
 module AnsibleTowerClient
   class Job < BaseModel
-    def self.endpoint
-      "jobs".freeze
-    end
-
     def extra_vars_hash
       extra_vars.empty? ? {} : hashify(:extra_vars)
     end

data/lib/ansible_tower_client/base_models/job_template.rb

@@ -11,6 +11,7 @@ module AnsibleTowerClient
       spec_url = related['survey_spec']
       return nil unless spec_url
       api.get(spec_url).body
+    rescue AnsibleTowerClient::UnlicensedFeatureError
     end
 
     def survey_spec_hash
@@ -20,9 +21,5 @@ module AnsibleTowerClient
     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/base_models/project.rb

@@ -1,7 +1,7 @@
 module AnsibleTowerClient
   class Project < BaseModel
-    def self.endpoint
-      "projects".freeze
+    def playbooks
+      Collection.new(api).find_all_by_url(related['playbooks'])
     end
   end
 end

data/lib/ansible_tower_client/collection.rb

@@ -47,17 +47,22 @@ module AnsibleTowerClient
     def fetch_more_results(next_page, get_options)
       return if next_page.nil?
       body = parse_response(api.get(next_page, get_options))
-      parse_result_set(body["results"])
-
-      body["next"]
+      parse_result_set(body)
     end
 
     def parse_response(response)
       JSON.parse(response.body)
     end
 
-    def parse_result_set(results)
-      results.each { |result| @collection << build_object(result) }
+    def parse_result_set(body)
+      case body.class.name
+      when "Array" then
+        @collection = body
+        nil
+      when "Hash" then
+        body["results"].each { |result| @collection << build_object(result) }
+        body["next"]
+      end
     end
 
     def build_object(result)

data/lib/ansible_tower_client/exception.rb

@@ -1,6 +1,7 @@
 module AnsibleTowerClient
   class Error < Exception; end
+  class ClientError < Error; end
   class ConnectionError < Error; end
   class NoMethodError < Error; end
-  class ClientError < Error; end
+  class UnlicensedFeatureError < Error; end
 end

data/lib/ansible_tower_client/middleware/raise_tower_error.rb

@@ -5,6 +5,8 @@ module AnsibleTowerClient
 
       def on_complete(env)
         case env[:status]
+        when 402
+          raise AnsibleTowerClient::UnlicensedFeatureError
         when 404
           raise Faraday::Error::ResourceNotFound, response_values(env)
         when 407

data/lib/ansible_tower_client/version.rb

@@ -1,3 +1,3 @@
 module AnsibleTowerClient
-  VERSION = "0.5.0".freeze
+  VERSION = "0.6.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansible_tower_client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_local.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md