right_support 2.5.5 → 2.6.1

data/lib/right_support/ci/junit_cucumber_formatter.rb

@@ -0,0 +1,31 @@
+module RightSupport::CI
+  if require_succeeds?('cucumber/formatter/junit')
+    class JUnitCucumberFormatter < Cucumber::Formatter::Junit
+      private
+
+      def build_testcase(duration, status, exception = nil, suffix = "")
+        @time += duration
+        # Use "cucumber" as a pseudo-package, and the feature name as a pseudo-class
+        classname = "cucumber.#{@feature_name}"
+        name = "#{@scenario}#{suffix}"
+        pending = [:pending, :undefined].include?(status)
+        passed = (status == :passed || (pending && !@options[:strict]))
+
+        @builder.testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
+          unless passed
+            @builder.failure(:message => "#{status.to_s} #{name}", :type => status.to_s) do
+              @builder.cdata! @output
+              @builder.cdata!(format_exception(exception)) if exception
+            end
+            @failures += 1
+          end
+          if passed and (status == :skipped || pending)
+            @builder.skipped
+            @skipped += 1
+          end
+        end
+        @tests += 1
+      end
+    end
+  end
+end

data/lib/right_support/ci/junit_rspec_formatter.rb

@@ -0,0 +1,170 @@
+# Copyright (c) 2009-2011 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET.  Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited.  Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and the licensee.
+
+require 'time'
+
+module RightSupport::CI
+  if require_succeeds?('spec/runner/formatter/base_text_formatter')
+    # RSpec 1.x
+    class JUnitRSpecFormatter < Spec::Runner::Formatter::BaseTextFormatter
+      def initialize(*args)
+        begin
+          require 'builder'
+        rescue LoadError => e
+          raise NotImplementedError, "Your Gemfile or gemspec must include builder (~> 3.0) in order to use this class"
+        end
+        super(*args)
+        @current_example_group = nil
+        @test_times = {}
+        @test_groups = {}
+        @test_results = {}
+        @test_failures = {}
+      end
+
+      def example_group_started(example)
+        @current_example_group = example
+      end
+
+      def example_started(example)
+        @test_groups[example] = @current_example_group
+        @example_started_at = Time.now
+      end
+
+      def example_passed(example)
+        @test_times[example] = Time.now - @example_started_at
+        @test_results[example] = 'passed'
+      end
+
+      def example_failed(example, counter, failure)
+        @test_times[example] = Time.now - @example_started_at
+        @test_results[example] = 'failed'
+        @test_failures[example] = failure
+      end
+
+      def example_pending(example)
+        @test_times[example] = Time.now - @example_started_at
+        @test_results[example] = 'pending'
+      end
+
+      def dump_summary(duration, example_count, failure_count, pending_count)
+        builder = Builder::XmlMarkup.new :indent => 2
+        builder.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
+        builder.testsuite :errors => 0, :failures => failure_count, :skipped => pending_count, :tests => example_count, :time => duration, :timestamp => Time.now.iso8601 do
+          builder.properties
+          @test_results.each_pair do |test, result|
+            classname        = classname_for(test)
+            full_description = test.description
+
+            # The full description always begins with the classname, but this is useless info when
+            # generating the XML report.
+            if full_description.start_with?(classname)
+              full_description = full_description[classname.length..-1].strip
+            end
+
+            builder.testcase(:classname => classname, :name => full_description, :time => @test_times[test]) do
+              case result
+              when "failed"
+                builder.failure :message => "failed #{full_description}", :type => "failed" do
+                  builder.cdata! failure_details_for(test)
+                end
+              when "pending" then
+                builder.skipped
+              end
+            end
+          end
+        end
+        output.puts builder.target!
+      end
+
+      private
+
+      def failure_details_for(example)
+        exception = @test_failures[example].exception
+        exception.nil? ? "" : "#{exception.message}\n#{format_backtrace(exception.backtrace, example).join("\n")}"
+      end
+
+      def classname_for(example)
+        # Take our best guess, by looking at the description of the example group
+        # and assuming the first word is a class name
+        group = @test_groups[example]
+        klass = group.description.split(/\s+/).first
+        "rspec.#{klass}"
+      end
+    end
+  elsif require_succeeds?('rspec/core/formatters/base_formatter')
+    # RSpec 2.x
+    class JUnitRSpecFormatter < RSpec::Core::Formatters::BaseFormatter
+      def initialize(*args)
+        begin
+          require 'builder'
+        rescue LoadError => e
+          raise NotImplementedError, "Your Gemfile or gemspec must include builder (~> 3.0) in order to use this class"
+        end
+        super(*args)
+        @test_results = []
+      end
+
+      def example_passed(example)
+        @test_results << example
+      end
+
+      def example_failed(example)
+        @test_results << example
+      end
+
+      def example_pending(example)
+        @test_results << example
+      end
+
+      def failure_details_for(example)
+        exception = example.exception
+        exception.nil? ? "" : "#{exception.message}\n#{format_backtrace(exception.backtrace, example).join("\n")}"
+      end
+
+      def classname_for(example)
+        eg = example.metadata[:example_group]
+        eg = eg[:example_group] while eg.key?(:example_group)
+        klass = eg[:description_args].to_s
+        "rspec.#{klass}"
+      end
+
+      def dump_summary(duration, example_count, failure_count, pending_count)
+        builder = Builder::XmlMarkup.new :indent => 2
+        builder.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
+        builder.testsuite :errors => 0, :failures => failure_count, :skipped => pending_count, :tests => example_count, :time => duration, :timestamp => Time.now.iso8601 do
+          builder.properties
+          @test_results.each do |test|
+            classname        = classname_for(test)
+            full_description = test.full_description
+            time             = test.metadata[:execution_result][:run_time]
+
+            # The full description always begins with the classname, but this is useless info when
+            # generating the XML report.
+            if full_description.start_with?(classname)
+              full_description = full_description[classname.length..-1].strip
+            end
+
+            builder.testcase(:classname => classname, :name => full_description, :time => time) do
+              case test.metadata[:execution_result][:status]
+              when "failed"
+                builder.failure :message => "failed #{full_description}", :type => "failed" do
+                  builder.cdata! failure_details_for test
+                end
+              when "pending" then
+                builder.skipped
+              end
+            end
+          end
+        end
+        output.puts builder.target!
+      end
+    end
+  end
+end

