right_agent 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb258d0df08bc7694ac92eb41a9e819eebfc8d6a
-  data.tar.gz: 6e5674fe87ac4372a3ae2479cae0f7911b65bc54
+  metadata.gz: d22fd938943f06f9b04001c14079c25e7724671d
+  data.tar.gz: 843eb9bf0b111a56dc763aa0cabb3f895d328b17
 SHA512:
-  metadata.gz: fc15f988d7292135374f76a736570d746669d8ab369435723c8b10f5ef8e229d41864dc122fd92658b46c4a1ebc5d67229dfad0fe78e1611a59162ded66ba39a
-  data.tar.gz: 060fdb4a7cb60604c45c4498add812ac079388edbf417bd4bc8fc0d83e2c9449101f369db7ba9f29c8d9d65a44dc36ee7b8788aa6a0ee4cc74daf38a6283b936
+  metadata.gz: 727ddf697ab2329655a70636475d2698c28c4cfbf2f6665d552d43fe812ec894b262ddc0a3d621f15585d701d3c7ec6961e22cb7aedb38f737a9fa3cf59fe485
+  data.tar.gz: 40e8e9422e00f2d0fab4613853daf4ec1a8b915c103496c1249486f22267acab47ac3a2e248b0ec96f13ef670647a3eb0613b561c7a3a26de00aadf4fbe891f2

data/lib/right_agent/core_payload_types/dev_repository.rb

@@ -72,5 +72,37 @@ module RightScale
     def serialized_members
       [ @repo_type, @url, @tag, @cookbooks_path, @ssh_key, @username, @password, @repo_sha, @positions ]
     end
+
+    # Maps the given DevRepository to a has that can be consumed by the RightScraper gem
+    #
+    # === Returns
+    # (Hash)::
+    #   :repo_type (Symbol):: Type of repository: one of :git, :svn, :download or :local
+    #     * :git denotes a 'git' repository that should be retrieved via 'git clone'
+    #     * :svn denotes a 'svn' repository that should be retrieved via 'svn checkout'
+    #     * :download denotes a tar ball that should be retrieved via HTTP GET (HTTPS if uri starts with https://)
+    #     * :local denotes cookbook that is already local and doesn't need to be retrieved
+    #   :url (String):: URL to repository (e.g. git://github.com/opscode/chef-repo.git)
+    #   :tag (String):: git commit or svn branch that should be used to retrieve repository
+    #                       Optional, use 'master' for git and 'trunk' for svn if tag is nil.
+    #                       Not used for raw repositories.
+    #   :cookbooks_path (Array):: Path to cookbooks inside repostory
+    #                                             Optional (use location of repository as cookbook path if nil)
+    #   :first_credential (String):: Either the Private SSH key used to retrieve git repositories, or the Username used to retrieve svn and raw repositories
+    #   :second_credential (String):: Password used to retrieve svn and raw repositories
+    def to_scraper_hash
+      repo = {}
+      repo[:repo_type]            = repo_type.to_sym unless repo_type.nil?
+      repo[:url]                  = url
+      repo[:tag]                  = tag
+      repo[:resources_path]       = cookbooks_path
+      if !ssh_key.nil?
+        repo[:first_credential]   = ssh_key
+      elsif !(username.nil? && password.nil?)
+        repo[:first_credential]   = dev_repo.username
+        repo[:second_credential]  = dev_repo.password
+      end
+      repo
+    end
   end
 end

data/lib/right_agent/error_tracker.rb

@@ -47,6 +47,7 @@ module RightScale
 
     # Log error and optionally track in stats
     # Errbit notification is left to the callback configured in the stats tracker
+    # Logging works even if init was never called
     #
     # @param [String, Object] component reporting error; non-string is snake-cased
     # @param [String] description of failure for use in logging
@@ -81,8 +82,11 @@ module RightScale
     #
     # @return [TrueClass] always true
     def track(component, exception, packet = nil)
-      component = component.class.name.split("::").last.snake_case unless component.is_a?(String)
-      @exception_stats.track(component, exception, packet)
+      if @exception_stats
+        component = component.class.name.split("::").last.snake_case unless component.is_a?(String)
+        @exception_stats.track(component, exception, packet)
+      end
+      true
     end
 
     # Notify Errbit of error if notification enabled
@@ -140,7 +144,7 @@ module RightScale
     #
     # @return [Hash] current statistics
     def stats(reset = false)
-      stats = {"exceptions" => @exception_stats.all}
+      stats = {"exceptions" => @exception_stats && @exception_stats.all}
       reset_stats if reset
       stats
     end

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.3.0'
-  spec.date      = '2014-05-27'
+  spec.version   = '2.3.1'
+  spec.date      = '2014-06-12'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'

data/spec/error_tracker_spec.rb

@@ -142,6 +142,13 @@ describe RightScale::ErrorTracker do
       @tracker.exception_stats.all.should == {"test" => {"total" => 1, "recent" => [{"count" => 1, "when" => 1000000,
                                               "type" => "RuntimeError", "message" => "error", "where" => nil}]}}
     end
+
+    it "only tracks if stats container exists" do
+      @tracker.instance_variable_set(:@exception_stats, nil)
+      request = RightScale::Request.new("/foo/bar", "payload")
+      @tracker.track("test", @exception, request).should be true
+      @tracker.exception_stats.should be nil
+    end
   end
 
   context :notify do
@@ -237,6 +244,12 @@ describe RightScale::ErrorTracker do
                                 "when" => 1000000, "type" => "RuntimeError", "message" => "error", "where" => nil}]}}}
     end
 
+    it "returns no exception stats if stats container not initialized" do
+      @tracker.instance_variable_set(:@exception_stats, nil)
+      @tracker.track(@agent, @exception).should be true
+      @tracker.stats.should == {"exceptions" => nil}
+    end
+
     it "resets stats after collecting current stats" do
       @tracker.track(@agent, @exception).should be true
       @tracker.stats(true).should == {"exceptions" => {"agent_mock" => {"total" => 1, "recent" => [{"count" => 1,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Lee Kirchhoff
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support