acquia-cloud 0.5.8 → 0.6.0.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15c71a91e7e03182227930284c9233977438867e
-  data.tar.gz: a4c1584a89d2885d038bbde0cdffe3cc4275b49b
+  metadata.gz: 4561c0e33f1c791e2adb973ac464880f5222c8b6
+  data.tar.gz: beec6a1c7d1ddcf642f524a588b222a536d810bb
 SHA512:
-  metadata.gz: 0694b6756881070e9525e8527b031701b2d50dd4d53d1b7159aad39a86dd95eba975979950c94e9b707cba2737efc7115d72db39f5e2cb2d0602fddf30785ad5
-  data.tar.gz: 2526577633e006b176636e642f7eadc705b7db9d7cd0eee01c05e1185ed8e7224abeb049c1afefbc0dc845557755c1d6701a518f40976b4b0755951b888f8916
+  metadata.gz: e0f67b6c765d1bba28b27ce86e8311c65253657d9b6e9aa897430e03f5850131644f7a88f8c333ba2464814722c4183fea8576dde2ef41ed7245c2bbd792f9af
+  data.tar.gz: 3e7bc9468622f7565504534b03e207090704f713c20a8c44a6ddffc23a092b8361647914491ae6abce73f8e629e76c25ea7b7ca132bbf4816be4184b6279d398

data/LICENSE

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

data/README.md

@@ -7,18 +7,18 @@
 **Author:** [Equiem](http://equiem.com.au/)  
 **Contributors:** [See contributors on GitHub][gh-contrib]  
 **Bugs/Support:** [Github Issues][gh-issues]  
-**Copyright:** 2015-2017  
+**Copyright:** 2015-2016  
 **License:** [MIT license][license]  
 **Status:** Active
 
 ## Synopsis
 
-`acquia-cloud` is a Ruby binding for the Acquia Cloud API.
+`acquia-cloud` is a Ruby binding for the Acquia Cloud API. 
 
 ## Installation
 
     $ gem install acquia-cloud
-
+    
 Or add `gem 'acquia-cloud'` to your Gemfile and update your bundle.
 
 ## Usage

data/lib/acquia/cloud.rb

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

data/lib/acquia/cloud/api.rb

@@ -19,10 +19,19 @@ module Acquia
           client.use Faraday::Response::RaiseError
         end
 
-        @credentials = Credentials.new(args[:credentials])
-        raise 'Unable to determine your Acquia Cloud credentials.' \
-          unless @credentials.defined?
-        @acquia.basic_auth @credentials.email, @credentials.key
+        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
       end
 
       def get(url = nil, params = nil, headers = nil, &block)

data/lib/acquia/cloud/database_backup.rb

@@ -63,7 +63,7 @@ module Acquia
           https = uri.scheme == 'https'
           Net::HTTP.start(uri.host, uri.port, use_ssl: https) do |http|
             request = Net::HTTP::Get.new uri
-            request.basic_auth @cloud.api.credentials.email, @cloud.api.credentials.key
+            request.basic_auth *@cloud.api.credentials
 
             http.request request do |response|
               response.read_body do |chunk|

data/lib/acquia/cloud/version.rb

@@ -1,5 +1,5 @@
 module Acquia
   class Cloud
-    VERSION = '0.5.8'
+    VERSION = '0.6.0.dev'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acquia-cloud
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0.dev
 platform: ruby
 authors:
 - Equiem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -83,7 +83,6 @@ 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
@@ -113,12 +112,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Bindings to the Acquia Cloud API.

data/lib/acquia/cloud/credentials.rb

@@ -1,50 +0,0 @@
-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? && !@key.nil?
-      end
-
-      alias_method :old_inspect, :inspect
-      private :old_inspect
-      def inspect
-        old_inspect.gsub(/, @key=".*?"/, '')
-      end
-    end
-  end
-end