scalr_api_v2 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfaa11e42bd9e4ffd2b715cf1abbef70f4b0395c
-  data.tar.gz: cdbca4d590cc172a600fb582d6731eab9199974d
+  metadata.gz: 88fb75c5f8f55a72130481651889c0ab9c56823d
+  data.tar.gz: 937534bc0d5823556136a50e7c41300b4c3d10e6
 SHA512:
-  metadata.gz: bc3f4781eeb9d7050d58a2b187763f4cd09635af7353484a7ddd2ac9a8c59f80b2efc47f3201c0adb54731d9e30e8892d9f79daf2636d0af875bc45a22d0a76f
-  data.tar.gz: ef9e6679d121005e3b56d3713c1cf65a877d8a44bd429441b0de5728ca8916ff8beee7b06394eb21f63d8c0467efd640c47307ddf5dce70e9a1e8b038150ad92
+  metadata.gz: 293b1980f69372cae7726c239909a8929e85d5bd9e576d5191b1c501e3c77a1f4356a78b96b4abbd3659f242fde4876ff33296958b80464cf68535f3b96037df
+  data.tar.gz: a413e910a14eb2b0aa9014267d10774742418a94636f8cfb65c13bbe8621d6293406bce661e2cbd2f5d3fe606a22cfa098c9dec09bc4d5a1c7857951a7e4e3de

data/.rubocop.yml

@@ -23,10 +23,10 @@ Metrics/LineLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 60
+  Max: 100
 
 Metrics/BlockLength:
-  Max: 60
+  Max: 100
 
 # Offense count: 1
 # Configuration parameters: MinBodyLength.

data/CHANGELOG

