ra10ke 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4483e49e41d8b69e98d4730662b79084a670580b
-  data.tar.gz: 0bf2f4d16f66755a60f3653852900e46983136f1
+SHA256:
+  metadata.gz: 54a37104f6389b661c4b4a8673a2e9ad2dd502c02586b934dc948d94312eb0b6
+  data.tar.gz: aa3292d5cca1ebe7247e9796787d76fc7e79792d77fbef1c8274f15f9468ac16
 SHA512:
-  metadata.gz: de78be1d8e3146d55b207bd48f100f00cd36e310f857d3de3d2cb831dc894c63b3196fa1aa75dd8fda9964c46e1f6f0412507ebb22863a2ec8e19a37bf39fb2c
-  data.tar.gz: 36087c043bb91a4a4b034fb86fc5695c6d2ea74c4ed5ababcb3737b2477ee9714fe30afb8544741feb73a306deacc41633341a7acbf41a354203480776ca223e
+  metadata.gz: cda904312f96b957f9a93b83ec9dee7a94fa2e200cf2ae2eb43781c15c10637f985f46ab7f6e7be114f1befd4486d8a156eb7166d9342428b52ec7a19738d0ec
+  data.tar.gz: 7bca30b657f0b072662b4aef38ae7269fa6a94d472a18ec0cad5270e05a06bc6b8f0b4aa7a3f165b281bf6755fae570358783a5d62c360bb4cf62d859a7f8145

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 CHANGELOG
 =========
 
+0.4.0
+-----
+
+2018-06-17
+
+* [#13](https://github.com/voxpupuli/ra10ke/pull/13) Avoid using `desired_ref` directly for Git
+* [#14](https://github.com/voxpupuli/ra10ke/pull/14) Set required Ruby version as `>= 2.1.0`
+* [#15](https://github.com/voxpupuli/ra10ke/pull/15) ignore invalid ref
+* [#16](https://github.com/voxpupuli/ra10ke/pull/16) Use Semantic Versioning for Git tags
+* [#17](https://github.com/voxpupuli/ra10ke/pull/17) Be careful around trimming Git tags
+* [#19](https://github.com/voxpupuli/ra10ke/pull/19) Ensure Puppetfile gets parsed with absolute path
+
+Many thanks to the following contributors for submitting the PRs:
+* [Valter Jansons](https://github.com/sigv)
+* [Martin Alfke](https://github.com/tuxmea)
+* [Matthias Baur](https://github.com/baurmatt)
+
 0.3.0
 -----
 

data/lib/ra10ke.rb

@@ -3,6 +3,7 @@ require 'rake/tasklib'
 require 'ra10ke/version'
 require 'ra10ke/solve'
 require 'git'
+require 'semverse'
 
 module Ra10ke
   class RakeTask < ::Rake::TaskLib
@@ -14,7 +15,7 @@ module Ra10ke
           require 'puppet_forge'
 
           PuppetForge.user_agent = "ra10ke/#{Ra10ke::VERSION}"
-          puppetfile = R10K::Puppetfile.new('.')
+          puppetfile = R10K::Puppetfile.new(Dir.pwd)
           puppetfile.load!
 
           # ignore file allows for "don't tell me about this"
@@ -35,35 +36,38 @@ module Ra10ke
             end
 
             if puppet_module.class == R10K::Module::Git
-              remote = puppet_module.instance_variable_get(:@remote)
-              ref    = puppet_module.instance_variable_get(:@desired_ref)
-
-              # some guards to prevent unnessicary execution
+              # use helper; avoid `desired_ref`
+              # we do not want to deal with `:control_branch`
+              ref = puppet_module.version
               next unless ref
-              next if ref == 'master'
 
+              remote = puppet_module.instance_variable_get(:@remote)
               remote_refs = Git.ls_remote(remote)
 
               # skip if ref is a branch
               next if remote_refs['branches'].key?(ref)
 
-              ref_type = 'sha'    if ref.match(/^[a-z0-9]{40}$/)
-              ref_type = 'tag'    if remote_refs['tags'].key?(ref)
-              case ref_type
-              when 'sha'
+              if remote_refs['tags'].key?(ref)
+                # there are too many possible versioning conventions
+                # we have to be be opinionated here
+                # so semantic versioning (vX.Y.Z) it is for us
+                # as well as support for skipping the leading v letter
+                tags = remote_refs['tags'].keys
+                latest_tag = tags.map do |tag|
+                  begin
+                    Semverse::Version.new tag
+                  rescue Semverse::InvalidVersionFormat
+                    # ignore tags that do not comply to semver
+                    nil
+                  end
+                end.select { |tag| !tag.nil? }.sort.last.to_s.downcase
+                latest_ref = tags.detect { |tag| [tag.downcase, "v#{tag.downcase}"].include?(latest_tag) }
+                latest_ref = 'undef (tags do not match semantic versioning)' if latest_ref.nil?
+              elsif ref.match(/^[a-z0-9]{40}$/)
+                # for sha just assume head should be tracked
                 latest_ref = remote_refs['head'][:sha]
-              when 'tag'
-                # we have to be opinionated here, due to multiple conventions only the two main will be accepted
-                # v#.#.# or #.#.# is what we will pick.
-                if ref.match(/^[vV]?\d[\.\d]*/)
-                  tags = remote_refs['tags']
-                  version_tags = tags.select { |f| /^[vV]?\d[\.\d]*/.match(f) }
-                  latest_ref = version_tags.keys.sort.last
-                else
-                  latest_ref = "undef (tags don't match v#.#.# or #.#.#)"
-                end
               else
-                raise "Unable to determine ref_type for #{puppet_module.title}"
+                raise "Unable to determine ref type for #{puppet_module.title}"
               end
 
               puts "#{puppet_module.title} is OUTDATED: #{ref} vs #{latest_ref}" if ref != latest_ref
@@ -76,7 +80,7 @@ module Ra10ke
           require 'r10k/action/puppetfile/check'
 
           puppetfile = R10K::Action::Puppetfile::Check.new({
-            :root => ".",
+            :root => Dir.pwd,
             :moduledir => nil,
             :puppetfile => nil
           }, '')

data/lib/ra10ke/solve.rb

@@ -26,7 +26,7 @@ module Ra10ke::Solve
 
           # Same as in the dependencies task, but oh well.
           PuppetForge.user_agent = "ra10ke/#{Ra10ke::VERSION}"
-          puppetfile = R10K::Puppetfile.new('.')
+          puppetfile = R10K::Puppetfile.new(Dir.pwd)
           puppetfile.load!
 
           # ignore file allows for "don't tell me about this"

data/lib/ra10ke/version.rb

@@ -1,3 +1,3 @@
 module Ra10ke
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/ra10ke.gemspec

@@ -14,10 +14,12 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_dependency "rake"
   spec.add_dependency "puppet_forge"
   spec.add_dependency "r10k"
   spec.add_dependency "git"
   spec.add_dependency "solve"
+  spec.add_dependency 'semverse', '~> 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ra10ke
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Theo Chatzimichos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-08 00:00:00.000000000 Z
+date: 2018-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: semverse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: R10K and Puppetfile rake tasks
 email:
 - tampakrap@gmail.com
@@ -108,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -116,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Syntax check for the Puppetfile, check for outdated installed puppet modules