vx-service_connector 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 506631ac3d925645c77d80c04a25f9a0ee56b870
-  data.tar.gz: 45f29455185ae52784716d02936edad184355a60
+  metadata.gz: 728d36964c4a9f513d0ca3ae5897c4beee46f8de
+  data.tar.gz: 909bc1aa8d6b30e85c0eb652e57e3991d16b5c1b
 SHA512:
-  metadata.gz: df26dd771eaa60bec62f5849bbb8e09ece06e69e79223b5cdcb34153ef78ffc43c4b7e90e0704eddfeeb161173841d1aad2f602a668795c55caa44d0177d0782
-  data.tar.gz: 9103c4e08c2293b9274ed3c1c4860958f173e4b1181a0716d6cda0387ee83b6743092134e90ce8c10c5ea73d532d37021cc9a177e3cfbbc3e4fa96e1ff4dfa90
+  metadata.gz: 915f71759d79a0306ca011f0acd66389c60d4b9925ae9bc2655149d25466c5a3b4e441371c49f55ff8941dabcf7cb60d29d245a396b0062de4fd9b81127555ed
+  data.tar.gz: 27bc9295f4ca3d4f9f0192cd4ebbb0ddf7e821e3254c09193c0ba9367a3fbca0d5b07b37b56ee0ad40ea6038f24e26f672930f80413ba08f68bc4429f5a48d86

data/lib/vx/service_connector/base.rb

@@ -22,11 +22,10 @@ module Vx
         raise ArgumentError, 'not implemented'
       end
 
-      private
+      def session
+        @session ||= create_session
+      end
 
-        def session
-          @session ||= create_session
-        end
     end
   end
 end

data/lib/vx/service_connector/github/payload.rb

@@ -1,12 +1,27 @@
+require 'ostruct'
+
 module Vx
   module ServiceConnector
     class Github
-      class Payload
+      Payload = Struct.new(:session, :params) do
 
-        def initialize(params)
-          @params = params || {}
+        def build
+          ServiceConnector::Model::Payload.new(
+            !!ignore?,
+            !!pull_request,
+            pull_request_number,
+            branch,
+            branch_label,
+            sha,
+            message,
+            author,
+            author_email,
+            web_url
+          )
         end
 
+        private
+
         def pull_request?
           key? "pull_request"
         end
@@ -21,7 +36,7 @@ module Vx
           end
         end
 
-        def head
+        def sha
           if pull_request?
             pull_request["head"]["sha"]
           else
@@ -29,14 +44,6 @@ module Vx
           end
         end
 
-        def base
-          if pull_request?
-            pull_request["base"]["sha"]
-          else
-            self["before"]
-          end
-        end
-
         def branch
           if pull_request?
             pull_request["head"]["ref"]
@@ -53,11 +60,35 @@ module Vx
           end
         end
 
-        def url
+        def web_url
+          if pull_request?
+            pull_request["html_url"]
+          else
+            head_commit["url"]
+          end
+        end
+
+        def message
+          if pull_request?
+            commit_for_pull_request.message
+          else
+            head_commit["message"]
+          end
+        end
+
+        def author
+          if pull_request?
+            commit_for_pull_request.author.name
+          else
+            head_commit? && head_commit["author"]["name"]
+          end
+        end
+
+        def author_email
           if pull_request?
-            pull_request["url"]
+            commit_for_pull_request.author.email
           else
-            self["compare"]
+            head_commit? && head_commit["author"]["email"]
           end
         end
 
@@ -85,37 +116,41 @@ module Vx
           if pull_request?
             closed_pull_request? || !foreign_pull_request?
           else
-            head == '0000000000000000000000000000000000000000' ||
-              tag?
+            sha == '0000000000000000000000000000000000000000' || tag?
           end
         end
 
-        def to_model
-          ServiceConnector::Model::Payload.new(
-            !!pull_request,
-            pull_request_number,
-            head,
-            base,
-            branch,
-            branch_label,
-            url,
-            !!ignore?
-          )
+
+        def commit_for_pull_request
+          @commit_for_pull_request ||=
+            begin
+              data = session.commit pull_request["base"]["repo"]["full_name"], sha
+              data.commit
+            rescue ::Octokit::NotFound => e
+              $stderr.puts "ERROR: #{e.inspect}"
+              OpenStruct.new
+            end
         end
 
-        private
+        def head_commit?
+          self["head_commit"]
+        end
 
-          def pull_request
-            self["pull_request"]
-          end
+        def head_commit
+          self["head_commit"] || {}
+        end
 
-          def key?(name)
-            @params.key? name
-          end
+        def pull_request
+          self["pull_request"]
+        end
 
-          def [](val)
-            @params[val]
-          end
+        def key?(name)
+          params.key? name
+        end
+
+        def [](val)
+          params[val]
+        end
 
       end
 

data/lib/vx/service_connector/github.rb

@@ -11,11 +11,11 @@ module Vx
       include ServiceConnector::Base
 
       def repos
-        @repos ||= Github::Repos.new(session).to_a
+        Github::Repos.new(session).to_a
       end
 
       def organizations
-        @organizations ||= Github::Repos.new(session).organizations
+        Github::Repos.new(session).organizations
       end
 
       def hooks(repo)
@@ -34,8 +34,8 @@ module Vx
         Github::Files.new(session, repo)
       end
 
-      def commits(repo)
-        Github::Commits.new(session, repo)
+      def payload(repo, params)
+        Github::Payload.new(session, params).build
       end
 
       private
@@ -48,6 +48,6 @@ module Vx
   end
 end
 
-%w{ hooks deploy_keys notices repos payload files commits }.each do |f|
-  require File.expand_path("../github/#{f}", __FILE__)
+Dir[File.expand_path("../github/*.rb", __FILE__)].each do |f|
+  require f
 end

data/lib/vx/service_connector/{gitlab_v4 → gitlab_v5}/files.rb

@@ -2,7 +2,7 @@ require 'base64'
 
 module Vx
   module ServiceConnector
-    class GitlabV4
+    class GitlabV5
       Files = Struct.new(:session, :repo) do
 
         def get(sha, path)

data/lib/vx/service_connector/{gitlab_v4 → gitlab_v5}/hooks.rb

@@ -1,6 +1,6 @@
 module Vx
   module ServiceConnector
-    class GitlabV4
+    class GitlabV5
       Hooks = Struct.new(:session, :repo) do
 
         def all

data/lib/vx/service_connector/{gitlab_v4 → gitlab_v5}/notices.rb

@@ -1,6 +1,6 @@
 module Vx
   module ServiceConnector
-    class GitlabV4
+    class GitlabV5
       Notices = Struct.new(:session, :repo) do
 
         def create(build_sha, build_status, build_url, description)

data/lib/vx/service_connector/gitlab_v5/payload.rb

@@ -0,0 +1,112 @@
+module Vx
+  module ServiceConnector
+    class GitlabV5
+      Payload = Struct.new(:session, :repo, :params) do
+
+        def build
+          ServiceConnector::Model::Payload.new(
+            !!ignore?,
+            !!pull_request?,
+            pull_request_number,
+            branch,
+            branch_label,
+            sha,
+            message,
+            author,
+            author_email,
+            web_url
+          )
+        end
+
+        private
+
+        def message
+          commit_for_payload["title"]
+        end
+
+        def author
+          commit_for_payload["author_name"]
+        end
+
+        def author_email
+          commit_for_payload["author_email"]
+        end
+
+        def pull_request?
+          false
+        end
+
+        def tag?
+          false
+        end
+
+        def pull_request_number
+          nil
+        end
+
+        def sha
+          self["after"]
+        end
+
+        def branch
+          self["ref"].to_s.split("refs/heads/").last
+        end
+
+        def branch_label
+          branch
+        end
+
+        def web_url
+          if u = self["repository"] && self["repository"]["homepage"]
+            "#{u}/commit/#{sha}"
+          end
+        end
+
+        def pull_request_head_repo_id
+          nil
+        end
+
+        def pull_request_base_repo_id
+          nil
+        end
+
+        def closed_pull_request?
+          false
+        end
+
+        def foreign_pull_request?
+          pull_request_base_repo_id != pull_request_head_repo_id
+        end
+
+        def ignore?
+          sha == '0000000000000000000000000000000000000000'
+        end
+
+        def pull_request
+          {}
+        end
+
+        def key?(name)
+          params.key? name
+        end
+
+        def [](val)
+          params[val]
+        end
+
+        def commit_for_payload
+          @commit_for_payload ||=
+            begin
+              commits = session.get("/projects/#{repo.id}/repository/commits", ref_name: sha)
+              commits.first || {}
+            rescue RequestError => e
+              $stderr.puts "ERROR: #{e.inspect}"
+              {}
+            end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/vx/service_connector/{gitlab_v4 → gitlab_v5}/repos.rb

@@ -1,6 +1,6 @@
 module Vx
   module ServiceConnector
-    class GitlabV4
+    class GitlabV5
       Repos = Struct.new(:session) do
 
         def to_a

data/lib/vx/service_connector/{gitlab_v4 → gitlab_v5}/session.rb

@@ -3,7 +3,7 @@ require 'uri'
 
 module Vx
   module ServiceConnector
-    class GitlabV4
+    class GitlabV5
 
       Session = Struct.new(:endpoint, :private_token) do
 

data/lib/vx/service_connector/gitlab_v5.rb

@@ -2,16 +2,44 @@ require 'gitlab'
 
 module Vx
   module ServiceConnector
-    class GitlabV5 < GitlabV4
+    GitlabV5 = Struct.new(:endpoint, :private_token) do
+
+      include ServiceConnector::Base
 
       def repos
-        @repos ||= GitlabV4::Repos.new(session).to_a
+        @repos ||= GitlabV5::Repos.new(session).to_a
+      end
+
+      def organizations
+        []
+      end
+
+      def hooks(repo)
+        GitlabV5::Hooks.new(session, repo)
       end
 
       def deploy_keys(repo)
         GitlabV5::DeployKeys.new(session, repo)
       end
 
+      def notices(repo)
+        GitlabV5::Notices.new(session, repo)
+      end
+
+      def files(repo)
+        GitlabV5::Files.new(session, repo)
+      end
+
+      def payload(repo, params)
+        GitlabV5::Payload.new(session, repo, params).build
+      end
+
+      private
+
+        def create_session
+          GitlabV5::Session.new(endpoint, private_token)
+        end
+
     end
   end
 end

data/lib/vx/service_connector/model.rb

@@ -12,14 +12,16 @@ module Vx
       )
 
       Payload = Struct.new(
+        :ignore?,
         :pull_request?,
         :pull_request_number,
-        :head,
-        :base,
         :branch,
         :branch_label,
-        :url,
-        :ignore?
+        :sha,
+        :message,
+        :author,
+        :author_email,
+        :web_url
       ) do
         def to_hash ; to_h end
 
@@ -34,26 +36,20 @@ module Vx
         end
       end
 
-      Commit = Struct.new(
-        :sha,
-        :message,
-        :author,
-        :author_email,
-        :http_url
-      )
-
       extend self
 
       def test_payload_attributes(params = {})
         {
+          ignore?:              false,
           pull_request?:        false,
           pull_request_number:  nil,
-          head:                 "HEAD",
-          base:                 '0000',
           branch:               'master',
           branch_label:         'master:label',
-          url:                  'http://example.com',
-          ignore?:              false
+          sha:                  "HEAD",
+          message:              'test commit',
+          author:               'User Name',
+          author_email:         'me@example.com',
+          web_url:              'http://example.com',
         }.merge(params)
       end
 
@@ -61,10 +57,6 @@ module Vx
         Payload.from_hash(test_payload_attributes params)
       end
 
-      def test_commit
-        Commit.new('sha', 'message', 'author', 'author_email', 'http_url')
-      end
-
       def test_repo
         Repo.new(
           1,

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/vx/service_connector.rb

@@ -6,21 +6,15 @@ module Vx
 
     autoload :Base,      File.expand_path("../service_connector/base",       __FILE__)
     autoload :Github,    File.expand_path("../service_connector/github",     __FILE__)
-    autoload :GitlabV4,  File.expand_path("../service_connector/gitlab_v4",  __FILE__)
     autoload :GitlabV5,  File.expand_path("../service_connector/gitlab_v5",  __FILE__)
     autoload :Model,     File.expand_path("../service_connector/model",      __FILE__)
 
     extend self
 
-    def github ; Github end
-    def gitlab_v3 ; GitlabV3 end
-
     def to(name)
       case name.to_sym
       when :github
         Github
-      when :gitlab_v4
-        GitlabV4
       when :gitlab_v5
         GitlabV5
       else
@@ -28,18 +22,5 @@ module Vx
       end
     end
 
-    def payload(name, params)
-      klass =
-        case name.to_sym
-        when :github
-          Github::Payload
-        when :gitlab_v4, :gitlab_v5
-          GitlabV4::Payload
-        else
-          raise ArgumentError, "Payload for #{name.inspect} is not defined"
-        end
-      klass.new(params).to_model
-    end
-
   end
 end