@@ -0,0 +1,8 @@
+== 0.2.0
+
+* Added account/user logic based on SCALR_ENV_ID being set. Defaults to 'account' mode if nil
+* Added Tests
+
+== 0.1.1
+
+* Initial version

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/autotraderuk/scalr_api_v2.svg?branch=master)](https://travis-ci.org/autotraderuk/scalr_api_v2)
+[![Build Status](https://travis-ci.org/autotraderuk/scalr_api_v2.svg?branch=master)](https://travis-ci.org/autotraderuk/scalr_api_v2) [![Gem Version](https://badge.fury.io/rb/scalr_api_v2.svg)](https://badge.fury.io/rb/scalr_api_v2)
 # ScalrApiV2
 
 Ruby gem to allow you to develop against V2 of the [SCALR API](https://api-explorer.scalr.com)
@@ -26,7 +26,7 @@ Set the below environment variables:
     export SCALR_API_KEY=your-api-key
     export SCALR_API_SECRET=your-api-secret
     export SCALR_URL=scalr-api-url
-    export SCALR_ENV_ID=id-of-desired-environment
+    export SCALR_ENV_ID=id-of-desired-environment (optional determines if request is sent as user or account i.e 'GET /api/v1beta0/account/scripts/' or 'GET /api/v1beta0/user/envId/scripts/'. defaults to account mode.)
 
 ### in your code
 

data/lib/scalr_api_v2/config.rb

@@ -3,17 +3,27 @@ module ScalrApiV2
   class Config
     def initialize; end
 
+    def mode_path(env_id)
+      mode = if env_id.nil?
+               'account'
+             else
+               Integer(env_id) >= 0 ? 'user' : 'account'
+             end
+      return mode == 'account' ? 'account' : "user/#{env_id}"
+    end
+
     def config
       config = {}
 
-      if ENV['SCALR_URL'].nil? || ENV['SCALR_KEY_ID'].nil? || ENV['SCALR_KEY_SECRET'].nil? || ENV['SCALR_ENV_ID'].nil?
-        config['error'] = 'Missing Environment variables, please configure SCALR_URL, SCALR_KEY_ID, SCALR_KEY_SECRET, SCALR_ENV_ID'
-        raise 'Missing Environment variables, please configure SCALR_URL, SCALR_KEY_ID, SCALR_KEY_SECRET, SCALR_ENV_ID'
+      if ENV['SCALR_URL'].nil? || ENV['SCALR_KEY_ID'].nil? || ENV['SCALR_KEY_SECRET'].nil?
+        config['error'] = 'Missing Environment variables, please configure SCALR_URL, SCALR_KEY_ID, SCALR_KEY_SECRET'
+        raise 'Missing Environment variables, please configure SCALR_URL, SCALR_KEY_ID, SCALR_KEY_SECRET'
       else
         config['url'] = ENV['SCALR_URL']
         config['key_id'] = ENV['SCALR_KEY_ID']
         config['key_secret'] = ENV['SCALR_KEY_SECRET']
-        config['env_id'] = ENV['SCALR_ENV_ID']
+        config['env_id'] = ENV['SCALR_ENV_ID'].nil? ? nil : ENV['SCALR_ENV_ID']
+        config['mode_path'] = mode_path(config['env_id'])
       end
       return config
     end

data/lib/scalr_api_v2/farms.rb

@@ -11,7 +11,7 @@ module ScalrApiV2
 
     # List all scripts
     def list
-      list = @scalr.list(format('/api/v1beta0/user/%s/farms/', @config['env_id']))
+      list = @scalr.list(format('/api/v1beta0/%s/farms/', @config['mode_path']))
       return list
     end
 

data/lib/scalr_api_v2/scripts.rb

@@ -18,43 +18,43 @@ module ScalrApiV2
 
     # List all scripts
     def list
-      list = @scalr.list(format('/api/v1beta0/user/%s/scripts/', @config['env_id']))
+      list = @scalr.list(format('/api/v1beta0/%s/scripts/', @config['mode_path']))
       return list
     end
 
     # List all script versions
     def versions(script_id = 1)
-      list = @scalr.list(format('/api/v1beta0/user/%s/scripts/%s/script-versions/', @config['env_id'], script_id))
+      list = @scalr.list(format('/api/v1beta0/%s/scripts/%s/script-versions/', @config['mode_path'], script_id))
       return list
     end
 
     # Create script accepts script_object as hash and generates JSON before making SCALR api call
     def create(script_object)
-      item = @scalr.create(format('/api/v1beta0/user/%s/scripts/', @config['env_id']), JSON.generate(script_object))
+      item = @scalr.create(format('/api/v1beta0/%s/scripts/', @config['mode_path']), JSON.generate(script_object))
       return item
     end
 
     # Create script version
     def create_version(script_id, script_object)
-      item = @scalr.create(format('/api/v1beta0/user/%s/scripts/%s/script-versions/', @config['env_id'], script_id), JSON.generate(script_object))
+      item = @scalr.create(format('/api/v1beta0/%s/scripts/%s/script-versions/', @config['mode_path'], script_id), JSON.generate(script_object))
       return item
     end
 
     # Update script version
     def update_version(script_id, script_version, script_object)
-      item = @scalr.patch(format('/api/v1beta0/user/%s/scripts/%s/script-versions/%s/', @config['env_id'], script_id, script_version), JSON.generate(script_object))
+      item = @scalr.patch(format('/api/v1beta0/%s/scripts/%s/script-versions/%s/', @config['mode_path'], script_id, script_version), JSON.generate(script_object))
       return item
     end
 
     # execute version
     def execute(script_id, script_execution_object)
-      item = @scalr.post(format('/api/v1beta0/user/%s/scripts/%s/actions/execute', @config['env_id'], script_id), JSON.generate(script_execution_object))
+      item = @scalr.post(format('/api/v1beta0/%s/scripts/%s/actions/execute', @config['mode_path'], script_id), JSON.generate(script_execution_object))
       return item
     end
 
     # execute script version
     def execute_version(script_id, script_version, script_execution_object)
-      item = @scalr.post(format('/api/v1beta0/user/%s/scripts/%s/script-versions/%s/actions/execute', @config['env_id'], script_id, script_version), JSON.generate(script_execution_object))
+      item = @scalr.post(format('/api/v1beta0/%s/scripts/%s/script-versions/%s/actions/execute', @config['mode_path'], script_id, script_version), JSON.generate(script_execution_object))
       return item
     end
   end

data/lib/scalr_api_v2/servers.rb

@@ -11,7 +11,7 @@ module ScalrApiV2
 
     # List all scripts
     def list
-      list = @scalr.list(format('/api/v1beta0/user/%s/servers/', @config['env_id']))
+      list = @scalr.list(format('/api/v1beta0/%s/servers/', @config['mode_path']))
       return list
     end
 

data/lib/scalr_api_v2/version.rb

@@ -1,4 +1,4 @@
 # ScalrApiV2::VERSION
 module ScalrApiV2
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scalr_api_v2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - david.meekin
@@ -205,6 +205,7 @@ files:
 - .rspec
 - .rubocop.yml
 - .travis.yml
+- CHANGELOG
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt