licensed 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877368e57ede0682327f09bcfcea106b6f34ac3a
-  data.tar.gz: 44e24e3dab3df7507ff805cd3eccc10591827586
+  metadata.gz: 75d816dc3934658ad4d8133632c7a14da32c9364
+  data.tar.gz: 78c9eff92c3b95b1b8162dd4bfc5b71047932170
 SHA512:
-  metadata.gz: 7891002cbec39b405c48498b93be1fe6b261ef88815673f5efc2b0a0fdf9410afbfb374bc41f2bf3030e4afe3505cc2ea9002d969693c32e78960e7044d01855
-  data.tar.gz: 3f254744732b945cd9df93f1c113ca424844200c1cc5686687108af7907cc2cc5d37a719b4b94800703b0f25f52eeabd4c535c0e3b54415e60c36e5afc8db684
+  metadata.gz: b7fec5980b6b926bbc6cc44c1ea097c8b3a6229d7e7303119b4d53c87afcf6b2da3f0951e36ab2bfb6aea614efe43a2ebd4759d5121a82649a5a3ffb05a31013
+  data.tar.gz: c3b9d9d5e0b5ea49eaba02341c67dba62390272f7cf7debca4306a2844e3d018cb109784573fa6c3c064653090dabb9c754c19f56606a20e06dd97a0f6858b1c

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 1.3.3 - 2018-09-07
+### Fixed
+- Manifest source configuration globs correctly enumerates files from within submodules
+- The manifest source no longer errors when getting version information from submodules
+
 ## 1.3.2 - 2018-08-15
 ### Fixed
 - Fixed issue when multiple versions of a cabal package are found
@@ -68,4 +73,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Initial release :tada:
 
-[Unreleased]: https://github.com/github/licensed/compare/1.3.2...HEAD
+[Unreleased]: https://github.com/github/licensed/compare/1.3.3...HEAD

data/lib/licensed/git.rb

@@ -18,13 +18,7 @@ module Licensed
       # descriptor - file or directory to retrieve latest SHA for
       def version(descriptor)
         return unless available? && descriptor
-
-        dir = File.directory?(descriptor) ? descriptor : File.dirname(descriptor)
-        file = File.directory?(descriptor) ? "." : File.basename(descriptor)
-
-        Dir.chdir dir do
-          Licensed::Shell.execute("git", "rev-list", "-1", "HEAD", "--", file, allow_failure: true)
-        end
+        Licensed::Shell.execute("git", "rev-list", "-1", "HEAD", "--", descriptor, allow_failure: true)
       end
 
       # Returns the commit date for the provided SHA as a timestamp
@@ -37,7 +31,7 @@ module Licensed
 
       def files
         return unless available?
-        output = Licensed::Shell.execute("git", "ls-tree", "--full-tree", "-r", "--name-only", "HEAD")
+        output = Licensed::Shell.execute("git", "ls-files", "--full-name", "--recurse-submodules")
         output.lines.map(&:strip)
       end
     end

data/lib/licensed/source/go.rb

@@ -36,12 +36,24 @@ module Licensed
               "summary"     => package["Doc"],
               "homepage"    => homepage(import_path),
               "search_root" => search_root(package_dir),
-              "version"     => Licensed::Git.version(package_dir)
+              "version"     => package_version(package_dir)
             })
           end.compact
         end
       end
 
+      # Returns the most recent git SHA for a package, or nil if SHA is
+      # not available
+      #
+      # package_directory - package location
+      def package_version(package_directory)
+        return unless package_directory
+
+        Dir.chdir package_directory do
+          Licensed::Git.version(".")
+        end
+      end
+
       # Returns the homepage for a package import_path.  Assumes that the
       # import path itself is a url domain and path
       def homepage(import_path)

data/lib/licensed/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Licensed
-  VERSION = "1.3.2".freeze
+  VERSION = "1.3.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensed
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: licensee