YAVM 0.5.3 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eba9029c23bfd2f971f59a447b13e37e36b1142
-  data.tar.gz: e90d9f8e38d38a98dd95b8f7a08f166481783086
+  metadata.gz: 21c63e026343a431d89b1a1aae437db9e899145a
+  data.tar.gz: 12ccfb21b7e2ea70c0c08e699074786f2fe3d2ad
 SHA512:
-  metadata.gz: be6fdf71327b88a7efc45d21b693943bb5b2434a09d287ff8b7c001ee6a317c63acf6e01b1f3230a96c30999ab1c66649a46ad53817ae3de634ca92016a73f22
-  data.tar.gz: cae1a8b5895a9866e50bc8cc01e60408350e406a6d337e08e0e0eaa019a0223dfa5998d57a83bffe02cfcccc89e06d5f8d5260342dfcc5367f150166d7956acd
+  metadata.gz: fa7b913dc3e02b68521cbf7f38aafa97553b5ade1631f58074403bb767d8f15a1420dd7485f7b242024420d5e874a5df04d788aa55363c7bff3a36f4f6e5f515
+  data.tar.gz: a6459ed4c915faf5833292564bc8c9f2584d4e719f70e47d9f5f0a4c23a3d4aa0ca3cb76cfcba27f9460c3c310a25dfb4fbf69730562be83390caccfc0fb909d

data/features/command_line.feature

@@ -74,3 +74,17 @@ Feature: Command Line Interface
 
     And I run `version tag`
     Then the output should contain "0.0.1"
+
+  Scenario: JSON output - numbers
+    Given I run `version inc major`
+
+    And I run `version json`
+    Then the output should be valid JSON
+    And the json should contain major=1
+
+  Scenario: JSON output - meta
+    Given I run `version meta 20150129135914`
+
+    And I run `version json`
+    Then the output should be valid JSON
+    And the json should contain meta="20150129135914"

data/features/step_definitions/formats.rb

@@ -0,0 +1,23 @@
+Then(/^the output should be valid YAML$/) do
+  expect {
+    YAML.load(last_command_started.output)
+  }.not_to raise_error
+end
+
+Then(/^the output should be valid JSON$/) do
+  expect {
+    JSON.load(last_command_started.output)
+  }.not_to raise_error
+end
+
+Then(/^the json should contain (major|minor|patch)=(.*?)$/) do |key, value|
+  json = JSON.load(last_command_started.output)
+
+  expect(json[key]).to eq(value.to_i)
+end
+
+Then(/^the json should contain (special|meta)="(.*?)"$/) do |key, value|
+  json = JSON.load(last_command_started.output)
+
+  expect(json[key]).to eq(value)
+end

data/features/step_definitions/project.rb

@@ -1,6 +1,9 @@
-require 'fileutils'
+require 'securerandom'
 
 Given(/^I have a (?:project|component) called "(.*?)"$/) do |name|
-  # Give each project/component/feature its own tmp dir
-  @dirs << name
+  # Give each instance of a project/component/feature its own tmp dir
+  @project_dir = "#{name}-#{SecureRandom.hex(4)}"
+
+  create_directory @project_dir
+  cd @project_dir
 end

data/features/step_definitions/stores/semver.rb

@@ -0,0 +1,6 @@
+Given(/^I have a semver file containing:$/) do |content|
+
+  Dir.chdir(expand_path '.') do
+    open('.semver', 'w') { |file| file.write(content) }
+  end
+end

data/features/stores/semver.feature

@@ -6,15 +6,23 @@ Feature: Native .semver store
 
   Background:
     Given I have a project called "semver-file"
-    And I have a semver file at version "1.3.2"
+    And I have a semver file containing:
+      """
+      ---
+      :major: 0
+      :minor: 3
+      :patch: 3
+      :special: ''
+      :meta: ''
+      """
 
-  Scenario: File should exist in files subcommand
+  Scenario: The file should exist in files subcommand
     Given I run `version files`
-    Then the output should contain './.semver'
+    Then the output should contain "./.semver"
 
   Scenario: Updating the version should be reflected in the file
-    Given I increment the minor version in the semver store
-    And I set all version stores
+    Given I run `version inc minor`
     And I run `cat ./.semver`
 
-    Then the output should contain ':minor: 4'
+    Then the output should contain "minor: 4"
+    And the output should be valid YAML

data/features/support/env.rb

@@ -3,5 +3,5 @@ require 'aruba/cucumber'
 Before do
   # Since we shell out in the tests, the `version` script
   # will only enable SimpleCov if this env var is set
-  set_env('COVERAGE', 'true')
+  set_environment_variable 'COVERAGE', 'true'
 end

data/lib/yavm/command_line.rb

@@ -93,6 +93,9 @@ module YAVM
       when 'format'
         puts "#{version.format(@args['<string>'])}"
 
+      when 'json'
+        puts "#{version.to_json}"
+
       when 'tag'
         puts "#{version.tag}"
 
@@ -155,6 +158,7 @@ module YAVM
         #{@invocation} special [<string>]
         #{@invocation} meta [<string>]
         #{@invocation} format <string>
+        #{@invocation} json
         #{@invocation} tag
         #{@invocation} files [(-1|-0)]
         #{@invocation} help
@@ -165,6 +169,7 @@ module YAVM
         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, %-s, %-t)
+        json         Display version in machine-readable JSON
         tag          Equivalent to format 'v%M.%m.%-p%-s'
         files        List the files which store version information
         help         Show this screen.
@@ -181,7 +186,7 @@ module YAVM
     end
 
     def version_commands
-      %w(show inc special meta init format tag)
+      %w(show inc special meta init format json tag)
     end
 
     def support_commands

data/lib/yavm/version.rb

@@ -43,22 +43,16 @@ module YAVM
     end
 
     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.empty? ? '' : "-#{special}")
-      string.gsub!('%-t', _meta.empty? ? '' : "+#{meta}")
-      string.gsub!('%%', '%')
-
-      string
+      string.gsub(/(%-?[Mmpst%])/, {
+        '%M' => major.to_s,
+        '%m' => minor.to_s,
+        '%p' => patch.to_s,
+        '%s' => special.to_s,
+        '%t' => meta.to_s,
+        '%-s' => special.to_s.empty? ? '' : "-#{special}",
+        '%-t' => meta.to_s.empty? ? '' : "+#{meta}",
+        '%%' => '%'
+      })
     end
 
     # rubocop:disable Style/RedundantSelf

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: YAVM
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.2
 platform: ruby
 authors:
 - Lewis Eason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2017-05-16 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !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
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         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.32'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.32'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         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.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.40'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.40'
 description: A tiny gem for managing project version numbers
 email: me@lewiseason.co.uk
 executables:
@@ -121,7 +121,9 @@ files:
 - bin/version
 - features/command_line.feature
 - features/initialization.feature
+- features/step_definitions/formats.rb
 - features/step_definitions/project.rb
+- features/step_definitions/stores/semver.rb
 - features/stores/gemspec.feature
 - features/stores/semver.feature
 - features/support/env.rb
@@ -145,24 +147,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Yet Another Version Manager
 test_files:
-- features/initialization.feature
 - features/support/env.rb
-- features/command_line.feature
+- features/step_definitions/formats.rb
 - features/step_definitions/project.rb
-- features/stores/semver.feature
+- features/step_definitions/stores/semver.rb
+- features/command_line.feature
 - features/stores/gemspec.feature
+- features/stores/semver.feature
+- features/initialization.feature