version_info 1.8.2 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718e8eee0dc06dd98dcc2757f024485ec4802bf4
-  data.tar.gz: 6bd0a11d3bd55e7ea7e25cc2b11d491bdbfbc8e6
+  metadata.gz: 3ea10020b18eabf4d326bcd99f2c108088948549
+  data.tar.gz: 9596273410ac0636b8c95f20a9dd4e7b6caf7472
 SHA512:
-  metadata.gz: e29144dd0136a49db899fc186f6563558ea9de0ca91cf2272bd352d7d5052a938b7003c96733387aaefcfc39fe99a667433fca9c6bfc6a2aa70398014586bcb4
-  data.tar.gz: 738ee136e707c8224ca6ce92df398d049db90301eea74cb74f49552fc4db4f31d4cc6c0a8873cfd0f657f55c1a09e4170813facb87083dc98b3f2d51e5bec186
+  metadata.gz: 1ce5e6d2d260950c64fdf5360a89a59b0fffc8516f5989e157945dd7d3079c251e2728c64d05e22ae64cf13f5d36362f5651188e37a17398f0ac10eaa35e5366
+  data.tar.gz: 8c4c67402bb4bba9cffa0c7389934ff710ee807930e0fabb02118c49912451f698afa5bdf0d5d4d7c0cbe45f1b16d0992b68f7af283209fbebb716117dd3bc38

data/.travis.yml

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

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 94.89
+    "covered_percent": 95.29
   }
 }

data/coverage/.resultset.json

@@ -9,26 +9,20 @@
         null,
         null,
         1,
-        115,
-        null,
-        null,
-        1,
-        19,
-        21,
-        19,
+        32,
         null,
         null,
         null,
         1,
-        26,
+        27,
         null,
         null,
         1,
-        29,
+        30,
         null,
         null,
         1,
-        20,
+        21,
         null,
         null,
         1,
@@ -42,25 +36,25 @@
         null,
         null,
         1,
-        31,
+        32,
         null,
         null,
         1,
-        31,
+        32,
         0,
         0,
         null,
-        31,
-        31,
-        31,
-        31,
+        32,
+        32,
+        32,
+        32,
         10,
         null,
-        31,
+        32,
         1,
         null,
         null,
-        31,
+        32,
         null,
         null,
         null,
@@ -73,17 +67,17 @@
         1,
         null,
         1,
-        29,
-        29,
-        29,
+        30,
+        30,
+        30,
         null,
         null,
         1,
-        72,
+        75,
         null,
         null,
         1,
-        29,
+        30,
         null,
         null,
         1,
@@ -92,8 +86,8 @@
         null,
         null,
         1,
-        8,
-        4,
+        10,
+        5,
         null,
         null,
         null,
@@ -116,7 +110,7 @@
         1,
         null,
         1,
-        24,
+        26,
         null,
         null,
         1,
@@ -129,9 +123,9 @@
         null,
         null,
         1,
-        8,
-        10,
-        2,
+        3,
+        16,
+        3,
         null,
         null,
         null
@@ -211,12 +205,13 @@
         1,
         1,
         1,
-        31,
-        31,
+        32,
+        32,
+        32,
         null,
         null,
         1,
-        43,
+        45,
         null,
         null,
         1,
@@ -224,8 +219,8 @@
         null,
         null,
         1,
-        29,
-        29,
+        30,
+        30,
         null,
         null,
         1,
@@ -234,25 +229,26 @@
         null,
         null,
         1,
-        4,
-        4,
+        5,
+        5,
         null,
         null,
         1,
-        31,
+        32,
+        32,
         null,
         null,
         1,
-        33,
+        34,
         null,
         null,
         1,
-        9,
-        9,
-        9,
-        6,
+        10,
+        10,
+        10,
+        7,
         null,
-        9,
+        10,
         null,
         null,
         1,
@@ -260,39 +256,56 @@
         null,
         null,
         1,
-        26,
+        30,
         null,
         null,
         1,
-        7,
+        10,
+        null,
+        null,
+        1,
+        12,
+        46,
+        46,
+        10,
+        10,
+        10,
+        null,
+        12,
+        null,
+        null,
+        1,
+        1,
         null,
         null,
         1,
         8,
-        30,
-        30,
-        7,
-        7,
-        7,
+        8,
+        8,
+        35,
+        35,
+        35,
         null,
         8,
         null,
         null,
         1,
-        1,
+        35,
+        40,
+        35,
         null,
         null,
         1,
-        5,
-        5,
-        19,
-        19,
-        19,
+        116,
+        null,
         null,
+        1,
+        160,
+        40,
         null,
         null,
         1,
-        124,
+        128,
         null,
         null,
         null,
@@ -303,11 +316,11 @@
         null,
         1,
         1,
-        8,
-        8,
-        8,
-        8,
-        8,
+        9,
+        9,
+        9,
+        9,
+        9,
         null,
         null,
         1,
@@ -363,12 +376,21 @@
         null,
         null,
         1,
+        null,
+        null,
+        1,
         1,
         1,
         1,
         1,
         null,
         null,
+        1,
+        1,
+        1,
+        1,
+        1,
+        null,
         null
       ],
       "Z:/Projects/github/version_info/spec/version_info/version_info_spec.rb": [
@@ -384,9 +406,14 @@
         null,
         8,
         null,
+        1,
+        8,
+        null,
         null,
         1,
         1,
+        1,
+        1,
         null,
         null,
         1,
@@ -404,23 +431,27 @@
         null,
         1,
         1,
+        1,
         null,
         null,
         1,
         1,
         1,
         1,
+        1,
         null,
         null,
         1,
         1,
         1,
+        1,
         null,
         null,
         1,
         1,
         1,
         1,
+        1,
         null,
         null,
         null,
@@ -509,6 +540,6 @@
         null
       ]
     },
-    "timestamp": 1385730622
+    "timestamp": 1386012568
   }
 }

data/lib/version_info.rb

@@ -8,12 +8,6 @@ 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
@@ -46,7 +40,7 @@ module VersionInfo
       old_const = other.const_get(:VERSION, false) 
       other.send(:remove_const, :VERSION) rescue true
     end
-    other.const_set(:VERSION, Data.new)
+    other.const_set(:VERSION, Data.new(VersionInfo.segments))
     singleton = other.singleton_class
     singleton.class_eval do
       define_method :VERSION do

data/lib/version_info/data.rb

@@ -3,8 +3,9 @@ require 'ostruct'
 module VersionInfo
   STORAGE_CLASS = {text: TextStorage, yaml: YamlStorage, module: ModuleStorage}
   class Data < OpenStruct
-    def initialize
-      super
+    def initialize(segments)
+      super()
+      @segments = segments.dup
       reset
     end
     
@@ -32,6 +33,7 @@ module VersionInfo
     end
     
     def reset
+      clear
       assign(get_defaults)
     end
     
@@ -40,9 +42,9 @@ module VersionInfo
     end
 
     def bump(key)
-      idx = VersionInfo.segments.index(key.to_sym) + 1
+      idx = segments.index(key.to_sym) + 1
       return unless idx
-      VersionInfo.segments[idx..-1].each do |sgm| 
+      segments[idx..2].each do |sgm| 
 	      send("#{sgm}=", 0) if send(sgm)
       end
       send("#{key}=", 1 + send(key).to_i)
@@ -61,11 +63,11 @@ module VersionInfo
     end
     
     def tag_format
-	    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
+      unless @tag_format
+        fmts = segments.map { |k| "%<#{k}>s"}
+        fmt_join = fmts.map { |k| "." }
+        fmt_join[2] = '+' if fmts.size > 2 #build uses '+'. See semver.org
+        fmt_join[-1] = '' if fmt_join.size > 0 #remove last char
         @tag_format = fmts.zip(fmt_join).flatten.join
       end
       @tag_format
@@ -76,16 +78,33 @@ module VersionInfo
     end
 
     def set_version_info(tag_str)
+      clear
       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 )
+        self.send("#{segment_at(idx)}=", val )
       end
+      self
+    end
+
+    def segment_at(idx)
+      @segments << :build if (@segments.size == 3) && (idx>=3)
+      (@segments.size..idx).each{|n| @segments << "vinfo#{n}".to_sym}
+      @segments[idx]
+    end
+
+    def segments
+      @segments
+    end
+
+    def clear
+      segments.each{|key| delete_field(key) if @table.has_key?(key)}
+      @tag_format = nil
     end
 
     def get_defaults
