manageiq-cross_repo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf9a2849a682e80a6099be954de0a7f2a1e3f019b3b04018a5a18aeeec68f905
-  data.tar.gz: 6308f46b490d5af9a923929bd706f9a41e057cd5cbefef8214db7b44f1d8978c
+  metadata.gz: 239fd403cb0702b0dc46c14a2091f60f6c3026eb9e2a4ba8177e2673111db23f
+  data.tar.gz: 65e594c923e080920fba7a24aa0ce75e31affa600e2f95238ff896c817dd597a
 SHA512:
-  metadata.gz: 1bf15c4fe299adab8a79a0bc37afd619032c2a868adf328db72a9eec4d918f435496872f182349d675347d14220248bdc99399059f8a62af4113433117c4118b
-  data.tar.gz: a910789c67868604ddc3fe304c7268952d474e36d81f120b39553c8dce2d23540984f319dd87f28cdd5dd4d80cdcd7fe01b4d44a97e9887b95b2ea00b4c9cf32
+  metadata.gz: 0a19241876f9e0d0911dd4ee6b5912ead8349b0c4acd648db93dca59d8f992f89130eb08e54efefb1472269c8f240ccefc29b94d2c469b5c85c6aaa1f37330cb
+  data.tar.gz: 120fbc5e638502dd731e3b37571595ff68f6125f54e37fed218a563d03c8e6e53a4e5291b33d1d8f2b40772a8221b43837cacdc0a47abc46855c637fd58224cf

data/README.md

@@ -29,6 +29,9 @@ Repo Formats:
     @ref:       Optional, defaults to master if #pr not set. Can be a branch, tag, or SHA. Mutually exclusive with #pr.
     #pr:        Optional, references a pull-request number. Mutually exclusive with @ref.
 
+  URL: https://github.com/org/repository, https://github.com/org/repository/tree/branch,
+       https://github.com/org/repository/commit/sha, https://github.com/org/repository/pull/pr
+
   Local: Either a fully qualified path or a relative path (e.g. /path/to/repo, ~/relative/to/home, ../relative/to/current/dir)
 
 Examples:

data/exe/manageiq-cross_repo

@@ -49,6 +49,9 @@ opts = Optimist.options do
         @ref:       Optional, defaults to master if #pr not set. Can be a branch, tag, or SHA. Mutually exclusive with #pr.
         #pr:        Optional, references a pull-request number. Mutually exclusive with @ref.
 
+      URL: https://github.com/org/repository, https://github.com/org/repository/tree/branch,
+           https://github.com/org/repository/commit/sha, https://github.com/org/repository/pull/pr
+
       Local: Either a fully qualified path or a relative path (e.g. /path/to/repo, ~/relative/to/home, ../relative/to/current/dir)
   EOS
 
@@ -86,6 +89,11 @@ end
 
 opts[:gem_repos] = opts[:gem_repos].flatten.flat_map { |repo| repo.split(",").map(&:strip) }
 
+if ENV["CI"] && opts[:test_repo] == "ManageIQ/manageiq@master" && opts[:core_repo].blank? && opts[:gem_repos].blank?
+  puts "Nothing to do!"
+  exit
+end
+
 begin
   ManageIQ::CrossRepo.run(opts[:test_repo], opts[:core_repo], opts[:gem_repos])
 rescue ArgumentError => e

data/lib/manageiq/cross_repo/repository.rb

@@ -1,6 +1,7 @@
 module ManageIQ::CrossRepo
   class Repository
-    attr_accessor :org, :repo, :ref, :sha, :url, :path
+    attr_reader :identifier, :server
+    attr_reader :org, :repo, :ref, :sha, :url, :path
 
     # ManageIQ::CrossRepo::Repository
     #
@@ -9,7 +10,9 @@ module ManageIQ::CrossRepo
     # @example
     #   Repostory.new("ManageIQ/manageiq@master", server: "https://github.com")
     def initialize(identifier, server: "https://github.com")
-      @org, @repo, @ref, @sha, @url, @path = parse_identifier(identifier, server)
+      @identifier = identifier
+      @server     = server
+      @org, @repo, @ref, @sha, @url, @path = parse_identifier
     end
 
     def core?
@@ -37,34 +40,91 @@ module ManageIQ::CrossRepo
 
     private
 
-    def parse_identifier(identifier, server)
-      if ["/", "~", "."].include?(identifier[0])
-        path = Pathname.new(identifier).expand_path
-        raise ArgumentError, "Path #{path} does not exist" unless path.exist?
+    def parse_identifier
+      if local_identifier?
+        parse_local_identifier
+      elsif url_identifier?
+        parse_url_identifier
+      else
+        parse_repo_identifier
+      end
+    end
+
+    def local_identifier?
+      ["/", "~", "."].include?(identifier[0])
+    end
+
+    def parse_local_identifier
+      path = Pathname.new(identifier).expand_path
+      raise ArgumentError, "Path #{path} does not exist" unless path.exist?
+
+      org  = nil
+      repo = path.basename.to_s
+      ref  = Dir.chdir(path) { `git rev-parse HEAD`.chomp }
+      sha  = ref
+      url  = nil
+
+      return org, repo, ref, sha, url, path
+    end
+
+    def url_identifier?
+      identifier.start_with?(server)
+    end
+
+    def parse_url_identifier
+      url_path = URI.parse(identifier).path
+      _, org, repo, type, commit_branch_or_pr = url_path.split("/")
+
+      case type
+      when "tree"
+        branch = commit_branch_or_pr
+      when "commit"
+        commit = commit_branch_or_pr
+      when "pull"
+        pr = commit_branch_or_pr
+      else
+        branch = "master"
+      end
+
+      url = File.join(server, org, repo)
+      sha =
+        if pr
+          git_pr_to_sha(url, pr)
+        elsif branch
+          git_branch_to_sha(url, branch)
+        else
+          commit
+        end
 
-        repo = path.basename.to_s
-        ref  = Dir.chdir(path) { `git rev-parse HEAD`.chomp }
-        sha  = ref
+      raise ArgumentError, "#{identifier} does not exist" if sha.nil?
+
+      ref  = nil
+      path = REPOS_DIR.join("#{org}/#{repo}@#{sha}")
+
+      return org, repo, ref, sha, url, path
+    end
+
+    def parse_repo_identifier
+      if identifier.include?("#")
+        name, pr = identifier.split("#")
       else
-        if identifier.include?("#")
-          name, pr = identifier.split("#")
+        name, ref_or_branch = identifier.split("@")
+        if ref_or_branch.nil?
+          branch = "master"
+        elsif ref_or_branch.match?(/^\h+$/)
+          ref = ref_or_branch
         else
-          name, ref_or_branch = identifier.split("@")
-          if ref_or_branch.nil?
-            branch = "master"
-          elsif ref_or_branch.match?(/^\h+$/)
-            ref = ref_or_branch
-          else
-            branch = ref_or_branch
-          end
+          branch = ref_or_branch
         end
+      end
 
-        org, repo = name.split("/")
-        repo, org = org, "ManageIQ" if repo.nil?
+      org, repo = name.split("/")
+      repo, org = org, "ManageIQ" if repo.nil?
 
-        url  = File.join(server, org, repo)
+      url = File.join(server, org, repo)
 
-        sha = if pr
+      sha =
+        if pr
           git_pr_to_sha(url, pr)
         elsif branch
           git_branch_to_sha(url, branch)
@@ -72,10 +132,9 @@ module ManageIQ::CrossRepo
           ref
         end
 
-        raise ArgumentError, "#{identifier} does not exist" if sha.nil?
+      raise ArgumentError, "#{identifier} does not exist" if sha.nil?
 
-        path = REPOS_DIR.join("#{org}/#{repo}@#{sha}")
-      end
+      path = REPOS_DIR.join("#{org}/#{repo}@#{sha}")
 
       return org, repo, ref, sha, url, path
     end
@@ -89,7 +148,7 @@ module ManageIQ::CrossRepo
     end
 
     def git_pr_to_sha(url, pr)
-      `git ls-remote #{url} refs/pull/#{pr}/head`.split("\t").first
+      git_branch_to_sha(url, "refs/pull/#{pr}/head")
     end
   end
 end

data/lib/manageiq/cross_repo/runner.rb

@@ -58,7 +58,7 @@ module ManageIQ::CrossRepo
     end
 
     def system!(*args)
-      exit($CHILD_STATUS.exitstatus) unless system(*args)
+      exit($?.exitstatus) unless system(*args)
     end
 
     def generate_bundler_d
@@ -68,7 +68,7 @@ module ManageIQ::CrossRepo
       if gem_repos.empty?
         FileUtils.rm_f override_path
       else
-        content = gem_repos.map { |gem| "override_gem \"#{gem.repo}\", :path => \"#{gem.path}\"" }.join("\n")
+        content = gem_repos.map { |gem| "ensure_gem \"#{gem.repo}\", :path => \"#{gem.path}\"" }.join("\n")
         FileUtils.mkdir_p(bundler_d_path)
 
         File.write(override_path, content)

data/lib/manageiq/cross_repo/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module CrossRepo
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-cross_repo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake