version_info 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6fed5fde16f2c17fdb40b6bd1c7dcd6942f1fe7
-  data.tar.gz: 89817de707b2b79da5249e3a76ba3bc3d5161987
+  metadata.gz: 718e8eee0dc06dd98dcc2757f024485ec4802bf4
+  data.tar.gz: 6bd0a11d3bd55e7ea7e25cc2b11d491bdbfbc8e6
 SHA512:
-  metadata.gz: 7e1f0d5fd0c14f8f160ddf24a861b6a04dacf8fa6555955cb5d099325e865cd4418713e9a1175f207981ecd1f29668dbf74a0957f5feea3dc4d9f41ed2ed3888
-  data.tar.gz: d713981e8668924181289b47e43853a2c847dccd227022e3ca6a5182648c94d399bb422ccf458c6ea3939aa0be040669ebeca7f3f229a378473dfa63490adf99
+  metadata.gz: e29144dd0136a49db899fc186f6563558ea9de0ca91cf2272bd352d7d5052a938b7003c96733387aaefcfc39fe99a667433fca9c6bfc6a2aa70398014586bcb4
+  data.tar.gz: 738ee136e707c8224ca6ce92df398d049db90301eea74cb74f49552fc4db4f31d4cc6c0a8873cfd0f657f55c1a09e4170813facb87083dc98b3f2d51e5bec186

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-	- 1.9.3
-	- 2.0.0
+    - 1.9.3
+    - 2.0.0

data/Gemfile.lock

@@ -12,9 +12,10 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    diff-lcs (1.2.4)
-    mime-types (1.19)
-    multi_json (1.7.2)
+    diff-lcs (1.2.5)
+    docile (1.1.1)
+    mime-types (2.0)
+    multi_json (1.8.2)
     notifier (0.4.1)
     rake (10.1.0)
     rest-client (1.6.7)
@@ -23,20 +24,21 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    rspec-mocks (2.14.4)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     test_notifier (1.0.1)
       notifier
