YAVM 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89f5ae4a9ec1d9aba8068c16cae331911225edbf
-  data.tar.gz: 00dd29ac52b21bd6cff55f408263b9398a742eb4
+  metadata.gz: 2eba9029c23bfd2f971f59a447b13e37e36b1142
+  data.tar.gz: e90d9f8e38d38a98dd95b8f7a08f166481783086
 SHA512:
-  metadata.gz: 3750f8ab3725a3c65ea16bd2b53d6c8f0db680bff35687e1027b85e83804ab60b3419144a9fb4f4536922c2a29d3fcdc363f54ef75a6a6df99621534086fef32
-  data.tar.gz: 5fe02152701c63abf62927279d2200da953cb7f969872b3d57540417cd28b7aefb13271fa06e73e54f05db8c35a82d0b5374b3635e1628b0928b66f19c14d359
+  metadata.gz: be6fdf71327b88a7efc45d21b693943bb5b2434a09d287ff8b7c001ee6a317c63acf6e01b1f3230a96c30999ab1c66649a46ad53817ae3de634ca92016a73f22
+  data.tar.gz: cae1a8b5895a9866e50bc8cc01e60408350e406a6d337e08e0e0eaa019a0223dfa5998d57a83bffe02cfcccc89e06d5f8d5260342dfcc5367f150166d7956acd

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 "versioning"
+    Given I have a project called "cli"
     And I run `version init`
 
     Then the output should contain "0.0.0"

data/features/step_definitions/project.rb

@@ -1,8 +1,6 @@
 require 'fileutils'
 
-Given(/^I have a project called "(.*?)"$/) do |name|
-  @project_dir = "tmp/aruba/#{name}"
-
-  FileUtils.mkdir_p @project_dir
-  Dir.chdir @project_dir
+Given(/^I have a (?:project|component) called "(.*?)"$/) do |name|
+  # Give each project/component/feature its own tmp dir
+  @dirs << name
 end

data/features/stores/gemspec.feature

@@ -0,0 +1,21 @@
+Feature: GemSpec Store
+  This store should update the version information
+  in a gemspec file without mangling the gemspec
+
+  Background:
+    Given I have a project called "gemspec"
+    And I have a gemspec at version "1.3.2" called "test.gemspec"
+
+  Scenario: The file should exist in files subcommand
+    Given I run `version files`
+    Then the output should contain './test.gemspec'
+
+  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
+    And I run `cat ./test.gemspec`
+
+    Then the output should match 'Gem::Specification.*\|([^\|]+)\|.*\1\.version\s+=\s+("|')([^"']+)(\2)'
+    # ruby -c path_to_gemspec
+    And the gemspec should be valid
+

data/features/stores/semver.feature

@@ -0,0 +1,20 @@
+Feature: Native .semver store
+  Where no other versioning store is available, or to
+  take advantage of any additional feautres, a yaml file
+  called `.semver' will be available to store version
+  information.
+
+  Background:
+    Given I have a project called "semver-file"
+    And I have a semver file at version "1.3.2"
+
+  Scenario: File should exist in files subcommand
+    Given I run `version files`
+    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
+    And I run `cat ./.semver`
+
+    Then the output should contain ':minor: 4'

data/features/support/env.rb

@@ -1,12 +1,7 @@
 require 'aruba/cucumber'
 
-Before do |_scenario|
-  @dirs = ['.']
-  @cwd  = Dir.pwd
-
+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')
 end
-
-After do |_scenario|
-  Dir.chdir @cwd
-end

data/lib/yavm/stores/gem_spec.rb

@@ -5,6 +5,8 @@ require 'yavm/stores/base'
 module YAVM
   module Stores
     class GemSpec < YAVM::Stores::Base
+      REGEX = %r{(Gem::Specification\.new do \|([^\|]+)\|.*)(\2.version\s+=\s+("|'))(\S+)\4(.*)}m
+
       def name
         "gemspec: #{filename}"
       end
@@ -23,12 +25,22 @@ module YAVM
 
       #
       # Munge the existing file to replace the version identifier.
-      # This might be a bit brittle.
+      # This might be a bit brittle, although it's slightly better
+      # than it was.
+      #
+      # The match groups in use are as follows
+      #   1: Everything before the ".version =" line
+      #   3: The start of that line, up to the opening quote
+      #   4: Backreference to the opening quote
+      #   6: The rest of the file
       #
       def set!(new_version)
         current_spec = IO.read(filename)
-        spec_token   = current_spec.match(/Gem::Specification.new do \|(?<token>[^\|]+)\|/m)['token']
-        new_spec     = current_spec.gsub(/^(\s+#{spec_token}\.version\s+=\s+)("|')([^"']+)(\2)/, "\\1\\2#{new_version}\\4")
+
+        new_spec = current_spec.gsub(REGEX) do
+          m = Regexp.last_match
+          next [m[1], m[3], new_version, m[4], m[6]].join
+        end
 
         File.open(filename, 'w') { |f| f.write new_spec }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: YAVM
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Lewis Eason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -122,6 +122,8 @@ files:
 - features/command_line.feature
 - features/initialization.feature
 - features/step_definitions/project.rb
+- features/stores/gemspec.feature
+- features/stores/semver.feature
 - features/support/env.rb
 - lib/yavm.rb
 - lib/yavm/command_line.rb
@@ -162,3 +164,5 @@ test_files:
 - features/support/env.rb
 - features/command_line.feature
 - features/step_definitions/project.rb
+- features/stores/semver.feature
+- features/stores/gemspec.feature