acquia-cloud 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d344dd0b4aac9724c42177e1db0ebd4ff1e99de5
-  data.tar.gz: af477384773b947d984e30c6bf7149991ee67d43
+  metadata.gz: 85c11648299dbc0bacb54b7fb14027dbe3bea2bd
+  data.tar.gz: f8c6f5136af56b64e12ad58f1ad3400a4696f76e
 SHA512:
-  metadata.gz: 40b074ee29df0f3cf85787b668e7bd86c7fa238ea787d9c79e712bf9da4250e9e1747822dc48483f7b5d7dfa7961659a8bd38b8bacc2222edee5e2071f641287
-  data.tar.gz: 96c7aaf78565bb1a3b2cbb606c0fb952647a3436dd7ca284c68973aa4e6554b0a21a0d589c2a7d1b39ada788e75ad80779a3f25535179065c1711fc22a5ffe75
+  metadata.gz: 4596ede846c0813bba17132abce2ff2de0464fa7e59a7c901fe1451d053aeca5172b71cdf2e1a1a86f1d8396682bca777ffa57b581e7659be877fdce6afea590
+  data.tar.gz: 7409c49b5efce6da5655d27dcbff331f697d8898a06f2c86369fd1a9f4f3c3e71fcc90a2bca7649c34debdbb2a4d66d3102b8ab5f9a35d7876132fd22c09be06

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017 Matthew Scharley
+Copyright (c) 2017 Equiem Services Pty Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

data/lib/acquia/cloud.rb

@@ -30,6 +30,7 @@ end
 %w{
   version
   errors
+  credentials
   api
   database
   database_backup

data/lib/acquia/cloud/api.rb

@@ -19,19 +19,10 @@ module Acquia
           client.use Faraday::Response::RaiseError
         end
 
-        if args[:credentials].nil?
-          if ENV['ACQUIA_CLOUD_CREDENTIALS'].nil?
-            raise 'Unable to detect your credentials. Please populate ACQUIA_CLOUD_CREDENTIALS with your username and API key.'
-          end
-
-          args[:credentials] = ENV['ACQUIA_CLOUD_CREDENTIALS']
-        end
-
-        @credentials = args[:credentials].split(':', 2)
-        if @credentials.length < 2
-          raise 'You must specify both username and API key in credentials.'
-        end
-        @acquia.basic_auth *@credentials
+        credentials = Credentials.new(args[:credentials])
+        raise 'Unable to determine your Acquia Cloud credentials.' \
+          unless credentials.defined?
+        @acquia.basic_auth credentials.email, credentials.key
       end
 
       def get(url = nil, params = nil, headers = nil, &block)

data/lib/acquia/cloud/credentials.rb

@@ -0,0 +1,50 @@
+require 'yaml'
+
+module Acquia
+  class Cloud
+    # This class controls access to Acquia Cloud API credentials.
+    #
+    # This class can load data from a few different places. Firstly, you can
+    # pass a string of the form "$email:$key". You can also load a similar
+    # string from the environment variable ACQUIA_CLOUD_CREDENTIALS.
+    #
+    # As a fallback if none of the above is provided then this class will check
+    # the ~/.acquia/cloudapi.conf file. This is the recommended approach for
+    # using credentials with this API as this file is shared between many
+    # different libraries.
+    class Credentials
+      CREDENTIALS_FILE = "#{ENV['HOME']}/.acquia/cloudapi.conf"
+
+      attr_reader :email
+      attr_reader :key
+
+      def initialize(value = nil)
+        value = ENV['ACQUIA_CLOUD_CREDENTIALS'] if value.nil?
+
+        if value.nil?
+          if File.exist? CREDENTIALS_FILE
+            creds = YAML.load_file CREDENTIALS_FILE
+
+            @email = creds['email']
+            @key = creds['key']
+          end
+        else
+          vals = value.split(':', 2)
+
+          @email = vals[0]
+          @key = vals[1]
+        end
+      end
+
+      def defined?
+        !@email.nil? && !@password.nil?
+      end
+
+      alias_method :old_inspect, :inspect
+      private :old_inspect
+      def inspect
+        old_inspect.gsub(/, @key=".*?"/, '')
+      end
+    end
+  end
+end

data/lib/acquia/cloud/version.rb

@@ -1,5 +1,5 @@
 module Acquia
   class Cloud
-    VERSION = '0.5.4'
+    VERSION = '0.5.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acquia-cloud
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Equiem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -83,6 +83,7 @@ files:
 - acquia-cloud.gemspec
 - lib/acquia/cloud.rb
 - lib/acquia/cloud/api.rb
+- lib/acquia/cloud/credentials.rb
 - lib/acquia/cloud/database.rb
 - lib/acquia/cloud/database_backup.rb
 - lib/acquia/cloud/database_environment.rb
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Bindings to the Acquia Cloud API.