verlane 0.0.2.4 → 0.0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecc72704d75378fd0669c0d0c124aaa15cfcb7e2
-  data.tar.gz: fb4cd695b4a40e7045beb7aefdb2fd41217d46fb
+  metadata.gz: 1fb4d9ef5c9309708b22675c8079e0b542306730
+  data.tar.gz: 695d338b44fa12e25b8b0339663954fd4c4a3a75
 SHA512:
-  metadata.gz: fb95404828f90e5ea86995a2301000fd63ba9dc3f1e7f539d0557530bfa21e08ff3ac0691760f6d9d3648a7052bc08130b95dca318cbc40462fd0a088835c6da
-  data.tar.gz: b4a9b2f9680fb0cc217efa5fafc0608d2544b67547d11604949f75b48310b9e8a230ad18d3ef52477d566557f819f739b0b0180ab6ffcbfd3ac84614884b4216
+  metadata.gz: 312960356bb7a28f3e56190c21a39db15922c6cc814f49abc8a647b4b56ed7031db6b3397ace0ffe20047d74ef03e5248487519c1130c6e0ca74b0c210f905b4
+  data.tar.gz: d674942a7dfac879631ddbde29feeeccca52dfa1d206b69704e4e13d227bfb16a9ae0250996bf55a244dd54e4c1f02b598159da442c7eb4078b9cf3b72017823

data/VERSION

@@ -1 +1 @@
-0.0.2.4
+0.0.2.5

data/lib/verlane/tasks/verlane.rake

@@ -3,25 +3,42 @@ require 'versionomy'
 require 'yaml'
 
 VERSION = if File.exists?('VERSION.yml')
-  Versionomy.create(YAML.load_file('VERSION.yml'))
+  yaml = YAML.load_file('VERSION.yml')
+  ver = Versionomy.create(yaml)
+  if !ver.prerelease? and yaml[:build] and yaml[:build] > ver.tiny2
+    ver = ver.change(tiny2: yaml[:build])
+  end
+  ver
 elsif File.exists?('VERSION')
   Versionomy.parse(File.read('VERSION').strip)
 else
   Versionomy.create(major: 0, minor: 0, tiny: 1)
 end
 
-def bump_version(version)
-  field = case version.release_type
-    when :alpha
-      :alpha_version
-    when :beta
-      :beta_version
-    when :release_candidate
-      :release_candidate_version
-    else
-      :tiny2
+def bump_version(version, fields = {})
+  if fields.empty?
+    key = case version.release_type
+      when :alpha
+        :alpha_version
+      when :beta
+        :beta_version
+      when :release_candidate
+        :release_candidate_version
+      else
+        :tiny2
+    end
+    fields[key] = true
+  end
+
+  build = version.tiny2
+  
+  new_ver = fields.inject(version) {|version, chg| field, change = chg; change.kind_of?(TrueClass) ? version.bump(field) : version.change(field => change) }
+
+  if new_ver.tiny2 < build
+    new_ver.change(tiny2: build)
+  else
+    new_ver
   end
-  version.bump(field)
 end
 
 def save_version(version)
@@ -33,6 +50,7 @@ def save_version(version)
   ver.merge!(version.values_hash)
   ver[:string] = version.to_s
   ver[:short]  = version.to_s
+  ver[:build]  = version.tiny2
   
   if File.exists?('VERSION.yml')
     File.open('VERSION.yml', 'w') {|io| io.write ver.to_yaml}
@@ -61,9 +79,9 @@ namespace :version do
   
   namespace :bump do
     VERSION.field_names[0..4].each do |field|
-      desc "Bump version to #{VERSION.bump(field).to_s}"
+      desc "Bump version to #{bump_version(VERSION, field => true).to_s}"
       task field do
-        save_version(VERSION.bump(field))
+        save_version(bump_version(VERSION, field => true))
       end
     end
   end
@@ -73,16 +91,16 @@ namespace :version do
     save_version(VERSION.release)
   end
   
-  desc "Prepare for release #{VERSION.bump(:minor).change(release_type: :beta).to_s}"
+  desc "Prepare for release #{bump_version(VERSION, minor: true, release_type: :beta).to_s}"
   task :pre do
-    save_version(VERSION.bump(:minor).change(release_type: :beta))
+    save_version(bump_version(VERSION, minor: true, release_type: :beta))
   end
   
   namespace :pre do
     VERSION.field_names[0..2].each do |field|
-      desc "Prepare for release #{VERSION.bump(field).change(release_type: :beta).to_s}"
+      desc "Prepare for release #{bump_version(VERSION, field => true, release_type: :beta).to_s}"
       task field do
-        save_version(VERSION.bump(field).change(release_type: :beta))
+        save_version(bump_version(VERSION, field => true, release_type: :beta))
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verlane
 version: !ruby/object:Gem::Version
-  version: 0.0.2.4
+  version: 0.0.2.5
 platform: ruby
 authors:
 - Mikko Kokkonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: versionomy