puppetfile-updater 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c4ccff3597955b212abd9580f4525c388c1bf69785bc2f9898f9add676dd75d
-  data.tar.gz: 9e6590f5e580377b98a70bf7d83436b26cbce26a566215c5d1d09cc3baef12a1
+  metadata.gz: 60e02e6b035bd9810d8292e50b3c4213ec687fdf0d6a7c9848bcec3141de7329
+  data.tar.gz: aa8c8182320447b00dabad5a20e35b96f53432690379de0a91012dfdf6fa9340
 SHA512:
-  metadata.gz: 495bb23e0edc3c3589784efd1e6013ef3a7e8c7edeebc838e2e10a32fd8a99b99c4730a93646fe1f272fd6d3b4d53233b9642b4198dff4e9e3c9982067fad056
-  data.tar.gz: c9e89efe6b61d65f67d9c9d1f5cf6089a6b05ab91eb32ee267144cb8aadbef93dd6895e7494b9dbf69d5dae97a802eba8eb78b8e3c74f88f2e78ee354961b6ad
+  metadata.gz: 0c2f1b4504a1c3aaa5b49df475014539f631fc2444314120819b76ca80c967149c760ed0b57b108a92a3359e0d4c846fadf05862f86480d20be1162ea46849d0
+  data.tar.gz: 3a1b9add9a9d2bd8f072cafcb56d62ba4e34e22a9624b1555adf9ab511a84c5abd1b48fca37aa22919ad382ac29f095982991764bb1dd69dcd2dd2908c0230b9

data/augeas/lenses/puppetfile.aug

@@ -25,31 +25,44 @@ 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.any . Util.eol ]
+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 *)

data/lib/puppetfile-updater/task.rb

@@ -14,6 +14,7 @@ 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 :debug
@@ -69,21 +70,23 @@ class PuppetfileUpdater
             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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetfile-updater
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Camptocamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2019-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,8 +66,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      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: []
@@ -96,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Keep your Puppetfile up-to-date.