origen 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d2449785c5161644ff8da66aa8403aae62f4d08
-  data.tar.gz: 8ee9264e19480135516b1c47a8a493d2cb748036
+  metadata.gz: fa35579495bf10b17e26daa07762d997834931d0
+  data.tar.gz: b31c04ce31fd8f75054da7696f9158bcbe93e225
 SHA512:
-  metadata.gz: 4de43c9c9c3f8dd7b31e8deea1036dcd4ca91ffd2cfa81081747b2b327805f992be7d08e758279caff1769f0a0ce76dc2b0ab0adbce05fa5ded120339839006b
-  data.tar.gz: df12a88ed32d574088e91c7cdf4e189bdabff2aa285961845c62c2cfdc784c42755f83b75ce703707488655f0144ed5f5e92264277b3527cce558752e14002cc
+  metadata.gz: e2be498edb881b314e50db159168f3e11537a29defe4f1117a4d81a0084fa2594f1fc9e443158d22b777614d13c93b5ea0b6c244d0f022ba547167ff8f327184
+  data.tar.gz: 142048906f8c6dcbd4a0ce163d6f8283c89e91e6e0be4fbd2962dfe06e6b2f610da8b856cfc17b360ca0b009411e4f575433343b5a6ff2e8fc2d566f8ab6dec9

data/config/version.rb

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

data/lib/origen/commands/interactive.rb

@@ -55,12 +55,7 @@ Usage: origen i [options]
 
   if defined?(Pry) && options[:pry]
     include ConsoleMethods
-  else
-    IRB::ExtendCommandBundle.send :include, Origen::ConsoleMethods
-    IRB.start
-    exit 0
-  end
-  # rubocop:disable Debugger, EmptyLines
+    # rubocop:disable Debugger, EmptyLines
 
 
 
@@ -68,7 +63,7 @@ Usage: origen i [options]
 
 
 
-  binding.pry
+    binding.pry
 
 
 
@@ -76,5 +71,9 @@ Usage: origen i [options]
 
 
 
-  # rubocop:enable Debugger, EmptyLines
+    # rubocop:enable Debugger, EmptyLines
+  else
+    IRB::ExtendCommandBundle.send :include, Origen::ConsoleMethods
+    IRB.start
+  end
 end

data/lib/origen/global_methods.rb

@@ -1,74 +1,6 @@
 module Origen
   module GlobalMethods
     require_relative 'encodings'
-    # If a new gem (i.e. not part of the existing Ruby installation) is required by Origen or an
-    # application then it should be required via this method.
-    # On Windows this can be installed automatically and this method will take care of doing
-    # that.
-    #
-    # However due to the restricted user permissions available on Linux this cannot be done
-    # automatically and you must ensure that you arrange to have the required gem installed
-    # on Linux - contact Stephen McGinty to get this done.
-    #
-    # A given user will then have to update their local toolset to pick this up and this method
-    # will give them the necessary instructions.
-    #
-    # @example
-    #
-    #   require_gem "rest-client"
-    #   require_gem "net/ldap", :name => "net-ldap"
-    def require_gem(name, options = {})
-      Origen.deprecate <<-END
-require_gem will be removed in Origen V3, Bundler should be used to manage gem dependencies
-END
-      options = {
-        name: name
-      }.merge(options)
-      name = name.to_s
-      options[:name] = options[:name].to_s
-      if options[:version] && options[:version] =~ /^v(.*)/
-        options[:version] = Regexp.last_match[1]
-      end
-      # This gem was not included in the initial Origen v2.x.x gemset, so need to handle instalations
-      # without it
-      begin
-        if options[:version]
-          gem options[:name], options[:version]
-        end
-        require name
-      rescue LoadError
-        if Origen.running_on_windows?
-          puts "Installing #{options[:name]}"
-          command = "gem install #{options[:name]} --no-rdoc --no-ri"
-          command += " --version #{options[:version]}" if options[:version]
-          if !system(command)
-            puts 'It looks like a problem occurred, ensure you have installed Ruby exactly per the Origen guide'
-          else
-            puts 'A missing gem has just been installed to your system, please re-run the previous command'
-          end
-        else
-          puts "Installing #{options[:name]}"
-          command = "gem install --user-install #{options[:name]} --no-rdoc --no-ri"
-          command += " --version #{options[:version]}" if options[:version]
-          if !system(command)
-            puts 'It looks like there was a problem installing that gem, run the following commands to ensure you have an up to date'
-            puts 'environment, then try again:'
-            puts ''
-            puts "  cd #{Origen.top}"
-            puts '  source source_setup update'
-            puts "  cd #{FileUtils.pwd}"
-          else
-            puts 'A missing gem has just been installed to your system, please re-run the previous command'
-          end
-          # puts "The current application has required a gem called #{options[:name]}, however that is not available in your current toolset."
-          # puts 'This may be solved by following the instructions below, otherwise contact the application owner.'
-          # puts ''
-          # puts_require_latest_ruby
-        end
-        exit 1
-      end
-    end
-
     def annotate(msg, options = {})
       Origen.app.tester.annotate(msg, options)
     end