-      VersionInfo.segments.inject({}){|h, k| h[k] = 0; h}
+      segments.inject({}){|h, k| h[k] = 0; h}
     end   
   end
 end

data/lib/version_info/text_storage.rb

@@ -23,8 +23,8 @@ module VersionInfo
     end
 
     def save_to(io)
-      io.puts VersionInfo.segments.map{|sgm| data.send(sgm)}.join('.')
-      data.to_hash.each {|k, v| io.puts "#{k}: #{v}" unless VersionInfo.segments.include?(k) }
+      io.puts data.tag #VersionInfo.segments.map{|sgm| data.send(sgm)}.join('.')
+      data.to_hash.each {|k, v| io.puts "#{k}: #{v}" unless data.segments.include?(k) }
 	    self      
     end
   end

data/lib/version_info/version.rb

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

data/spec/version_info/text_format_spec.rb

@@ -47,14 +47,24 @@ END
     @test_module::VERSION.to_hash.should == {:major => 1, :minor => 2, :patch => 3}  
   end
 
-  it "auto expand segments " do
+  it "auto add segments on load" 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
+  it "can save custom tag format" do
+    @test_module::VERSION.set_version_info("1.2.3+B4.5")
+    io = StringIO.new
+    File.should_receive(:open).and_yield(io)
+    @test_module::VERSION.save
+    io.string.should == <<END
+1.2.3+B4.5
+END
+  end
+
+  it "auto add build segment 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
@@ -62,10 +72,9 @@ END
   end
 
   it "can load custom data " do
-    io = StringIO.new("1.2.3\nauthor: jcangas\n")
+    io = StringIO.new("1.2.3+B4.5\nauthor: jcangas\n")
     File.should_receive(:open).and_yield(io)
     @test_module::VERSION.load
-    @test_module::VERSION.to_hash.should == {:major => 1, :minor => 2, :patch => 3, :author => 'jcangas' }  
+    @test_module::VERSION.to_hash.should == {:major => 1, :minor => 2, :patch => 3, :build => 'B4', :vinfo4 => 5, :author => 'jcangas' }  
   end
-
 end

data/spec/version_info/version_info_spec.rb

@@ -10,9 +10,14 @@ describe "VersionInfo defaults" do
 
     @test_module::VERSION.file_name = nil
   end
+  after :each do
+    @test_module = nil
+  end
 
   it "is initalized" do
+    @test_module::VERSION.segments.should == [:major, :minor, :patch]
     @test_module::VERSION.to_hash.should == {:major => 0, :minor => 0, :patch => 0 }
+    @test_module::VERSION.tag_format.should == "%<major>s.%<minor>s.%<patch>s"
   end
 
   it "can assign filename" do
@@ -30,23 +35,27 @@ describe "VersionInfo defaults" do
 
   it "tag has format" do
     @test_module::VERSION.tag.should == '0.0.0'    
+    @test_module::VERSION.tag_format.should == "%<major>s.%<minor>s.%<patch>s"
   end
 
   it "tag format can be changed" do
+    @test_module::VERSION.set_version_info('0.0.0.0')
     @test_module::VERSION.build_flag = 'pre'
-    @test_module::VERSION.tag_format = @test_module::VERSION.tag_format + "--%<build_flag>s"
-    @test_module::VERSION.tag.should == '0.0.0--pre'    
+    @test_module::VERSION.tag_format = "%<major>d.%<minor>d.%<patch>d-%<build_flag>s%<build>d"
+    @test_module::VERSION.tag.should == '0.0.0-pre0'    
   end
 
   it "can bump a segment" do
+    @test_module::VERSION.bump(:minor)
     @test_module::VERSION.bump(:patch)
-    @test_module::VERSION.tag.should == '0.0.1'    
+    @test_module::VERSION.tag.should == '0.1.1'    
   end
 
-  it "bump a segment reset sublevels " do
+  it "bump a segment reset semver sublevels " do
+    @test_module::VERSION.set_version_info("1.2.3+B4.5")
     @test_module::VERSION.bump(:patch)
     @test_module::VERSION.bump(:minor)
-    @test_module::VERSION.tag.should == '0.1.0'   
+    @test_module::VERSION.tag.should == "1.3.0+B4.5"   
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: version_info
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.5
 platform: ruby
 authors:
 - Jorge L. Cangas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler