rscalr 0.0.15 → 0.0.16

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c1d09e3277034b6fff104dd498bc8c7280fa4f4a
+  data.tar.gz: f037ab7e67e26247eebcb2885efe0db9aca164e5
+SHA512:
+  metadata.gz: c628603cf19d159730791913700b7ee5a1fcdd2024f69eaf11ca8fa10c4183950b2a79debd2d0abc83ea9d7b41e6fcb3d5c6278c9b4904d201723374117e4033
+  data.tar.gz: 899109fde0145cc322eba14e37604ab7fb472958d8f6465eb43666f10281b13b75df46ea8a1c9a0d8d8dd417e5fd562cfea0168b819717e310dfe74da29c8ee2

data/README.md

@@ -50,6 +50,7 @@ If you use this tool a lot from the command line, you can set environment variab
 ```bash
 export SCALR_API_KEY=your-api-key
 export SCALR_API_SECRET=your-api-secret
+export SCALR_URL=scalr-api-url, optional, default=https://api.scalr.net
 export SCALR_ENV_ID=id-of-desired-environment # optional
 export SCALR_CLIENT_VERBOSE=true # Print API calls/responses to stdout, optional, default=false
 ```

data/Rakefile

@@ -0,0 +1,8 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/lib/rscalr/api/scalr.rb

@@ -12,9 +12,10 @@ require 'rexml/document'
 class Scalr
   attr_accessor :config
   
-  # Default versions
+  # Default values
   $DEFAULT_VERSION = '2.3.0'
   $DEFAULT_AUTH_VERSION = '3'
+  $DEFAULT_URL = 'https://api.scalr.net'
   
   def initialize(config=nil)
     if (config.nil?)
@@ -25,6 +26,7 @@ class Scalr
     
     @config[:version] = $DEFAULT_VERSION if @config[:version].nil?
     @config[:auth_version] = $DEFAULT_AUTH_VERSION if @config[:auth_version].nil?
+    @config[:url] = $DEFAULT_URL if @config[:url].nil?
   end
   
   #=================== API Section ===================================
@@ -263,6 +265,7 @@ class Scalr
     config = {}
     config[:key_id] = ENV['SCALR_API_KEY'] unless ENV['SCALR_API_KEY'].nil?
     config[:key_secret] = ENV['SCALR_API_SECRET'] unless ENV['SCALR_API_SECRET'].nil?
+    config[:url] = ENV['SCALR_URL'] unless ENV['SCALR_URL'].nil?
     config[:env_id] = ENV['SCALR_ENV_ID'] unless ENV['SCALR_ENV_ID'].nil?
     config[:version] = ENV['SCALR_API_VERSION'] unless ENV['SCALR_API_VERSION'].nil?
     config[:auth_version] = ENV['SCALR_API_AUTH_VERSION'] unless ENV['SCALR_API_AUTH_VERSION'].nil?
@@ -294,8 +297,8 @@ class Scalr
   	  params[:AuthVersion] = @config[:auth_version]
   	  params[:KeyID] = @config[:key_id]
   	  params[:EnvID] = @config[:env_id] unless @config[:env_id].nil?
-			
-  	  uri = URI("https://api.scalr.net/?" + hash_to_querystring(params))
+	
+  	  uri = URI(url + "?" + hash_to_querystring(params))
   	  $stdout.puts(uri) if @config[:verbose]
 	
 	    response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
@@ -350,6 +353,22 @@ class Scalr
     @config[:env_id]
   end
   
+  # Changes the configured API endpoint for this instance
+  def url= url
+    @config[:url] = url
+  end
+  
+  # Get the current environment value. A nil response means the "first" environment will be assumed for API calls, 
+  # per the Scalr API docs.
+  def url
+    @config[:url]
+  end
+  
+  def verbose= setting
+    if !!setting == setting 
+      @config[:verbose] = !!setting
+    end
+  end
 end
 
 # Represents a response from an API call. Thin wrapper around an REXML::Document of the parsed repsonse.

data/lib/rscalr/model/dashboard.rb

@@ -110,6 +110,33 @@ class Dashboard
     @environments
   end
   
+  def get_role(name)
+    if @roles.nil?
+      load_roles
+    end
+    @roles[name]
+  end
+  
+  def load_roles
+    @roles = {}
+    
+    scalr_response = @client.roles_list
+    scalr_response.root.each_element('RoleSet/Item') { |row| 
+      role = Role.new
+      
+      row.each_element { |prop| 
+        if "ID" == prop.name
+          role.id = prop.text
+        elsif "Name" == prop.name
+          role.name = prop.text
+        end
+      }
+      @roles[role.name] = role
+    }
+    
+    @roles
+  end
+
   # Blocks up to timeout seconds waiting on log response(s) of script execution. Returns true iff 
   # script executed successfully (returned) exit_value on all servers.
   def verify_script_success(script_execution, exit_value=0, timeout_sec=60)
@@ -162,4 +189,8 @@ class Dashboard
     
     success
   end
+  
+  def verbose= setting
+    @client.verbose = setting
+  end
 end

data/lib/rscalr/version.rb

@@ -1,3 +1,3 @@
 module Rscalr
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/test/test_obj_roles.rb

@@ -0,0 +1,22 @@
+require 'rscalr'
+require 'test/unit'
+
+class TestObjRoles < Test::Unit::TestCase
+  
+  def setup      
+    @scalr = Scalr.new({
+      :key_id => ENV['SCALR_TEST_API_KEY'], 
+      :key_secret => ENV['SCALR_TEST_API_SECRET'], 
+      :env_id => ENV['SCALR_TEST_ENV_ID'] 
+    })
+      
+    @dashboard = Dashboard.new @scalr   
+  end
+  
+  def test_get_role_by_name
+    role = @dashboard.get_role(ENV['SCALR_TEST_ROLE_NAME'])
+    
+    assert_not_nil(role, "Test role not found by name")
+  end
+  
+end

data/test/test_url.rb

@@ -0,0 +1,20 @@
+require 'rscalr'
+require 'test/unit'
+
+class TestUrl < Test::Unit::TestCase
+  
+  def test_set_and_get_url
+    scalr = Scalr.new({ :key_id => '123', :key_secret => '123abc' })
+    
+    assert_equal('https://api.scalr.net', scalr.url, "url should default to api.scalr.net if not specified")
+    
+    scalr = Scalr.new({ :key_id => '123', :key_secret => '123abc', :url => 'https://scalr.example.com/api/api.php' })
+
+    assert_equal('https://scalr.example.com/api/api.php', scalr.url, "url not set correctly from config in ctor")
+    
+    scalr.url = 'http://api.scalr.example.net'
+    
+    assert_equal('http://api.scalr.example.net', scalr.url, "url not set correctly from setter")
+  end
+  
+end

metadata

@@ -1,30 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rscalr
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.15
+version: !ruby/object:Gem::Version
+  version: 0.0.16
 platform: ruby
-authors: 
+authors:
 - Nathan Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-14 00:00:00 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies: []
-
-description: Rscalr is a Ruby implementation of the Scalr API, written to interface cleanly with Chef and other internal release management tasks.
-email: 
+description: Rscalr is a Ruby implementation of the Scalr API, written to interface
+  cleanly with Chef and other internal release management tasks.
+email:
 - nate@branchout.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - README.md
+- Rakefile
 - lib/rscalr.rb
 - lib/rscalr/api/scalr.rb
 - lib/rscalr/model/dashboard.rb
@@ -41,41 +37,41 @@ files:
 - lib/rscalr/model/server_log.rb
 - lib/rscalr/version.rb
 - rscalr.gemspec
+- test/test_client_farms.rb
 - test/test_env_id.rb
+- test/test_obj_environments.rb
+- test/test_obj_logs.rb
+- test/test_obj_roles.rb
 - test/test_sig.rb
-- test_integration/test_client_farms.rb
-- test_integration/test_obj_environments.rb
-- test_integration/test_obj_logs.rb
+- test/test_url.rb
 homepage: 
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby implementation of the Scalr API
-test_files: 
+test_files:
+- test/test_client_farms.rb
 - test/test_env_id.rb
+- test/test_obj_environments.rb
+- test/test_obj_logs.rb
+- test/test_obj_roles.rb
 - test/test_sig.rb
-- test_integration/test_client_farms.rb
-- test_integration/test_obj_environments.rb
-- test_integration/test_obj_logs.rb
+- test/test_url.rb