puppetfile-updater 0.3.2 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTIzM2VlM2ZlYmNlZDE0MWQ0ZjM4YWQ2NTlmZDYyNDA2YTU0ZjhkNQ==
-  data.tar.gz: !binary |-
-    ZGQwZTA3ZmU4YjVlMmJhZjk2NjQ3ZmNjNGQxMDEyMjFmYWQ2NjFiNQ==
+SHA256:
+  metadata.gz: 67afad5138980f13a131de2838390bce5e7a282288c38dea365e4051ab525350
+  data.tar.gz: 85a0eade9472640b6f027f5b665f8013399bf6e1bd904ba22f8372433d6e53f7
 SHA512:
-  metadata.gz: !binary |-
-    MGFmMGIyMTY3Njk2MjRjNTA3ZWZhNTViYzc3YTg5ZDJiOGVhMDRjMWQyNWYx
-    N2Q2YjdkZGRmMTAwZjQwYjY2ZDU0YWU3NjUwOTRhMDNlYjZhNDRkMjQyMDBj
-    ZGYwZjllZDBkNWJlMjRlY2ViZmZiMmI0NjY2YjcxNmU0ZjJhM2U=
-  data.tar.gz: !binary |-
-    NGJjYjY1YWUzN2QwMTYzMDVkYTgyYzBjNWE5ZTM1Mjc5ZGVkM2FlZjM3ZTE4
-    Y2E1NjRmNmFlOGQ5ZjI2NjI2Njk0ZDMxNTM4NjMzMzY3NTE1Zjg1NWJjNGIz
-    NDkxNjhjZTRlNjFkODYyYjhkZTQ3MTUwN2E4ODdiMzI4YmFmYTM=
+  metadata.gz: c004f77860c1d0c7bc3f24468ec5cf60a368302b81fef164d56c37440b504c4ef40992b68e654fd554f34ee7501599a8365ab2f93ef60f4457f50698261fae7f
+  data.tar.gz: e36fa66babe89ed420b98fd72522d4385b59de76be8b55551b8220bbdf1c355df671782ad73f4602403a2bbfb7e41c76c26c11e30cf5d944d0612d4814b8d68a

data/augeas/lenses/puppetfile.aug

@@ -25,28 +25,45 @@ module Puppetfile =
 (* View: comma
      a comma, optionally preceded or followed by spaces or newlines *)
 let comma = del /[ \t\n]*,[ \t\n]*/ ", "
+let comma_nospace = del /[ \t\n]*,/ ","
+
+let comment_or_eol = Util.eol | Util.comment_eol
+let quote_to_comment_or_eol = Quote.do_quote (store /[^#\n]*/) . comment_or_eol
+
+(* View: moduledir
+     The moduledir setting specifies where modules from the Puppetfile will be installed *)
+let moduledir = [ Util.indent . key "moduledir" . Sep.space
+                . quote_to_comment_or_eol ]
 
 (* View: forge
      a forge entry *)
-let forge = [ Util.indent . key "forge" . Sep.space . Quote.any . Util.eol ]
+let forge = [ Util.indent . key "forge" . Sep.space
+            . quote_to_comment_or_eol ]
 
 (* View: metadata
      a metadata entry *)
-let metadata = [ Util.indent . key "metadata" . Util.eol ]
+let metadata = [ Util.indent . key "metadata" . comment_or_eol ]
 
 (* View: mod
      a module entry, with optional version and options *)
 let mod =
      let mod_name = Quote.do_quote (store ((Rx.word . /[\/-]/)? . Rx.word))
-  in let version = [ label "@version" . Quote.do_quote (store /[^:\n]+/) ]
-  in let opt = [ Util.del_str ":" . key Rx.word . del /[ \t]*=>[ \t]*/ " => "
-               . Quote.do_quote (store /[^,\n]*/) ]
-  in let opts = Build.opt_list opt comma
+  in let version = [ label "@version" . Quote.do_quote (store /[^#:\n]+/) . Util.comment_eol? ]
+  in let sto_opt_val = store /[^#"', \t\n][^#"',\n]*[^#"', \t\n]|[^#"', \t\n]/
+  in let opt = [
+                 Util.del_str ":" . key Rx.word
+                 . (del /[ \t]*=>[ \t]*/ " => " . Quote.do_quote_opt sto_opt_val)?
+               ]
+  in let opt_eol = del /([ \t\n]*\n)?/ ""
+  in let opt_space_or_eol = del /[ \t\n]*/ " "
+  in let comma_opt_eol_comment = comma_nospace . (opt_eol . Util.comment_eol)*
+                               . opt_space_or_eol
+  in let opts = Build.opt_list opt comma_opt_eol_comment
   in [ Util.indent . Util.del_str "mod" . seq "mod" . Sep.space . mod_name
-     . (comma . version)?
-     . (comma . opts)?
-     . Util.eol ] 
+     . (comma_opt_eol_comment . version)?
+     . (comma_opt_eol_comment . opts . Util.comment_eol?)?
+     . Util.eol ]
 
 (* View: lns
      the Puppetfile lens *)
-let lns = (Util.empty | Util.comment | forge | metadata | mod)*
+let lns = (Util.empty | Util.comment | forge | metadata | mod | moduledir )*

data/lib/puppetfile-updater/task.rb

@@ -14,8 +14,10 @@ class PuppetfileUpdater
     attr_accessor :user
     attr_accessor :module
     attr_accessor :major
+    attr_accessor :skip_git
     attr_accessor :gh_login
     attr_accessor :gh_password
+    attr_accessor :gh_token
     attr_accessor :debug
 
     # Public: Initialise a new PuppetfileUpdater::RakeTask.
@@ -44,10 +46,21 @@ class PuppetfileUpdater
 
         @user ||= '.*'
 
-        gh_opts = @gh_login.nil? ? { } : {
-          :login    => @gh_login,
-          :password => @gh_password,
-        }
+        gh_opts = {}
+
+        unless @gh_user.nil?
+          gh_opts = {
+            :login    => @gh_login,
+            :password => @gh_password,
+          }
+        end
+
+        unless @gh_token.nil?
+          gh_opts = {
+            :access_token => @gh_token,
+          }
+        end
+
         github = Octokit::Client.new gh_opts
 
         libdir = File.dirname(__FILE__)
@@ -62,33 +75,35 @@ class PuppetfileUpdater
           aug.load!
 
           error_path = '/augeas/files/Puppetfile/error'
-          unless aug.match('/augeas/files/Puppetfile/error').size == 0
+          unless aug.match(error_path).size == 0
             msg = "Failed to parse Puppetfile at line #{aug.get(error_path+'/line')}, "
             msg << "character #{aug.get(error_path+'/char')}: "
-            msg << aug.get('/augeas/files/Puppetfile/error/message')
+            msg << aug.get(error_path+'/message')
             abort msg
           end
 
-          # Update from GitHub
-          aug.match("/files/Puppetfile/*[git=~regexp('.*/#{@user}/.*')]").each do |mpath|
-            m = aug.get(mpath)
-            puts "D: Considering #{m} for git update" if @debug
-            next if !@module.nil? && @module != m.gsub(%r{.*[-/]}, '')
-            puts "D: #{m} selected by filters" if @debug
-
-            warn "W: #{m} is a fork!" unless m =~ /#{@user}/
-
-            git_url = aug.get("#{mpath}/git")
-            repo = Octokit::Repository.from_url(git_url.gsub(/\.git$/, ''))
-            commits = github.commits(repo)
-            ref = commits[0].sha[0...7]
-            puts "D: New ref for #{m} is #{ref}" if @debug
-            aug.set("#{mpath}/ref", ref)
+          unless @skip_git
+            # Update from GitHub
+            aug.match("/files/Puppetfile/*[git=~regexp('.*/#{@user}[/-].*')]").each do |mpath|
+              m = aug.get(mpath)
+              puts "D: Considering #{m} for git update" if @debug
+              next if !@module.nil? && @module != m.gsub(%r{.*[-/]}, '')
+              puts "D: #{m} selected by filters" if @debug
+
+              warn "W: #{m} is a fork!" unless m =~ /#{@user}/
+
+              git_url = aug.get("#{mpath}/git")
+              repo = Octokit::Repository.from_url(git_url.gsub(/\.git$/, ''))
+              commits = github.commits(repo)
+              ref = commits[0].sha[0...7]
+              puts "D: New ref for #{m} is #{ref}" if @debug
+              aug.set("#{mpath}/ref", ref)
+            end
           end
 
           # Update from Forge
           PuppetForge.user_agent = 'Puppetfile-Updater/0.1.0'
-          aug.match("/files/Puppetfile/*[label()!='#comment' and .=~regexp('#{@user}/.*') and @version]").each do |mpath|
+          aug.match("/files/Puppetfile/*[label()!='#comment' and .=~regexp('#{@user}[/-].*') and @version]").each do |mpath|
             m = aug.get(mpath).gsub('/', '-')
             puts "D: Considering #{m} for forge update" if @debug
             next if !@module.nil? && @module != m.gsub(%r{.*[-/]}, '')
@@ -98,6 +113,8 @@ class PuppetfileUpdater
             release = forge_m.releases.select { |r| r.deleted_at.nil? }[0]
             new_v = release.version
             puts "D: New version for #{m} is #{new_v}" if @debug
+
+            warn "W: #{m} looks abandoned (version = #{new_v})" if new_v =~ /^99/
             if new_v.split('.')[0] != v.split('.')[0]
               if @major
                 warn "W: #{m} has incompatible changes between #{v} and #{new_v}"

metadata

@@ -1,75 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: puppetfile-updater
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Camptocamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-augeas
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '    Keep your Puppet file up-to-date with latest versions from the
-  Forge and GitHub.
-
-'
+description: "    Keep your Puppet file up-to-date with latest versions from the Forge
+  and GitHub.\n"
 email: raphael.pinson@camptocamp.com
 executables: []
 extensions: []
@@ -89,17 +87,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Keep your Puppetfile up-to-date.