origen 0.32.1 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf76087ad1eed645f45fe797f3b5561d216a9712
-  data.tar.gz: fc8ad3b72821063fed4bbbc43f8c822df4c6a578
+  metadata.gz: 4bbe04ff06fc71620ec53701cfda0b4ea651b44a
+  data.tar.gz: 3515abaaad4c9e9779dd3064182d17b62abb9990
 SHA512:
-  metadata.gz: 22f0891066cbaafd8a7b712a794a095baded766e57536fa477bb7bdffcde3865a8f198bab18c9605fbdc1da49b29e10073160d5ab9fa7efbbe0af5773facbe0b
-  data.tar.gz: 954ae5c524084789ad30658011ca7c3d7f796053e3b745ba32dfd85614482b3cccdf5071be411b8bbe3bb4d5ec12d41b0aab48b7f9bfb38b3ea8d22e5e283510
+  metadata.gz: fe7b6df198be766746adfdd12d9c2fb2c49d7808f20c595785adf03816929376bbbd5252efaec7edd5d8db70905187fdc79229ab76c4eb4ea8a37606edf8e436
+  data.tar.gz: 1d27cf5f647ab632461e78c45ab91fb572d06ac80a6cdccb066f34e5b7136355fb77b76163526212cd98c4f28e782045ed2c9dfc7b0c7335086594d77c0bf9e2

data/config/version.rb

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

data/lib/origen/users/user.rb

@@ -157,10 +157,56 @@ module Origen
         end
       end
 
-      # Returns a string like "Stephen McGinty <Stephen.Mcginty@freescale.com>"
+      # Returns a string like "Stephen McGinty <stephen.mcginty@nxp.com>"
       def name_and_email
         "#{name} <#{email}>"
       end
+
+      # Returns a private global Origen session store (stored in the user's home directory and only readable
+      # by them).
+      # See - http://origen-sdk.org/origen/guides/misc/session/#Global_Sessions
+      def auth_session
+        @session ||= begin
+          @session = Origen.session.user
+          @session.private = true
+          @session
+        end
+      end
+
+      # Returns the password for the current user.
+      # If the user hasn't supplied it yet they will be prompted to enter it, it will then be stored
+      #
+      # First, try in the global session, if its not defined, ask for it.
+      def password(options = {})
+        unless current?
+          fail "You can only reference the password for the current user (#{self.class.current_user_id})!"
+        end
+
+        if options[:refresh]
+          auth_session[:password] = nil
+        end
+
+        if auth_session[:password]
+          password = decrypt(auth_session[:password])
+        else
+          puts 'Please enter your password:'
+          password = (STDIN.noecho(&:gets) || '').chomp
+
+          # TODO: Need some kind of callback here to optionally verify password correctness via LDAP or similar
+
+          auth_session[:password] = encrypt(password)
+        end
+
+        password
+      end
+
+      def decrypt(text)
+        text
+      end
+
+      def encrypt(text)
+        text
+      end
     end
   end
 end

data/vendor/lib/models/origen/export1.rb

@@ -69,7 +69,7 @@ module Origen
       model.add_virtual_pin :relay1
       model.add_virtual_pin :relay2, packages: { bga: {} }
 
-      model.sub_block :block1, file: 'origen/export1/block1.rb', dir: '/home/stephen/Code/github/origen/vendor/lib/models', lazy: true
+      model.sub_block :block1, file: 'origen/export1/block1.rb', dir: '/proj/.tec_k3s/users/cengelken_b50956/origen_blocks/master/vendor/lib/models', lazy: true
 
     end
   end

data/vendor/lib/models/origen/export1/block1.rb

@@ -4,7 +4,7 @@ module Origen
   module Export1
     module Block1
       def self.extended(model)
-        model.sub_block :x, file: 'origen/export1/block1/x.rb', dir: '/home/stephen/Code/github/origen/vendor/lib/models', lazy: true, base_address: 0x40000000
+        model.sub_block :x, file: 'origen/export1/block1/x.rb', dir: '/proj/.tec_k3s/users/cengelken_b50956/origen_blocks/master/vendor/lib/models', lazy: true, base_address: 0x40000000
 
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.33.0
 platform: ruby
 authors:
 - Stephen McGinty
@@ -630,7 +630,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit