app_version 0.1.7 → 0.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 14aa690f2861de784ba49287717c9ba828889d59
+  data.tar.gz: ac83e1f63aedccb03e8b52770b3a56aa29a6300e
+SHA512:
+  metadata.gz: b60b91a073efe4fbde1041415ba6a6eb0592eda2a8a5ac58fd919e566533e8a1235a975e08213a4441743b4f4b05e1bfbb7c8e7f1fc9b1dcc6cbb658c8f9574f
+  data.tar.gz: 11f330cda1e2889ba99e937b4bd1c9b9ecf3f7c139e7ab485ff5f41e1046f402386102274a6a89e504ac7552e88e6616c72ba2f77d0e67bad7b05ec141af09b2

data/README.md

@@ -2,13 +2,14 @@
 
 [![Build Status](https://travis-ci.org/mort666/app_version.png?branch=master)](https://travis-ci.org/mort666/app_version)
 
-This is a simple plugin that makes it easy to manage the version number of your Rails application. The version numbers supported by this plugin look like '2.0.1 M4 (600) of branch by coder on 2008-10-27'.
+This is a simple plugin that makes it easy to manage the version number of your Rails application. The version numbers supported by this plugin look like '2.0.0-rc.1 M4 (600) of branch by coder on 2008-10-27'.
 
 The components of the version number are:
 
   	2          => major
   	0          => minor
-  	1          => patch
+  	0          => patch
+    rc.1       => meta information (as defined by Semantic Versioning)
   	M4         => milestone
   	(600)      => build number (usually Subversion revision)
  	branch     => the name of the branch this version is from.
@@ -45,6 +46,7 @@ following format:
   	major:     2
   	minor:     0
   	patch:     1
+    meta:      rc.1
   	milestone: 4
   	build:     git-revcount
   	branch:    master
@@ -59,7 +61,7 @@ Using 'svn' for the build number will cause the plugin to query Subversion for t
 
 The plugin creates a constant `APP_VERSION` that contains the version number of the application. Calling the `to_s` method on APP_VERSION will result in a properly formatted version number. 
 
-APP_VERSION also has `major`, `minor`, `patch`, `milestone`, `build`, `branch`, `committer`, and `build_date` methods to retrieve the individual components of the version number.
+APP_VERSION also has `major`, `minor`, `patch`, `meta`, `milestone`, `build`,`branch`, `committer`, and `build_date` methods to retrieve the individual components of the version number.
 
 ### Capistrano Usage
 

data/lib/app_version/app_version.rb

@@ -6,9 +6,9 @@ module App
   class Version
     include Comparable
 
-    attr_accessor :major, :minor, :patch, :milestone, :build, :branch, :committer, :build_date, :format
+    attr_accessor :major, :minor, :patch, :milestone, :build, :branch, :meta, :committer, :build_date, :format
 
-    [:major, :minor, :patch, :milestone, :build, :branch, :committer, :format].each do |attr|
+    [:major, :minor, :patch, :milestone, :build, :branch, :committer, :meta, :format].each do |attr|
       define_method "#{attr}=".to_sym do |value|
         instance_variable_set("@#{attr}".to_sym, value.blank? ? nil : value.to_s)
       end
@@ -29,6 +29,7 @@ module App
         @major      = args[:major].to_s
         @minor      = args[:minor].to_s
         @patch      = args[:patch].to_s     unless args[:patch].blank?
+        @meta       = args[:meta].to_s      unless args[:meta].blank?
         @milestone  = args[:milestone].to_s unless args[:milestone].blank?
         @build      = args[:build].to_s     unless args[:build].blank?
         @branch     = args[:branch].to_s    unless args[:branch].blank?
@@ -62,20 +63,21 @@ module App
 
     # Parses a version string to create an instance of the Version class.
     def self.parse(version)
-      m = version.match(/(\d+)\.(\d+)(?:\.(\d+))?(?:\sM(\d+))?(?:\s\((\d+)\))?(?:\sof\s(\w+))?(?:\sby\s(\w+))?(?:\son\s(\S+))?/)
+      m = version.match(/(\d+)\.(\d+)(?:\.(\d+))?(?:-([\w.\d]+))?(?:\sM(\d+))?(?:\s\((\d+)\))?(?:\sof\s(\w+))?(?:\sby\s(\w+))?(?:\son\s(\S+))?/)
 
       raise ArgumentError.new("The version '#{version}' is unparsable") if m.nil?
 
       version = App::Version.new :major     => m[1],
                                :minor     => m[2],
                                :patch     => m[3],
-                               :milestone => m[4],
-                               :build     => m[5],
-                               :branch    => m[6],
-                               :committer => m[7]
-
-      if (m[8] && m[8] != '')
-        date = Date.parse(m[8])
+                               :meta      => m[4],
+                               :milestone => m[5],
+                               :build     => m[6],
+                               :branch    => m[7],
+                               :committer => m[8]
+
+      if (m[9] && m[9] != '')
+        date = Date.parse(m[9])
         version.build_date = date
       end
 
@@ -92,7 +94,7 @@ module App
       #   return self.build <=> other.build
       # end
 
-      %w(build major minor patch milestone branch committer build_date).each do |meth|
+      %w(build major minor patch milestone branch meta committer build_date).each do |meth|
         rhs = self.send(meth) || -1
         lhs = other.send(meth) || -1
 
@@ -109,6 +111,7 @@ module App
       else
         str = "#{major}.#{minor}"
         str << ".#{patch}" unless patch.blank?
+        str << "-#{meta}" unless meta.blank?
         str << " M#{milestone}" unless milestone.blank?
         str << " (#{build})" unless build.blank?
         str << " of #{branch}" unless branch.blank?

data/test/app_version_test.rb

@@ -1,14 +1,15 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_support'
 require 'app_version'
 
-class AppVersionTest < Test::Unit::TestCase
+class AppVersionTest < MiniTest::Unit::TestCase
 
   def setup
     @version = App::Version.new
     @version.major = '1'
     @version.minor = '2'
     @version.patch = '3'
+    @version.meta = 'rc.1'
     @version.milestone = '4'
     @version.build = '500'
     @version.branch = 'master'
@@ -22,16 +23,16 @@ class AppVersionTest < Test::Unit::TestCase
   end
 
   def test_create_from_string
-    version = App::Version.parse '1.2.3 M4 (500) of master by coder on 2008-10-27'
+    version = App::Version.parse '1.2.3-rc.1 M4 (500) of master by coder on 2008-10-27'
     assert_equal @version, version
 
-    version = App::Version.parse '1.2.3 M4 (500)'
+    version = App::Version.parse '1.2.3-rc.1 M4 (500)'
     @version.branch = nil
     @version.committer = nil
     @version.build_date = nil
     assert_equal @version, version
 
-    version = App::Version.parse '1.2.3 (500)'
+    version = App::Version.parse '1.2.3-rc.1 (500)'
     @version.milestone = nil
     @version.branch = nil
     @version.committer = nil
@@ -40,6 +41,7 @@ class AppVersionTest < Test::Unit::TestCase
 
     version = App::Version.parse '1.2 (500)'
     @version.patch = nil
+    @version.meta = nil
     @version.branch = nil
     @version.committer = nil
     @version.build_date = nil
@@ -48,6 +50,7 @@ class AppVersionTest < Test::Unit::TestCase
     version = App::Version.parse '1.2'
     @version.milestone = nil
     @version.build = nil
+    @version.meta = nil
     @version.branch = nil
     @version.committer = nil
     @version.build_date = nil
@@ -55,6 +58,7 @@ class AppVersionTest < Test::Unit::TestCase
 
     version = App::Version.parse '1.2.1'
     @version.patch = 1
+    @version.meta = nil
     @version.branch = nil
     @version.committer = nil
     @version.build_date = nil
@@ -68,6 +72,7 @@ class AppVersionTest < Test::Unit::TestCase
     @version.build = 6
     @version.branch = 'branch'
     @version.committer = 'coder'
+    @version.meta = nil
     @version.build_date = Date.civil(2008, 10, 31)
     assert_raises(ArgumentError) { App::Version.parse 'This is not a valid version' }
   end
@@ -76,6 +81,7 @@ class AppVersionTest < Test::Unit::TestCase
     version = App::Version.new  :major => 1,
                               :minor => 2,
                               :patch => 3,
+                              :meta => "rc.1",
                               :milestone => 4,
                               :build => 500,
                               :branch => 'master',
@@ -88,6 +94,7 @@ class AppVersionTest < Test::Unit::TestCase
     version = App::Version.new  'major' => 1,
                               'minor' => 2,
                               'patch' => 3,
+                              'meta' => "rc.1",
                               'milestone' => 4,
                               'build' => 500,
                               'branch' => 'master',
@@ -100,6 +107,7 @@ class AppVersionTest < Test::Unit::TestCase
     version = App::Version.new  :major => '1',
                               :minor => '2',
                               :patch => '3',
+                              :meta => 'rc.1',
                               :milestone => '4',
                               :build => '500',
                               :branch => 'master',
@@ -112,6 +120,7 @@ class AppVersionTest < Test::Unit::TestCase
     version = App::Version.new  'major' => '1',
                               'minor' => '2',
                               'patch' => '3',
+                              'meta' => 'rc.1',
                               'milestone' => '4',
                               'build' => '500',
                               'branch' => 'master',
@@ -125,12 +134,13 @@ class AppVersionTest < Test::Unit::TestCase
     version = App::Version.new  :major => '1',
                               :minor => '2',
                               :patch => '3',
+                              :meta => 'rc.1',
                               :milestone => '4',
                               :build => '500',
                               :branch => 'master',
                               :committer => 'coder',
                               :build_date => '12wtf34'
-    assert_not_equal @version, version
+    assert @version != version
   end
 
   def test_should_raise_when_major_is_missing
@@ -152,6 +162,7 @@ class AppVersionTest < Test::Unit::TestCase
     @version.milestone = nil
     @version.build = nil
     @version.branch = nil
+    @version.meta = nil
     @version.committer = nil
     @version.build_date = nil
     assert_equal @version, version
@@ -203,62 +214,62 @@ class AppVersionTest < Test::Unit::TestCase
   end
 
   def test_to_s
-    assert_equal '1.2.3 M4 (500) of master by coder on 2008-10-27', @version.to_s
+    assert_equal '1.2.3-rc.1 M4 (500) of master by coder on 2008-10-27', @version.to_s
   end
 
   def test_to_s_with_no_milestone
     @version.milestone = nil
-    assert_equal '1.2.3 (500) of master by coder on 2008-10-27', @version.to_s
+    assert_equal '1.2.3-rc.1 (500) of master by coder on 2008-10-27', @version.to_s
   end
 
   def test_to_s_with_no_build
     @version.build = nil
-    assert_equal '1.2.3 M4 of master by coder on 2008-10-27', @version.to_s
+    assert_equal '1.2.3-rc.1 M4 of master by coder on 2008-10-27', @version.to_s
   end
 
   def test_to_s_with_no_patch
     @version.patch = nil
-    assert_equal '1.2 M4 (500) of master by coder on 2008-10-27', @version.to_s
+    assert_equal '1.2-rc.1 M4 (500) of master by coder on 2008-10-27', @version.to_s
   end
 
   def test_to_s_with_no_build_or_milestone
     @version.milestone = nil
     @version.build = nil
-    assert_equal '1.2.3 of master by coder on 2008-10-27', @version.to_s
+    assert_equal '1.2.3-rc.1 of master by coder on 2008-10-27', @version.to_s
   end
 
   def test_to_s_with_no_branch
     @version.branch = nil
-    assert_equal '1.2.3 M4 (500) by coder on 2008-10-27', @version.to_s
+    assert_equal '1.2.3-rc.1 M4 (500) by coder on 2008-10-27', @version.to_s
   end
 
   def test_to_s_with_no_committer
     @version.committer = nil
-    assert_equal '1.2.3 M4 (500) of master on 2008-10-27', @version.to_s
+    assert_equal '1.2.3-rc.1 M4 (500) of master on 2008-10-27', @version.to_s
   end
 
   def test_to_s_with_no_build_date
     @version.build_date = nil
-    assert_equal '1.2.3 M4 (500) of master by coder', @version.to_s
+    assert_equal '1.2.3-rc.1 M4 (500) of master by coder', @version.to_s
   end
 
   def test_to_s_with_no_branch_or_committer
     @version.branch = nil
     @version.committer = nil
-    assert_equal '1.2.3 M4 (500) on 2008-10-27', @version.to_s
+    assert_equal '1.2.3-rc.1 M4 (500) on 2008-10-27', @version.to_s
   end
 
   def test_to_s_with_no_committer_or_build_date
     @version.committer = nil
     @version.build_date = nil
-    assert_equal '1.2.3 M4 (500) of master', @version.to_s
+    assert_equal '1.2.3-rc.1 M4 (500) of master', @version.to_s
   end
 
   def test_to_s_with_no_build_date_or_committer_or_build_date
     @version.branch = nil
     @version.committer = nil
     @version.build_date = nil
-    assert_equal '1.2.3 M4 (500)', @version.to_s
+    assert_equal '1.2.3-rc.1 M4 (500)', @version.to_s
   end
 
   def test_version_with_leading_zeros

data/test/version.yml

@@ -2,6 +2,7 @@
 major:      1
 minor:      2
 patch:      3
+meta:		'rc.1'
 milestone:  4
 build:      500
 branch:     master

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_version
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.1.8
 platform: ruby
 authors:
 - Stephen Kapp
@@ -10,22 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.8
 description: App Version Gem originally App Version Rails Plugin from https://github.com/toland/app_version,
@@ -37,41 +34,40 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- Rakefile
+- lib/app_version.rb
 - lib/app_version/app_version.rb
 - lib/app_version/railtie.rb
 - lib/app_version/templates/version.yml
 - lib/app_version/templates/version.yml.erb
-- lib/app_version.rb
 - lib/install.rb
 - lib/tasks/app_version_tasks.rake
 - lib/uninstall.rb
-- Rakefile
-- README.md
 - test/app_version_test.rb
 - test/version.yml
 homepage: https://github.com/mort666/app_version
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails App Version Gem
 test_files:
 - test/app_version_test.rb