origen 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 386c5e434e711ec01dd643a04282d2662f7ff312
-  data.tar.gz: fd0058e5748471a646a0e05fa582e7212fc50613
+  metadata.gz: c220c4b98134c25059399a9c5f8f9719ad39a6d0
+  data.tar.gz: 1faed96ffe8651f6d49f8e3932a3ab17b0d28e38
 SHA512:
-  metadata.gz: 3d43b3346743a82f2144c9d6bc9b29f4aaab1c5af84d75e2d08fea74035680fabf7e851b1a6fb91c71cdb9dbaa32ee077c3cf3f0772f9ac408d62c1e7d979ec3
-  data.tar.gz: 399ad3393b90080cf5607d599e302de982edf1ce52340b8af4fb3f426eedca47ff45b82446bf7d1c6216cab797421254b4debda0690360d5cc09e41786d7b437
+  metadata.gz: '01218847dde5ecd45712e55138007b7d2157e6390445f308759be1a0d53d2adbec7167394cbd4cc34efabcf674d42c43e08695140b91b582436fe2a557a1525b'
+  data.tar.gz: 93747cc9c2559141f4c4d8cf3378a715a0874db7928093973eeb070c1a1354b62ddd6f15b7e91a5828794d03a1953ae8c47ea5426ef293176265040e0bcd9d8d

data/bin/origen

@@ -61,7 +61,7 @@ if origen_root
 elsif Origen.site_config.gem_manage_bundler && (Origen.site_config.user_install_enable || Origen.site_config.tool_repo_install_dir)
   # Force everyone to have a consistent way of installing gems with bundler.
   # In this case, we aren't running from an Origen application, so build everything at Origen.home instead
-  # Have two options here: if user_install_enable is tru, use user_install_dir. Otherwise, use the tool_repo_install_dir
+  # Have two options here: if user_install_enable is true, use user_install_dir. Otherwise, use the tool_repo_install_dir
   Origen.site_config.user_install_enable ? origen_root = File.expand_path(Origen.site_config.user_install_dir) : origen_root = File.expand_path(Origen.site_config.tool_repo_install_dir)
   unless Dir.exists?(origen_root)
     load File.expand_path('../../lib/origen/utility/input_capture.rb', __FILE__)
@@ -174,7 +174,11 @@ begin
     require 'origen/commands_global'
   end
 rescue Exception => e
-  unless e.is_a?(SystemExit) && e.status == 0
+  # A formatted stack dump will not be printed if the application ends via 'exit 0' or 'exit 1'. In that
+  # case the application code is responsible for printing a helpful error message.
+  # This will intercept all other exits, e.g. via 'fail "Something has done wrong"', and split the stack
+  # dump to separate all in-application references from Origen core/plugin references.
+  unless e.is_a?(SystemExit)
     puts
     if Origen.app_loaded?
       puts 'COMPLETE CALL STACK'

data/config/version.rb

@@ -1,6 +1,6 @@
 module Origen
   MAJOR = 0
-  MINOR = 21
+  MINOR = 22
   BUGFIX = 0
   DEV = nil
 

data/lib/origen/commands/new.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'httparty'
 require 'digest'
 require 'gems'
+require 'time'
 
 include Origen::Utility::InputCapture
 
@@ -25,7 +26,7 @@ http://origen-sdk.org/origen_app_generators
 Usage: origen new [APP_NAME] [options]
 END
   opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
-  opts.on('-v', '--version TAG', String, 'Use a specific version of Origen App Generators') { |f| options[:version] = f }
+  opts.on('-f', '--fetch', 'Fetch the latest versions of the app generators, otherwise happens every 24hrs') { options[:fetch] = true }
   opts.separator ''
   opts.on('-h', '--help', 'Show this message') { puts opts; exit }
 end
@@ -45,69 +46,85 @@ unless Dir["#{dir}/*"].empty?
   exit 1
 end
 
-version = options[:version] || begin
-  (Gems.info 'origen_app_generators')['version']
-end
-
-version ||= '0.0.0'
+generators_dir = "#{Origen.home}/app_generators"
+update_required = false
 
-version.sub!(/^v/, '')
-
-if Origen.running_on_windows?
-  tmp = 'C:/tmp/origen_app_generators'
+# Update the generators every 24hrs unless specifically requested
+if options[:fetch] || !File.exist?(generators_dir)
+  update_required = true
 else
-  tmp = '/tmp/origen_app_generators'
-end
-
-tmp_dir = "#{tmp}/app_gen#{version}"
-lib = "#{tmp_dir}/lib"
-md5 = "#{tmp}/md5#{version}"
-
-# If the app generators already exists in /tmp, check that all files are still there.
-# This deals with the problem of some files being swept up by the tmp cleaner while
-# leaving the top-level folder there.
-if File.exist?(tmp_dir) && File.exist?(md5)
-  old_sig = File.read(md5)
-  hash = Digest::MD5.new
-  Dir["#{tmp_dir}/**/{*,.*}"].each do |f|
-    hash << File.read(f) unless File.directory?(f)
+  if Origen.session.app_generators[generators_dir]
+    if Time.now - Origen.session.app_generators[generators_dir] > 60 * 60 * 24
+      update_required = true
+    end
+  else
+    update_required = true
   end
-  new_sig = hash.hexdigest
-  all_present = old_sig == new_sig
-else
-  all_present = false
 end
 
-unless all_present
-
-  FileUtils.rm_rf(tmp_dir) if File.exist?(tmp_dir)
-  FileUtils.mkdir_p(tmp) unless File.exist?(tmp)
-
-  File.open("#{tmp}/app_gen#{version}.gem", 'wb') do |f|
-    response = HTTParty.get("http://rubygems.org/downloads/origen_app_generators-#{version}.gem")
-    if response.success?
-      f.write response.parsed_response
-    else
-      puts "Sorry, could not find app generators version #{version}"
-      exit 1
+generators = [['http://rubygems.org', 'origen_app_generators']] + Array(Origen.site_config.app_generators)
+
+if update_required
+  puts 'Fetching the latest app generators...'
+  FileUtils.rm_rf(generators_dir) if File.exist?(generators_dir)
+  FileUtils.mkdir(generators_dir)
+
+  Dir.chdir generators_dir do
+    generators.each_with_index do |gen, i|
+      # If a reference to a gem from a gem server
+      if gen.is_a?(Array)
+        response = HTTParty.get("#{gen[0]}/api/v1/dependencies.json?gems=#{gen[1]}")
+
+        if response.success?
+          latest_version = JSON.parse(response.body).map { |v| v['number'] }.max
+
+          response = HTTParty.get("#{gen[0]}/gems/#{gen[1]}-#{latest_version}.gem")
+          if response.success?
+            File.open("#{gen[1]}-#{latest_version}.gem", 'wb') do |f|
+              f.write response.parsed_response
+            end
+          else
+            puts "Sorry, could not find generator #{gen[1]} version #{latest_version}"
+          end
+
+          `gem unpack #{gen[1]}-#{latest_version}.gem`
+          FileUtils.rm_rf("#{gen[1]}-#{latest_version}.gem")
+          FileUtils.mv("#{gen[1]}-#{latest_version}", i.to_s)
+
+        else
+          puts "Failed to get generator #{gen[1]}, the response from the server was:"
+          puts response.body
+        end
+
+      # If a reference to a git repo
+      elsif gen.to_s =~ /\.git$/
+        Origen::RevisionControl.new(remote: gen, local: i.to_s).checkout(version: 'master', force: true)
+
+      # Assume a reference to a folder
+      else
+        if File.exist?(gen)
+          FileUtils.cp_r(gen, i.to_s)
+        else
+          puts "Failed to find generator at #{gen}"
+        end
+
+      end
     end
-  end
 
-  Dir.chdir tmp do
-    `gem unpack app_gen#{version}.gem`
-    `rm -f app_gen#{version}.gem`
+    Origen.session.app_generators[generators_dir] = Time.now
   end
-
-  hash = Digest::MD5.new
-  Dir["#{tmp_dir}/**/{*,.*}"].each do |f|
-    hash << File.read(f) unless File.directory?(f)
-  end
-  File.open(md5, 'w') { |f| f.write(hash.hexdigest) }
 end
 
-$LOAD_PATH.unshift(lib)
+generators.each_with_index do |gen, i|
+  lib = "#{generators_dir}/#{i}/lib"
+  $LOAD_PATH.unshift(lib)
+end
 
 Origen.with_boot_environment do
   require 'origen_app_generators'
+  generators.each_with_index do |gen, i|
+    loader = "#{generators_dir}/#{i}/config/load_generators.rb"
+    require loader if File.exist?(loader)
+  end
   OrigenAppGenerators.invoke(dir)
 end

data/lib/origen/site_config.rb

@@ -50,11 +50,11 @@ module Origen
     def find_val(val, options = {})
       env = "ORIGEN_#{val.upcase}"
       if ENV.key?(env)
-        config = ENV[env]
+        val = ENV[env]
         if TRUE_VALUES.include?(val)
-          config = true
+          return true
         elsif FALSE_VALUES.include?(val)
-          config = false
+          return false
         end
         config
       else

data/origen_site_config.yml

@@ -1,3 +1,17 @@
+# GENERAL SETUP
+
+# Application generator plugins can be used to extend the available new application templates
+# that are offered via the 'origen new' command.
+# This allows you to offer application shells that are unique to your company or to specific
+# domains within your company.
+#app_generators:
+#  # Example of how to reference a plugin from an internal gem server (recommended)
+#  - ["http://gems.mycompany.net:9292", my_app_generators]
+#  # Alternatively a file system path to a central copy of a plugin can be used
+#  - "/path/to/some/central/location/my_app_generators"
+#  # Or a reference to a plugin's Git repository can be used
+#  - "http://bitbucket.mycompany.net/origen/my_app_generators.git"
+
 # GEM SETUP
 
 # If your company has an internal gem server enter it here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -603,7 +603,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit