origen 0.51.3 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6b01aa2a6001678a624d9e819007d180711b4955d714bc6a2977f4e739b364f
-  data.tar.gz: 67bc84c10b253978cfcd7f47447a8299d61693984f1779e993a96bcce1ef4129
+  metadata.gz: 66da9dd0e7daf45df9ed1b3296be702222ccfbdd9a7daa9d4258e13b8170a2d9
+  data.tar.gz: d4e0594b55959d9d98a8971f08e87d2fd62074f72076c21a5a75b3d667996638
 SHA512:
-  metadata.gz: bcb831bda418c0ddb8ba3970a74bc02fbf296f31f7c5a847f23a2157218d0618a6ec291f9f5d1a347aef615fcbcb26a3989590bb02a763a26e5ed61ee68472a5
-  data.tar.gz: 5480f5d17fd808670ce6109d8a9f4e9f0646b6bb7118b8555877e87a3f75c5f6bfda988d231e3bd8df42898b4b41f97704ad1fd119951a86e6f55faa5a7207f9
+  metadata.gz: 25583f8f1033819423e649ddd3743e7b7a4a523b12724985e34b2b06d5dd83d3495e8eae9949cd5e6049b94548374a2c2ee3f9088815667a85c1d3e17633787a
+  data.tar.gz: e4d661a56516345b15ad2fa812fdb11ed171a3a067d6b5c86dc837bf4429c11244ab43ebe7677f9db16f442bf882aafbb7dcf2091cf4b14cfb0f14c86627e676

data/config/version.rb

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

data/lib/origen.rb

@@ -782,6 +782,13 @@ unless defined? RGen::ORIGENTRANSITION
         end
       end
 
+      # OS agnostic split of a caller line into file and line number
+      def split_caller_line(line)
+        arr = line.split(':')
+        arr[0] = arr[0] + ':' + arr.delete_at(1) if Origen.os.windows?
+        arr
+      end
+
       private
 
       def current_command=(val)

data/lib/origen/sub_blocks.rb

@@ -298,9 +298,7 @@ module Origen
           fail "You have already defined a sub-block named #{name} within class #{self.class}"
         end
         if respond_to?(name)
-          callers = caller[0].split(':')
-          # reunite the drive and path if on windows os
-          callers[0] = callers[0] + ':' + callers.delete_at(1) if Origen.os.windows?
+          callers = Origen.split_caller_line caller[0]
           Origen.log.warning "The sub_block defined at #{Pathname.new(callers[0]).relative_path_from(Pathname.pwd)}:#{callers[1]} is overriding an existing method called #{name}"
         end
         define_singleton_method name do
@@ -354,9 +352,7 @@ module Origen
       yield                  # any sub_block calls within this block will have their ID added to @current_group
       my_group = @current_group.dup
       if respond_to?(id)
-        callers = caller[0].split(':')
-        # reunite the drive and path if on windows os
-        callers[0] = callers[0] + ':' + callers.delete_at(1) if Origen.os.windows?
+        callers = Origen.split_caller_line caller[0]
         Origen.log.warning "The sub_block_group defined at #{Pathname.new(callers[0]).relative_path_from(Pathname.pwd)}:#{callers[1]} is overriding an existing method called #{id}"
       end
       define_singleton_method "#{id}" do

data/lib/tasks/gem.rake

@@ -24,7 +24,12 @@ namespace 'gem' do
       if Origen.app.config.release_externally
         cmd = "gem push #{built_gem_path}"
       else
-        cmd = "gem inabox --host #{Origen.site_config.gem_server!} #{built_gem_path}"
+        url = Origen.site_config.gem_server_push || Origen.site_config.gem_server!
+        if Origen.site_config.gem_push_cmd
+          cmd = Origen.site_config.gem_push_cmd.gsub('+URL+', url).gsub('+GEM+', built_gem_path)
+        else
+          cmd = "gem push #{built_gem_path} --host #{url}"
+        end
       end
       sh(cmd) do |ok, _res|
         if ok

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.8.11".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Stephen McGinty".freeze]
-  s.date = "2019-05-27"
+  s.date = "2019-06-10"
   s.email = ["stephen.f.mcginty@gmail.com".freeze]
   s.files = ["bin/boot.rb".freeze, "config/application.rb".freeze, "config/boot.rb".freeze, "config/commands.rb".freeze, "config/shared_commands.rb".freeze, "config/version.rb".freeze, "lib/origen_app_generators.rb".freeze, "lib/origen_app_generators/application.rb".freeze, "lib/origen_app_generators/base.rb".freeze, "lib/origen_app_generators/empty_application.rb".freeze, "lib/origen_app_generators/empty_plugin.rb".freeze, "lib/origen_app_generators/new.rb".freeze, "lib/origen_app_generators/new_app_tests.rb".freeze, "lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb".freeze, "lib/origen_app_generators/plugin.rb".freeze, "lib/origen_app_generators/test_engineering/common.rb".freeze, "lib/origen_app_generators/test_engineering/stand_alone_application.rb".freeze, "lib/origen_app_generators/test_engineering/test_block.rb".freeze, "templates/app_generators".freeze, "templates/app_generators/application".freeze, "templates/app_generators/application/.gitignore".freeze, "templates/app_generators/application/.irbrc".freeze, "templates/app_generators/application/.rspec".freeze, "templates/app_generators/application/.travis.yml".freeze, "templates/app_generators/application/Gemfile".freeze, "templates/app_generators/application/Rakefile".freeze, "templates/app_generators/application/app".freeze, "templates/app_generators/application/app/blocks".freeze, "templates/app_generators/application/app/blocks/top_level.rb".freeze, "templates/app_generators/application/app/lib".freeze, "templates/app_generators/application/app/lib/module.rb".freeze, "templates/app_generators/application/app/templates".freeze, "templates/app_generators/application/app/templates/web".freeze, "templates/app_generators/application/app/templates/web/index.md.erb".freeze, "templates/app_generators/application/app/templates/web/layouts".freeze, "templates/app_generators/application/app/templates/web/layouts/_basic.html.erb".freeze, "templates/app_generators/application/app/templates/web/partials".freeze, "templates/app_generators/application/app/templates/web/partials/_navbar.html.erb".freeze, "templates/app_generators/application/app/templates/web/release_notes.md.erb".freeze, "templates/app_generators/application/config".freeze, "templates/app_generators/application/config/application.rb".freeze, "templates/app_generators/application/config/boot.rb".freeze, "templates/app_generators/application/config/commands.rb".freeze, "templates/app_generators/application/config/maillist_dev.txt".freeze, "templates/app_generators/application/config/maillist_prod.txt".freeze, "templates/app_generators/application/config/version.rb".freeze, "templates/app_generators/application/doc".freeze, "templates/app_generators/application/doc/history".freeze, "templates/app_generators/application/dot_keep".freeze, "templates/app_generators/application/origen_core_session".freeze, "templates/app_generators/application/spec".freeze, "templates/app_generators/application/spec/spec_helper.rb".freeze, "templates/app_generators/application/target".freeze, "templates/app_generators/application/target/debug.rb".freeze, "templates/app_generators/application/target/default.rb".freeze, "templates/app_generators/application/target/production.rb".freeze, "templates/app_generators/new".freeze, "templates/app_generators/new/generator.rb".freeze, "templates/app_generators/new/info.md.erb".freeze, "templates/app_generators/origen_infrastructure".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/application.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/base.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/module.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/plugin.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb".freeze, "templates/app_generators/plugin".freeze, "templates/app_generators/plugin/Gemfile".freeze, "templates/app_generators/plugin/Rakefile".freeze, "templates/app_generators/plugin/app".freeze, "templates/app_generators/plugin/app/templates".freeze, "templates/app_generators/plugin/app/templates/web".freeze, "templates/app_generators/plugin/app/templates/web/index.md.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_external.html.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_internal.html.erb".freeze, "templates/app_generators/plugin/config".freeze, "templates/app_generators/plugin/config/boot.rb".freeze, "templates/app_generators/plugin/gemspec.rb".freeze, "templates/app_generators/test_engineering".freeze, "templates/app_generators/test_engineering/environment".freeze, "templates/app_generators/test_engineering/environment/j750.rb".freeze, "templates/app_generators/test_engineering/environment/uflex.rb".freeze, "templates/app_generators/test_engineering/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application".freeze, "templates/app_generators/test_engineering/stand_alone_application/.keep".freeze, "templates/app_generators/test_engineering/test_block".freeze, "templates/app_generators/test_engineering/test_block/.keep".freeze]
   s.homepage = "http://origen-sdk.org/origen_app_generators".freeze

data/origen_app_generators/templates/app_generators/application/Gemfile

@@ -1,5 +1,5 @@
-<% if (@audience != :external) && Origen.site_config.gem_server -%>
-<%   Array(Origen.site_config.gem_server).each do |server| -%>
+<% if (@audience != :external) && (Origen.site_config.gem_server_pull || Origen.site_config.gem_server) -%>
+<%   Array(Origen.site_config.gem_server_pull || Origen.site_config.gem_server).each do |server| -%>
 source '<%= server %>'
 <%   end -%>
 <% else %>
@@ -23,6 +23,11 @@ gem 'byebug', '~>8'  # You can remove this version constraint if you don't care
 # that then you can remove this line
 gem 'nokogiri', '1.8.5'
 <% end -%>
+<% if (@audience != :external) && Origen.site_config.gem_push_plugins -%>
+<%   Array(Origen.site_config.gem_push_plugins).each do |plugin| -%>
+gem <%= plugin.map{ |d| "\"#{d}\"" }.join(', ') %>
+<%   end -%>
+<% end -%>
 
 # Uncomment these if you want to use a visual debugger (e.g. Visual Studio Code) to debug your app
 #gem 'ruby-debug-ide'

data/origen_app_generators/templates/app_generators/plugin/Gemfile

@@ -1,5 +1,5 @@
-<% if (@audience != :external) && Origen.site_config.gem_server -%>
-<%   Array(Origen.site_config.gem_server).each do |server| -%>
+<% if (@audience != :external) && (Origen.site_config.gem_server_pull || Origen.site_config.gem_server) -%>
+<%   Array(Origen.site_config.gem_server_pull || Origen.site_config.gem_server).each do |server| -%>
 source '<%= server %>'
 <%   end -%>
 <% else %>
@@ -17,6 +17,11 @@ gem 'byebug', '~>8'  # You can remove this version constraint if you don't care
                      # supporting earlier versions of Ruby 2
 gem 'ripper-tags'
 gem 'origen_doc_helpers'
+<% if (@audience != :external) && Origen.site_config.gem_push_plugins -%>
+<%   Array(Origen.site_config.gem_push_plugins).each do |plugin| -%>
+gem <%= plugin.map{ |d| "\"#{d}\"" }.join(', ') %>
+<%   end -%>
+<% end -%>
 
 # Uncomment these if you want to use a visual debugger (e.g. Visual Studio Code) to debug your app
 #gem 'ruby-debug-ide'

data/origen_site_config.yml

@@ -43,8 +43,24 @@ centralized_site_config_verify_ssl: true
 
 # GEM SETUP
 
-# If your company has an internal gem server enter it here
-#gem_server: http://gems.company.net:9292
+# If your company has an internal gem server enter it here:
+#gem_server: https://gems.company.net:9292
+# or here, if you need to use different urls for push and pull (write and read):
+#gem_server_push: https://gems.company.net:9292
+#gem_server_pull: https://gems.company.net:9292
+
+# By default, the Origen 'rake gem:release' task (called by the 'origen rc tag' command), will use
+# the standard Ruby 'gem push' command to push gems to your company gem server.
+# If you need to use a different command, define it here as a string using, +GEM+ where you want
+# the gem name to be referenced, and +URL+ to reference your company gem server.
+#gem_push_cmd: "gem inabox --host +URL+ +GEM+"
+#gem_push_cmd: "gem nexus +GEM+ --url +URL+ --clear-repo --ignore-ssl-errors"
+
+# If your custom gem_push_cmd requires a gem plugin(s), add the gem names here and they will be
+# included in new applications generated via the 'origen new' command.
+#gem_push_plugins:
+#  - geminabox
+#  - nexus
 
 # When true Origen will configure and run Bundler in a consistent way for every
 # user (recommended)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.51.3
+  version: 0.52.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -276,34 +276,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: geminabox
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.4
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: dentaku
   requirement: !ruby/object:Gem::Requirement