origen 0.5.5 → 0.5.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b80c17a521c57a2224a8dbaf0cd5eb5fc491d05e
4
- data.tar.gz: f6e079388e0a44a8f27da31bab055e2adc367182
3
+ metadata.gz: cdb741aab26127261ac1b0ab4f5ac223efb3a334
4
+ data.tar.gz: d48c4c6494a7c32732ce4305d36dc5bafbfbad02
5
5
  SHA512:
6
- metadata.gz: ab33e26f2c1ec8f6630493aef179b8da9fd2e666ebb3bd01f660e06e710de668e67a0fc3c72687601b74e3f7f28b0d4e69d7ac64be499b17e7aec56378545c53
7
- data.tar.gz: 578c228043bf7ffbe9d42cfd68de8713fc0930f50dfd1221bb02ca4315b207cc8e8f814a9c108dcfcf2cdcee5c16d52bde2489160482e0eb26bbba66b29b71a3
6
+ metadata.gz: 66b4cd9a2872c4bd6e63f71dc48a2799dc843f0c5de477708fd502462fde0c7e4bba209233b8581425d853ff28814e9a70aad1d63c9c7c998b1af7335c9918c5
7
+ data.tar.gz: 0d342df42ce048de8392a03b37b0b2a14dbe4ec9eb7f4547914488cb46dee7c8ca8aa337ee8ffc17f92a954e15aa12292e5205a84e98fb82c620692b51931d44
data/config/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Origen
2
2
  MAJOR = 0
3
3
  MINOR = 5
4
- BUGFIX = 5
4
+ BUGFIX = 6
5
5
  DEV = nil
6
6
 
7
7
  VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
data/lib/origen.rb CHANGED
@@ -231,8 +231,9 @@ unless defined? RGen::ORIGENTRANSITION
231
231
  application.target
232
232
  end
233
233
 
234
- def load_target(t, options = {})
235
- target.temporary = t
234
+ def load_target(t = nil, options = {})
235
+ t, options = nil, t if t.is_a?(Hash)
236
+ target.temporary = t if t
236
237
  application.load_target!(options)
237
238
  application.runner.prepare_and_validate_workspace
238
239
  end
@@ -157,6 +157,18 @@ module Origen
157
157
  @root
158
158
  end
159
159
 
160
+ # Returns a path to the imports directory (e.g. used by the remotes and similar features) for the
161
+ # application. e.g. if the app live at /home/thao/my_app, then the imports directory will typically
162
+ # be /home/thao/.my_app_imports_DO_NOT_HAND_MODIFY
163
+ #
164
+ # Origen will ensure that this directory is outside of the scope of the current application's revision
165
+ # control system. This prevents conflicts with the revision control system for the application and those
166
+ # used to import 3rd party dependencies
167
+ def imports_directory
168
+ workspace_manager.imports_directory
169
+ end
170
+ alias_method :imports_dir, :imports_directory
171
+
160
172
  # Returns the namespace used by the application as a string
161
173
  def namespace
162
174
  @namespace ||= self.class.to_s.split('::').first.gsub('_', '').sub('Application', '')
@@ -468,8 +480,17 @@ module Origen
468
480
  end
469
481
 
470
482
  def session(reload = false)
471
- @session = nil if reload
472
- @session ||= Database::KeyValueStores.new(self, persist: false)
483
+ if current?
484
+ @session = nil if reload
485
+ @session ||= Database::KeyValueStores.new(self, persist: false)
486
+ else
487
+ puts "All plugins should use the top-level application's session store, i.e. use:"
488
+ puts " Origen.app.session.#{name}"
489
+ puts 'instead of:'
490
+ puts ' Origen.app!.session'
491
+ puts
492
+ exit 1
493
+ end
473
494
  end
474
495
 
475
496
  def versions
@@ -31,7 +31,7 @@ gem_use_from_system:
31
31
  # # Without email_domain specified
32
32
  # User.new("ax1234@company.com").email # => "ax1234@company.com"
33
33
  #email_domain: company.com
34
- #email_server: remotesmtp.company.net
34
+ #email_server: smtp.company.net
35
35
  #email_port: 25
36
36
 
37
37
  # Required parameters to connect to your company's LDAP system
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: origen
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.5
4
+ version: 0.5.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen McGinty
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-23 00:00:00.000000000 Z
11
+ date: 2015-09-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport