origen 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdb741aab26127261ac1b0ab4f5ac223efb3a334
-  data.tar.gz: d48c4c6494a7c32732ce4305d36dc5bafbfbad02
+  metadata.gz: 7890471b8ec2f67729fe1f77eb91bc06203fd708
+  data.tar.gz: 46e1254090dfd0a60417b29877d4fd8fe6903b45
 SHA512:
-  metadata.gz: 66b4cd9a2872c4bd6e63f71dc48a2799dc843f0c5de477708fd502462fde0c7e4bba209233b8581425d853ff28814e9a70aad1d63c9c7c998b1af7335c9918c5
-  data.tar.gz: 0d342df42ce048de8392a03b37b0b2a14dbe4ec9eb7f4547914488cb46dee7c8ca8aa337ee8ffc17f92a954e15aa12292e5205a84e98fb82c620692b51931d44
+  metadata.gz: 48539a0c1c7d0dd911d39c896a6510ad88cda19aec158c94241032337d3977439574b7c827f653a382dea13c96652c6b0f55f0bb363428bdf8e622c792424962
+  data.tar.gz: 1d3cc10f4d91369a046bed8a86fe77cecaffeff7f8b6c1644d542b146718b0620cecfeea8bd07b8d368b38b497f71586d9546e51744f45479ccbcff0676ab170

data/config/version.rb

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

data/lib/origen/application.rb

@@ -111,7 +111,9 @@ module Origen
           elsif config.rc_url =~ /git/
             @revision_controller ||= RevisionControl::Git.new(
               local:  root,
-              remote: config.rc_url
+              # If a workspace is based on a fork of the master repo, config.rc_url may not
+              # be correct
+              remote: RevisionControl::Git.origin || config.rc_url
             )
 
           end

data/lib/origen/revision_control/git.rb

@@ -1,6 +1,16 @@
 module Origen
   module RevisionControl
     class Git < Base
+      # Returns the origin for the PWD
+      def self.origin
+        git('remote --verbose', verbose: false).each do |remote|
+          if remote =~ /^origin\s+([^\s]+)/
+            return Regexp.last_match(1)
+          end
+        end
+        nil
+      end
+
       def build(options = {})
         if Dir["#{local}/*"].empty? || options[:force]
           FileUtils.rm_rf(local.to_s)

metadata

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