rscalr 0.0.8 → 0.0.10

data/lib/rscalr.rb

@@ -1,7 +1,10 @@
 require 'rscalr/api/scalr'
 require 'rscalr/model/dashboard'
+require 'rscalr/model/environment'
 require 'rscalr/model/farm'
 require 'rscalr/model/farm_role'
+require 'rscalr/model/log'
+require 'rscalr/model/log_list'
 require 'rscalr/model/role'
 require 'rscalr/model/script'
 require 'rscalr/model/server'

data/lib/rscalr/api/scalr.rb

@@ -357,5 +357,10 @@ class ScalrResponse < REXML::Document
       root.elements['Message'].text
     end
   end
+  
+  # Convenience method to output a repsonse to a stream in a human readable format
+  def pretty_print(dest=$stdout)
+    write(dest, 1)
+  end
 end
 

data/lib/rscalr/model/dashboard.rb

@@ -1,10 +1,8 @@
-require 'rscalr/model/farm'
-require 'rscalr/model/script'
-
 class Dashboard
-  
+
   def initialize client
     @client = client
+    @env_id = @client.env_id
   end
   
   def get_farm(name)
@@ -15,7 +13,7 @@ class Dashboard
   end
   
   def load_farms
-    @farms = {} if @farms == nil
+    @farms = {}
     
     scalr_response = @client.farms_list
     scalr_response.root.each_element('FarmSet/Item') { |row| 
@@ -66,4 +64,31 @@ class Dashboard
     
     @scripts
   end
+  
+  def get_environment(name)
+    if @environments.nil?
+      load_environments
+    end
+    @environments[name]
+  end
+  
+  def load_environments
+    @environments = {}
+    
+    scalr_response = @client.environments_list
+    scalr_response.root.each_element('EnvironmentSet/Item') { |row| 
+      environment = Environment.new
+      
+      row.each_element { |prop| 
+        if "ID" == prop.name
+          environment.id = prop.text
+        elsif "Name" == prop.name
+          environment.name = prop.text
+        end
+      }
+      @environments[environment.name] = environment
+    }
+    
+    @environments
+  end
 end

data/lib/rscalr/model/environment.rb

@@ -0,0 +1,3 @@
+class Environment
+  attr_accessor :id, :name
+end

data/lib/rscalr/model/farm.rb

@@ -57,6 +57,43 @@ class Farm
     @farm_roles
   end
   
+  # Loads a Loglist of Log entries for the farm, given the specified parameters
+  def load_logs(server_id=nil, start=nil, limit=nil)
+    scalr_response = @client.logs_list(@id, server_id, start, limit)
+    loglist = LogList.new
+    
+    scalr_response.root.each_element do |element|
+      if "TotalRecords" == element.name
+        loglist.total_records = element.text.to_i
+      elsif "StartFrom" == element.name
+        loglist.start = element.text.to_i
+      elsif "RecordsLimit" == element.name
+        loglist.limit = element.text.to_i
+      elsif "LogSet" == element.name
+        element.each_element do |item|
+          log = Log.new
+
+          item.each_element do |prop| 
+            if "ServerID" == prop.name
+              log.server_id = prop.text
+            elsif "Message" == prop.name
+              log.message = prop.text
+            elsif "Severity" == prop.name
+              log.severity = prop.text.to_i
+            elsif "Timestamp" == prop.name
+              log.timestamp = prop.text.to_i
+            elsif "Source" == prop.name
+              server.source = prop.text
+            end
+          end
+          loglist << log
+        end
+      end
+    end
+    
+    loglist
+  end
+  
   def to_s
     "{ type: \"farm\", id: #{@id}, name: \"#{@name}\", status: #{@status} }"
   end

data/lib/rscalr/model/log.rb

@@ -0,0 +1,7 @@
+class Log
+  attr_accessor :server_id, :message, :severity, :timestamp, :source
+  
+  def to_s
+    "{ type: \"log\", server_id: \"#{@server_id}\", message: \"#{@message}\", severity: #{@severity}, timestamp: #{@timestamp}, source: \"#{@source}\" }"
+  end
+end

data/lib/rscalr/model/log_list.rb

@@ -0,0 +1,16 @@
+class LogList
+  attr_accessor :total_records, :start, :limit
+  attr_reader :logs
+  
+  def initialize
+    @logs = []
+  end
+  
+  def <<(log)
+    @logs << log if log.is_a? Log
+  end
+  
+  def to_s
+    "{ type: \"loglist\", total_records: #{@total_records}, start: \"#{@message}\", limit: #{@severity}, logs: [ #{@logs.each do |log| log.to_s + ',' end} ] }"
+  end
+end

data/lib/rscalr/version.rb

@@ -1,3 +1,3 @@
 module Rscalr
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
 end

data/test/test_env_id.rb

@@ -0,0 +1,20 @@
+require 'rscalr'
+require 'test/unit'
+
+class TestSig < Test::Unit::TestCase
+  
+  def test_set_and_get_env
+    scalr = Scalr.new({ :key_id => '123', :key_secret => '123abc' })
+    
+    assert_equal(nil, scalr.env_id, "env_id should default to nil if not specified")
+    
+    scalr = Scalr.new({ :key_id => '123', :key_secret => '123abc', :env_id => 456 })
+
+    assert_equal(456, scalr.env_id, "env_id not set correctly from config in ctor")
+    
+    scalr.env_id = 789
+    
+    assert_equal(789, scalr.env_id, "env_id not set correctly from setter")
+  end
+  
+end

data/test_integration/test_obj_environments.rb

@@ -0,0 +1,24 @@
+require 'rscalr'
+require 'test/unit'
+
+class TestObjEnvironments < 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_list_launch_details_terminate
+    environment = @dashboard.get_environment(ENV['SCALR_TEST_ENV_NAME'])
+    
+    assert_not_nil(environment, "Test environment not found by name")
+    assert_equal(ENV['SCALR_TEST_ENV_ID'], environment.id)
+    assert_equal(ENV['SCALR_TEST_ENV_NAME'], environment.name)
+  end
+  
+end

data/test_integration/test_obj_logs.rb

@@ -0,0 +1,30 @@
+require 'rscalr'
+require 'test/unit'
+
+class TestObjLogs < 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
+    
+    @farm_test1_name = 'test1'
+  end
+  
+  def test_list_launch_details_terminate
+    farm = @dashboard.get_farm(@farm_test1_name)
+    
+    assert_not_nil(farm, "Test farm not found by name")
+    
+    loglist = farm.load_logs
+    
+    assert_not_nil(loglist, "Log list could not be loaded")
+    assert_equal(0, loglist.total_records, "Test farm 1 should not have any logs associated with it")
+    
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscalr
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 -08:00
-default_executable: 
+date: 2013-02-15 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.
@@ -25,16 +24,21 @@ files:
 - lib/rscalr.rb
 - lib/rscalr/api/scalr.rb
 - lib/rscalr/model/dashboard.rb
+- lib/rscalr/model/environment.rb
 - lib/rscalr/model/farm.rb
 - lib/rscalr/model/farm_role.rb
+- lib/rscalr/model/log.rb
+- lib/rscalr/model/log_list.rb
 - lib/rscalr/model/role.rb
 - lib/rscalr/model/script.rb
 - lib/rscalr/model/server.rb
 - lib/rscalr/version.rb
 - rscalr.gemspec
+- test/test_env_id.rb
 - test/test_sig.rb
 - test_integration/test_client_farms.rb
-has_rdoc: true
+- test_integration/test_obj_environments.rb
+- test_integration/test_obj_logs.rb
 homepage: 
 licenses: []
 post_install_message: 
@@ -55,10 +59,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of the Scalr API
 test_files:
+- test/test_env_id.rb
 - test/test_sig.rb
 - test_integration/test_client_farms.rb
+- test_integration/test_obj_environments.rb
+- test_integration/test_obj_logs.rb