right_support 2.6.1 → 2.6.2

data/lib/right_support/ci/{junit_cucumber_formatter.rb → java_cucumber_formatter.rb}

@@ -1,6 +1,20 @@
+# Copyright (c) 2012- 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.
+
+# Cucumber naïvely requires JUST this file without necessarily requiring
+# RightSupport's main file. Make up for Cucumber's shortcomings.
+require 'right_support'
+
 module RightSupport::CI
   if require_succeeds?('cucumber/formatter/junit')
-    class JUnitCucumberFormatter < Cucumber::Formatter::Junit
+    class JavaCucumberFormatter < Cucumber::Formatter::Junit
       private
 
       def build_testcase(duration, status, exception = nil, suffix = "")

data/lib/right_support/ci/{junit_rspec_formatter.rb → java_spec_formatter.rb}

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (c) 2012- RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET.  Any unauthorized use,
@@ -13,7 +13,7 @@ require 'time'
 module RightSupport::CI
   if require_succeeds?('spec/runner/formatter/base_text_formatter')
     # RSpec 1.x
-    class JUnitRSpecFormatter < Spec::Runner::Formatter::BaseTextFormatter
+    class JavaSpecFormatter < Spec::Runner::Formatter::BaseTextFormatter
       def initialize(*args)
         begin
           require 'builder'
@@ -100,7 +100,7 @@ module RightSupport::CI
     end
   elsif require_succeeds?('rspec/core/formatters/base_formatter')
     # RSpec 2.x
-    class JUnitRSpecFormatter < RSpec::Core::Formatters::BaseFormatter
+    class JavaSpecFormatter < RSpec::Core::Formatters::BaseFormatter
       def initialize(*args)
         begin
           require 'builder'

data/lib/right_support/ci/rake_task.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2012- RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'rake/tasklib'
 
 # Make sure the rest of RightSupport is required, since this file can be
@@ -30,31 +51,22 @@ module RightSupport::CI
       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,
+            t.rspec_opts = ['-r', 'right_support/ci',
+                            '-f', JavaSpecFormatter.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')]
+            t.spec_opts = ['-r', 'right_support/ci',
+                           '-f', JavaSpecFormatter.name + ":" + File.join(@output_path, 'rspec', 'rspec.xml')]
           end
         end
 
@@ -62,7 +74,7 @@ module RightSupport::CI
           desc "Run Cucumber features"
           Cucumber::Rake::Task.new do |t|
             t.cucumber_opts = ['--no-color',
-                               '--format', JUnitCucumberFormatter.name,
+                               '--format', JavaCucumberFormatter.name,
                                '--out', File.join(@output_path, 'cucumber')]
           end
           task :cucumber => [:prep]

data/lib/right_support/ci.rb

@@ -3,9 +3,9 @@ module RightSupport
   end
 end
 
-require 'right_support/ci/junit_cucumber_formatter'
-require 'right_support/ci/junit_rspec_formatter'
+require 'right_support/ci/java_cucumber_formatter'
+require 'right_support/ci/java_spec_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
+# Must defer loading of the Rake task to the Rakefiles themselves.
 #require 'right_support/ci/rake_task'

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.6.1'
-  s.date    = '2012-11-07'
+  s.version = '2.6.2'
+  s.date    = '2012-11-08'
 
   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: 21
+  hash: 19
   prerelease: false
   segments: 
   - 2
   - 6
-  - 1
-  version: 2.6.1
+  - 2
+  version: 2.6.2
 platform: ruby
 authors: 
 - Tony Spataro
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-07 00:00:00 -08:00
+date: 2012-11-08 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -37,8 +37,8 @@ files:
 - 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/java_cucumber_formatter.rb
+- lib/right_support/ci/java_spec_formatter.rb
 - lib/right_support/ci/rake_task.rb
 - lib/right_support/config.rb
 - lib/right_support/config/feature_set.rb