origen 0.7.28 → 0.7.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75d5d9aaf90f96ddc002948b9de5093f25c0e242
-  data.tar.gz: 25129581da1a3cfdd2d90f19eb99329e2a565219
+  metadata.gz: 82e6c45883ec5797c6a69d7af5cbf81a7f0abd30
+  data.tar.gz: 2e339ab8e5ffdac4e51876008844425f34aba46b
 SHA512:
-  metadata.gz: 99667abb0f3589396192c82d68c6737ba567924a3cc71c2b49db0371fc0e18c0cd3a89fc8530e58d3fe1c5711e2b50297ce772d65fa850ff94332cd4e2128b9b
-  data.tar.gz: 0e7d3b9ff878aacdd2fd7643f3dad9a9382b6a69cea505ecf51b2fccfc62fa4b2144c83acf33389b183b48594a6f94513134e4afba83a516fc8c5ab6a0513563
+  metadata.gz: 0c4c01e0b963d8a12816078b9827f6daf6897f0f9cba016e61e8863f698dfaf44d8d539c151b086670f87b17af873253cf7760012155a686d862264ca2586e57
+  data.tar.gz: b8624abcb510d26731f4e5c9e1ab03b72b85f733cd54f261b0ed695a42647f6de1f5ebe9bcbae0fc7cb15a5e9c7f77895f70b448279a594739dfb9ffcbd63cdc

data/config/version.rb

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

data/lib/origen/application.rb

@@ -119,10 +119,11 @@ module Origen
             )
           elsif config.rc_url =~ /git/
             @revision_controller ||= RevisionControl::Git.new(
-              local:  root,
+              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))
+              remote:                 (options[:uninitialized] ? config.rc_url : (RevisionControl::Git.origin || config.rc_url)),
+              allow_local_adjustment: true
             )
 
           end

data/lib/origen/revision_control/base.rb

@@ -27,7 +27,7 @@ module Origen
         end
         @remote = Pathname.new(options[:remote])
         @local = Pathname.new(options[:local]).expand_path
-        initialize_local_dir
+        initialize_local_dir(options)
       end
 
       # Build the local workspace for the first time.
@@ -249,7 +249,7 @@ module Origen
         end
       end
 
-      def initialize_local_dir
+      def initialize_local_dir(options = {})
         FileUtils.mkdir_p(local.to_s) unless local.exist?
       end
     end

data/lib/origen/revision_control/design_sync.rb

@@ -285,7 +285,7 @@ module Origen
         end
       end
 
-      def initialize_local_dir
+      def initialize_local_dir(options = {})
         super
         unless initialized?
           Origen.log.debug "Initializing DSSC workspace at #{local}"

data/lib/origen/revision_control/git.rb

@@ -244,7 +244,22 @@ module Origen
         end
       end
 
-      def initialized?
+      def initialized?(options = {})
+        @hierarchy_searched ||= begin
+          path = @local.dup
+          until path.root? || File.exist?("#{local}/.git")
+            if File.exist?("#{path}/.git")
+              if options[:allow_local_adjustment]
+                @local = path
+              else
+                fail "Requested local repository #{local} is within existing local repository #{path}"
+              end
+            else
+              path = path.parent
+            end
+          end
+          true
+        end
         File.exist?("#{local}/.git") &&
           git('remote -v', verbose: false).any? { |r| r =~ /#{remote_without_protocol_and_user}/ || r =~ /#{remote_without_protocol_and_user.to_s.gsub(':', "\/")}/ } &&
           !git('status', verbose: false).any? { |l| l =~ /^#? ?Initial commit$/ }
@@ -309,9 +324,9 @@ module Origen
         !(git('status --verbose', verbose: false).last =~ /^(no changes|nothing to commit|nothing added to commit but untracked files present)/)
       end
 
-      def initialize_local_dir
+      def initialize_local_dir(options = {})
         super
-        unless initialized?
+        unless initialized?(options)
           Origen.log.debug "Initializing Git workspace at #{local}"
           git 'init'
           git 'remote remove origin', verbose: false, check_errors: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.28
+  version: 0.7.29
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport