origen 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57352a8b9560ae28fd11789e2338de6d77691e46
-  data.tar.gz: 41ad98388361e0e274e3d113b179e8a707f83ecb
+  metadata.gz: 164ff1785465c05f948cea646a845c30d9501318
+  data.tar.gz: 572cfdfd8d006b70e8b447789530284d99a1d391
 SHA512:
-  metadata.gz: dd1086933ce68c4e4218d260efda5d612c7c0a4372d4dc6a6325310e8941522d6e70b51c4f31a5a22ffbeeaceb1fdde0f450b5f1d9fceea3eb8aeac24430470c
-  data.tar.gz: 787cff0c13841c02c7f846005fb29bd08510bd8ddc38a49942120713494aa463542b451afade21922ff1a5e936e20346bb087fa1be82b5e8788cc4f29c8c178e
+  metadata.gz: c5bb8de8859693e4ba457f555709dca46200ddccccbde5ea382b6099ba2ee22e8e90d72c9ddc7aaa1fb5dd2e54bb535925df9455017c7ad5dc889eacbfd40afe
+  data.tar.gz: 6a96a68b9d08642282b489d0f6d08596fcee33fed04c41264b66bdaa836ad21130b370213b564fac1fe3db842feb8985b3f82c421417d28114a351602f0beb9d

data/config/version.rb

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

data/lib/origen.rb

@@ -159,10 +159,6 @@ unless defined? RGen::ORIGENTRANSITION
       end
       alias_method :application!, :app!
 
-      def has_plugin?(plugin)
-        _applications_lookup[:name][plugin.to_sym].nil? ? false : true
-      end
-
       # @api private
       def with_source_file(file)
         @current_source_dir = Pathname.new(file).dirname

data/lib/origen/commands.rb

@@ -228,7 +228,7 @@ end.compact
 
 case @command
 when 'generate', 'program', 'compile', 'merge', 'interactive', 'target', 'environment',
-     'save', 'lsf', 'web', 'time', 'dispatch', 'rc', 'lint', 'plugin', 'fetch', 'mode', 'gem' # , 'add'
+     'save', 'lsf', 'web', 'time', 'dispatch', 'rc', 'lint', 'plugin', 'fetch', 'mode' # , 'add'
 
   require "origen/commands/#{@command}"
   exit 0 unless @command == 'interactive'

data/lib/origen/core_ext/fixnum.rb

@@ -43,4 +43,14 @@ class Fixnum
       return nil
     end
   end
+
+  def to_spreadsheet_column
+    index_hash = Hash.new { |hash, key| hash[key] = hash[key - 1].next }.merge(0 => 'A')
+    index_hash[self]
+  end
+  alias_method :to_xls_column, :to_spreadsheet_column
+  alias_method :to_xlsx_column, :to_spreadsheet_column
+  alias_method :to_xls_col, :to_spreadsheet_column
+  alias_method :to_xlsx_col, :to_spreadsheet_column
+  alias_method :to_spreadsheet_col, :to_spreadsheet_column
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Stephen McGinty
@@ -421,7 +421,6 @@ files:
 - lib/origen/commands/compile.rb
 - lib/origen/commands/environment.rb
 - lib/origen/commands/fetch.rb
-- lib/origen/commands/gem.rb
 - lib/origen/commands/generate.rb
 - lib/origen/commands/helpers.rb
 - lib/origen/commands/interactive.rb

data/lib/origen/commands/gem.rb

@@ -1,270 +0,0 @@
-require 'optparse'
-require 'fileutils'
-require 'rubygems'
-require 'origen/version_string'
-
-include Origen::Utility::InputCapture
-
-options = {}
-
-opt_parser = OptionParser.new do |opts|
-  opts.banner = <<-END
-Usage: origen gem
-       origen gem gem_name [option]
-       origen gem fetch gem_name
-       origen gem clean (gem_name|all)
-
-Quickstart Examples:
-  origen gem                           # Displays the list of currently used gems
-  origen gem gem_name                  # Displays details of specified gem
-  origen gem fetch gem name            # Poluates/copies gem source to a local repo (<application_top_level_path>/tmp/gems)
-                                       #  and updates Gemfile to use local copy
-  origen gem clean (gem_name|all)      # Removes/deletes the local copy of the gem source and updated Gemfile to
-                                       #  use originally specified version/path
-
-The following options are available:
-  END
-  opts.on('--location', 'Display the location of the specified gem') { options[:gem_location] = true }
-  opts.on('--version', 'Display the version of the specified gem') { options[:gem_version] = true }
-  opts.on('-h', '--help', 'Show this message') { puts opts; exit }
-end
-
-opt_parser.parse! ARGV
-
-QUIET_ATTRS = %w(
-  files test_files signing_key licenses rdoc_options
-  autorequire cert_chain post_install_message
-)
-
-def self._local_gems
-  gems = {}
-  Gem::Specification.sort_by { |g| [g.name.downcase, g.version] }.group_by(&:name).map do |name, specs|
-    gems[name.to_sym] = {
-      name:     name,
-      version:  specs.map(&:version).join(','),
-      location: specs.map(&:full_gem_path).join(','),
-      authors:  specs.map(&:authors).join(',')
-    }
-  end
-  gems
-end
-
-def self._local_gems_orig
-  Gem::Specification.sort_by { |g| [g.name.downcase, g.version] }.group_by(&:name)
-end
-
-def self._session_gem_path
-  "#{Origen.app.root}/tmp/gems"
-end
-
-def self._application_gemfile
-  "#{Origen.app.root}/Gemfile"
-end
-
-def self._local_path_to_gem(gem)
-  "#{_session_gem_path}/#{Pathname(gem[:location]).basename}"
-end
-
-def self._gem_basename(gem)
-  "#{Pathname(gem[:location]).basename}"
-end
-
-def self._gem_rc_version(gem)
-  gem[:version]
-end
-
-def self._update_gemfile
-  content = File.read(_application_gemfile)
-
-  search_regexp = "# ORIGEN GEM AUTO-GENERATED.*# /ORIGEN GEM AUTO-GENERATED.*?\n"
-
-  if Origen.app.session.gems.keys.empty?
-    new_contents = content.gsub(/#{search_regexp}/m, '')
-  else
-    replacement_string = "# ORIGEN GEM AUTO-GENERATED---------------DO NOT REMOVE THIS LINE-------------\n"
-    replacement_string += "# -- DO NOT CHECK IN WITH THIS SECTION!\n"
-    replacement_string += "# -- DO NOT HAND MODIFY!\n"
-    replacement_string += "# -- USE 'origen gem clean all' to reset\n"
-    replacement_string += "\n"
-
-    Origen.app.session.gems.keys.sort.each do |g|
-      replacement_string += "gem '#{g}', path: '#{Origen.app.session.gems[g.to_sym]}'\n"
-      replacement_string += "puts \"\\e[1;93;40mWARNING: Using session gem for '#{g}'\\e[0m\"\n"
-    end
-
-    replacement_string += "def gem(*args)\n"
-    replacement_string += "  return if [#{Origen.app.session.gems.keys.sort.map { |e| "'" + e.to_s + "'" }.join(',')}].include? args[0]\n"
-    replacement_string += "  super(*args)\n"
-    replacement_string += "end\n"
-    replacement_string += "#\n"
-    replacement_string += "# /ORIGEN GEM AUTO-GENERATED---------------DO NOT REMOVE THIS LINE------------\n"
-
-    if content =~ /#{search_regexp}/m
-      new_contents = content.gsub(/#{search_regexp}/m, replacement_string)
-    else
-      new_contents = replacement_string + content
-    end
-  end
-  File.open(_application_gemfile, 'w') { |file| file.puts new_contents }
-end
-
-gems = _local_gems
-
-if !ARGV[0]
-  longest_key = gems.keys.max_by(&:length)
-  puts ''
-  printf "%-#{longest_key.length}s %-15s %s\n", 'Gem', 'Version', 'Location'
-  puts '--------------------------------------------------------------------------------------------------------------'
-  gems.each do |k, v|
-    printf "%-#{longest_key.length}s %-15s %s\n", k, v[:version], v[:location]
-  end
-  puts ''
-else
-  case input = ARGV.shift
-  when 'clean'
-    gem = ARGV[0]
-    if gem
-      if gem == 'all'
-        if Dir.exist? _session_gem_path
-          puts ''
-          puts 'You are about to delete all local gems (tmp/gems/).  IS THAT CORRECT?'
-          puts ''
-          get_text confirm: true
-          Origen::Log.console_only do
-            Dir.chdir Origen.root do
-              system("rm -fr #{_session_gem_path}")
-            end
-          end
-          unless Origen.app.session.gems.keys.empty?
-            Origen.app.session.gems.keys.sort.each do |g|
-              Origen.app.session.gems.delete_key(g)
-            end
-            _update_gemfile
-          end
-        else
-          puts 'There are no local gems present, nothing to clean.'
-        end
-      elsif gems.key?(gem.to_sym)
-        if Dir.exist? _local_path_to_gem(gems[gem.to_sym])
-          # check if already exists, ask for permission to blow away
-          puts ''
-          puts "You are about to delete the local copy of '#{gem}' (tmp/gems/#{_gem_basename(gems[gem.to_sym])}).  IS THAT CORRECT?"
-          puts ''
-          get_text confirm: true
-          Origen::Log.console_only do
-            Dir.chdir Origen.root do
-              system("rm -fr #{_local_path_to_gem(gems[gem.to_sym])}")
-            end
-          end
-          Origen.app.session.gems.delete_key(gem.to_sym)
-          _update_gemfile
-        else
-          puts "Gem '#{gem}' is not locally present, nothing to clean."
-        end
-      end
-    else
-      puts "Error: Must specify gem to be cleaned or 'all'. Use 'origen gem -h' for usage"
-    end
-  when 'fetch'
-    gem = ARGV[0]
-    if gem
-      if gems.key?(gem.to_sym)
-        # Initialize ./tmp/gems/
-        FileUtils.mkdir_p(_session_gem_path) unless Dir.exist? _session_gem_path
-
-        if Dir.exist? _local_path_to_gem(gems[gem.to_sym])
-          # check if already exists, ask for permission to blow away
-          puts ''
-          puts "Gem '#{_gem_basename(gems[gem.to_sym])}' already exists locally, would you like to replace?"
-          puts "(This will delete and replace the exising copy at #{_local_path_to_gem(gems[gem.to_sym])})"
-          puts ''
-          get_text confirm: true
-          Origen::Log.console_only do
-            Dir.chdir Origen.root do
-              # Blow away these temporary files
-              system("rm -fr #{_local_path_to_gem(gems[gem.to_sym])}")
-            end
-          end
-        end
-
-        if Origen.has_plugin?(gem)
-          # Set up the requested plugin workspace
-          rc_url = Origen.app(gem.to_sym).config.rc_url || Origen.app(gem.to_sym).config.vault
-          if rc_url =~ /git/
-            Origen::RevisionControl::Git.git("clone #{rc_url} #{_gem_basename(gems[gem.to_sym])}", local: _session_gem_path, verbose: true)
-          else
-            # Use Origen::RevisionControl for DesignSync
-            rc = Origen::RevisionControl.new remote: rc_url, local: _local_path_to_gem(gems[gem.to_sym])
-            tag = Origen::VersionString.new(_gem_rc_version(gems[gem.to_sym]))
-            tag = tag.prefixed if tag.semantic?
-            rc.build version: tag
-          end
-        else
-          puts 'Not an Origen plugin gem, only COPYING source.'
-          FileUtils.cp_r(gems[gem.to_sym][:location], _session_gem_path)
-        end
-
-        # FileUtils.cp_r(gems[gem.to_sym][:location], _session_gem_path)
-        unless options[:dont_use]
-          Origen.app.session.gems[gem.to_sym] = "#{_local_path_to_gem(gems[gem.to_sym])}"
-        end
-
-        _update_gemfile
-
-        puts "Fetched #{gem} to tmp/gems/#{_gem_basename(gems[gem.to_sym])}"
-        puts ''
-        # puts 'Please add the following to your Gemfile:'
-        # puts ''
-        # puts "gem '#{gem}', path: '#{_local_path_to_gem(gems[gem.to_sym])}'"
-        # puts ''
-      else
-        puts "Error: '#{gem}' is not a currently used gem.  Use 'origen gem' for gem list."
-      end
-    else
-      puts "Error: Must specify gem to be fetched. Use 'origen gem -h' for usage"
-    end
-  # when 'reset'
-  #   gem = ARGV[0]
-  #   if gem
-  #     puts "Resetting #{gem} to Gemfile/gemspec"
-  #   else
-  #     puts "Error: Must specify gem to be cleaned or 'all'"
-  #   end
-  else
-    gem = input
-    if gems.key?(gem.to_sym)
-      a = _local_gems_orig[gem].to_yaml.split(/\n+/)
-      skip = true
-
-      if options[:gem_location] || options[:gem_version]
-        puts '================================================================================='
-        puts "Gem Name: #{gems[gem.to_sym][:name]}"
-        puts "Version:  #{gems[gem.to_sym][:version]}" if options[:gem_version]
-        puts "Location: #{gems[gem.to_sym][:location]}" if options[:gem_location]
-        puts '================================================================================='
-      else
-        puts '================================================================================='
-        puts "Gem Name: #{gems[gem.to_sym][:name]}"
-        puts "Version:  #{gems[gem.to_sym][:version]}"
-        puts "Location: #{gems[gem.to_sym][:location]}"
-        puts '---------------------------------------------------------------------------------'
-        puts 'Details:'
-        a.each do |line|
-          if line =~ /^  (\w+):(.*)$/
-            topic = Regexp.last_match(1)
-            if QUIET_ATTRS.include? topic
-              skip = true
-            else
-              skip = false
-            end
-          end
-          puts "  #{line}" unless skip
-        end
-        puts '---------------------------------------------------------------------------------'
-        puts '================================================================================='
-      end
-    else
-      puts "Error: '#{gem}' not a valid command or gem. Use 'origen gem -h' for usage or 'origen gem' for gem list."
-    end
-  end
-end