data/lib/right_support/ci/rake_task.rb

@@ -0,0 +1,73 @@
+require 'rake/tasklib'
+
+# Make sure the rest of RightSupport is required, since this file can be
+# required directly.
+require 'right_support'
+
+module RightSupport::CI
+  # A Rake task definition that creates a CI namespace with appropriate
+  # tests.
+  class RakeTask < ::Rake::TaskLib
+    include ::Rake::DSL if defined?(::Rake::DSL)
+
+    # The namespace in which to define the continuous integration tasks.
+    #
+    # Default :ci
+    attr_accessor :ci_namespace
+
+    # The base directory for output files.
+    #
+    # Default 'measurement'
+    attr_accessor :output_path
+
+    def initialize(*args)
+      @ci_namespace = args.shift || :ci
+
+      yield self if block_given?
+
+      @output_path ||= 'measurement'
+
+      namespace @ci_namespace do
+        task :prep do
+          FileUtils.mkdir_p('measurement')
+
+          # Tweak RUBYOPT so RubyGems and RightSupport are automatically required.
+          # This is necessary because Cucumber doesn't have a -r equivalent we can
+          # use to inject ourselves into its process. (There is an -r, but it disables
+          # auto-loading.)
+          rubyopt = '-rright_support'
+          if ENV.key?('RUBYOPT')
+            rubyopt = ENV['RUBYOPT'] + ' ' + rubyopt
+            rubyopt = '-rrubygems ' + rubyopt unless (rubyopt =~ /ubygems/)
+          end
+          ENV['RUBYOPT'] = rubyopt
+        end
+
+        if require_succeeds?('rspec/core/rake_task')
+          # RSpec 2
+          desc "Run RSpec examples"
+          RSpec::Core::RakeTask.new(:spec => :prep) do |t|
+            t.rspec_opts = ['-f', JUnitRSpecFormatter.name,
+                            '-o', File.join(@output_path, 'rspec', 'rspec.xml')]
+          end
+        elsif require_succeeds?('spec/rake/spectask')
+          # RSpec 1
+          Spec::Rake::SpecTask.new(:spec => :prep) do |t|
+            desc "Run RSpec Examples"
+            t.spec_opts = ['-f', JUnitRSpecFormatter.name + ":" + File.join(@output_path, 'rspec', 'rspec.xml')]
+          end
+        end
+
+        if require_succeeds?('cucumber/rake/task')
+          desc "Run Cucumber features"
+          Cucumber::Rake::Task.new do |t|
+            t.cucumber_opts = ['--no-color',
+                               '--format', JUnitCucumberFormatter.name,
+                               '--out', File.join(@output_path, 'cucumber')]
+          end
+          task :cucumber => [:prep]
+        end
+      end
+    end
+  end
+end

data/lib/right_support/ci.rb

@@ -0,0 +1,11 @@
+module RightSupport
+  module CI
+  end
+end
+
+require 'right_support/ci/junit_cucumber_formatter'
+require 'right_support/ci/junit_rspec_formatter'
+
+# Don't auto-require the Rake task; it mixes the Rake DSL into everything!
+# Must defer loading of the Rake task to the Rakefiles
+#require 'right_support/ci/rake_task'

data/lib/right_support/net/request_balancer.rb

@@ -63,10 +63,10 @@ module RightSupport::Net
     # reflection to handle ALL RSpec-related exceptions.
     spec_namespaces = if require_succeeds?('rspec')
       # RSpec 2.x
-      [RSpec::Mocks, RSpec::Expectations]
+      [::RSpec::Mocks, ::RSpec::Expectations]
     elsif require_succeeds?('spec')
       # RSpec 1.x
-      [Spec::Expectations]
+      [::Spec::Expectations]
     else
       # RSpec is not present
       []

data/lib/right_support/net/s3_helper.rb

@@ -23,6 +23,8 @@ module RightSupport::Net
   # RightSupport::Net::S3Helper.init(s3_config, Rightscale::S3, Encryptor)
   # s3_health = RightSupport::Net::S3Helper.health_check
   class S3Helper
+    class BucketNotFound < Exception; end
+
     # Init() is the first method which must be called.
     # This is configuration and integration with S3 and Encryptor
     #
@@ -36,12 +38,22 @@ module RightSupport::Net
     # @param  [Class] encryptor  Class which will be used to encrypt data
     #                              encrypt() and decrypt() methods must be implemented
     #
-    # Init() does not return anything
+    # @raise BucketNotFound if bucket name specified in config["bucket_name"] does not exist
+    #
+    # @return [true] always returns true
     def self.init(config, s3, encryptor)
       @config = config
       @s3class = s3
       @encryptor = encryptor
+
+      # Reset any S3 objects we'd been caching, since config may have changed
+      @s3 = @bucket = nil
+      # Make sure our bucket exists -- better to do it now than on first access!
+      self.bucket
+
+      true
     end
+
     # Checks S3 credentials syntax in config parameter
     #
     # @return  [Boolean]  true if s3 creadentials are ok or false if not
@@ -56,15 +68,16 @@ module RightSupport::Net
     def self.config
       @config
     end
-    # Creates (if does not exist) and return S3 object
+    # Create (if does not exist) and return S3 object
     def self.s3
       @s3 ||= @s3class.new config["creds"]["aws_access_key_id"], config["creds"]["aws_secret_access_key"]
     end
-    # Creates S3 Bucket object using created in s3() object
+    # Create Bucket object using S3 object
+    # @raise BucketNotFound if bucket name specified in config["bucket_name"] does not exist
     def self.bucket
-      #TO DISCUSS: second param 'true' means 'create new bucket'
-      #@bucket ||= s3.bucket(config["bucket_name"], true)
       @bucket ||= s3.bucket(config["bucket_name"])
+      raise BucketNotFound, "Bucket #{config["bucket_name"]} does not exist" if @bucket.nil?
+      @bucket
     end
     # Returns Master secret from config
     def self.master_secret

data/lib/right_support.rb

@@ -2,12 +2,13 @@
 require 'thread'
 
 require 'right_support/ruby'
+require 'right_support/log'
 require 'right_support/data'
+require 'right_support/validation'
 require 'right_support/crypto'
-require 'right_support/config'
+require 'right_support/rack'
 require 'right_support/db'
-require 'right_support/log'
 require 'right_support/net'
-require 'right_support/rack'
+require 'right_support/config'
 require 'right_support/stats'
-require 'right_support/validation'
+require 'right_support/ci'

data/right_support.gemspec

@@ -7,8 +7,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'right_support'
-  s.version = '2.5.5'
-  s.date    = '2012-10-18'
+  s.version = '2.6.1'
+  s.date    = '2012-11-07'
 
   s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Sergey Enin', 'Alexey Karpik']
   s.email   = 'support@rightscale.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 21
   prerelease: false
   segments: 
   - 2
-  - 5
-  - 5
-  version: 2.5.5
+  - 6
+  - 1
+  version: 2.6.1
 platform: ruby
 authors: 
 - Tony Spataro
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-18 00:00:00 -07:00
+date: 2012-11-07 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,10 @@ files:
 - LICENSE
 - README.rdoc
 - lib/right_support.rb
+- lib/right_support/ci.rb
+- lib/right_support/ci/junit_cucumber_formatter.rb
+- lib/right_support/ci/junit_rspec_formatter.rb
+- lib/right_support/ci/rake_task.rb
 - lib/right_support/config.rb
 - lib/right_support/config/feature_set.rb
 - lib/right_support/config/recursive_true_class.rb