jekyll-netlify 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19d6996452296df23ad6980f1bf2ed141bda74b2
-  data.tar.gz: 26971263d3b67fc4057c381087321189788b8ae8
+  metadata.gz: 7aae431f9d6f5183479bd3d88a753e7805f65802
+  data.tar.gz: c1881d6e1fe8729cdc76c9134c7c4256f0131bfd
 SHA512:
-  metadata.gz: ae03615628732badd59741ddbdb35e0c705d1e60e3b4a3cae03a92ed4456eab545911c7e0a6aea53d9935b57ffbf17610241d3608ee53ba41ba8ffb5a30a0400
-  data.tar.gz: 8a12d798feaa1d2cd0c791a54f862efe154354f34747f687cff6397a6ae9996c927c4a31398265aca6ba89cf26e60bd6d782ee4e1d40e282dff0768b61d986c1
+  metadata.gz: 639773eb1a7bb2c7458a60ba51f10f2c99b56d23fa748784c02cda6d2ab62c5558e3e0283826c291f66b9dcc4b2f62f75f806929cc1647f3288fbae88b00210b
+  data.tar.gz: 7caca1b0233ba3c338d5f6ce5d3809b2a4e7831b05f473d655612191b81a853f4232e1d2bcd6fd4df92524c9094b0a3c72f12e7af0f48fbfd2c9210dd2aa8f4a

data/.rubocop.yml

@@ -0,0 +1,28 @@
+---
+AllCops:
+  TargetRubyVersion: 2.1
+Metrics/ClassLength:
+  Exclude:
+    - test/**/*.rb
+Style/FileName:
+  Exclude:
+    - lib/jekyll-netlify.rb
+Metrics/MethodLength:
+  Max: 30
+Metrics/AbcSize:
+  Max: 30
+Metrics/BlockLength:
+  Exclude:
+    - test/**/*.rb
+Style/TrailingCommaInLiteral:
+  Enabled: false
+Style/TrailingCommaInArguments:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Style/MultilineTernaryOperator:
+  Enabled: false
+Style/ConditionalAssignment:
+  Enabled: false
+Style/GuardClause:
+  Enabled: false

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/jayvdb/jekyll-netlify.svg?branch=master)](https://travis-ci.org/jayvdb/jekyll-netlify)
+[![Gem Version](https://badge.fury.io/rb/jekyll-netlify.svg)](https://badge.fury.io/rb/jekyll-netlify)
 
 # Jekyll::Netlify
 
@@ -31,7 +32,7 @@ This plugin adds hash of `site.netlify` containing
 
 - repository_url
 - branch
-- pull_request: bool
+- pull_request: bool (but the next release it will also be the pull_request number when available)
 - head
 - commit
 - context

data/jekyll-netlify.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jekyll/netlify/version'
@@ -21,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'jekyll', '~> 3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'shoulda'
   spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop', '~> 0.41'
+  spec.add_development_dependency 'shoulda'
 end

data/lib/jekyll/netlify/generator.rb

@@ -32,6 +32,27 @@ module Jekyll
         ENV['PULL_REQUEST'].eql?('true') ? true : false
       end
 
+      def pull_request_id(env = ENV)
+        branch = env['BRANCH']
+        return false unless branch =~ /^(pull|merge-requests)/
+
+        parts = branch.split(%r{\/})
+        parts[1].to_i
+      end
+
+      def pull_request_url(env = ENV)
+        repository_url = env['REPOSITORY_URL']
+        if repository_url.start_with? 'git@'
+          repository_url = repository_url.tr(':', '/')
+          repository_url = repository_url.gsub('git@', 'https://')
+        end
+        if repository_url.include? 'gitlab'
+          return repository_url + '/merge_requests/' + pull_request_id.to_s
+        elsif repository_url.include? 'github'
+          return repository_url + '/pulls/' + pull_request_id.to_s
+        end
+      end
+
       def webhook?
         ENV.key?('WEBHOOK_URL')
       end
@@ -40,7 +61,6 @@ module Jekyll
         data = {
           'repository_url' => env['REPOSITORY_URL'],
           'branch' => env['BRANCH'],
-          'pull_request' => pull_request?,
           'head' => env['HEAD'],
           'commit' => env['COMMIT_REF'],
           'context' => env['CONTEXT'],
@@ -48,6 +68,19 @@ module Jekyll
           'url' => ENV['URL'],
           'deploy_prime_url' => env['DEPLOY_PRIME_URL'],
         }
+        if pull_request?
+          id = pull_request_id
+          if id
+            data['pull_request'] = {
+              'id' => id,
+              'url' => pull_request_url,
+            }
+          else
+            data['pull_request'] = true
+          end
+        else
+          data['pull_request'] = false
+        end
         data['webhook'] = !webhook? ? false : {
           'title' => env['WEBHOOK_TITLE'],
           'body' => env['WEBHOOK_BODY'],

data/lib/jekyll/netlify/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 module Jekyll
   module Netlify
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/test/test_netlify.rb

@@ -93,7 +93,7 @@ class Jekyll::NetlifyTest < Minitest::Test
     end
   end
 
-  context 'netlify pull request' do
+  context 'netlify unrecognised pull request' do
     setup do
       Jekyll.instance_variable_set(
         :@logger, Jekyll::LogAdapter.new(Jekyll::Stevenson.new, :error)
@@ -102,7 +102,7 @@ class Jekyll::NetlifyTest < Minitest::Test
       ENV.clear
 
       ENV['URL'] = 'https://example.com'
-      ENV['BRANCH'] = 'master'
+      ENV['BRANCH'] = 'foo/bar'
       ENV['CONTEXT'] = 'deploy-preview'
       ENV['PULL_REQUEST'] = 'true'
       ENV['DEPLOY_URL'] = 'https://578ab634d5d5cf960d620--open-api.netlify.com'
@@ -147,6 +147,102 @@ class Jekyll::NetlifyTest < Minitest::Test
     end
   end
 
+  context 'netlify github pull request' do
+    setup do
+      Jekyll.instance_variable_set(
+        :@logger, Jekyll::LogAdapter.new(Jekyll::Stevenson.new, :error)
+      )
+
+      ENV.clear
+
+      ENV['REPOSITORY_URL'] = 'https://github.com/foo/bar'
+      ENV['URL'] = 'https://example.com'
+      ENV['BRANCH'] = 'pull/23/head'
+      ENV['CONTEXT'] = 'deploy-preview'
+      ENV['PULL_REQUEST'] = 'true'
+      ENV['DEPLOY_URL'] = 'https://578ab634d5d5cf960d620--open-api.netlify.com'
+      ENV['DEPLOY_PRIME_URL'] = 'https://beta--open-api.netlify.com'
+
+      config = Jekyll.configuration(
+        source: jekyll_test_site,
+        destination: File.join(jekyll_test_site, '_site'),
+      )
+      @site = Jekyll::Site.new(config)
+      @site.read
+      @site.generate
+    end
+
+    context 'info' do
+      setup do
+        @netlify = @site.config['netlify']
+      end
+
+      should 'be a pull request' do
+        assert_operator @netlify, :has_key?, 'pull_request'
+        assert_instance_of Hash, @netlify['pull_request']
+      end
+
+      should 'have a pull request id' do
+        assert_instance_of Integer, @netlify['pull_request']['id']
+        assert_equal 23, @netlify['pull_request']['id']
+      end
+
+      should 'have a pull request url' do
+        assert_instance_of String, @netlify['pull_request']['url']
+        assert_equal 'https://github.com/foo/bar/pulls/23',
+                     @netlify['pull_request']['url']
+      end
+    end
+  end
+
+  context 'netlify gitlab pull request' do
+    setup do
+      Jekyll.instance_variable_set(
+        :@logger, Jekyll::LogAdapter.new(Jekyll::Stevenson.new, :error)
+      )
+
+      ENV.clear
+
+      ENV['REPOSITORY_URL'] = 'git@gitlab.com:foo/bar'
+      ENV['URL'] = 'https://example.com'
+      ENV['BRANCH'] = 'merge-requests/23/head'
+      ENV['CONTEXT'] = 'deploy-preview'
+      ENV['PULL_REQUEST'] = 'true'
+      ENV['DEPLOY_URL'] = 'https://578ab634d5d5cf960d620--open-api.netlify.com'
+      ENV['DEPLOY_PRIME_URL'] = 'https://beta--open-api.netlify.com'
+
+      config = Jekyll.configuration(
+        source: jekyll_test_site,
+        destination: File.join(jekyll_test_site, '_site'),
+      )
+      @site = Jekyll::Site.new(config)
+      @site.read
+      @site.generate
+    end
+
+    context 'info' do
+      setup do
+        @netlify = @site.config['netlify']
+      end
+
+      should 'be a pull request' do
+        assert_operator @netlify, :has_key?, 'pull_request'
+        assert_instance_of Hash, @netlify['pull_request']
+      end
+
+      should 'have a pull request id' do
+        assert_instance_of Integer, @netlify['pull_request']['id']
+        assert_equal 23, @netlify['pull_request']['id']
+      end
+
+      should 'have a pull request url' do
+        assert_instance_of String, @netlify['pull_request']['url']
+        assert_equal 'https://gitlab.com/foo/bar/merge_requests/23',
+                     @netlify['pull_request']['url']
+      end
+    end
+  end
+
   context 'netlify webhook deploy' do
     setup do
       Jekyll.instance_variable_set(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-netlify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - John Vandenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.41'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0'
 description: Access Netlify environment values in Jekyll templates
 email:
 - jayvdb@gmail.com
@@ -102,9 +102,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,99 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jekyll-netlify (0.1.0)
-      jekyll (~> 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.3.0)
-    colorator (1.1.0)
-    concurrent-ruby (1.0.5)
-    ffi (1.9.18)
-    forwardable-extended (2.6.0)
-    i18n (0.9.1)
-      concurrent-ruby (~> 1.0)
-    jekyll (3.6.2)
-      addressable (~> 2.4)
-      colorator (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.14)
-      liquid (~> 4.0)
-      mercenary (~> 0.3.3)
-      pathutil (~> 0.9)
-      rouge (>= 1.7, < 3)
-      safe_yaml (~> 1.0)
-    jekyll-sass-converter (1.5.0)
-      sass (~> 3.4)
-    jekyll-watch (1.5.0)
-      listen (~> 3.0)
-    kramdown (1.15.0)
-    liquid (4.0.0)
-    listen (3.1.5)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    mercenary (0.3.6)
-    metaclass (0.0.4)
-    minitest (5.10.3)
-    mocha (1.3.0)
-      metaclass (~> 0.0.1)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    pathutil (0.16.0)
-      forwardable-extended (~> 2.6)
-    powerpack (0.1.1)
-    public_suffix (3.0.1)
-    rainbow (2.2.2)
-      rake
-    rake (12.2.1)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (2.2.1)
-    rubocop (0.51.0)
-      parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    safe_yaml (1.0.4)
-    sass (3.5.3)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.2)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.4)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.6)
-  jekyll-netlify!
-  mocha
-  rake
-  rubocop (~> 0.41)
-  shoulda
-
-BUNDLED WITH
-   1.16.0