@@ -102,6 +34,14 @@ END
       Origen.generator.compiler.render(*args, &block)
     end
 
+    def dut
+      Origen.top_level
+    end
+
+    def tester
+      Origen.tester
+    end
+
     # The options passed to an ERB template. Having it
     # global like this is ugly, but it does allow a hash of options
     # to always be available in templates even if the template
@@ -117,89 +57,9 @@ END
       binding
     end
 
-    def debug(*lines)
-      Origen.deprecate 'debug method is deprecated, use Origen.log.debug instead'
-      if Origen.debug?
-        Origen.log.info ''
-        c = caller[0]
-        c =~ /(.*):(\d+):.*/
-        $_last_log_time ||= Time.now
-        delta = Time.now - $_last_log_time
-        $_last_log_time = Time.now
-        begin
-          Origen.log.info "*** Debug *** %.6f #{Regexp.last_match[1]}:#{Regexp.last_match[2]}" % delta
-        rescue
-          # For this to fail it means the deprecated method was called by IRB or similar
-          # and in that case there is no point advising who called anyway
-        end
-        options = lines.last.is_a?(Hash) ? lines.pop : {}
-        lines.flatten.each do |line|
-          line.split(/\n/).each do |line|
-            Origen.log.info line, options
-          end
-        end
-      end
-    end
-
     Pattern = Origen.pattern unless defined?(Pattern)
     Flow = Origen.flow unless defined?(Flow)
     Resources = Origen.resources unless defined?(Resources)
     User = Origen::Users::User unless defined?(User)
-
-    # Returns an Excel column based on an Integer argument
-    def get_excel_column(n)
-      excel_columns = {}
-      @column = 'A'
-      (1..75).to_a.each do |i|
-        excel_columns[i] = @column
-        @column = @column.succ
-      end
-      excel_columns[n]
-    end
-
-    # Returns the full class hierarchy of an object
-    def get_full_class(obj)
-      klass_str = ''
-      until obj.nil?
-        if obj == Origen.top_level
-          klass_str.prepend obj.class.to_s
-        else
-          # If the class method produces "SubBlock" then use the object name instead
-          if obj.class.to_s.split('::').last == 'SubBlock'
-            klass_str.prepend "::#{obj.name.upcase}"
-          else
-            klass_str.prepend "::#{obj.class.to_s.split('::').last}"
-          end
-        end
-        obj = obj.parent
-      end
-      klass_str
-    end
-
-    # Returns Rgen supported encoding formats
-    def encodings(format = nil)
-      if format.nil?
-        Origen::ENCODINGS.keys
-      else
-        Origen::ENCODINGS[format].keys
-      end
-    end
-
-    # Returns the encoded symbol as a String if one match is found.
-    # Returns a hash for multiple results and nil for no match
-    def encoding_search(symbol, options = {})
-      options = {
-        format: :utf8
-      }.update(options)
-      fail "The encoding format '#{options[:format]}' is not supported, please choose from #{encodings}" unless encodings.include? options[:format]
-      results = Origen::ENCODINGS[options[:format]].filter(symbol)
-      if results.size == 1
-        results.values.first
-      elsif results.size > 1
-        results
-      else
-        return nil
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport