right_develop 2.1.1 → 2.1.2

data/README.rdoc

@@ -20,10 +20,13 @@ You can override various aspects of the CI harness' behavior by passing a block
 tweaks various instance variables of the resulting Rake task:
 
   RightDevelop::CI::RakeTask.new do |task|
-    task.ci_namespace = :my_happy_ci
-    task.rspec_pattern = "spec/important/**/*_spec.rb" # only run the important specs for CI
-    task.output_path   = "ci_results"                  # use ci_results as the base dir for all output files
-    task.rspec_output  = "happy_specs.xml"             # write to ci_results/rspec/happy_specs.xml
+    task.ci_namespace  = :my_happy_ci
+    task.rspec_name    = :important                       # run as my_happy_ci:important
+    task.rspec_desc    = "important specs with CI output" # or use cucumber_{name,desc} for Cucumber
+    task.rspec_pattern = "spec/important/**/*_spec.rb"    # only run the important specs for CI
+    task.rspec_opts    = ["-t", "important"]              # alternatively, only run tasks tagged as important
+    task.output_path   = "ci_results"                     # use ci_results as the base dir for all output files
+    task.rspec_output  = "happy_specs.xml"                # write to ci_results/rspec/happy_specs.xml
   end
 
 ==== Keeping the CI Harness Out of Production

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/lib/right_develop/ci/rake_task.rb

@@ -74,6 +74,34 @@ module RightDevelop::CI
     # Default 'measurement'
     attr_accessor :output_path
 
+    # The name for the RSpec task.
+    #
+    # Default :spec
+    attr_accessor :rspec_name
+
+    # The description for the RSpec task.
+    #
+    # Default "Run RSpec examples"
+    attr_accessor :rspec_desc
+
+    # An array of additional options for the RSpec task.
+    #
+    # Default: []
+    #
+    # Use like:
+    #   rspec_opts = ["-t", "~slow_specs"]
+    attr_accessor :rspec_opts
+
+    # The name for the Cucumber task.
+    #
+    # Default :cucumber
+    attr_accessor :cucumber_name
+
+    # The description for the Cucumber task.
+    #
+    # Default "Run Cucumber examples"
+    attr_accessor :cucumber_desc
+
     def initialize(*args)
       @ci_namespace = args.shift || :ci
 
@@ -81,6 +109,11 @@ module RightDevelop::CI
 
       @output_path ||= 'measurement'
       @rspec_output ||= 'rspec.xml'
+      @rspec_name ||= :spec
+      @rspec_desc ||= "Run RSpec examples"
+      @cucumber_name ||= :cucumber
+      @cucumber_desc ||= "Run Cucumber examples"
+      @rspec_opts ||= []
 
       namespace @ci_namespace do
         task :prep do
@@ -90,22 +123,26 @@ module RightDevelop::CI
         end
 
         if defined?(::RSpec::Core::RakeTask)
+          default_opts = ['-r', 'right_develop/ci',
+                          '-f', JavaSpecFormatter.name,
+                          '-o', File.join(@output_path, 'rspec', @rspec_output)]
+
           # RSpec 2
-          desc "Run RSpec examples"
-          RSpec::Core::RakeTask.new(:spec => :prep) do |t|
-            t.rspec_opts = ['-r', 'right_develop/ci',
-                            '-f', JavaSpecFormatter.name,
-                            '-o', File.join(@output_path, 'rspec', @rspec_output)]
+          desc @rspec_desc
+          RSpec::Core::RakeTask.new(@rspec_name => :prep) do |t|
+            t.rspec_opts = default_opts + @rspec_opts
             unless self.rspec_pattern.nil?
               t.pattern = self.rspec_pattern
             end
           end
         elsif defined?(::Spec::Rake::SpecTask)
+          default_opts = ['-r', 'right_develop/ci',
+                          '-f', JavaSpecFormatter.name + ":" + File.join(@output_path, 'rspec', @rspec_output)]
+
           # RSpec 1
-          Spec::Rake::SpecTask.new(:spec => :prep) do |t|
-            desc "Run RSpec Examples"
-            t.spec_opts = ['-r', 'right_develop/ci',
-                           '-f', JavaSpecFormatter.name + ":" + File.join(@output_path, 'rspec', @rspec_output)]
+          Spec::Rake::SpecTask.new(@rspec_name => :prep) do |t|
+            desc @rspec_desc
+            t.spec_opts = default_opts + @rspec_opts
             unless self.rspec_pattern.nil?
               t.spec_files = FileList[self.rspec_pattern]
             end
