YAVM 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00614a6d85ba88c1ee44b69f5411310ce0a35da0
-  data.tar.gz: c095eb2841da7051fcdefe06fd7a1b95db33aa6d
+  metadata.gz: 89f5ae4a9ec1d9aba8068c16cae331911225edbf
+  data.tar.gz: 00dd29ac52b21bd6cff55f408263b9398a742eb4
 SHA512:
-  metadata.gz: 9b0372097d1be4cc53611184184e973cd94f5dc01fc37d5912bde8c0218565ce579324fa796f1853eebd136ae60423f9ee39fab4d714f677f7ec15744b34fafa
-  data.tar.gz: 073e1526bbd6658d91cf952b0bb24939eccec6699074fb8f2f1d49983e8d127a888b98047dddf2d40e5cb96757cfd0a442ffba2d5f6ef616a571e95e6090272c
+  metadata.gz: 3750f8ab3725a3c65ea16bd2b53d6c8f0db680bff35687e1027b85e83804ab60b3419144a9fb4f4536922c2a29d3fcdc363f54ef75a6a6df99621534086fef32
+  data.tar.gz: 5fe02152701c63abf62927279d2200da953cb7f969872b3d57540417cd28b7aefb13271fa06e73e54f05db8c35a82d0b5374b3635e1628b0928b66f19c14d359

data/bin/git-versiontag

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+lib = File.expand_path('../lib/', __FILE__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+
+lib = File.expand_path('../../lib/', __FILE__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+
+require 'yavm'
+require 'shell'
+
+Shell.def_system_command :git, 'git'
+
+sh = Shell.new
+
+version = YAVM.version
+files = YAVM.versions.files
+
+sh.git('add', *files)
+sh.git('commit', '--allow-empty', '-m', "Version #{version}", '--only', *files)
+sh.git('tag', '-a', version.tag, '-m' "Version #{version}")
+

data/bin/version

@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'simplecov_loader' if ENV['COVERAGE']
-
 lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 lib = File.expand_path('../../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
+require 'simplecov_loader' if ENV['COVERAGE']
 require 'yavm/command_line'
 
 begin

data/features/command_line.feature

@@ -3,7 +3,7 @@ Feature: Command Line Interface
   version number, and set the 'special' and 'meta' fields
 
   Background:
-    Given I have a project called "project"
+    Given I have a project called "versioning"
     And I run `version init`
 
     Then the output should contain "0.0.0"

data/features/initialization.feature

@@ -3,7 +3,7 @@ Feature: Command Line Initialization
   enforce consistency.
 
   Background:
-    Given I have a project called "project"
+    Given I have a project called "versioning"
 
   Scenario: Project with no version number
     Given I run `version`

data/features/support/env.rb

@@ -1,12 +1,12 @@
 require 'aruba/cucumber'
 
-Before do |scenario|
-  @dirs = ['tmp/aruba']
+Before do |_scenario|
+  @dirs = ['.']
   @cwd  = Dir.pwd
 
   set_env('COVERAGE', 'true')
 end
 
-After do |scenario|
+After do |_scenario|
   Dir.chdir @cwd
 end

data/lib/yavm.rb

@@ -1,11 +1,10 @@
 lib = File.dirname(__FILE__)
-$:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'yavm/version'
 require 'yavm/stores'
 
 module YAVM
-
   def version(quiet: true, quick: true)
     versions = YAVM::Stores.locate_versions(quick)
 
@@ -14,10 +13,13 @@ module YAVM
     else
       return nil if quiet
 
-      raise RuntimeError, 'No version information available'
+      fail 'No version information available'
     end
   end
 
-  module_function :version
+  def versions
+    YAVM::Stores.locate_versions
+  end
 
+  module_function :version, :versions
 end

data/lib/yavm/command_line.rb

@@ -97,7 +97,14 @@ module YAVM
         puts "#{version.tag}"
 
       when 'files'
-        puts versions.map { |v| v.store.filename || nil }.compact.join "\n"
+        sep = "\n"
+        pad = ''
+
+        sep = ' '  if @args['-1']
+        pad = '"'  if @args['-1']
+        sep = "\0" if @args['-0']
+
+        puts versions.files.map { |v| "#{pad}#{v}#{pad}" }.join(sep)
 
       when 'help'
         Docopt::Exit.set_usage(nil)
@@ -149,7 +156,7 @@ module YAVM
         #{@invocation} meta [<string>]
         #{@invocation} format <string>
         #{@invocation} tag
-        #{@invocation} files
+        #{@invocation} files [(-1|-0)]
         #{@invocation} help
 
       Options:

data/lib/yavm/stores.rb

@@ -7,13 +7,12 @@ require 'yavm/stores/gem_spec'
 
 module YAVM
   module Stores
-
     def stores
       [
         YAVM::Stores::Semver,
         YAVM::Stores::Package,
         YAVM::Stores::Bower,
-        YAVM::Stores::GemSpec,
+        YAVM::Stores::GemSpec
       ]
     end
 

data/lib/yavm/stores/base.rb

@@ -2,7 +2,6 @@ require 'json'
 
 module YAVM
   module Stores
-
     class Base
       def name
         self.class.name
@@ -21,11 +20,9 @@ module YAVM
       def filename
         Dir[glob].first if exists?
       end
-
     end
 
     class GenericJSON < YAVM::Stores::Base
-
       def data
         @data ||= JSON.parse(IO.read(filename))
       end
@@ -38,9 +35,6 @@ module YAVM
         @data = update_version_key(new_version.to_s)
         File.open(filename, 'w') { |f| f.write JSON.pretty_generate(data) }
       end
-
     end
-
-
   end
 end

data/lib/yavm/stores/bower.rb

@@ -3,7 +3,6 @@ require 'yavm/stores/base'
 module YAVM
   module Stores
     class Bower < YAVM::Stores::GenericJSON
-
       def name
         'bower.json file'
       end
@@ -18,9 +17,8 @@ module YAVM
 
       def update_version_key(what)
         data['version'] = what
-        return data
+        data
       end
-
     end
   end
 end

data/lib/yavm/stores/gem_spec.rb

@@ -5,7 +5,6 @@ require 'yavm/stores/base'
 module YAVM
   module Stores
     class GemSpec < YAVM::Stores::Base
-
       def name
         "gemspec: #{filename}"
       end
@@ -33,7 +32,6 @@ module YAVM
 
         File.open(filename, 'w') { |f| f.write new_spec }
       end
-
     end
   end
 end

data/lib/yavm/stores/package.rb

@@ -3,7 +3,6 @@ require 'yavm/stores/base'
 module YAVM
   module Stores
     class Package < YAVM::Stores::GenericJSON
-
       def name
         'npm package.json'
       end
@@ -18,9 +17,8 @@ module YAVM
 
       def update_version_key(what)
         data['version'] = what
-        return data
+        data
       end
-
     end
   end
 end

data/lib/yavm/stores/semver.rb

@@ -5,7 +5,6 @@ require 'yavm/stores/base'
 module YAVM
   module Stores
     class Semver < YAVM::Stores::Base
-
       def name
         '.semver file'
       end
@@ -29,7 +28,6 @@ module YAVM
       def set!(new_version)
         File.open(filename, 'w') { |f| f.write new_version.to_yaml }
       end
-
     end
   end
 end

data/lib/yavm/version.rb

@@ -5,6 +5,8 @@ module YAVM
   class Version
     extend ::Forwardable
 
+    VERSION_REGEX = /\A(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)(?:-(?<special>[a-z0-9]+))?(?:\+(?<meta>[a-z0-9]+))?\z/i
+
     attr_accessor :store
 
     def initialize(store, vobject = nil)
@@ -20,24 +22,12 @@ module YAVM
       end
     end
 
-    def special
-      empty_is_nil(:special)
-    end
-
-    def meta
-      empty_is_nil(:meta)
-    end
-
     def to_s
       format('%M.%m.%p%-s')
     end
 
     def to_hash
-      dump = @_version.marshal_dump
-      dump[:special] ||= ''
-      dump[:meta]    ||= ''
-
-      dump
+      @_version.marshal_dump
     end
 
     def to_yaml
@@ -55,14 +45,17 @@ module YAVM
     def format(string = '')
       string = string.dup
 
+      _special = special || ''
+      _meta    = meta || ''
+
       # ? http://stackoverflow.com/a/8132638
       string.gsub!('%M', major.to_s)
       string.gsub!('%m', minor.to_s)
       string.gsub!('%p', patch.to_s)
-      string.gsub!('%s', special || '')
-      string.gsub!('%t', meta || '')
-      string.gsub!('%-s', special ? "-#{special}" : '')
-      string.gsub!('%-t', meta ? "+#{meta}" : '')
+      string.gsub!('%s', _special)
+      string.gsub!('%t', _meta)
+      string.gsub!('%-s', _special.empty? ? '' : "-#{special}")
+      string.gsub!('%-t', _meta.empty? ? '' : "+#{meta}")
       string.gsub!('%%', '%')
 
       string
@@ -80,28 +73,36 @@ module YAVM
       case what
       when :major
         self.major += 1
-        self.minor  = 0
-        self.patch  = 0
       when :minor
         self.minor += 1
-        self.patch  = 0
       when :patch
         self.patch += 1
       else
         fail "Can't increment #{what}"
       end
+    end
 
-      if [:major, :minor, :patch].include? what
-        self.special = nil
-        self.meta    = nil
-      end
+    def major=(value)
+      clears(:minor, :patch, :special, :meta)
+      @_version.major = value
+    end
+
+    def minor=(value)
+      clears(:patch, :special, :meta)
+      @_version.minor = value
+    end
+
+    def patch=(value)
+      @_version.patch = value
     end
 
     private
 
-    def empty_is_nil(key)
-      value = @_version.send(key) || ''
-      value.empty? ? nil : value
+    def clears(*properties)
+      properties.each do |p|
+        value = @_version.send(p).is_a?(Fixnum) ? 0 : ''
+        @_version.send("#{p}=", value)
+      end
     end
 
     def empty
@@ -111,16 +112,18 @@ module YAVM
     end
 
     def parse(string)
-      match = string.match(/\A(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)(?:-(?<special>[a-z0-9]+))?(?:\+(?<meta>[a-z0-9]+))?\z/i)
+      match = string.match(VERSION_REGEX)
 
       @_version = Hash[match.names.zip(match.captures)]
       @_version = OpenStruct.new(@_version)
       integerize!
+      stringify!
     end
 
     def load(hash)
       @_version = OpenStruct.new(hash)
       integerize!
+      stringify!
     end
 
     def integerize!
@@ -129,11 +132,17 @@ module YAVM
       @_version.patch = @_version.patch.to_i
     end
 
+    def stringify!
+      @_version.special ||= ''
+      @_version.meta ||= ''
+    end
+
     #
     # Allows calling "version.minor" and the like on the Version instance
     #
     def_delegators :@_version,
-                   :major,  :minor,  :patch,
-                   :major=, :minor=, :patch=, :special=, :meta=
+                   :major, :minor, :patch,
+                   :special,  :meta,
+                   :special=, :meta=
   end
 end

data/lib/yavm/versions.rb

@@ -23,12 +23,15 @@ module YAVM
       versions.reject { |v| v == versions.first }.length.zero?
     end
 
+    def files
+      versions.map { |v| v.store.filename || nil }.compact
+    end
+
     def_delegators :versions, :<<, :length, :size, :[],
-      :first, :each, :each_with_index, :empty?, :any?, :map
+                   :first, :each, :each_with_index, :empty?, :any?, :map
 
     private
 
     attr_accessor :versions
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: YAVM
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Lewis Eason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.32'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.32'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -98,10 +112,12 @@ description: A tiny gem for managing project version numbers
 email: me@lewiseason.co.uk
 executables:
 - version
+- git-versiontag
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- bin/git-versiontag
 - bin/version
 - features/command_line.feature
 - features/initialization.feature
@@ -137,13 +153,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Yet Another Version Manager
 test_files:
 - features/initialization.feature
-- features/command_line.feature
 - features/support/env.rb
+- features/command_line.feature
 - features/step_definitions/project.rb
-has_rdoc: