version_info 1.8.8 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8faed425d19abf274ee245d50f63c35ab49f6ac3
-  data.tar.gz: bcb30f9e127ce124b4a68f235a47d13759a6feff
+  metadata.gz: 6631429538dbd8b3cc32768357a3fa332ee82b3e
+  data.tar.gz: f6e2355cb2d0af05745727b21d4749898cb243ba
 SHA512:
-  metadata.gz: 8c11d70dd3fcfa4e0cf0c6b1c12aeeb04b4f42c905e0987edadf293926e0aa3aa3080347bfb5aee4e746988e0e5fe73a5153e8bb54973681d464bf39d53e4d38
-  data.tar.gz: 4c4803ba8ee25fa43a79781560ce00d0e67d7bffa1f4edc0634c0b13705d24c22ba6e7d03b53ada1afc7e016a8437a8490ce1004ef5e232e76907548ce4bb28c
+  metadata.gz: 44b3ed302d485ddc12352502541b956bc400a4f20e98f7f5e2866b22b3199dfad0a7e7d8b4b6d05bea314c318041bbaac1a49a20ca40c505b8b0d67b9b8fd3c1
+  data.tar.gz: 62a4c716f397f07651932a13811516d40f00367eaf961516b751b8d3991ff372b090a3009301cd033f661da6d2d1cc456b9b4bbb995ae67ec69749a6b5034e25

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 96.97
+    "covered_percent": 96.99
   }
 }

data/coverage/.resultset.json

@@ -9,20 +9,20 @@
         null,
         null,
         1,
-        35,
+        37,
         null,
         null,
         null,
         1,
-        30,
+        32,
         null,
         null,
         1,
-        33,
+        17,
         null,
         null,
         1,
-        24,
+        26,
         null,
         null,
         1,
@@ -36,25 +36,25 @@
         null,
         null,
         1,
-        35,
+        37,
         null,
         null,
         1,
-        35,
+        37,
         0,
         0,
         null,
-        35,
-        35,
-        35,
-        35,
+        37,
+        37,
+        37,
+        37,
         12,
         null,
-        35,
+        37,
         2,
         null,
         null,
-        35,
+        37,
         null,
         null,
         null,
@@ -62,22 +62,20 @@
         null
       ],
       "Z:/Projects/github/version_info/lib/version_info/storage.rb": [
-        1,
         1,
         1,
         null,
         1,
-        33,
-        33,
-        33,
+        17,
+        17,
         null,
         null,
         1,
-        113,
+        47,
         null,
         null,
         1,
-        33,
+        7,
         null,
         null,
         1,
@@ -85,9 +83,9 @@
         null,
         null,
         1,
-        2,
-        2,
-        2,
+        3,
+        3,
+        3,
         null,
         null,
         1,
@@ -115,25 +113,25 @@
         1,
         null,
         1,
-        22,
+        4,
         null,
         null,
         1,
-        18,
+        0,
         null,
         null,
         1,
-        22,
-        22,
-        22,
+        4,
+        4,
+        4,
         null,
         null,
         1,
-        22,
-        23,
-        22,
-        22,
-        22,
+        4,
+        5,
+        4,
+        4,
+        4,
         null,
         null,
         1,
@@ -158,7 +156,7 @@
         null,
         1,
         1,
-        9,
+        3,
         null,
         null,
         1,
@@ -193,17 +191,7 @@
         1,
         null,
         1,
-        12,
-        null,
-        null,
-        1,
-        0,
-        null,
-        null,
-        1,
-        1,
-        1,
-        1,
+        3,
         null,
         null,
         1,
@@ -233,22 +221,25 @@
         1,
         1,
         1,
-        35,
-        35,
-        35,
+        37,
+        37,
+        37,
         null,
         null,
         1,
-        63,
+        39,
+        17,
+        null,
+        39,
         null,
         null,
         1,
-        4,
+        11,
         null,
         null,
         1,
-        33,
-        33,
+        35,
+        35,
         null,
         null,
         1,
@@ -262,21 +253,21 @@
         null,
         null,
         1,
-        35,
-        35,
+        37,
+        37,
         null,
         null,
         1,
-        37,
+        39,
         null,
         null,
         1,
-        12,
-        12,
-        12,
-        9,
+        13,
+        13,
+        13,
+        10,
         null,
-        12,
+        13,
         null,
         null,
         1,
@@ -284,22 +275,22 @@
         null,
         null,
         1,
-        56,
+        42,
         null,
         null,
         1,
-        18,
+        20,
         null,
         null,
         1,
-        20,
-        58,
-        58,
-        13,
-        13,
-        13,
+        22,
+        66,
+        66,
+        15,
+        15,
+        15,
         null,
-        20,
+        22,
         null,
         null,
         1,
@@ -307,33 +298,33 @@
         null,
         null,
         1,
-        28,
-        28,
-        28,
-        95,
-        95,
-        95,
+        10,
+        10,
+        10,
+        41,
+        41,
+        41,
         null,
-        28,
+        10,
         null,
         null,
         1,
-        95,
-        100,
-        95,
+        41,
+        46,
+        41,
         null,
         null,
         1,
-        150,
+        140,
         null,
         null,
         1,
-        252,
-        63,
+        188,
+        47,
         null,
         null,
         1,
-        140,
+        148,
         null,
         null,
         null,
@@ -440,11 +431,19 @@
         null,
         1,
         1,
-        9,
-        9,
-        9,
-        9,
-        9,
+        11,
+        11,
+        11,
+        11,
+        11,
+        null,
+        null,
+        1,
+        1,
+        null,
+        null,
+        1,
+        1,
         null,
         null,
         1,
@@ -453,6 +452,10 @@
         null,
         1,
         1,
+        1,
+        1,
+        1,
+        1,
         null,
         null,
         1,
@@ -664,6 +667,6 @@
         null
       ]
     },
-    "timestamp": 1392630616
+    "timestamp": 1392639091
   }
 }

data/lib/version_info.rb

@@ -40,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(VersionInfo.segments))
+    other.const_set(:VERSION, Data.new(VersionInfo.segments.dup))
     singleton = other.singleton_class
     singleton.class_eval do
       define_method :VERSION do

data/lib/version_info/data.rb

@@ -5,21 +5,24 @@ module VersionInfo
   class Data < OpenStruct
     def initialize(segments)
       super()
-      @segments = segments.dup
+      @segments = segments
       reset
     end
     
     def storage
-      @storage ||= STORAGE_CLASS[VersionInfo.file_format.to_sym].new(self)
+      unless @storage
+        @storage ||= STORAGE_CLASS[VersionInfo.file_format.to_sym].new(self)
+      end
+      @storage
     end
     
     def file_name
-      storage.file_name      
+      @file_name ||= Dir.pwd + '/' + storage.default_file_name
     end
 
     def file_name=(value)
+      @file_name = value
       @storage = nil #recreate storage
-      storage.file_name = value
     end
     
     def load

data/lib/version_info/module_storage.rb

@@ -17,14 +17,15 @@ module VersionInfo
     end
 
     def parse_from(content)
-      match = content.join("\n").match /(\s*VERSION\s*=\s*)('|")(.*)('|")/
-      str = match[3]
+      match = content.join.match /(\s*VERSION\s*=\s*)('|")(.*)('|")/
+      str = match ? match[3] : "0.0.0"
       data.set_version_info(str)
       self
     end
 
     def save      
       content = load_content.join
+      content = "VERSION = '#{data.tag}'" if content.empty?
       content.gsub!(/(\s*VERSION\s*=\s*)('|").*('|")/, "\\1\\2#{data.tag}\\3")
 	    File.open(file_name, 'w' ) {|out| out.print content}
 	    self

data/lib/version_info/storage.rb

@@ -1,19 +1,17 @@
 module VersionInfo
   class Storage
-    attr :data
     
     def initialize(data)
       super()
       @data = data
-      load if file_name && File.exist?(file_name)
     end
     
-    def file_name
-      @file_name ||= Dir.pwd + '/' + default_file_name
+    def data
+      @data
     end
 
-    def file_name=(value)
-      @file_name = value
+    def file_name
+      @data.file_name
     end
 
     def load_content

data/lib/version_info/version.rb

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

data/spec/version_info/text_format_spec.rb

@@ -17,10 +17,22 @@ describe "Text file format" do
     @test_module::VERSION.to_hash.should == {:major => 0, :minor => 0, :patch => 0 }
   end
 
+  it "has tag str" do
+    @test_module::VERSION.tag.should == "0.0.0"
+  end
+
+  it "can bump minor" do
+    @test_module::VERSION.bump(:minor)
+    @test_module::VERSION.storage.data.should ==  @test_module::VERSION
+    @test_module::VERSION.storage.data.to_hash.should == {:major => 0, :minor => 1, :patch => 0 }
+    @test_module::VERSION.storage.data.tag.should == "0.1.0"
+    @test_module::VERSION.to_hash.should == {:major => 0, :minor => 1, :patch => 0 }
+  end
+
   it "can save " do
+    @test_module::VERSION.bump(:minor)
     io = StringIO.new
     File.should_receive(:open).and_yield(io)
-    @test_module::VERSION.bump(:minor)
     @test_module::VERSION.save
     io.string.should == "0.1.0\n"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: version_info
 version: !ruby/object:Gem::Version
-  version: 1.8.8
+  version: 1.9.0
 platform: ruby
 authors:
 - Jorge L. Cangas