origen 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9023aa4162108db923831a277ad1f31b872ac2cf
-  data.tar.gz: 6bc389d23096efde82668b6b7652e59a98a886b7
+  metadata.gz: 25b15e270740c0844ea3310d0b8b7dba5ea4e449
+  data.tar.gz: e1c78978a03c9f992ab549db6e53bc02364b4b4e
 SHA512:
-  metadata.gz: d1686e33496b9bc14ae9039ba3f4045f080c1c8811fb37c2fdf554c5094a46cf9e52c55438d98551626b5a599acfe66d22d14ebe04bbc78b02d6d5e1bfe26cd7
-  data.tar.gz: dabe7b99bb6ac62c685557223579443fb14761c9c438eb6d704b9da7fd60c4480944f1c6d5cc794b29a543650348549c0eddc3447cbf5e5f8ded578beb5d50c8
+  metadata.gz: ec73502e12c6e34fd2b15f5c32e9464d1b1a4e1397040af6858516c3f14343fa9b2e8f7d93be8fc041d30819ce19bce47911e0ed1017ccd43481d425960eb5b1
+  data.tar.gz: 6edf23f23cbfac8c770408d45478343e81ae7399d7387525a20ce3380786805da3403b27f92e04ddc663cc13061444ee6f2335d6f2b613eca082ea1d8afa33cc

data/config/application.rb

@@ -1,5 +1,4 @@
 class OrigenCoreApplication < Origen::Application
-
   self.name      = "Origen Core"
   self.namespace = "Origen"
 

data/config/commands.rb

@@ -9,17 +9,10 @@ aliases ={
 case @command
 
 when "specs"
-  ARGV.unshift "spec"
   require "rspec"
-  # For some unidentified reason Rspec does not autorun on this version
-  if RSpec::Core::Version::STRING && RSpec::Core::Version::STRING == "2.11.1"
-    RSpec::Core::Runner.run ARGV
-  else
-    require "rspec/autorun"
-  end
-  exit 0 # RSpec will exit 1 automatically if a test fails
+  exit RSpec::Core::Runner.run(['spec'])
 
-when "examples"  
+when "examples", "test"  
   $enable_testers = true if ARGV.delete("--testers")
   Origen.load_application
   status = 0
@@ -38,6 +31,12 @@ when "examples"
     status = 1
   end
   puts
+  if @command == "test"
+    Origen.app.unload_target!
+    require "rspec"
+    result = RSpec::Core::Runner.run(['spec'])
+    status = status == 1 ? 1 : result
+  end
   exit status
 
 when "regression"
@@ -64,8 +63,9 @@ when "make_file"
 
 else
   @application_commands = <<-EOT
- specs        Run the specs (tests), -c will enable coverage
- examples     Run the examples, -c will enable coverage
+ specs        Run the specs (unit tests), -c will enable coverage
+ examples     Run the examples (acceptance tests), -c will enable coverage
+ test         Run both specs and examples, -c will enable coverage
  regression   Test the regression manager (runs a subset of examples)
   EOT
 

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 2
-  BUGFIX = 1
+  BUGFIX = 2
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen/commands.rb

@@ -31,8 +31,16 @@ ORIGEN_COMMAND_ALIASES = {
 Origen::Log.console_only = (%w(save target environment version).include?(@command) || ARGV.include?('--exec_remote'))
 
 if ARGV.delete('--coverage') ||
-   ((@command == 'specs' || @command == 'examples') && (ARGV.delete('-c') || ARGV.delete('--coverage')))
+   ((@command == 'specs' || @command == 'examples' || @command == 'test') && (ARGV.delete('-c') || ARGV.delete('--coverage')))
   require 'simplecov'
+  begin
+    if ENV['CONTINUOUS_INTEGRATION']
+      require 'coveralls'
+      SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+    end
+  rescue LoadError
+    # No problem
+  end
   SimpleCov.start
   Origen.log.info 'Started code coverage'
   SimpleCov.configure do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -720,7 +720,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Semiconductor Developer's Kit