shipit-engine 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee64f554f8b69bafd115203bc2cecc33521d5a7a
-  data.tar.gz: 7c8029319509f59e820d7923e9ecc6eaf226d8e2
+  metadata.gz: e8a76aee01307d253747b6e49c6c7be3bb4c3cf2
+  data.tar.gz: 511372e610c0dfcdad6038607733841ee2752d0b
 SHA512:
-  metadata.gz: 950959a1195778f0e3113db087b7e999866467ad79a095a70843a309f09bd212566e2d91679ee1b72d85854ae2b00a54189b33433051d46461f6aa880652af4e
-  data.tar.gz: 5a9a53f97e460c4fc189220b6f028d9a2851bd6298542491a295fe1a7949fe981b3090dee882960b49aa05b275d9a70cfdec0142a761efab06fdd4bb29332f97
+  metadata.gz: ed8a88d84aa2f2d6e845fadad57c9aa39ebb78986f60ccd351a502bc6f5753c9a17e99bb7e3baf2c5b9e9c6fe716d3358c65bf704c7dbf4bffed69ae5c8595f3
+  data.tar.gz: d9bf4e7c3550d38705f5482971f84177eb64cddc42248e42c5197009d6fa12bbdc0914360c722fa7298b4d596e7e8a0c44f00d3af8ba2c2f4cbb0c119e222ae9

data/app/models/shipit/commit.rb

@@ -80,7 +80,8 @@ module Shipit
     end
 
     def refresh_statuses!
-      Shipit.github_api.statuses(github_repo_name, sha).each do |status|
+      github_statuses = stack.handle_github_redirections { Shipit.github_api.statuses(github_repo_name, sha) }
+      github_statuses.each do |status|
         statuses.replicate_from_github!(status)
       end
     end

data/app/models/shipit/stack.rb

@@ -215,7 +215,28 @@ module Shipit
     end
 
     def github_commits
-      Shipit.github_api.commits(github_repo_name, sha: branch)
+      handle_github_redirections do
+        Shipit.github_api.commits(github_repo_name, sha: branch)
+      end
+    end
+
+    def handle_github_redirections
+      # https://developer.github.com/v3/#http-redirects
+      resource = yield
+      if resource.try(:message) == 'Moved Permanently'
+        refresh_repository!
+        yield
+      else
+        resource
+      end
+    end
+
+    def refresh_repository!
+      resource = Shipit.github_api.repo(github_repo_name)
+      if resource.try(:message) == 'Moved Permanently'
+        resource = Shipit.github_api.get(resource.url)
+      end
+      update!(repo_owner: resource.owner.login, repo_name: resource.name)
     end
 
     def active_task?

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.8.8'
+  VERSION = '0.8.9'
 end

data/test/models/stacks_test.rb

@@ -417,5 +417,26 @@ module Shipit
 
       assert_equal 'pending', @stack.merge_status
     end
+
+    test "#handle_github_redirections update the stack if the repository was renamed" do
+      repo_permalink = 'https://api.github.com/repositories/42'
+
+      commits_redirection = stub(message: 'Moved Permanently', url: File.join(repo_permalink, '/commits'))
+      Shipit.github_api.expects(:commits).with(@stack.github_repo_name, sha: 'master').returns(commits_redirection)
+
+      repo_redirection = stub(message: 'Moved Permanently', url: repo_permalink)
+      Shipit.github_api.expects(:repo).with('shopify/shipit-engine').returns(repo_redirection)
+
+      repo_resource = stub(name: 'shipster', owner: stub(login: 'george'))
+      Shipit.github_api.expects(:get).with(repo_permalink).returns(repo_resource)
+
+      commits_resource = stub
+      Shipit.github_api.expects(:commits).with('george/shipster', sha: 'master').returns(commits_resource)
+
+      assert_equal 'shopify/shipit-engine', @stack.github_repo_name
+      assert_equal commits_resource, @stack.github_commits
+      @stack.reload
+      assert_equal 'george/shipster', @stack.github_repo_name
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Jean Boussier