semver 0.2.2 → 1.0.0

data/.semver

@@ -1,5 +1,5 @@
---- 
-:minor: "2"
-:patch: "2"
+---
+:patch: 0
 :special: ""
-:major: "0"
+:major: 1
+:minor: 0

data/README.md

@@ -20,9 +20,10 @@ quickstart for ruby
     require 'semver'
     v = SemVer.find
     v.major                     # => "0"
-    v.major.next!
+    v.major += 1
     v.major                     # => "1"
     v.format "%M.%m.%p"         # => "1.1.0"
+    v.to_s                      # => "v1.1.0"
     v.save
 
 git integration

data/bin/semver

@@ -6,24 +6,38 @@ require 'semver'
 class CommandError < StandardError; end
 
 begin
-  command = ARGV.shift or raise CommandError, "no command given"
+  command = ARGV.shift || 'tag'
 
   case command
   when /^init(ialize)?$/
-    FileUtils.touch SemVer::FILE_NAME
-    version = SemVer.find
-    version
-    version.save
+    file = SemVer::FILE_NAME
+
+    if File.exist? file
+      puts "#{file} already exists"
+    else
+      version = SemVer.new
+      version.save file
+    end
 
   when /^inc(rement)?$/
     version = SemVer.find
     dimension = ARGV.shift or raise CommandError, "required: major | minor | patch"
 
     case dimension
-    when 'major' then version.major.next!
-    when 'minor' then version.minor.next!
-    when 'patch' then version.patch.next!
-    else raise CommandError, "#{dimension} is invalid: major | minor | patch"
+    when 'major'
+      version.major += 1
+      version.minor = 0
+      version.patch = 0
+
+    when 'minor'
+      version.minor += 1
+      version.patch = 0
+
+    when 'patch'
+      version.patch += 1
+
+    else
+      raise CommandError, "#{dimension} is invalid: major | minor | patch"
     end
 
     version.special = ''
@@ -42,7 +56,7 @@ begin
 
   when 'tag'
     version = SemVer.find
-    puts version.format "v%M.%m.%p%s"
+    puts version.to_s
 
   when 'help'
     puts <<-HELP
@@ -62,7 +76,7 @@ PLEASE READ http://semver.org
   else raise CommandError, "invalid command #{command}"
   end
 
-rescue CommandError, NoSemVerError => e
+rescue CommandError => e
   puts e.message
   puts "#{$0} help for more info"
   exit 1

data/lib/semver.rb

@@ -1,14 +1,16 @@
 require 'yaml'
-
-class NoSemVerError < StandardError; end
+require 'ruby-debug'
+require 'ruby-debug'
 
 class SemVer
 
   FILE_NAME = '.semver'
+  TAG_FORMAT = 'v%M.%m.%p%s'
 
   def SemVer.find dir=nil
     v = SemVer.new
-    v.load
+    f = SemVer.find_file dir
+    v.load f
     v
   end
 
@@ -20,59 +22,47 @@ class SemVer
     Dir.chdir dir do
 
       loop do
+        raise "#{dir} is not semantic versioned" if File.dirname(path) == '/'
 
-        if File.dirname(File.expand_path(path)) == '/'
-          raise NoSemVerError, "#{dir} is not semantic versioned"
-        elsif Dir[FILE_NAME].empty?
+        if Dir[path].empty?
           path = File.join '..', path
+          path = File.expand_path path
           next
         else
-          path = File.expand_path path
           return path
         end
 
       end
 
     end
-  end
 
-  class << self
-
-    def attr_writer_pattern pattern, symbol
+  end
 
-      define_method("#{symbol}=".to_sym) do |str|
+  attr_accessor :major, :minor, :patch, :special
 
-        if str =~ pattern || str.empty?
-          instance_variable_set "@#{symbol}".to_sym, str
-        else
-          raise "#{symbol}: #{str} does not match pattern #{pattern}"
-        end
-
-      end
+  def initialize major=0, minor=0, patch=0, special=''
+    major.kind_of? Integer or raise "invalid major: #{major}"
+    minor.kind_of? Integer or raise "invalid minor: #{minor}"
+    patch.kind_of? Integer or raise "invalid patch: #{patch}"
 
+    unless special.empty?
+      special =~ /[A-Za-z][0-9A-Za-z-]+/ or raise "invalid special: #{special}"
     end
 
+    @major, @minor, @patch, @special = major, minor, patch, special
   end
 
-  attr_writer_pattern /\d+/, :major
-  attr_writer_pattern /\d+/, :minor
-  attr_writer_pattern /\d+/, :patch
-  attr_writer_pattern /[A-Za-z][0-9A-Za-z-]+/, :special
-  attr_reader :major, :minor, :patch, :special
-
-  def initialize major='0', minor='0', patch='0', special=''
-    self.major, self.minor, self.patch, self.special = major.to_s, minor.to_s, patch.to_s, special.to_s
+  def load file
+    @file = file
+    hash = YAML.load_file(file) || {}
+    @major = hash[:major] or raise "invalid semver file: #{file}"
+    @minor = hash[:minor] or raise "invalid semver file: #{file}"
+    @patch = hash[:patch] or raise "invalid semver file: #{file}"
+    @special = hash[:special]  or raise "invalid semver file: #{file}"
   end
 
-  def load file=SemVer.find_file
-    hash = open(file) { |io| YAML::load io.read } || {}
-    self.major = hash[:major] || '0'
-    self.minor = hash[:minor] || '0'
-    self.patch = hash[:patch] || '0'
-    self.special = hash[:special] || ''
-  end
-
-  def save file=SemVer.find_file
+  def save file=nil
+    file ||= @file
 
     hash = {
       :major => @major,
@@ -81,18 +71,22 @@ class SemVer
       :special => @special
     }
 
-    yaml = YAML::dump hash
+    yaml = YAML.dump hash
     open(file, 'w') { |io| io.write yaml }
   end
 
   def format fmt
-    fmt.gsub! '%M', @major
-    fmt.gsub! '%m', @minor
-    fmt.gsub! '%p', @patch
-    fmt.gsub! '%s', @special
+    fmt.gsub! '%M', @major.to_s
+    fmt.gsub! '%m', @minor.to_s
+    fmt.gsub! '%p', @patch.to_s
+    fmt.gsub! '%s', @special.to_s
     fmt
   end
 
+  def to_s
+    format TAG_FORMAT
+  end
+
   def <=> other
     maj = major.to_i <=> other.major.to_i
     return maj unless maj == 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: semver
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
+  - 1
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Francesco Lazzarino
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 -04:00
+date: 2011-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Semantic Versioning