-    thor (0.16.0)
-    tins (0.10.0)
+    thor (0.18.1)
+    tins (0.13.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,8 +1,9 @@
 ## VersionInfo
 
-### Travis CI status
+### Current status
 
 [![Build Status](https://secure.travis-ci.org/jcangas/version_info.png)](http://travis-ci.org/jcangas/version_info)
+[![Gem Version](https://badge.fury.io/rb/version_info.png)](http://badge.fury.io/rb/version_info)
 
 ### Install
 

data/coverage/.resultset.json

@@ -9,20 +9,26 @@
         null,
         null,
         1,
-        66,
+        115,
+        null,
+        null,
+        1,
+        19,
+        21,
+        19,
         null,
         null,
         null,
         1,
-        6,
+        26,
         null,
         null,
         1,
-        27,
+        29,
         null,
         null,
         1,
-        18,
+        20,
         null,
         null,
         1,
@@ -36,25 +42,25 @@
         null,
         null,
         1,
-        29,
+        31,
         null,
         null,
         1,
-        29,
+        31,
         0,
         0,
         null,
-        29,
-        29,
-        29,
-        29,
+        31,
+        31,
+        31,
+        31,
         10,
         null,
-        29,
+        31,
         1,
         null,
         null,
-        29,
+        31,
         null,
         null,
         null,
@@ -67,22 +73,22 @@
         1,
         null,
         1,
-        27,
-        27,
-        27,
+        29,
+        29,
+        29,
         null,
         null,
         1,
-        66,
+        72,
         null,
         null,
         1,
-        27,
+        29,
         null,
         null,
         1,
-        8,
-        4,
+        12,
+        6,
         null,
         null,
         1,
@@ -110,17 +116,16 @@
         1,
         null,
         1,
-        20,
+        24,
         null,
         null,
         1,
-        null,
-        2,
-        2,
-        3,
-        2,
-        2,
-        2,
+        4,
+        4,
+        5,
+        4,
+        4,
+        4,
         null,
         null,
         1,
@@ -206,12 +211,12 @@
         1,
         1,
         1,
-        29,
-        29,
+        31,
+        31,
         null,
         null,
         1,
-        39,
+        43,
         null,
         null,
         1,
@@ -219,13 +224,13 @@
         null,
         null,
         1,
-        27,
-        27,
+        29,
+        29,
         null,
         null,
         1,
-        4,
-        4,
+        6,
+        6,
         null,
         null,
         1,
@@ -234,11 +239,11 @@
         null,
         null,
         1,
-        29,
+        31,
         null,
         null,
         1,
-        31,
+        33,
         null,
         null,
         1,
@@ -255,15 +260,22 @@
         null,
         null,
         1,
-        22,
+        26,
         null,
         null,
         1,
-        6,
+        7,
         null,
         null,
         1,
-        25,
+        8,
+        30,
+        30,
+        7,
+        7,
+        7,
+        null,
+        8,
         null,
         null,
         1,
@@ -271,27 +283,31 @@
         null,
         null,
         1,
-        3,
-        12,
+        5,
+        5,
+        19,
+        19,
+        19,
+        null,
         null,
         null,
         1,
-        116,
+        124,
         null,
         null,
         null,
         null
       ],
-      "Z:/Projects/github/version_info/spec/version_info/module_format_spec.rb": [
+      "Z:/Projects/github/version_info/spec/version_info/text_format_spec.rb": [
         1,
         null,
         1,
         1,
-        6,
-        null,
-        6,
-        6,
-        6,
+        8,
+        8,
+        8,
+        8,
+        8,
         null,
         null,
         1,
@@ -304,12 +320,6 @@
         null,
         1,
         1,
-        null,
-        null,
-        1,
-        1,
-        null,
-        null,
         1,
         1,
         1,
@@ -322,30 +332,15 @@
         1,
         1,
         1,
-        null,
-        null,
-        null
-      ],
-      "Z:/Projects/github/version_info/spec/version_info/text_format_spec.rb": [
         1,
         null,
-        1,
-        1,
-        6,
-        6,
-        6,
-        6,
         null,
         null,
-        1,
-        1,
         null,
-        null,
-        1,
         1,
         null,
         null,
-        1,
+        null,
         1,
         1,
         1,
@@ -358,14 +353,6 @@
         1,
         1,
         1,
-        1,
-        1,
-        null,
-        null,
-        null,
-        null,
-        1,
-        null,
         null,
         null,
         1,
@@ -475,6 +462,7 @@
         6,
         6,
         6,
+        6,
         null,
         null,
         1,
@@ -521,6 +509,6 @@
         null
       ]
     },
-    "timestamp": 1379663599
+    "timestamp": 1385730622
   }
 }

data/lib/version_info/data.rb

@@ -61,7 +61,14 @@ module VersionInfo
     end
     
     def tag_format
-	    @tag_format ||= VersionInfo.segments.map { |k| "%<#{k}>d"}.join('.')
+	    unless @tag_format
+        fmts = VersionInfo.segments.map { |k| "%<#{k}>s"}
+        fmt_join = VersionInfo.segments.map { |k| "." }
+        fmt_join[2] = '+' #build uses '+'. See semver.org
+        fmt_join[-1] = '' #remove last char
+        @tag_format = fmts.zip(fmt_join).flatten.join
+      end
+      @tag_format
     end
 
     def tag_format=(value)
@@ -69,12 +76,16 @@ module VersionInfo
     end
 
     def set_version_info(tag_str)
-      values = tag_str.to_s.split('.')
-      VersionInfo.segments.each{|sgm| self.send("#{sgm}=", values.shift.match(/(\d+)/).to_s.to_i) }
+      values = tag_str.to_s.split(/\.|\+|\-/)
+      values.each_with_index do |val, idx|
+        val = val.to_s.chomp
+        val = val.match(/(^\d+)$/) ? val.to_i : val
+        self.send("#{VersionInfo.segment_at(idx)}=", val )
+      end
     end
 
     def get_defaults
-      VersionInfo.segments[0..2].inject({}){|h, k| h[k] = 0; h}
+      VersionInfo.segments.inject({}){|h, k| h[k] = 0; h}
     end   
   end
 end

data/lib/version_info/text_storage.rb

@@ -14,7 +14,6 @@ module VersionInfo
     end
 
     def load_from(io)
-      #content = io.string.split("\n") unless io.is_a? Array
       content = io.readlines
       str = content.shift
       custom = content.inject({}) {|result, line| k, v = line.chomp.split(':'); result[k.strip.to_sym] = v.strip; result}

data/lib/version_info/version.rb

@@ -1,6 +1,6 @@
 
 module VersionInfo
-  VERSION = "1.8.0"
+  VERSION = "1.8.2"
   versionable(self)
   VERSION.file_name = __FILE__ 
 end

data/lib/version_info.rb

@@ -8,6 +8,12 @@ module VersionInfo
     @segments ||= [:major, :minor, :patch] 
   end
 
+  def self.segment_at(idx)
+    segments << :build if (segments.size == 3) && (idx>=3)
+    (segments.size..idx).each{|n| segments << "vinfo#{n}".to_sym}
+    @segments[idx]
+  end
+
   # define segments
   def self.segments=(values)
     @segments = values

data/spec/spec_helper.rb

@@ -29,3 +29,5 @@ if Notifier.os?(/mingw32/)
 		end
 	end
 end
+
+TestNotifier.default_notifier = :growl

data/spec/version_info/module_format_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Module file format" do
   before :each do
     VersionInfo.file_format = :module
-
+    VersionInfo.segments = nil
     @test_module = Module.new
     @test_module.send :include, VersionInfo # force new VERSION value
     @test_module::VERSION.file_name = nil
@@ -34,9 +34,9 @@ describe "Module file format" do
   it "can assign VERSION" do
     @test_module.VERSION = '1.2.4'
     @test_module.VERSION.author = 'jcangas'    
-    @test_module.VERSION.email = 'jorge.cangas@gmail.com'    
+    @test_module.VERSION.email = 'jcangas@example.com'    
     @test_module.VERSION.class.name.should == 'VersionInfo::Data'
-    @test_module.VERSION.to_hash.should == {major: 1, minor: 2, patch: 4, author: 'jcangas', email: 'jorge.cangas@gmail.com' }
+    @test_module.VERSION.to_hash.should == {major: 1, minor: 2, patch: 4, author: 'jcangas', email: 'jcangas@example.com' }
   end
 
 end

data/spec/version_info/text_format_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe "Text file format" do
   before :each do
     VersionInfo.file_format = :text
+    VersionInfo.segments = nil
     @test_module = Module.new
     @test_module.send :include, VersionInfo
     @test_module::VERSION.file_name = nil
@@ -29,12 +30,12 @@ describe "Text file format" do
     File.should_receive(:open).and_yield(io)
     @test_module::VERSION.bump(:minor)
     @test_module::VERSION.author = 'jcangas'
-    @test_module::VERSION.email = 'jorge.cangas@gmail.com'
+    @test_module::VERSION.email = 'jcangas@example.com'
     @test_module::VERSION.save
     io.string.should == <<END
 0.1.0
 author: jcangas
-email: jorge.cangas@gmail.com
+email: jcangas@example.com
 END
 
   end
@@ -43,7 +44,21 @@ END
     io = StringIO.new("1.2.3")
     File.should_receive(:open).and_yield(io)
     @test_module::VERSION.load
-    @test_module::VERSION.to_hash.should == {:major => 1, :minor => 2, :patch => 3 }  
+    @test_module::VERSION.to_hash.should == {:major => 1, :minor => 2, :patch => 3}  
+  end
+
+  it "auto expand segments " do
+    io = StringIO.new("1.2.3.B4.5")
+    File.should_receive(:open).and_yield(io)
+    @test_module::VERSION.load
+    @test_module::VERSION.to_hash.should == {:major => 1, :minor => 2, :patch => 3, :build => 'B4', :vinfo4 => 5  }  
+  end
+
+  it "auto expand for build uses semvar.org tag format " do
+    io = StringIO.new("1.2.3.B4.5")
+    File.should_receive(:open).and_yield(io)
+    @test_module::VERSION.load
+    @test_module::VERSION.tag.should == "1.2.3+B4.5"  
   end
 
   it "can load custom data " do

data/spec/version_info/yaml_format_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe "Yaml file format" do
   before :each do
     VersionInfo.file_format = :yaml
+    VersionInfo.segments = nil
     @test_module = Module.new
     @test_module.send :include, VersionInfo
     @test_module::VERSION.file_name = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: version_info
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.2
 platform: ruby
 authors:
 - Jorge L. Cangas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,14 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: version_info
-rubygems_version: 2.1.4
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby gem to manage your project version data. Rake tasks included!
-test_files:
-- spec/spec_helper.rb
-- spec/version_info/module_format_spec.rb
-- spec/version_info/test_file.rb
-- spec/version_info/text_format_spec.rb
-- spec/version_info/version_info_spec.rb
-- spec/version_info/yaml_format_spec.rb
+test_files: []