YAVM 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: facb897561d347c7ffc318e9487ee3c7e5adde5d
-  data.tar.gz: 54c812978d0f7ac5da5d9bc57653908cf31a5262
+  metadata.gz: 450e204f126f7defb9d7b30a04343d4dca59c690
+  data.tar.gz: efaef9d41a0e498d3d0abb67aa651b56464d7ffc
 SHA512:
-  metadata.gz: 6e0a066aecde80ba4f9a547b3d1d04d3056bd3af37df82147b0b4fe852f40a8c723fd0744e5fd1f0a30210c2cc9d29c40483dc426be752a1d533616ed232521e
-  data.tar.gz: 76d9eea472c53de52d227e5bf2a72908ba77467a493347035694a28476127059f7d9535e0aebaea09c22f4b2e32dd014d53bd3c42f8fd2d3ac5e7572ed12f70b
+  metadata.gz: 556e07afb6a9bb612d8bbf14b8c383cc9c1defb618e7968848e96bac2004a0c0bfd86d116c7c82657dd379d7303659fbfc9bf2ea1adf3fee7a6d73b4f82487c8
+  data.tar.gz: 961c5f4967d96c5ef8250b6d06054d1a65653cee1e478e3a76d40451b54f01fa1557e1bc03367ab33d081cc4e5ef74bb8cacd7aee4221c2bc443d6d9878fc631

data/README.md

@@ -54,6 +54,8 @@ Tag | Meaning
 %t  | Me**t**a
 %%  | Literal % Character
 
+Add a dash to `%s` and `%t` (`%-s`/`%-t`) to prefix with the appropriate character.
+
 ## Conflict Resolution
 
 If your project contains multiple supported version "stores", YAVM will keep them in sync.
@@ -89,9 +91,9 @@ Now on 1.0.3
 - [x] package.json support
 - [x] bower.json support
 - [x] when changing version, show new one
-- [ ] programmatic interface
-- [ ] tests
+- [x] programmatic interface
+- [ ] tests. inprogress
 - [ ] handle invalid version info (see Version#parse)
 - [x] 'version init'
-- [ ] quick mode (when finding versions - short circuit once one is found)
+- [x] quick mode (when finding versions - short circuit once one is found)
 - [ ] raise sensible exceptions

data/bin/version

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

data/features/command_line.feature

@@ -0,0 +1,76 @@
+Feature: Command Line Interface
+  The command line interface allows the end-user to increment the
+  version number, and set the 'special' and 'meta' fields
+
+  Background:
+    Given I have a project called "project"
+    And I run `version init`
+
+    Then the output should contain "0.0.0"
+
+  Scenario: Incrementing major version
+    Given I run `version inc major`
+    Then the output should contain "1.0.0"
+
+  Scenario: Incrementing minor version
+    Given I run `version inc minor`
+    Then the output should contain "0.1.0"
+
+  Scenario: Incrementing patch level
+    Given I run `version inc patch`
+    Then the output should contain "0.0.1"
+
+  Scenario: Incrementing major version resets minor and patch
+    Given I run `version inc minor`
+    And I run `version inc patch`
+    And I run `version inc major`
+
+    Then the output should contain "1.0.0"
+
+  Scenario: Incrementing minor version resets patch
+    Given I run `version inc major`
+    And I run `version inc patch`
+    And I run `version inc minor`
+
+    Then the output should contain "1.1.0"
+
+  Scenario: Setting the special field
+    Given I run `version special "pre3"`
+    Then the output should contain "0.0.0-pre3"
+
+  Scenario: Setting the meta field
+    Given I run `version meta 20150129135914`
+    Then the output should contain "0.0.0"
+
+    And I run `version tag`
+    Then the output should contain "0.0.0+20150129135914"
+
+  Scenario: Setting both meta and special fields
+    Given I run `version special "pre3"`
+    And I run `version meta 20150129135914`
+
+    Then the output should contain "0.0.0-pre3"
+
+  Scenario: Incrementing major version resets special and meta
+    Given I run `version special "pre3"`
+    And I run `version meta 20150129135914`
+    And I run `version inc major`
+
+    And I run `version tag`
+    Then the output should contain "1.0.0"
+
+  Scenario: Incrementing minor version resets special and meta
+    Given I run `version special "pre3"`
+    And I run `version meta 20150129135914`
+    And I run `version inc minor`
+
+    And I run `version tag`
+    Then the output should contain "0.1.0"
+
+  Scenario: Incrementing patch level resets special and meta
+    Given I run `version special "pre3"`
+    And I run `version meta 20150129135914`
+    And I run `version inc patch`
+
+    And I run `version tag`
+    Then the output should contain "0.0.1"

data/features/support/env.rb

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

data/lib/yavm.rb

@@ -6,20 +6,18 @@ require 'yavm/stores'
 
 module YAVM
 
-  def find(quiet = true)
-    versions = YAVM::Stores.locate_versions
+  def version(quiet: true, quick: true)
+    versions = YAVM::Stores.locate_versions(quick)
 
     if versions.equal?
       return versions.first
     else
       return nil if quiet
 
-      raise RuntimeError, ''
-
+      raise RuntimeError, 'No version information available'
     end
-
   end
 
-  module_function :find
+  module_function :version
 
 end

data/lib/yavm/command_line.rb

@@ -153,8 +153,8 @@ module YAVM
         init         Create a .semver file for tracking versioning
         special      Set a special (eg: pre-release) suffix
         meta         Set a metadata version suffix
-        format       Display version in specific format (%M, %m, %p, %s, %t)
-        tag          Equivalent to format 'v%M.%m.%p%s'
+        format       Display version in specific format (%M, %m, %p, %s, %t, %-s, %-t)
+        tag          Equivalent to format 'v%M.%m.%-p%-s'
         help         Show this screen.
 
       DOCOPT

data/lib/yavm/stores.rb

@@ -17,10 +17,16 @@ module YAVM
       ]
     end
 
-    def locate_versions
+    def locate_versions(quick = false)
       versions = stores.map do |store|
         store = store.new
-        next store.to_version if store.exists?
+        if store.exists?
+          if quick
+            return YAVM::Versions.new([store.to_version])
+          else
+            next store.to_version
+          end
+        end
       end
 
       YAVM::Versions.new(versions)

data/lib/yavm/version.rb

@@ -29,7 +29,7 @@ module YAVM
     end
 
     def to_s
-      format('%M.%m.%p%s')
+      format('%M.%m.%p%-s')
     end
 
     def to_hash
@@ -44,8 +44,12 @@ module YAVM
       to_hash.to_yaml
     end
 
+    def to_json
+      to_hash.to_json
+    end
+
     def tag
-      format('v%M.%m.%p%s%t')
+      format('v%M.%m.%p%-s%-t')
     end
 
     def format(string = '')
@@ -55,8 +59,10 @@ module YAVM
       string.gsub!('%M', major.to_s)
       string.gsub!('%m', minor.to_s)
       string.gsub!('%p', patch.to_s)
-      string.gsub!('%s', special ? "-#{special}" : '')
-      string.gsub!('%t', meta ? "+#{meta}" : '')
+      string.gsub!('%s', special || '')
+      string.gsub!('%t', meta || '')
+      string.gsub!('%-s', special ? "-#{special}" : '')
+      string.gsub!('%-t', meta ? "+#{meta}" : '')
       string.gsub!('%%', '%')
 
       string

metadata

@@ -1,115 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: YAVM
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Lewis Eason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.28.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: '0.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.28.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: '0.28'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.18
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.18
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.18
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.18
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.2
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.9'
 description: A tiny gem for managing project version numbers
 email: me@lewiseason.co.uk
 executables:
@@ -119,6 +117,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/version
+- features/command_line.feature
 - features/initialization.feature
 - features/step_definitions/project.rb
 - features/support/env.rb
@@ -144,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -158,6 +157,7 @@ specification_version: 4
 summary: Yet Another Version Manager
 test_files:
 - features/initialization.feature
+- features/command_line.feature
 - features/support/env.rb
 - features/step_definitions/project.rb
 has_rdoc: