origen 0.59.0 → 0.59.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52b7a0c967bbdd152dcadcd1d3a5d0d47a3a48bd743b5aaa025597f410a1b744
-  data.tar.gz: 439452b12489afef5e6837c51c01cfa9c2dd685d2240c9aabedb393f6d7f4dbb
+  metadata.gz: be12bb5b800939408adf130a00a28b7f18231ad8ff4c4d85faf1d84e5a010269
+  data.tar.gz: d109bc8ff310e00c4a95408845bfcb376f2685471407dd7acb146c7ed0f0718b
 SHA512:
-  metadata.gz: c02acf82d4c5c7320ad02568ea7d5f1d482924dbc140d06df1ce112c87f67a487e0094396d2db6ea96e95211f8c6c9fc49440a45d7cf4f30a1e840fb440dedf3
-  data.tar.gz: b32686b81fe9326fcd22c5688be13e0683ba25b64f3fb4f9de8e2efe746756bee72c83b6362ff461bbdbb328496082e9cd8930a4548411aaa7863e16ffabf6b9
+  metadata.gz: 4cae4addf34171310be4685c8fada1529be19dafcd19db00e8c51211026e34f7490c476d484136cfaeac40d962d06f4de9877b4ffdc5aa3d7b2f89ac4f8115f7
+  data.tar.gz: 0a13bd267944d0aa0f8a79bb6b1b48c3f570269cf204a48e7507d9e4557bae7e98869847fd1b4787d0a55137228bf60ea68960dc2fad13488bb835f09b414d81

data/config/version.rb

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

data/lib/origen/users/ldap.rb

@@ -15,9 +15,14 @@ module Origen
       HOST = Origen.site_config.ldap_host
       PORT = Origen.site_config.ldap_port
       BASE_DN = Origen.site_config.ldap_base_dn
+      LDAP_ENCRYPTION = Origen.site_config.ldap_encryption
+
+      if LDAP_ENCRYPTION.nil?
+        LDAP_ENCRYPTION = 'simple_tls'
+      end
 
       def available?
-        !!(SERVICE_ACCOUNT && SERVICE_PASS && HOST && PORT && BASE_DN)
+        !!(SERVICE_ACCOUNT && SERVICE_PASS && HOST && PORT && BASE_DN && LDAP_ENCRYPTION)
       end
 
       # Lookup the given user in the core directory and return an object representing the user's entry
@@ -57,7 +62,8 @@ module Origen
       def service
         @service ||= Net::LDAP.new host:       HOST,
                                    port:       PORT,
-                                   encryption: { method: :simple_tls },
+                                   base:       BASE_DN,
+                                   encryption: LDAP_ENCRYPTION,
                                    auth:       { method: :simple, username: SERVICE_ACCOUNT, password: SERVICE_PASS }
       end
     end

data/spec/format/origen_formatter.rb

@@ -1,14 +1,26 @@
 require 'rspec/core/formatters/base_formatter'
 
 class OrigenFormatter < RSpec::Core::Formatters::BaseFormatter
-
-  def dump_summary(duration, example_count, failure_count, pending_count)
-    if failure_count > 0
-      Origen.app.stats.report_fail
-    else
-      Origen.app.stats.report_pass
+  if Gem::Version.new(RSpec::Version::STRING) < Gem::Version.new('3.0.0')
+    # legacy formatter
+    def dump_summary(duration, example_count, failure_count, pending_count)
+      if failure_count > 0
+        Origen.app.stats.report_fail
+      else
+        Origen.app.stats.report_pass
+      end
+      super(duration, example_count, failure_count, pending_count)
+    end
+  else
+    # RSpec 3 API
+    RSpec::Core::Formatters.register self, :dump_summary
+    def dump_summary(summary)
+      puts
+      if summary.failed_examples.size > 0
+        Origen.app.stats.report_fail
+      else
+        Origen.app.stats.report_pass
+      end
     end
-    super(duration, example_count, failure_count, pending_count)
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.59.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport