prospectus 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09e3eb70e15d9d758dfb44b958b5bc5a0c965abe
-  data.tar.gz: 46af1179d96eaddefcae2f4873efa3925a96d200
+  metadata.gz: 80d2f6a11c582414c1d7051f1e8ddd58a0d38115
+  data.tar.gz: 8b63a427fb3a9e397587b84c7822377986591454
 SHA512:
-  metadata.gz: 05ce7e4674f3337ac8aa392b33ee60e7d5c36bed6d9a1489d291c2a3b20d143a41b38c7c17aa4f0b78d7880f463ad057c82c63439b0fb86cbc54aa87b53f6f37
-  data.tar.gz: 59ce1dc03534fbb9efe9d4618004a4f22ca3a2f6e9ff3359f97df1388a6cd67eb5d6efd72428b8bf23819c7e4c8322bc0af8e2ad9fcb9f66644205b95c1dbcdc
+  metadata.gz: f88e0dff9b17f94c793ae90c7596f460d7ec0d715a716f468b6f2e8d23ff50a8fba8382bb1554937099b7b538281d040f6b374b92d53e85ff68d081e4a3f6669
+  data.tar.gz: ea53724956a1632855b5a999e1aa4b48b2c30cb711e1f97b570745cd6bc4f3365e4013cba2234b5b38893288cb913f579b611e700afe8f5733136b26975ad09f

data/README.md

@@ -112,7 +112,7 @@ end
 
 ### github_tag
 
-This checks the latest GitHub tag for a repo. Supports the Regex helper and uses the GitHub API helper for API access.
+This checks the latest GitHub tag for a repo. Supports the Regex and Filter helpers and uses the GitHub API helper for API access.
 
 ```
 expected do
@@ -263,6 +263,21 @@ actual do
 end
 ```
 
+### filter
+
+Allows filtering of available items. Useful for modules that must parse a list where you only care about some of the entries (like upstream repos that tag multiple packages in the same repo).
+
+The provided argument is the regex pattern to filter the list with.
+
+```
+# This filters out github tags that don't match the format 1.2.3
+expected do
+  github_tag
+  repo 'foo/bar'
+  filter /^[\d.]+$/
+end
+```
+
 ### chdir
 
 Used to chdir to a different directory before loading the state.

data/lib/prospectus/helpers/filter.rb

@@ -0,0 +1,20 @@
+module LogCabin
+  module Modules
+    ##
+    # Use regex to filter out from a list of matches
+    module Filter
+      def filter_helper(list)
+        return list unless @filter_regex
+        new_list = list.select { |x| x =~ @filter_regex }
+        return new_list unless new_list.empty?
+        raise("No matches found in list: #{@filter_regex} / #{list}")
+      end
+
+      private
+
+      def filter(regex)
+        @filter_regex = regex
+      end
+    end
+  end
+end

data/lib/prospectus/helpers/gitlab_api.rb

@@ -20,12 +20,18 @@ module LogCabin
       private
 
       def gitlab_token
+        @gitlab_token ||= token_from_file
         @gitlab_token ||= Keylime.new(
           server: gitlab_endpoint,
           account: 'prospectus'
         ).get!("GitLab API token (#{gitlab_endpoint}/profile/account)").password
       end
 
+      def token_from_file
+        return unless File.exist? File.expand_path('~/.gitlab_api')
+        File.read('~/.gitlab_api').strip
+      end
+
       def gitlab_endpoint
         @gitlab_endpoint ||= 'https://gitlab.com'
       end

data/lib/prospectus/modules/github_tag.rb

@@ -8,6 +8,7 @@ module LogCabin
     module GithubTag
       include Prospectus.helpers.find(:regex)
       include Prospectus.helpers.find(:github_api)
+      include Prospectus.helpers.find(:filter)
 
       def load!
         raise('No repo specified') unless @repo
@@ -17,7 +18,8 @@ module LogCabin
       private
 
       def tag
-        @tag ||= github_api.tags(@repo).first.name
+        return @tag if @tag
+        @tags = filter_helper(github_api.tags(@repo).map { |x| x[:name] }).first
       end
     end
   end

data/lib/prospectus/version.rb

@@ -2,5 +2,5 @@
 ##
 # Declare package version
 module Prospectus
-  VERSION = '0.0.13'.freeze
+  VERSION = '0.0.15'.freeze
 end

data/prospectus.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'mercenary', '~> 0.3.4'
   s.add_dependency 'logcabin', '~> 0.0.1'
 
-  s.add_development_dependency 'rubocop', '~> 0.37.0'
-  s.add_development_dependency 'rake', '~> 10.5.0'
+  s.add_development_dependency 'rubocop', '~> 0.41.1'
+  s.add_development_dependency 'rake', '~> 11.2.0'
   s.add_development_dependency 'codecov', '~> 0.1.1'
-  s.add_development_dependency 'rspec', '~> 3.4.0'
+  s.add_development_dependency 'rspec', '~> 3.5.0'
   s.add_development_dependency 'fuubar', '~> 2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prospectus
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.41.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.41.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 11.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 11.2.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - circle.yml
 - lib/prospectus.rb
 - lib/prospectus/helpers/chdir.rb
+- lib/prospectus/helpers/filter.rb
 - lib/prospectus/helpers/github_api.rb
 - lib/prospectus/helpers/gitlab_api.rb
 - lib/prospectus/helpers/regex.rb