origen 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc4a84b64d3cb9f9ee4b5d8de1160a3ba5de60cd
-  data.tar.gz: 0eb5bb2d2e1fc69c2292d0c055d8a0015fd3930e
+  metadata.gz: 337374eae5a026a7c7e1384271736512a03581fb
+  data.tar.gz: ff8998208b3ea0dec2d1f8d764395c022c92a110
 SHA512:
-  metadata.gz: a9fcae76485f5a2920fc838bab48563b6287d9c57d06d3ff6d01d99b0d974cd6d5c5f954f8fb00d8d229e298254402ea8f6b1264404716ab40b594b4ff5c048b
-  data.tar.gz: be008ee6ce644e6af04ea0983f8e48389ab94a410f77049915b351914ebcb85b3f91a36b60d818d5db45a006973dd2763bde078501b940002cce1b5a3b89420a
+  metadata.gz: a9daab3584692eab42da79cd7b1262eac2c70a9921f4e5a2235243ec4132974ace8f00ad58c8c385c25d2d788b76cfe0256dd7d6c9ae204128d9eb8b9472bc30
+  data.tar.gz: 238c335dec7d87f24c80a82f9d130367760fd57437228dd8059224112be81349cc9b589a12e48cb7432e41d1c86da22ae252284d0119d9806073696613d3aca9

data/bin/origen

@@ -8,8 +8,6 @@ require 'fileutils'
 class OrigenBootError < StandardError
 end
 
-ORIGEN_MIN_GCC_VERSION = '4.6.3'
-
 # Keep a note of the pwd at the time when Origen was first loaded, this is initially used
 # by the site_config lookup.
 $_origen_invocation_pwd ||= Pathname.pwd
@@ -87,26 +85,6 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
                 `bundle config build.#{switches}`
               end
             end
-            gcc_version = begin
-              begin
-                line = `gcc --version`.split("\n").first
-              rescue
-                puts "You don't seem to have gcc available, make sure you following the Origen installation instructions:"
-                puts 'http://origen-sdk.org/origen/latest/guides/starting/installing/'
-                exit 1
-              end
-              if line =~ /(\d+\.\d+\.\d+)/
-                Regexp.last_match(1)
-              end
-            end
-            if gcc_version
-              if gcc_version < ORIGEN_MIN_GCC_VERSION
-                puts "Origen requires a minimum of GCC version #{ORIGEN_MIN_GCC_VERSION}, but you have #{gcc_version}."
-                exit 1
-              end
-            else
-              puts 'Unable to determine gcc version, proceeding with fingers crossed...'
-            end
           end
           result = system(cmd)
         end

data/config/version.rb

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

data/lib/origen.rb

@@ -683,6 +683,17 @@ unless defined? RGen::ORIGENTRANSITION
         @current_command
       end
 
+      # Provides a global Origen session stored at ~/.origen/session (Origen.home)
+      def session(reload = false)
+        @session = nil if reload
+        @session ||= Database::KeyValueStores.new(self, persist: false)
+      end
+
+      # Returns the home directory of Origen (i.e., the primary place that Origen operates out of)
+      def home
+        "#{Dir.home}/.origen"
+      end
+
       private
 
       def current_command=(val)

data/lib/origen/core_ext.rb

@@ -8,3 +8,4 @@ require 'origen/core_ext/hash'
 require 'origen/core_ext/array'
 require 'origen/core_ext/range'
 require 'origen/core_ext/enumerable'
+require 'origen/core_ext/regexp'

data/lib/origen/core_ext/regexp.rb

@@ -0,0 +1,16 @@
+require 'yaml'
+class Regexp
+  def to_txt(options = {})
+    options = {
+      no_mods: false
+    }.update(options)
+    expr, mods = '', ''
+    if to_yaml.match(/regexp\s+\/(.*)\/(.*)/).nil?
+      Origen.log.error('Cannot convert the regular expression to text, something changed in the YAML view of the regular expressions')
+      fail
+    else
+      (expr, mods) = to_yaml.match(/regexp\s+\/(.*)\/(.*)/).captures
+    end
+    options[:no_mods] ? "\/#{expr}\/" : "\/#{expr}\/#{mods}"
+  end
+end

data/lib/origen/database/key_value_store.rb

@@ -5,10 +5,12 @@ module Origen
       # Returns the parent database (the application's collection of
       # key-value stores)
       attr_reader :database
+      attr_accessor :private
 
       def initialize(database, name)
         @name = name
         @database = database
+        @private = false
       end
 
       # Read a value from the store
@@ -54,6 +56,10 @@ module Origen
         database.persisted?
       end
 
+      def private?
+        @private
+      end
+
       private
 
       def dssc
@@ -86,7 +92,6 @@ module Origen
         unless file.dirname.exist?
           FileUtils.mkdir_p(file.dirname.to_s)
         end
-        `chmod u+w #{file}` if file.exist?
         if @uncommitted
           database.record_new_store(name)
           @uncommitted = false
@@ -94,16 +99,22 @@ module Origen
         File.open(file.to_s, 'w') do |f|
           Marshal.dump(store, f)
         end
+        if private?
+          FileUtils.chmod(0600, file)
+        else
+          FileUtils.chmod(0664, file)
+        end
         if persisted?
           dssc.check_in file, new: true, keep: true, branch: 'Trunk'
         end
       end
 
       def file
+        file_path = database.app == Origen ? Origen.home : database.app.root
         if persisted?
-          @file ||= Pathname.new("#{database.app.root}/.db/#{name.to_s.symbolize}")
+          @file ||= Pathname.new("#{file_path}/.db/#{name.to_s.symbolize}")
         else
-          @file ||= Pathname.new("#{database.app.root}/.session/#{name.to_s.symbolize}")
+          @file ||= Pathname.new("#{file_path}/.session/#{name.to_s.symbolize}")
         end
       end
     end

data/lib/origen/database/key_value_stores.rb

@@ -14,9 +14,9 @@ module Origen
 
       def inspect
         if persisted?
-          "< #{app.class}'s Database >"
+          app == Origen ? "Origen's Global Database" : "< #{app.class}'s Database >"
         else
-          "< #{app.class}'s Session >"
+          app == Origen ? "Origen's Global Session" : "< #{app.class}'s Session >"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -447,6 +447,7 @@ files:
 - lib/origen/core_ext/numeric.rb
 - lib/origen/core_ext/object.rb
 - lib/origen/core_ext/range.rb
+- lib/origen/core_ext/regexp.rb
 - lib/origen/core_ext/string.rb
 - lib/origen/database.rb
 - lib/origen/database/key_value_store.rb