origen 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b918cf2aa4bd8dca1788f375b5af4827e93ad1e9
-  data.tar.gz: eb0bbe853476f9df9bf1bb8445952b685c6005da
+  metadata.gz: 3a6f307efbb9972715b248f12bc59f2edd3f8432
+  data.tar.gz: f033097d7efbd060767547b8c456a76d24bd7374
 SHA512:
-  metadata.gz: fdc2131fac4f0d527f3f8920cdbf76b847971a95ede803c197cbdf8963e45b2fc84c5366b9f03d2a434204e5959a84b92f704cbd38f9e21e1d5d4aa3f5cd049d
-  data.tar.gz: ab6f218b1b986d91b5c70ef39e2806fa1121e997d8487f4602b827b6692826999c975048a18bafa8adf5b099c9c27da711fdf1ac8f3444385dafb84e63b2c7eb
+  metadata.gz: efd7f4c1e713696f2cbd322cf912ad1b6e90adc16f08a70620ee0008ca2eca60c6d2cb02039d23981003dd856a318e36756a71de4bee7ab6734bfa21afdc5f58
+  data.tar.gz: e59b86bafdea83a70a17f4fedaf194fe118de3f433a82cc2fb8ffb8070fc7b1614fd6fe196bb8fb633ad6c24d3a85cab9c7c2cba3396cf76ddec37b50ddcf0a8

data/config/version.rb

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

data/lib/origen/application.rb

@@ -176,6 +176,50 @@ module Origen
       @namespace ||= self.class.to_s.split('::').first.gsub('_', '').sub('Application', '')
     end
 
+    # Returns array of email addresses in the DEV maillist file
+    def maillist_dev
+      maillist_parse(maillist_dev_file)
+    end
+
+    # Returns array of email addresses in the PROD maillist file
+    def maillist_prod
+      maillist_parse(maillist_prod_file)
+    end
+
+    # Returns default location of DEV maillist file (customize locally if needed)
+    def maillist_dev_file
+      Origen.app.root.to_s + '/config/maillist_dev.txt'
+    end
+
+    # Returns default location of PROD maillist file (customize locally if needed)
+    def maillist_prod_file
+      Origen.app.root.to_s + '/config/maillist_prod.txt'
+    end
+
+    # Parses maillist file and returns an array of email address
+    def maillist_parse(file)
+      maillist = []
+
+      # if file doesn't exist, just return empty array, otherwise, parse for emails
+      if File.exist?(file)
+        File.readlines(file).each do |line|
+          if index = (line =~ /\#/)
+            # line contains some kind of comment
+            # check if there is any useful info, ignore it not
+            unless line[0, index].strip.empty?
+              maillist << Origen::Users::User.new(line[0, index].strip).email
+            end
+          else
+            # if line is not empty, generate an email
+            unless line.strip.empty?
+              maillist << Origen::Users::User.new(line.strip).email
+            end
+          end
+        end
+      end
+      maillist
+    end
+
     # Returns an array of users who have subscribed for production release
     # notifications for the given application on the website
     def subscribers_prod

data/lib/origen/application/release.rb

@@ -76,7 +76,7 @@ Your workspace has local modifications that are preventing the requested action
           Origen.app.listeners_for(:after_release_tag).each do |listener|
             listener.after_release_tag(tag, note, type, selector, options)
           end
-          # @mailer.send_release_notice(tag, note, type, selector) unless options[:silent]
+          @mailer.send_release_notice(tag, note, type, selector) unless options[:silent]
           Origen.app.listeners_for(:after_release_email).each do |listener|
             listener.after_release_email(tag, note, type, selector, options)
           end

data/lib/origen/users/user.rb

@@ -74,9 +74,17 @@ module Origen
       end
 
       def email
-        @email ||= ENV['ORIGEN_EMAIL'] || email_from_rc || begin
-          if Origen.site_config.email_domain
-            "#{id}@#{Origen.site_config.email_domain}"
+        if current?
+          @email ||= ENV['ORIGEN_EMAIL'] || email_from_rc || begin
+            if Origen.site_config.email_domain
+              "#{id}@#{Origen.site_config.email_domain}"
+            end
+          end
+        else
+          @email ||= begin
+            if Origen.site_config.email_domain
+              "#{id}@#{Origen.site_config.email_domain}"
+            end
           end
         end
       end

data/lib/origen/utility/mailer.rb

@@ -82,14 +82,14 @@ or a member of the development team.
 END3
 
         if external?(type)
-          to = app_users + Origen.app.subscribers_prod + Origen.app.subscribers_dev
+          to = Origen.app.maillist_prod + Origen.app.maillist_dev
           if config.release_email_subject
             subject = "[#{Origen.app.namespace}] New Official Release: #{config.release_email_subject}"
           else
             subject = "[#{Origen.app.namespace}] New Official Release"
           end
         else
-          to = admins + Origen.app.subscribers_dev
+          to = Origen.app.maillist_dev
           if config.release_email_subject
             subject = "[#{Origen.app.namespace}] New Development Tag: #{config.release_email_subject}"
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport