jekyll-github-metadata 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3e72823f82c2827bf6da1ec2c3b0d18738afe58
-  data.tar.gz: fd512a9002386eeeaf838bb6126be9b6cd10dd89
+  metadata.gz: cfca06588f4d2c2769492d9ffa8d441925de0d39
+  data.tar.gz: c8a940aa8c5346259cd9c587260f994a2786f0d7
 SHA512:
-  metadata.gz: 5cd472d10371cb3226d7d49a6f557bc2ec551d0433e606dc4a54ce6ccb2659b5c74c7316f72897e3521b438bcc9079a39ec488bd1a771c7b44e0ca9822f1f815
-  data.tar.gz: 4312ed0311b7b1b2fcd686dee1419e547335d8d38452dc81011ca9c950ff816af462bedd20152c178daf4406d219dcdd910b0452743707bbd58c2fb4e628197e
+  metadata.gz: 6db4dbfc1fcd303b4f4d843117756a9286cb8d920541f4e685dba9c2f4271324ab36f6e7c7276a7b6b878e84fbf91b51f46537af92454bb883dddf59f3018483
+  data.tar.gz: 2265206c894d2f4579ca527990dbede34a5f9ca299103583e29e5007f3d9dd6bc12821df2d783738e9857af7285c988f80e5e437dfb446999f3bfe37505f4550

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

@@ -31,22 +31,43 @@ module Jekyll
       def git_remote_url
         `git remote --verbose`.split("\n").grep(%r{\Aorigin\t}).map do |remote|
           remote.sub(/\Aorigin\t(.*) \([a-z]+\)/, "\\1")
-        end.uniq.first
+        end.uniq.first || ""
       end
 
-      def git_nwo
+      def nwo_from_git_origin_remote
         return unless Jekyll.env == "development"
         matches = git_remote_url.match %r{github.com(:|/)([\w-]+)/([\w-]+)}
         matches[2..3].join("/") if matches
       end
 
+      def nwo_from_env
+        ENV['PAGES_REPO_NWO']
+      end
+
+      def nwo_from_config(site)
+        repo = site.config['repository']
+        repo if repo && repo.is_a?(String) && repo.include?('/')
+      end
+
+      # Public: fetches the repository name with owner to fetch metadata for.
+      # In order of precedence, this method uses:
+      # 1. the environment variable $PAGES_REPO_NWO
+      # 2. 'repository' variable in the site config
+      # 3. the 'origin' git remote's URL
+      #
+      # site - the Jekyll::Site being processed
+      #
+      # Return the name with owner (e.g. 'parkr/my-repo') or raises an
+      # error if one cannot be found.
       def nwo(site)
-        ENV['PAGES_REPO_NWO'] || \
-          site.config['repository'] || \
-          git_nwo || \
+        nwo_from_env || \
+          nwo_from_config(site) || \
+          nwo_from_git_origin_remote || \
           proc {
-            raise GitHubMetadata::NoRepositoryError, "No repo name found. "
-              "Specify using PAGES_REPO_NWO or 'repository' in your configuration."
+            raise GitHubMetadata::NoRepositoryError, "No repo name found. " \
+              "Specify using PAGES_REPO_NWO environment variables, " \
+              "'repository' in your configuration, or set up an 'origin' " \
+              "git remote pointing to your github.com repository."
           }.call
       end
     end

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

@@ -1,5 +1,5 @@
 module Jekyll
   module GitHubMetadata
-    VERSION = '1.10.0'
+    VERSION = '1.11.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-github-metadata
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit