nub 0.0.60 → 0.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e93be4cfe9723de6906362477f61055ee38368002c7df4c4385934bf44d26316
-  data.tar.gz: eba15a1db0455f1b09390fab9c4e0600a029954945e70455af584a8f825c9f87
+  metadata.gz: d8a6bc1396062829fa734eaf735c935e6a7cda5cecf90c72dbdc5d65f482110f
+  data.tar.gz: 27ef79fa291579d0e27472e3bf093255af62d5d5aa1be8b54fb08700fe32201e
 SHA512:
-  metadata.gz: e8fc6b5cb8e1e4d1a5f7c9f31a464c3b09eaac6a43fc946515ffb9f6296e6745e855682e99616881f227bf39fae053770a46cfc03065e5308f828952c2159587
-  data.tar.gz: 9ba29c5dc676eee5be89a96e10b26337f6a3f7eac5a46de09a0d020e655c3336533805ae468f8142bce33e796ac4f5174dcdb0b089afe22579e095cec160cd43
+  metadata.gz: 9d0f14440f01add99f363f1d5b5dc0ad334fda3be284e74229bdd54a150f9e5e49dc58a4aa411a61aa92ab598c19fa60bb21344610599586cc9804ae762f6187
+  data.tar.gz: fcdf68fe617a5a5cddee5d1687083fdef0795885d35dc48490134ed53e82e3828ef90180c5aee4eac3d9ae09bb8052ea21d3fa769bcd180561eddf0f6e0402b2

data/lib/nub/fileutils.rb

@@ -1,5 +1,5 @@
 #MIT License
-#Copyright (c) 2018 phR0ze
+#Copyright (c) 2017-2018 phR0ze
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy
 #of this software and associated documentation files (the "Software"), to deal
@@ -39,40 +39,37 @@ module FileUtils
   end
 
   # Increment SemVer formatted versions
-  # @param files [String/Array] files to increment version for
+  # @param path [String] file to increment version for
   # @param regex [Regex] capture pattern for version match
   # @param major [Bool] true then increment the major
   # @param minor [Bool] true then increment the minor
   # @param rev [Bool] true then increment the revision
   # @param override [String] value to use for version if set
-  # @return true on change
-  def self.inc_version(files, regex, major:false, minor:false, rev:true, override:nil)
-    changed = nil
-    files = [files] if files.is_a?(String)
-
-    files.each{|filename|
-      changed |= self.update(filename){|line|
-
-        # Increment version
-        if ver = line[regex, 1]
-          new_ver = nil
-          if not override
-            new_ver = ver.strip.split('.')
-            new_ver[0] = new_ver[0].to_i + 1 if major
-            new_ver[1] = new_ver[1].to_i + 1 if minor
-            new_ver[2] = new_ver[2].to_i + 1 if rev
-            new_ver = new_ver * '.'
-          else
-            new_ver = override
-          end
+  # @return new version
+  def self.inc_version(path, regex, major:false, minor:false, rev:true, override:nil)
+    version = nil
+    self.update(path){|line|
 
-          # Modify the original line
-          line.gsub!(ver, new_ver)
+      # Increment version
+      if ver = line[regex, 1]
+        new_ver = nil
+        if not override
+          new_ver = ver.strip.split('.')
+          new_ver[0] = new_ver[0].to_i + 1 if major
+          new_ver[1] = new_ver[1].to_i + 1 if minor
+          new_ver[2] = new_ver[2].to_i + 1 if rev
+          new_ver = new_ver * '.'
+        else
+          new_ver = override
         end
-      }
+
+        # Modify the original line
+        version = new_ver
+        line.gsub!(ver, new_ver)
+      end
     }
 
-    return changed
+    return version
   end
 
   # Update the file using a block, revert on failure.
@@ -113,8 +110,11 @@ module FileUtils
   # @param year [String] year to add if needed
   # @return true on change
   def self.update_copyright(path, copyright, year:Time.now.year)
+    set_copyright = false
+
     changed = self.update(path){|line|
-      if line =~ /#{Regexp.quote(copyright)}/
+      if !set_copyright && line =~ /#{Regexp.quote(copyright)}/
+        set_copyright = true
         _year = line[/#{Regexp.quote(copyright)}\s+((\d{4}\s)|(\d{4}-\d{4})).*/, 1].strip
         if _year.include?("-")
           years = _year.split("-")
@@ -127,6 +127,20 @@ module FileUtils
     return changed
   end
 
+  # Get SemVer formatted versions
+  # @param path [String] file to increment version for
+  # @param regex [Regex] capture pattern for version match
+  # @return version
+  def self.version(path, regex)
+    if File.file?(path)
+      File.readlines(path).each{|line|
+        if ver = line[regex, 1]
+          return ver
+        end
+      }
+    end
+    return nil
+  end
 end
 
 # vim: ft=ruby:ts=2:sw=2:sts=2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nub
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.65
 platform: ruby
 authors:
 - Patrick Crummett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize