versionifier 0.0.3 → 0.1.0

data/bin/v+

@@ -1,64 +1,83 @@
 #!/usr/bin/env ruby
+require "versionifier"
 
-the_project = { :name => Dir.pwd.split("/").last }
-
+# Get the project name and the version file path
+the_project = { 
+  :name => Dir.pwd.split("/").last }
 the_version_file = { 
-  :path => Dir.pwd + "/lib/" + the_project[:name] + "/version.rb" 
-}
+  :path => Dir.pwd + "/lib/" + the_project[:name] + "/version.rb" }
 
+# Exit if version file not found
 raise ArgumentError, "Version file not found on #{the_version_file[:path]}" unless File.exists? the_version_file[:path]
 
+# Read the current version from the version file
 the_version_file[:content] = File.read the_version_file[:path]
+the_matches = the_version_file[:content].match /VERSION\s+=\s+"(\d+?\.\d+?\.\d+?)"/
 
-the_matches = the_version_file[:content].match /VERSION\s+=\s+"(\d+?)\.(\d+?)\.(\d+?)"/
+# Create a version from the data
+current_version = Versionifier::Version.new the_matches[1]
 
-the_version = {
-  :major    => the_matches[1].to_i,
-  :regular  => the_matches[2].to_i,
-  :minor    => the_matches[3].to_i
-}
+instructions = <<-INST
 
-if ARGV.empty?
-  puts ""
-  puts "Working on #{the_project[:name]} (#{the_version[:major]}.#{the_version[:regular]}.#{the_version[:minor]})"
-  puts ""
-  puts "Usage: "
-  puts "  v+ 1        # 0.0.4 -> 0.0.5"
-  puts "  v+ 1.0      # 0.0.4 -> 0.1.4"
-  puts "  v+ 1.0.0    # 0.0.4 -> 1.0.4"
-  puts ""
-  puts "Any combination is valid. For example:"
-  puts "  v+ 1.0.2    # 0.0.4 -> 1.0.6"
+Working on #{the_project[:name]} (#{current_version})"
 
-else
+Usage:
+  v+ 1        # 0.0.4 -> 0.0.5
+  v+ 1.x      # 0.0.4 -> 0.1.4
+  v+ 1.x.x    # 0.0.4 -> 1.0.4
+
+'!' at the end of the argument resets minor version numbers:
+  v+ 1.x!     # 0.0.4 -> 0.1.0
+  v+ 2.x.x!   # 0.0.4 -> 2.0.0
+INST
+
+# Depending on the arguments...
+unless ARGV.empty?
+  the_argument = ARGV.shift
   
-  the_argument = { :raw => ARGV.shift }
-  the_new_version = the_version.clone
+  # Check if argument is reset
+  if the_argument.end_with? "!"
+    the_argument = the_argument[0..the_argument.length-2]
+    options = :reset
+  else 
+    options = nil
+  end
   
-  if the_match = the_argument[:raw].match(/^\d+$/)
-    the_argument.merge! :major => 0, :regular => 0, :minor => the_match[0].to_i
-  elsif the_match = the_argument[:raw].match(/^(\d+?)\.(\d+)$/)
-    the_argument.merge! :major => 0, :regular => the_match[1].to_i, :minor => the_match[2].to_i
-  elsif the_match = the_argument[:raw].match(/^(\d+?)\.(\d+?)\.(\d+)$/)
-    the_argument.merge! :major => the_match[1].to_i,
-                        :regular => the_match[2].to_i,
-                        :minor => the_match[3].to_i
+  incrementation = 0
+  which = nil
+  # Check if argument is properly formed
+  if matches = the_argument.match(/^(\d+)\.x\.x$|^(\d+)\.x$|^(\d+)$/)
+    if matches[1]
+      incrementation = matches[1].to_i
+      which = :major
+    elsif matches[2]
+      incrementation = matches[2].to_i
+      which = :regular
+    elsif matches[3]
+      incrementation = matches[3].to_i
+      which = :minor
+    end
   else
-    raise ArgumentError, "The argument must follow the format <number>[.<number>[.<number>]]"
+    puts "Malformed argument. Please follow usage instructions:"
+    puts instructions
+    Process.exit!
   end
   
-  the_new_version[:major]     += the_argument[:major]
-  the_new_version[:regular]   += the_argument[:regular]
-  the_new_version[:minor]     += the_argument[:minor]
+  # Get the final file
+  the_final_version = current_version.increment which, incrementation, options
+  the_final_file = the_version_file[:content].gsub(/VERSION\s+=\s+"\d+?\.\d+?\.\d+?"/, "VERSION = \"#{the_final_version}\"")
 
-  the_final_file = the_version_file[:content].gsub(/VERSION\s+=\s+"\d+?\.\d+?\.\d+?"/, "VERSION = \"#{the_new_version[:major]}.#{the_new_version[:regular]}.#{the_new_version[:minor]}\"")
-  
   # Save the file
   File.open the_version_file[:path], "w" do |file|
     file.write the_final_file
   end
-  
-  puts "In #{the_project[:name]} (#{the_version[:major]}.#{the_version[:regular]}.#{the_version[:minor]}) "
-  puts "  - Version number updated to (#{the_new_version[:major]}.#{the_new_version[:regular]}.#{the_new_version[:minor]})"
-  
+
+  puts "In #{the_project[:name]} (#{current_version}) "
+  puts "  - Version number updated to (#{the_final_version})"
+
+else
+
+  # Print instructions  
+  puts instructions
+
 end

data/bin/v+.bck

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+
+# Get the project name and the version file path
+the_project = { 
+  :name => Dir.pwd.split("/").last }
+the_version_file = { 
+  :path => Dir.pwd + "/lib/" + the_project[:name] + "/version.rb" }
+
+# Exit if version file not found
+raise ArgumentError, "Version file not found on #{the_version_file[:path]}" unless File.exists? the_version_file[:path]
+
+# Read the version file
+the_version_file[:content] = File.read the_version_file[:path]
+
+the_matches = the_version_file[:content].match /VERSION\s+=\s+"(\d+?)\.(\d+?)\.(\d+?)"/
+
+the_version = {
+  :major    => the_matches[1].to_i,
+  :regular  => the_matches[2].to_i,
+  :minor    => the_matches[3].to_i
+}
+
+if ARGV.empty?
+  puts ""
+  puts "Working on #{the_project[:name]} (#{the_version[:major]}.#{the_version[:regular]}.#{the_version[:minor]})"
+  puts ""
+  puts "Usage: "
+  puts "  v+ 1        # 0.0.4 -> 0.0.5"
+  puts "  v+ 1.0      # 0.0.4 -> 0.1.4"
+  puts "  v+ 1.0.0    # 0.0.4 -> 1.0.4"
+  puts ""
+  puts "Any combination is valid. For example:"
+  puts "  v+ 1.0.2    # 0.0.4 -> 1.0.6"
+
+else
+  
+  the_argument = { :raw => ARGV.shift }
+  the_new_version = the_version.clone
+  
+  if the_match = the_argument[:raw].match(/^\d+$/)
+    the_argument.merge! :major => 0, :regular => 0, :minor => the_match[0].to_i
+  elsif the_match = the_argument[:raw].match(/^(\d+?)\.(\d+)$/)
+    the_argument.merge! :major => 0, :regular => the_match[1].to_i, :minor => the_match[2].to_i
+  elsif the_match = the_argument[:raw].match(/^(\d+?)\.(\d+?)\.(\d+)$/)
+    the_argument.merge! :major => the_match[1].to_i,
+                        :regular => the_match[2].to_i,
+                        :minor => the_match[3].to_i
+  else
+    raise ArgumentError, "The argument must follow the format <number>[.<number>[.<number>]]"
+  end
+  
+  the_new_version[:major]     += the_argument[:major]
+  the_new_version[:regular]   += the_argument[:regular]
+  the_new_version[:minor]     += the_argument[:minor]
+
+  the_final_file = the_version_file[:content].gsub(/VERSION\s+=\s+"\d+?\.\d+?\.\d+?"/, "VERSION = \"#{the_new_version[:major]}.#{the_new_version[:regular]}.#{the_new_version[:minor]}\"")
+  
+  # Save the file
+  File.open the_version_file[:path], "w" do |file|
+    file.write the_final_file
+  end
+  
+  puts "In #{the_project[:name]} (#{the_version[:major]}.#{the_version[:regular]}.#{the_version[:minor]}) "
+  puts "  - Version number updated to (#{the_new_version[:major]}.#{the_new_version[:regular]}.#{the_new_version[:minor]})"
+  
+end

data/features/steps/versionify.rb

@@ -0,0 +1,15 @@
+Given /the version number (.+?)$/ do |full_version|
+  @original_version = Versionifier::Version.new full_version
+end
+
+When /I increment (.+?) by (\d+?)$/ do |which, quant|
+  @final_version  = @original_version.increment which.to_sym, quant.to_i
+end
+
+When /I increment (.+?) by (\d+?) and reset everything under/ do |which, quant|
+  @final_version = @original_version.increment which.to_sym, quant.to_i, :reset
+end
+
+Then /I should get (.+?)$/ do |final_version|
+  @final_version.should == final_version
+end

data/features/support/env.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH << File.expand_path("../../../lib", __FILE__)
+require "versionifier"

data/features/versionify.feature

@@ -0,0 +1,27 @@
+Feature: Easily update version number
+  In order to manage version numbers from shell
+  As a lazy gem developer
+  I want to have convenience methods to update version numbers
+  
+  Scenario Outline: Incrementing numbers
+    Given the version number <input>
+    When I increment <which> by <quant>
+    Then I should get <out>
+    
+  Scenarios: Regular incrementations
+    | input | which   | quant | out   |
+    | 0.0.4 | major   | 1     | 1.0.4 |
+    | 0.2.5 | regular | 4     | 0.6.5 |
+    | 1.5.3 | minor   | 3     | 1.5.6 |
+    
+  Scenario Outline: Reseting minor and regular
+    Given the version number <input>
+    When I increment <which> by <quant> and reset everything under
+    Then I should get <out>
+  
+  Scenarios: Incrementations with reset
+    | input | which   | quant | out    |
+    | 0.0.5 | regular | 1     | 0.1.0  |
+    | 0.3.9 | major   | 2     | 2.0.0  |
+    | 4.5.2 | regular | 5     | 4.10.0 |
+    | 3.7.1 | major   | 1     | 4.0.0  |

data/lib/versionifier/version.rb

@@ -1,3 +1,40 @@
 module Versionifier
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
+
+  class Version
+    attr_accessor :major, :regular, :minor
+    def initialize(the_version)
+      splitted    = the_version.split "."
+      @major      = splitted[0].to_i
+      @regular    = splitted[1].to_i
+      @minor      = splitted[2].to_i
+    end
+    
+    def increment(which, quant, options = nil)
+      new_version = self.clone
+      new_version.send "#{which}=".to_sym, self.send(which) + quant
+      if options == :reset
+        case which
+          when :major
+            new_version.regular = 0; new_version.minor = 0
+          when :regular
+            new_version.minor = 0
+        end
+      end
+      new_version
+    end
+    
+    def to_s; "#{@major}.#{@regular}.#{@minor}"; end
+    def eql?(other)
+      if other.is_a? String
+        return other == self.to_s
+      else
+        return super other
+      end
+    end
+    
+    def ==(other)
+      return self.eql? other
+    end
+  end
 end

data/lib/versionifier.rb

@@ -1,3 +1 @@
-module Versionifier
-  # Your code goes here...
-end
+require "versionifier/version"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versionifier
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-04 00:00:00.000000000 -03:00
+date: 2011-08-08 00:00:00.000000000 -03:00
 default_executable: 
 dependencies: []
 description: Version number update gem
@@ -17,6 +17,7 @@ email:
 - xavier.via.canel@gmail.com
 executables:
 - v+
+- v+.bck
 extensions: []
 extra_rdoc_files: []
 files:
@@ -25,6 +26,10 @@ files:
 - README.rdoc
 - Rakefile
 - bin/v+
+- bin/v+.bck
+- features/steps/versionify.rb
+- features/support/env.rb
+- features/versionify.feature
 - lib/versionifier.rb
 - lib/versionifier/version.rb
 - versionifier.gemspec