rake-extensions 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db2a2a929ce970a047f99148c7a1185cb1afa395
-  data.tar.gz: 848146156c6afa2c0fed7d7a15780bd5bf7f86c8
+  metadata.gz: 7a1f693eef67e1e885c2ed765e2d27c4e56ae8f0
+  data.tar.gz: f91a5824513b7175561eeb57ac0433a8c5d34ce2
 SHA512:
-  metadata.gz: fab6a75ed2ef6fe699c78d24252115d920ec75fcdb7e44f29c9f913adf58d273b37d73462f192b53d12119f317e0c9cd2cb45903b748dd329094cb7133fa694f
-  data.tar.gz: 5c553235cedeb115760437725dafa96c05776f5b264e579f9ca3cf65cd27cc4cc1ebd7a632db80fee817b2daf024a1b12235ab639b4565ffd67c963f2069a7de
+  metadata.gz: fef45ab9426e94b4f3af675c94029ee9efa37be8f7dc4af6badf2e62dafea76b94a349ef62f94ce842727342d04ff5994962ea7d4eec9d11568fbf7991e6dd54
+  data.tar.gz: d4027c9ceff62b3db0e5b943cb530d536d0377977a426e6785f6f88b3895d97a2febea9fe1380ac90a7673c6f7089156a92477ae72a90ecd0d0c2c6b417b538a

data/lib/rake-extensions.rb

@@ -67,7 +67,19 @@ class Versioner
   end
 end
 
-class TomlVersioner
+def current_version_with_regex(filelist, r)
+  current_version = nil
+  FileUtils.cd @version_dir, :verbose => false do
+    filelist.each do |file|
+      text = File.read(file)
+      if match = text.match(r)
+        current_version = match.captures[1]
+      end
+    end
+  end
+  current_version
+end
+class Versioner
   def initialize(version_dir)
     @version_dir = version_dir
   end
@@ -76,60 +88,32 @@ class TomlVersioner
     v = Version.new(current_version)
     v.send(jump)
   end
-  def get_current_version()
-    current_version = nil
-    FileUtils.cd @version_dir, :verbose => false do
-      ['Cargo.toml'].each do |file|
-        text = File.read(file)
-        if match = text.match(/^version\s=\s\"(.*)\"/i)
-          current_version = match.captures[0]
-        end
-      end
-    end
-    current_version
-  end
   def increment_version(jump)
     next_version = get_next_version(jump)
     puts "increment version from #{get_current_version} ==> #{next_version}"
     update_version(next_version)
   end
+end
+class TomlVersioner < Versioner
+  VERSION_REGEX = /^(version\s=\s['\"])(\d+\.\d+\.\d+)(['\"])/i
+  def get_current_version()
+    current_version_with_regex(['Cargo.toml'], VERSION_REGEX)
+  end
   def update_version(new_version)
     FileUtils.cd @version_dir, :verbose => false do
       ['Cargo.toml'].each do |file|
         text = File.read(file)
-        new_contents = text.gsub(/^version\s=\s\"\d+\.\d+\.\d+\"/, "version = \"#{new_version}\"")
+        new_contents = text.gsub(VERSION_REGEX, "\\1#{new_version}\\3")
         File.open(file, "w") { |f| f.puts new_contents }
       end
     end
   end
 end
-class GemspecVersioner
+class GemspecVersioner < Versioner
   VERSION_REGEX = /^(\s*.*?\.version\s*?=\s*['\"])(.*)(['\"])/i
   DATE_REGEX = /^(\s*.*?\.date\s*?=\s*['\"])(.*)(['\"])/
-  def initialize(version_dir)
-    @version_dir = version_dir
-  end
-  def get_next_version(jump)
-    current_version = get_current_version()
-    v = Version.new(current_version)
-    v.send(jump)
-  end
   def get_current_version()
-    current_version = nil
-    FileUtils.cd @version_dir, :verbose => false do
-      FileList['*.gemspec'].each do |file|
-        text = File.read(file)
-        if match = text.match(VERSION_REGEX)
-          current_version = match.captures[1]
-        end
-      end
-    end
-    current_version
-  end
-  def increment_version(jump)
-    next_version = get_next_version(jump)
-    puts "increment version from #{get_current_version} ==> #{next_version}"
-    update_version(next_version)
+    current_version_with_regex(FileList['*.gemspec'], VERSION_REGEX)
   end
   def update_version(new_version)
     FileUtils.cd @version_dir, :verbose => false do
@@ -143,37 +127,16 @@ class GemspecVersioner
     end
   end
 end
-class JsonVersioner
-  def initialize(version_dir)
-    @version_dir = version_dir
-  end
-  def get_next_version(jump)
-    current_version = get_current_version()
-    v = Version.new(current_version)
-    v.send(jump)
-  end
+class JsonVersioner < Versioner
+  VERSION_REGEX = /^(\s\s['\"]version['\"]:\s['\"])(.*)(['\"])/i
   def get_current_version()
-    current_version = nil
-    FileUtils.cd @version_dir, :verbose => false do
-      ['package.json'].each do |file|
-        text = File.read(file)
-        if match = text.match(/^\s\s\"version\":\s\"(.*)\"/i)
-          current_version = match.captures[0]
-        end
-      end
-    end
-    current_version
-  end
-  def increment_version(jump)
-    next_version = get_next_version(jump)
-    puts "increment version from #{get_current_version} ==> #{next_version}"
-    update_version(next_version)
+    current_version_with_regex(['package.json'], VERSION_REGEX)
   end
   def update_version(new_version)
     FileUtils.cd @version_dir, :verbose => false do
       ['package.json'].each do |file|
         text = File.read(file)
-        new_contents = text.gsub(/^\s\s\"version\":\s\"\d+\.\d+\.\d+\"/, "  \"version\": \"#{new_version}\"")
+        new_contents = text.gsub(VERSION_REGEX, "\\1#{new_version}\\3")
         File.open(file, "w") { |f| f.puts new_contents }
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Oliver Mueller