nub 0.0.59 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d44b3ec64a04d2f92ed1f47ea2cea94cb61cdbf910597a68e33264fc7a08507a
-  data.tar.gz: 5adcda6c4ddeedaf96c855e58c41caf84072d246a136038b8f1cc492d9ca14b8
+  metadata.gz: e93be4cfe9723de6906362477f61055ee38368002c7df4c4385934bf44d26316
+  data.tar.gz: eba15a1db0455f1b09390fab9c4e0600a029954945e70455af584a8f825c9f87
 SHA512:
-  metadata.gz: 556d332bb10b0f37ab55f2a53af5b951408928ecc63d3215cc2d4a4216b0c3dc6fcc6d5c9a2770c6a4de61f7c2cddfc22b0f438bbd9757c223308e64d9d180f2
-  data.tar.gz: fb5d7e41fdb4488e88cdc755f0681da35706eeacf9acef2ce8cc02760f659e01b2f6c47e006dc3d2acd57b4d308a170b1ddeb4c16c30bdc75467d714ae71189a
+  metadata.gz: e8fc6b5cb8e1e4d1a5f7c9f31a464c3b09eaac6a43fc946515ffb9f6296e6745e855682e99616881f227bf39fae053770a46cfc03065e5308f828952c2159587
+  data.tar.gz: 9ba29c5dc676eee5be89a96e10b26337f6a3f7eac5a46de09a0d020e655c3336533805ae468f8142bce33e796ac4f5174dcdb0b089afe22579e095cec160cd43

data/lib/nub/fileutils.rb

@@ -24,23 +24,109 @@ require 'fileutils'
 # Monkey patch FileUtils with some useful methods
 module FileUtils
 
+  # Check PATH for executable
+  # @param name [String] name of executable to find
+  # @param path [Array] path to search
+  # @return path of executable or nil
+  def self.exec?(name, path:nil)
+    (path || ENV['PATH'].split(File::PATH_SEPARATOR).uniq).each{|dir|
+      target = File.join(dir, name)
+      if stat = File.stat(target) rescue nil
+        return target if stat.file? && stat.executable?
+      end
+    }
+    return nil
+  end
+
+  # Increment SemVer formatted versions
+  # @param files [String/Array] files 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
+
+          # Modify the original line
+          line.gsub!(ver, new_ver)
+        end
+      }
+    }
+
+    return changed
+  end
+
+  # Update the file using a block, revert on failure.
+  # Use this for simple line edits. Block is passed in each line of the file
+  # @param filename [String] name of the file to change
+  # @return true on change
+  def self.update(filename)
+    changed = false
+    block = Proc.new # Most efficient way to get block
+
+    begin
+      lines = nil
+      File.open(filename, 'r+'){|f|
+        lines = f.readlines
+        lines.each{|line|
+          line_copy = line.dup
+          block.call(line)
+          changed |= line_copy != line
+        }
+
+        # Save the changes back to the file
+        f.seek(0)
+        f.truncate(0)
+        f.puts(lines)
+      }
+    rescue
+      # Revert back to the original incase of failure
+      File.open(filename, 'w'){|f| f.puts(lines)} if lines
+      raise
+    end
+
+    return changed
+  end
+
   # Check copyright and update if required
   # @param path [String] path of the file to update
   # @param copyright [String] copyright match string e.g. Copyright (c)
-  def update_copyright(path, copyright, year)
-    modify(path){|line|
-      if line =~ /##{Regexp.quote(copyright)}/
-        year = line[/##{Regexp.quote(copyright)}\s+((\d{4}\s)|(\d{4}-\d{4})).*/, 1].strip
-        if year.include?("-")
-          years = year.split("-")
-          line.gsub!(year, "#{years.first}-#{curr_year}") if years.last != curr_year
-        else
-          prev_year = year == curr_year.to_s ? year.to_i - 1 : year
-          line.gsub!(year.to_s, "#{prev_year}-#{curr_year}")
+  # @param year [String] year to add if needed
+  # @return true on change
+  def self.update_copyright(path, copyright, year:Time.now.year)
+    changed = self.update(path){|line|
+      if line =~ /#{Regexp.quote(copyright)}/
+        _year = line[/#{Regexp.quote(copyright)}\s+((\d{4}\s)|(\d{4}-\d{4})).*/, 1].strip
+        if _year.include?("-")
+          years = _year.split("-")
+          line.gsub!(_year, "#{years.first}-#{year}") if years.last != year
+        elsif prev_year = _year != year.to_s ? year.to_i - 1 : nil
+          line.gsub!(_year.to_s, "#{prev_year}-#{year}")
         end
       end
     }
+    return changed
   end
+
 end
 
 # vim: ft=ruby:ts=2:sw=2:sts=2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nub
 version: !ruby/object:Gem::Version
-  version: 0.0.59
+  version: 0.0.60
 platform: ruby
 authors:
 - Patrick Crummett
@@ -31,27 +31,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.11.3
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.11.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement