version_info 0.7.1 → 1.0.0

data/README.md

@@ -21,9 +21,9 @@ Include VersionInfo in your main project module (or class):
       include VersionInfo
     end
 
-From here, is better to use the builtin rake/thor tasks (see it fordward). Here is how VersionInfo works and their user options:
+From here, is better to use the builtin rake/thor tasks (see it forward). Here is how VersionInfo works and their user options:
 
-After you included VersionIinfo, a new class MyProject::Version is defined (it inherit from VersionIinfo::Data). Also a new constant MyProject::VERSION is created holding an object of class MyProject::VersionIinfo.
+After you included VersionIinfo, a new constant MyProject::VERSION is created holding an object of class VersionInfo::Data
 
 VersionInfo use yaml file to store version data:
 
@@ -33,9 +33,10 @@ VersionInfo use yaml file to store version data:
     patch: 0
     author: jcangas
 
-By default the file is named version_info.yml and stored near the main file with the include VersionIinfo thing.
+By default the file is named version_info.yml and stored in the current dir, useful
+when using Rake or Thor.
 
-Anyway, you can change this:
+Anyway, you can change this (recomended):
     module MyProject
       include VersionInfo
       VERISION.file_name = '/path/to/my_file.yaml'      
@@ -84,7 +85,7 @@ And you get a few tasks with a namespace vinfo:
     rake vinfo:patch  # Bumps version segment PATCH
     rake vinfo:show   # Show current version tag and create version_info.yml if missing
 
-Or, if you prefer Thor:
+If you prefer Thor:
 
     VersionInfo::ThorTasks.install(:class => MyProject) # use the thing where you included VersionInfo
 
@@ -99,5 +100,7 @@ Or, if you prefer Thor:
 
 ### Install
 
+ VersionInfo is [https://rubygems.org/gems/version_info](https://rubygems.org/gems/version_info) at so:
+
     gem install version_info
 

data/Rakefile

@@ -9,6 +9,7 @@ require 'version_info/version'
 
 
 VersionInfo::RakeTasks.install(:class => VersionInfo)
+
 # now we have VersionInfo::VERSION defined, can load this
 Bundler::GemHelper.install_tasks
 

data/lib/version_info.rb

@@ -2,19 +2,18 @@ require 'version_info/data'
 
 module VersionInfo
 
-
   def self.segments
-    [:major, :minor, :patch, :state, :build]
+    [:major, :minor, :patch]
   end
    
   def self.included(other)
-    data = Class.new(Data)
-    other.const_set('Version', data)
-    other.const_set('VERSION', data.new)
+    # data = Class.new(Data)
+    # other.const_set('Version', data)
+    other.const_set('VERSION', Data.new)
   end
 
-  autoload :RakeTasks, 'version_info/tasks'
-  autoload :ThorTasks, 'version_info/tasks'
+  autoload :RakeTasks, 'version_info/rake_tasks'
+  autoload :ThorTasks, 'version_info/thor_tasks'
 
 end
 

data/lib/version_info/data.rb

@@ -14,7 +14,7 @@ module VersionInfo
     end
 
     def file_name
-      @file_name ||= Dir.pwd + '/' + underscore(self.class.name) +  '_info.yml'
+      @file_name ||= Dir.pwd + '/' + 'version_info.yml'
     end
 
     def file_name=(value)
@@ -28,7 +28,7 @@ module VersionInfo
       VersionInfo.segments[idx..-1].each do |sgm| 
 	      send("#{sgm}=", 0) if send(sgm)
       end
-      send("#{key}=", 1 + send(key))
+      send("#{key}=", 1 + send(key).to_i)
     end
     
     def load

data/lib/version_info/{tasks.rb → rake_tasks.rb}

@@ -1,39 +1,4 @@
-module VersionInfo
-  module ThorTasks
-    def self.install(opts = {})
-      Class.new(::Thor) do
-        @target = opts[:class]
-        class << self
-            attr_reader :target
-        end
-        namespace :vinfo
-
-        desc 'show', "Show version tag and create version_info.yml if missing"
-        def show
-          puts target::VERSION.tag
-          target::VERSION.save unless File.exist?(target::VERSION.file_name)
-        end
-
-        desc "inspect", "Show complete version info"
-        def inspect
-          puts target::VERSION.inspect
-        end
-
-        desc "bump SEGMENT=patch", "bumps segment: [#{VersionInfo.segments.join(', ')}]"
-        def bump(sgm = :patch)
-            target::VERSION.bump(sgm)
-            puts "version changed to #{target::VERSION}"
-            target::VERSION.save
-        end
-
-      protected
-        def target
-            self.class.target
-        end
-      end
-    end
-  end
-  
+module VersionInfo 
   class RakeTasks
     
     def self.install(opts = {})

data/lib/version_info/thor_tasks.rb

@@ -0,0 +1,37 @@
+module VersionInfo
+  module ThorTasks
+    def self.install(opts = {})
+      Class.new(::Thor) do
+        @target = opts[:class]
+        class << self
+            attr_reader :target
+        end
+        namespace :vinfo
+
+        desc 'show', "Show version tag and create version_info.yml if missing"
+        def show
+          puts target::VERSION.tag
+          target::VERSION.save unless File.exist?(target::VERSION.file_name)
+        end
+
+        desc "inspect", "Show complete version info"
+        def inspect
+          puts target::VERSION.inspect
+        end
+
+        desc "bump SEGMENT=patch", "bumps segment: [#{VersionInfo.segments.join(', ')}]"
+        def bump(sgm = :patch)
+            target::VERSION.bump(sgm)
+            puts "version changed to #{target::VERSION}"
+            target::VERSION.save
+        end
+
+      protected
+        def target
+            self.class.target
+        end
+      end
+    end
+  end  
+end
+

data/lib/version_info/version.rb

@@ -1,7 +1,5 @@
 module VersionInfo
-  Version = Class.new(Data)
-
-  VERSION = Version.new 
+  VERSION = Data.new 
   VERSION.file_name = 'lib/version_info/version_info.yml'
 end
 

data/lib/version_info/version_info.yml

@@ -1,4 +1,4 @@
 --- 
-major: 0
-minor: 7
-patch: 1
+major: 1
+minor: 0
+patch: 0

data/spec/version_info/version_info_spec.rb

@@ -3,26 +3,26 @@ require 'spec_helper'
 require 'version_info/test_file'
 
 describe "VersionInfo" do
+
   before :each do
     module TestFile
-      include VersionInfo # force new VERSION data
+      include VersionInfo # force new VERSION value
     end
   end
+
   after :each do
     module TestFile
       remove_const :VERSION
-      remove_const :Version
+      # remove_const :Version
     end
-  end
-    
-
+  end    
 
   it "is initalized" do
     TestFile::VERSION.marshal_dump.should == {:major => 0, :minor => 0, :patch => 0 }
   end
 
   it "has default filename" do
-    TestFile::VERSION.file_name.should ==  Dir.pwd + '/test_file/version_info.yml'
+    TestFile::VERSION.file_name.should ==  Dir.pwd + '/version_info.yml'
   end
 
   it "can assign filename" do

metadata

@@ -3,10 +3,10 @@ name: version_info
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 7
   - 1
-  version: 0.7.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Jorge L. Cangas
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 +01:00
+date: 2011-05-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,8 @@ files:
 - autotest/discover.rb
 - lib/version_info.rb
 - lib/version_info/data.rb
-- lib/version_info/tasks.rb
+- lib/version_info/rake_tasks.rb
+- lib/version_info/thor_tasks.rb
 - lib/version_info/version.rb
 - lib/version_info/version_info.yml
 - spec/spec_helper.rb