jekyll-github-metadata 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7118e76a45b88b13ed74056081b4f8c770afe7eb
-  data.tar.gz: 4c68fc503a1c8d070ec518af2c3cece4d21bd642
+  metadata.gz: f60e53e846b6f161a8da39e7ef1ac9ec787e3826
+  data.tar.gz: 4ff42a6cbabcc431ea0743ca537d2f31544152c2
 SHA512:
-  metadata.gz: 1f392cde09024155ffd90de399a77ff4a58b9ce9d631b25c07c42c0dad43efa649b620a2285eadc92f956a49a35a4d0efbaf34317568d321000e50e26d85a71d
-  data.tar.gz: 3347b15c29ebea89267d5388ae89b4b1be87a87b7f61e7686b69841a384389dea2df1818daaebc404508c5ca2696b49b7a9d091bb0bcf024401c03f43260ef4f
+  metadata.gz: 18cbe8b1812895dc605ffe583cac531c6d8814f1b68aca33908d36da605587d99801f0f874f0c0578f3a5c169098ac97c530b55b3af7527a3397663282a1db8a
+  data.tar.gz: 5952a5f8f42f1e6a144426834d078d10a0a6cd53632fe2e95012d52fa3502f3a8dc7e7b24bc604b62e75f6376ca6330c97904111482fd3e04d210449e0f88735

data/lib/jekyll-github-metadata.rb

@@ -1,3 +1,5 @@
+require 'octokit'
+
 module Jekyll
   module GitHubMetadata
     autoload :Client,     'jekyll-github-metadata/client'
@@ -39,13 +41,13 @@ module Jekyll
       end
 
       def register_value(key, value)
-        values[key.to_s] = Value.new(value)
+        values[key.to_s] = Value.new(key.to_s, value)
       end
     end
 
     # Environment-Specific
     register_value('environment', proc { environment })
-    register_value('hostname', proc { Pages.github_url })
+    register_value('hostname', proc { Pages.github_hostname })
     register_value('pages_hostname', proc { Pages.pages_hostname })
     register_value('api_url', proc { Pages.api_url })
 
@@ -58,7 +60,7 @@ module Jekyll
 
     # The Juicy Stuff
     register_value('public_repositories',  proc { |c,r| c.list_repos(r.owner, "type" => "public") })
-    register_value('organization_members', proc { |c,r| c.organization_public_members(owner) if r.organization_repository? })
+    register_value('organization_members', proc { |c,r| c.organization_public_members(r.owner) if r.organization_repository? })
     register_value('build_revision',       proc { `git rev-parse HEAD`.strip })
     register_value('project_title',        proc { |_,r| r.name })
     register_value('project_tagline',      proc { |_,r| r.tagline })
@@ -80,6 +82,7 @@ module Jekyll
     register_value('show_downloads',       proc { |_,r| r.show_downloads? })
     register_value('url',                  proc { |_,r| r.pages_url })
     register_value('contributors',         proc { |c,r| c.contributors(r.nwo) })
+    register_value('releases',             proc { |c,r| c.releases(r.nwo) })
   end
 end
 

data/lib/jekyll-github-metadata/client.rb

@@ -2,7 +2,6 @@ module Jekyll
   module GitHubMetadata
     class Client
       def initialize(options = nil)
-        require 'octokit'
         @client = build_octokit_client(options)
       end
 
@@ -15,8 +14,8 @@ module Jekyll
 
       def build_octokit_client(options = nil)
         options = options || Hash.new
-        if ENV['JEKYLL_GITHUB_TOKEN']
-          options.merge!(:access_token => ENV['JEKYLL_GITHUB_TOKEN'])
+        if ENV['JEKYLL_GITHUB_TOKEN'] || Octokit.access_token
+          options.merge!(:access_token => ENV['JEKYLL_GITHUB_TOKEN'] || Octokit.access_token)
         elsif File.exist?(File.join(ENV['HOME'], '.netrc')) && safe_require('netrc')
           options.merge!(:netrc => true)
         else

data/lib/jekyll-github-metadata/ghp_metadata_generator.rb

@@ -5,8 +5,16 @@ module Jekyll
     class GHPMetadataGenerator < Jekyll::Generator
       def generate(site)
         GitHubMetadata.repository = GitHubMetadata::Repository.new(site.config.fetch('repository'))
-        site.config['github'] = GitHubMetadata.to_liquid
+        site.config['github'] =
+          case site.config['github']
+          when nil
+            GitHubMetadata.to_liquid
+          when Hash
+            Jekyll::Utils.deep_merge_hashes(GitHubMetadata.to_liquid, site.config['github'])
+          else
+            site.config['github']
+          end
       end
     end
   end
-end
+end

data/lib/jekyll-github-metadata/pages.rb

@@ -7,15 +7,24 @@ module Jekyll
         end
 
         def api_url
-          'https://api.github.com'
+          trim_last_slash(ENV['PAGES_API_URL'] || Octokit.api_endpoint || 'https://api.github.com')
         end
 
-        def github_url
-          'github.com'
+        def github_hostname
+          trim_last_slash(ENV['PAGES_GITHUB_HOSTNAME'] || Octokit.web_endpoint || 'https://github.com')
         end
 
         def pages_hostname
-          'github.io'
+          trim_last_slash(ENV.fetch('PAGES_PAGES_HOSTNAME', 'github.io'))
+        end
+
+        private
+        def trim_last_slash(url)
+          if url[-1] == "/"
+            url[0..-2]
+          else
+            url
+          end
         end
       end
     end

data/lib/jekyll-github-metadata/repository.rb

@@ -17,7 +17,7 @@ module Jekyll
       end
 
       def repo_info
-        @repo_into ||= (Value.new(proc { |c| c.repository(nwo) }).render || Hash.new)
+        @repo_info ||= (Value.new(proc { |c| c.repository(nwo) }).render || Hash.new)
       end
 
       def language
@@ -29,7 +29,7 @@ module Jekyll
       end
 
       def owner_url
-        "#{Pages.github_url}/#{owner}"
+        "#{Pages.github_hostname}/#{owner}"
       end
 
       def owner_gravatar_url
@@ -41,7 +41,7 @@ module Jekyll
       end
 
       def repository_url
-        "#{Pages.github_url}/#{nwo}"
+        "#{Pages.github_hostname}/#{nwo}"
       end
 
       def zip_url
@@ -103,12 +103,12 @@ module Jekyll
         if cname || primary?
           "http://#{domain}"
         else
-          File.join("http://#{domain}", name)
+          File.join("http://#{domain}", name, "")
         end
       end
 
       def cname
-        @cname ||= (Value.new(proc { |c| c.pages(nwo) }).render || {'cname' => nil})['cname']
+        @cname ||= (Value.new('cname', proc { |c| c.pages(nwo) }).render || {'cname' => nil})['cname']
       end
 
       def domain

data/lib/jekyll-github-metadata/value.rb

@@ -3,10 +3,19 @@ require 'json'
 module Jekyll
   module GitHubMetadata
     class Value
-      attr_reader :value
+      attr_reader :key, :value
 
-      def initialize(value)
-        @value = value
+      def initialize(*args)
+        case args.size
+        when 1
+          @key = '{anonymous}'
+          @value = args.first
+        when 2
+          @key = args.first.to_s
+          @value = args.last
+        else
+          raise ArgumentError.new("#{args.size} args given but expected 1 or 2")
+        end
       end
 
       def render
@@ -25,6 +34,9 @@ module Jekyll
           @value
         end
         @value = Sanitizer.sanitize(@value)
+      rescue RuntimeError, NameError => e
+        Jekyll.logger.error "GitHubMetadata:", "Error processing value '#{key}':"
+        raise e
       end
 
       def to_s
@@ -37,8 +49,14 @@ module Jekyll
 
       def to_liquid
         case render
+        when nil
+          nil
+        when true, false
+          value
+        when Hash
+          value
         when String, Numeric, Array
-          render
+          value
         else
           to_json
         end

data/lib/jekyll-github-metadata/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module GitHubMetadata
-    VERSION = '0.1.0'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-github-metadata
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +84,14 @@ dependencies:
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 description: 
@@ -115,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: The site.github namespace