origen 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d127d3c6a39b412a8556608b10b6ec2ef9a1ccaa
-  data.tar.gz: fa1b288892a6654704aed6a79ae29cb7c4f3af83
+  metadata.gz: 680531e26b7e211517e36649bd3d684d5d8452ef
+  data.tar.gz: aa8bde4fe52e7d10775eb9fc790baaf7f99a7fc7
 SHA512:
-  metadata.gz: edae522a13effe32a3fa24b6f28c85587cd108f24d63f7f3543221e5c656dc227e77500d632e25559e87fb76cf7166737a502aa7e2500601538d95cb07051564
-  data.tar.gz: 0431396fa522702e504b037a11aeec790cc7500d1853366e8be3e8e27a56f5642bd0bbf98b8f0b0c11050786831872a7253577e7d4de5cc534dd9cc68a307ef8
+  metadata.gz: 933e06b3c0e4b4c4ce85a0c54ccd4e855ef1fdb9292b6d39828083bdffecc92df0434d28b4b38115c705b421922bfb43cdbc3cbd1470887f4b936189316ead83
+  data.tar.gz: dc94a81757cb13be94012c7d9cd699842c0075d10f4abf11882531e93b8333752a176ca5d0c1a9eb09f6a31fda2675ff6e058220cb6abffbd7fc5452eaefd020

data/config/application.rb

@@ -27,10 +27,12 @@ class OrigenCoreApplication < Origen::Application
   }
 
   config.remotes = [
+    # To include the OrigenAppGenerators documentation in the main guides
     {
       dir: "origen_app_generators",
       rc_url: "https://github.com/Origen-SDK/origen_app_generators.git",
-      version: "1006fe8",
+      version: "v1.1.0",
+      development: true
     }
   ]
 

data/config/version.rb

@@ -1,6 +1,6 @@
 module Origen
   MAJOR = 0
-  MINOR = 23
+  MINOR = 24
   BUGFIX = 0
   DEV = nil
 

data/lib/origen.rb

@@ -75,6 +75,7 @@ unless defined? RGen::ORIGENTRANSITION
 
     class GitError < OrigenError; status_code(11); end
     class DesignSyncError < OrigenError; status_code(12); end
+    class RevisionControlUninitializedError < OrigenError; status_code(13); end
 
     class << self
       include Origen::Utility::TimeAndDate

data/lib/origen/application.rb

@@ -119,20 +119,25 @@ module Origen
     def revision_controller(options = {})
       if current?
         if config.rc_url
-          if config.rc_url =~ /^sync:/
-            @revision_controller ||= RevisionControl::DesignSync.new(
-              local:  root,
-              remote: config.rc_url
-            )
-          elsif config.rc_url =~ /git/
-            @revision_controller ||= RevisionControl::Git.new(
-              local:                  root,
-              # If a workspace is based on a fork of the master repo, config.rc_url may not
-              # be correct
-              remote:                 (options[:uninitialized] ? config.rc_url : (RevisionControl::Git.origin || config.rc_url)),
-              allow_local_adjustment: true
-            )
+          begin
+            if config.rc_url =~ /^sync:/
+              @revision_controller ||= RevisionControl::DesignSync.new(
+                local:  root,
+                remote: config.rc_url
+              )
+            elsif config.rc_url =~ /git/
+              @revision_controller ||= RevisionControl::Git.new(
+                local:                  root,
+                # If a workspace is based on a fork of the master repo, config.rc_url may not
+                # be correct
+                remote:                 (options[:uninitialized] ? config.rc_url : (RevisionControl::Git.origin || config.rc_url)),
+                allow_local_adjustment: true
+              )
 
+            end
+          # The rc_url has been defined, but the initial app checkin has not been done yet
+          rescue RevisionControlUninitializedError
+            @revision_controller = nil
           end
         elsif config.vault
           @revision_controller ||= RevisionControl::DesignSync.new(

data/lib/origen/commands/new.rb

@@ -67,7 +67,7 @@ generators = [['http://rubygems.org', 'origen_app_generators']] + Array(Origen.s
 if update_required
   puts 'Fetching the latest app generators...'
   FileUtils.rm_rf(generators_dir) if File.exist?(generators_dir)
-  FileUtils.mkdir(generators_dir)
+  FileUtils.mkdir_p(generators_dir)
 
   Dir.chdir generators_dir do
     generators.each_with_index do |gen, i|

data/lib/origen/core_ext/bignum.rb

@@ -1,36 +1,38 @@
-class Bignum
-  # Extend Fixnum to enable 10.cycles
-  def cycles
-    if block_given?
-      times do
-        yield
-        Origen.app.tester.cycle
+unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
+  class Bignum
+    # Extend Fixnum to enable 10.cycles
+    def cycles
+      if block_given?
+        times do
+          yield
+          Origen.app.tester.cycle
+        end
+      else
+        Origen.app.tester.cycle(repeat: self)
       end
-    else
-      Origen.app.tester.cycle(repeat: self)
     end
-  end
-  alias_method :cycle, :cycles
+    alias_method :cycle, :cycles
 
-  alias_method :old_bit_select, :[]
-  def [](*args)
-    if args.length == 1 && !args.first.is_a?(Range)
-      old_bit_select(args.first)
-    else
-      if args.first.is_a?(Range)
-        msb = args.first.first
-        lsb = args.first.last
+    alias_method :old_bit_select, :[]
+    def [](*args)
+      if args.length == 1 && !args.first.is_a?(Range)
+        old_bit_select(args.first)
       else
-        msb = args.first
-        lsb = args.last
+        if args.first.is_a?(Range)
+          msb = args.first.first
+          lsb = args.first.last
+        else
+          msb = args.first
+          lsb = args.last
+        end
+        (self >> lsb) & 0.ones_comp(msb - lsb + 1)
       end
-      (self >> lsb) & 0.ones_comp(msb - lsb + 1)
     end
-  end
 
-  def ones_comp(num_bits)
-    self ^ ((1 << num_bits) - 1)
+    def ones_comp(num_bits)
+      self ^ ((1 << num_bits) - 1)
+    end
+    alias_method :ones_complement, :ones_comp
+    alias_method :ones_compliment, :ones_comp
   end
-  alias_method :ones_complement, :ones_comp
-  alias_method :ones_compliment, :ones_comp
 end

data/lib/origen/remote_manager.rb

@@ -221,7 +221,7 @@ module Origen
       # Add remotes from imports
       Origen.app.plugins.each do |plugin|
         plugin.config.remotes.each do |import_remote|
-          add_remote(import_remote)
+          add_remote(import_remote) unless import_remote[:development]
         end
       end
       @remotes

data/lib/origen/revision_control/git.rb

@@ -362,7 +362,11 @@ module Origen
             exit_status = wait_thr.value
             unless exit_status.success?
               if options[:check_errors]
-                fail GitError, "This command failed: 'git #{command}'"
+                if output.any? { |l| l =~ /Not a git repository/ }
+                  fail RevisionControlUninitializedError
+                else
+                  fail GitError, "This command failed: 'git #{command}'"
+                end
               end
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-09-02 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.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit