ansible_tower_client 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86a18d8f7863faba1111ec0be11334fdaee96f1e
-  data.tar.gz: a0fb3db7bfb6cd83a6726cab8c76836105c1a2f3
+  metadata.gz: 0d07c93de33e2d4030e213e4fbddb7c8f302a7e6
+  data.tar.gz: 48b627c92d4ce8fc4aa06e3bdfd95ca6786d7962
 SHA512:
-  metadata.gz: 2f02ac1ff450afa55d3ea6f99209ed699f8037f19cec9eeb57832ef609c1905d0c97d2b8c78880b494a1e6249d5523902fe681b3ee6dfecb43a392ac8e13c68d
-  data.tar.gz: a32e851b0b97792c3905528584aa27696ee1b8f0f7c5469935e807694705dc069721481bbb57a687658e1743bae21e16f8b6e565c089502ef1e6d27e2388c613
+  metadata.gz: d168c39fefdd4640ce3f17fb868280676a855a3704bcaf83e460c1bee27f44570c1c5ccc87c285d7ab5cebaa80e3b615caac12275e3118b25412d094ff530b46
+  data.tar.gz: a070d079a997df26b3bacfb0668cb43497e77d1243d584669edc1cdcd31f9cc46068a5425ac966c68bb460ef46f7e67dcf61b187a0f3788f37764f03cba4b35b

data/lib/ansible_tower_client.rb

@@ -1,8 +1,7 @@
-require "ansible_tower_client/error"
 require "json"
+require "yaml"
 require "ansible_tower_client/logging"
 require "ansible_tower_client/null_logger"
-require "ansible_tower_client/valid_json"
 require "ansible_tower_client/version"
 
 require "ansible_tower_client/connection"
@@ -17,7 +16,6 @@ require "ansible_tower_client/host"
 require "ansible_tower_client/inventory"
 require "ansible_tower_client/job"
 require "ansible_tower_client/job_template"
-require "ansible_tower_client/json_values"
 require "more_core_extensions/all"
 require "active_support/inflector"
 

data/lib/ansible_tower_client/base_model.rb

@@ -33,6 +33,10 @@ module AnsibleTowerClient
       super(raw_hash)
     end
 
+    def hashify(attribute)
+      YAML.safe_load(send(attribute))
+    end
+
     private
 
     # convert a hash to an instance of nested model class

data/lib/ansible_tower_client/collection.rb

@@ -24,7 +24,6 @@ module AnsibleTowerClient
 
     def find(id)
       raw_body = JSON.parse(api.get("#{klass.endpoint}/#{id}/").body)
-      raise ResourceNotFound.new(self, :id => id) if raw_body['id'].nil?
       klass.new(api, raw_body)
     end
 

data/lib/ansible_tower_client/connection.rb

@@ -10,9 +10,12 @@ module AnsibleTowerClient
 
       require 'faraday'
       require 'faraday_middleware'
+      require 'ansible_tower_client/middleware/raise_tower_error'
+      Faraday::Response.register_middleware :raise_tower_error => -> { Middleware::RaiseTowerError }
       @connection = Faraday.new(options[:base_url], :ssl => {:verify => verify_ssl}) do |f|
         f.use FaradayMiddleware::FollowRedirects, :limit => 3, :standards_compliant => true
         f.request(:url_encoded)
+        f.response(:raise_tower_error)
         f.adapter(Faraday.default_adapter)
         f.basic_auth(options[:username], options[:password])
       end

data/lib/ansible_tower_client/job_template.rb

@@ -3,7 +3,7 @@ module AnsibleTowerClient
     def launch(options = {})
       launch_url = "#{url}launch/"
       options = options.dup
-      new_limit = options.delete('limit')
+      new_limit = options.delete(:limit) || options.delete('limit')
       response = with_temporary_changes(new_limit) do
         api.post(launch_url, options).body
       end
@@ -18,6 +18,14 @@ module AnsibleTowerClient
       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

data/lib/ansible_tower_client/middleware/raise_tower_error.rb

@@ -0,0 +1,23 @@
+module AnsibleTowerClient
+  module Middleware
+    class RaiseTowerError < Faraday::Response::Middleware
+      CLIENT_ERROR_STATUSES = 400...600
+
+      def on_complete(env)
+        case env[:status]
+        when 404
+          raise Faraday::Error::ResourceNotFound, response_values(env)
+        when 407
+          # mimic the behavior that we get with proxy requests with HTTPS
+          raise Faraday::Error::ConnectionFailed, %(407 "Proxy Authentication Required ")
+        when CLIENT_ERROR_STATUSES
+          raise Faraday::Error::ClientError, env.body
+        end
+      end
+
+      def response_values(env)
+        {:status => env.status, :headers => env.response_headers, :body => env.body}
+      end
+    end
+  end
+end

data/lib/ansible_tower_client/version.rb

@@ -1,3 +1,3 @@
 module AnsibleTowerClient
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansible_tower_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -161,17 +161,15 @@ files:
 - lib/ansible_tower_client/base_model.rb
 - lib/ansible_tower_client/collection.rb
 - lib/ansible_tower_client/connection.rb
-- lib/ansible_tower_client/error.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/job.rb
 - lib/ansible_tower_client/job_template.rb
-- lib/ansible_tower_client/json_values.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/valid_json.rb
 - lib/ansible_tower_client/version.rb
 homepage: https://github.com/ManageIQ/ansible_tower_client
 licenses:

data/lib/ansible_tower_client/error.rb

@@ -1,39 +0,0 @@
-require 'faraday'
-
-module AnsibleTowerClient
-  class ResourceNotFound < Faraday::ResourceNotFound
-    def initialize(klass, attrs = {})
-      @klass  = klass
-      @attrs  = attrs
-      @key    = attrs.keys.first
-      @value  = attrs[@key]
-      super(issue_error)
-    end
-
-    def issue_error
-      method = @key.nil? ? 'general' : @key
-      send("#{method}_msg")
-    end
-
-    private
-
-    def id_msg
-      "Couldn't find #{@klass} with '#{@key}'=#{@value}"
-    end
-
-    def general_msg
-      "Couldn't find #{@klass}"
-    end
-  end
-
-  class Error < StandardError
-    attr_reader :message
-    def initialize(klass)
-      @message = "Error on #{klass.class.name}: #{klass.inspect}"
-      super(message)
-    end
-  end
-
-  class InvalidHash < Error; end
-  class InvalidJson < Error; end
-end

data/lib/ansible_tower_client/json_values.rb

@@ -1,15 +0,0 @@
-module AnsibleTowerClient
-  class JSONValues
-    include ValidJSON
-
-    def initialize(vars)
-      raise InvalidHash.new(vars) unless vars.kind_of?(Hash)
-      @vars = vars
-    end
-
-    def extra_vars
-      validate(@vars['extra_vars'])
-    end
-
-  end
-end

data/lib/ansible_tower_client/valid_json.rb

@@ -1,12 +0,0 @@
-module AnsibleTowerClient
-  module ValidJSON
-    def validate(text)
-      begin
-        JSON.parse(text)
-      rescue JSON::ParserError => e
-        raise InvalidJson.new(e)
-      end
-    end
-  end
-end
-