@@ -114,8 +151,7 @@ module RightDevelop::CI
           raise LoadError, "Cannot define CI rake task: unsupported RSpec version"
         end
 
-        desc "Run Cucumber features"
-        Cucumber::Rake::Task.new do |t|
+        Cucumber::Rake::Task.new(@cucumber_name, @cucumber_desc) do |t|
           t.cucumber_opts = ['--no-color',
                              '--format', JavaCucumberFormatter.name,
                              '--out', File.join(@output_path, 'cucumber')]

data/lib/right_develop/ci/util.rb

@@ -6,6 +6,14 @@ module RightDevelop::CI
     # in Java class names.
     JAVA_CLASS_NAME = /[A-Za-z0-9_]/
 
+    # The dot character gets special treatment: even if we XML-escape it, Jenkins will assume
+    # that it functions as a package separator. So, we'll replace it with an equivalent Unicode
+    # character. Hooray homographic character attacks!
+    JAVA_PACKAGE_SEPARATOR = '.'
+
+    # Replacement codepoint that looks a bit like a period
+    JAVE_PACKAGE_SEPARATOR_HOMOGLYPH = '·'
+
     # Make a string suitable for parsing by Jenkins JUnit display plugin by escaping any non-valid
     # Java class name characters as an XML entity. This prevents Jenkins from interpreting "hi1.2"
     # as a package-and-class name.
@@ -18,6 +26,8 @@ module RightDevelop::CI
       name.each_char do |chr|
         if chr =~ JAVA_CLASS_NAME
           result << chr
+        elsif chr == JAVA_PACKAGE_SEPARATOR
+          result << JAVE_PACKAGE_SEPARATOR_HOMOGLYPH
         else
           chr = chr.unpack('U')[0].to_s(16)
           result << "&#x#{chr};"

data/right_develop.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{right_develop}
-  s.version = "2.1.1"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tony Spataro"]
-  s.date = %q{2014-01-21}
+  s.date = %q{2014-03-24}
   s.default_executable = %q{right_develop}
   s.description = %q{A toolkit of development tools created by RightScale.}
   s.email = %q{support@rightscale.com}
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    ".ruby-version",
     "CHANGELOG.rdoc",
     "LICENSE",
     "README.rdoc",
@@ -53,42 +52,43 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/rightscale/right_develop}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Reusable dev & test code.}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, ["< 0.10", ">= 0.8.7"])
+      s.add_runtime_dependency(%q<rake>, [">= 0.8.7", "< 0.10"])
       s.add_runtime_dependency(%q<right_support>, ["~> 2.0"])
       s.add_runtime_dependency(%q<builder>, ["~> 3.0"])
-      s.add_runtime_dependency(%q<rspec>, ["< 3.0", ">= 1.3"])
-      s.add_runtime_dependency(%q<cucumber>, ["< 1.3.3", "~> 1.0"])
-      s.add_runtime_dependency(%q<trollop>, ["< 3.0", ">= 1.0"])
+      s.add_runtime_dependency(%q<rspec>, [">= 1.3", "< 3.0"])
+      s.add_runtime_dependency(%q<cucumber>, ["~> 1.0", "< 1.3.3"])
+      s.add_runtime_dependency(%q<trollop>, [">= 1.0", "< 3.0"])
       s.add_runtime_dependency(%q<right_git>, ["~> 0.1.0"])
       s.add_runtime_dependency(%q<right_aws>, [">= 2.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
     else
-      s.add_dependency(%q<rake>, ["< 0.10", ">= 0.8.7"])
+      s.add_dependency(%q<rake>, [">= 0.8.7", "< 0.10"])
       s.add_dependency(%q<right_support>, ["~> 2.0"])
       s.add_dependency(%q<builder>, ["~> 3.0"])
-      s.add_dependency(%q<rspec>, ["< 3.0", ">= 1.3"])
-      s.add_dependency(%q<cucumber>, ["< 1.3.3", "~> 1.0"])
-      s.add_dependency(%q<trollop>, ["< 3.0", ">= 1.0"])
+      s.add_dependency(%q<rspec>, [">= 1.3", "< 3.0"])
+      s.add_dependency(%q<cucumber>, ["~> 1.0", "< 1.3.3"])
+      s.add_dependency(%q<trollop>, [">= 1.0", "< 3.0"])
       s.add_dependency(%q<right_git>, ["~> 0.1.0"])
       s.add_dependency(%q<right_aws>, [">= 2.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<rdoc>, [">= 2.4.2"])
     end
   else
-    s.add_dependency(%q<rake>, ["< 0.10", ">= 0.8.7"])
+    s.add_dependency(%q<rake>, [">= 0.8.7", "< 0.10"])
     s.add_dependency(%q<right_support>, ["~> 2.0"])
     s.add_dependency(%q<builder>, ["~> 3.0"])
-    s.add_dependency(%q<rspec>, ["< 3.0", ">= 1.3"])
-    s.add_dependency(%q<cucumber>, ["< 1.3.3", "~> 1.0"])
-    s.add_dependency(%q<trollop>, ["< 3.0", ">= 1.0"])
+    s.add_dependency(%q<rspec>, [">= 1.3", "< 3.0"])
+    s.add_dependency(%q<cucumber>, ["~> 1.0", "< 1.3.3"])
+    s.add_dependency(%q<trollop>, [">= 1.0", "< 3.0"])
     s.add_dependency(%q<right_git>, ["~> 0.1.0"])
     s.add_dependency(%q<right_aws>, [">= 2.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])

data/right_develop.rconf

@@ -1,8 +1,14 @@
 ruby do
-  version  'ruby-1.8.7-p371'
-  rubygems '1.8.25'  # jeweler gem is sensitive to rubygems version
-  gemset   'right_develop'
+  # this is a lie! this gem must be compatible with 1.8.7, 1.9.x and 2.x.
+  # we're specifying the least common denominator here, as the bulk of our
+  # code is still tied to Ruby 1.8.
+  version  'ree-1.8.7-2012.02'
+  # jeweler gem is sensitive to rubygems version; moreover, RubyGems > 1.3 sometimes generates
+  # gem indexes that are not readable by 1.3 ... once again, take the least common denominator
+  # approach.
+  rubygems '1.3.7'
 end
+
 bundler do
   version '1.3.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_develop
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 15
+  prerelease: false
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Tony Spataro
@@ -15,21 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-13 00:00:00 -08:00
+date: 2014-03-24 00:00:00 -07:00
 default_executable: right_develop
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 49
@@ -38,11 +30,18 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  prerelease: false
-  requirement: *id001
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 10
+        version: "0.10"
   name: rake
-- !ruby/object:Gem::Dependency 
+  requirement: *id001
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -53,11 +52,11 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  prerelease: false
-  requirement: *id002
   name: right_support
-- !ruby/object:Gem::Dependency 
+  requirement: *id002
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -68,21 +67,14 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
-  requirement: *id003
   name: builder
-- !ruby/object:Gem::Dependency 
+  requirement: *id003
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 9
@@ -90,14 +82,28 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  prerelease: false
-  requirement: *id004
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   name: rspec
-- !ruby/object:Gem::Dependency 
+  requirement: *id004
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
     - - <
       - !ruby/object:Gem::Version 
         hash: 29
@@ -106,21 +112,21 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-    - - ~>
+  name: cucumber
+  requirement: *id005
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
-  prerelease: false
-  requirement: *id005
-  name: cucumber
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
     - - <
       - !ruby/object:Gem::Version 
         hash: 7
@@ -128,18 +134,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  prerelease: false
-  requirement: *id006
   name: trollop
-- !ruby/object:Gem::Dependency 
+  requirement: *id006
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -151,11 +150,11 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  prerelease: false
-  requirement: *id007
   name: right_git
-- !ruby/object:Gem::Dependency 
+  requirement: *id007
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -167,11 +166,11 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  prerelease: false
-  requirement: *id008
   name: right_aws
+  requirement: *id008
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -183,11 +182,11 @@ dependencies:
         - 8
         - 3
         version: 1.8.3
-  prerelease: false
-  requirement: *id009
   name: jeweler
-- !ruby/object:Gem::Dependency 
+  requirement: *id009
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -199,9 +198,10 @@ dependencies:
         - 4
         - 2
         version: 2.4.2
-  prerelease: false
-  requirement: *id010
   name: rdoc
+  requirement: *id010
+  prerelease: false
+  type: :development
 description: A toolkit of development tools created by RightScale.
 email: support@rightscale.com
 executables: 
@@ -212,7 +212,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .ruby-version
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
@@ -272,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Reusable dev & test code.

data/.ruby-version

@@ -1 +0,0 @@
-1.8.7-p371