git_version_bumper 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb8da4442776c5c2b36a649d287a93d580e9f94
-  data.tar.gz: 6f43b4c88f832e2b31fe4a99db70735e44ae526e
+  metadata.gz: 059b9f2b4333be286ce491c7834d60cba29e839a
+  data.tar.gz: de0b99447a776e61712e5b969503a5d771f79858
 SHA512:
-  metadata.gz: d456e626ae2b310b870c5ac55bf106b54d6cf6c2d825d4e7053441cd0e81b293f4ac1be5296447400524ba704907c4a49452d32ff38dbc56d2cf444b45da09a8
-  data.tar.gz: 3afdad2e3b4acf215a9b3b1b7ed85c183f7625ce16f0228ccf6d76b0e44664cf4f0f03f3a21dc6a5e01175a2d01eec7ec42c636972c8ba24ae0bae2dbf101f25
+  metadata.gz: 7726edb6070885b8bac2df462aa8981ae392ef88c7b8df974cd25c37766cd74b352972a4a29cfd6c4374925c8a83cc1aa179b8935073fdbfa5722874cf06d1d1
+  data.tar.gz: 1b82e0f7c9162615c86849b0f36806abbb6142a5e985f494989dd67424d1bd652981d14535a7e5ea856904b6c6e6400fbb9737a41dca7d79b5b8a405703e26c3

data/.travis.yml

@@ -1,3 +1,6 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=d946fbe840359053ee5604eb18d4cd53c9da50bb2e6af66191385e49962be152
 sudo: false
 cache: bundler
 language: ruby
@@ -6,10 +9,16 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3
+  - 2.4.0
+  - 2.4.1
+  - 2.4.2
   - ruby-head
   - jruby-19mode
   - jruby-9.0.1.0
+  - jruby-9.1.5.0
+  - jruby-9.1.9.0
+  - jruby-head
   - rbx-3
 env:
   # this doesn't do anything for MRI or RBX, but it doesn't hurt them either
@@ -18,13 +27,17 @@ env:
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby-head
     - rvm: rbx-3
   fast_finish: true
 before_install: gem update --remote bundler
 install:
   - bundle install --retry=3
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 script:
   - bundle exec rspec
-addons:
-  code_climate:
-    repo_token: d946fbe840359053ee5604eb18d4cd53c9da50bb2e6af66191385e49962be152
+after_script:
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi

data/README.md

@@ -4,7 +4,7 @@
 
 # GitVersionBumper
 
-CLI tool to create version bump commit and tag witCLI tool to create version bump commit and tag with newest version in a Git repository. Versioning is based on [Semantic Versioning](http://semver.org/).  Version bump types include `MAJOR`, `MINOR`, and `PATCH`.
+CLI tool to create version bump commit and tag with newest version in a Git repository. Versioning is based on [Semantic Versioning](http://semver.org/).  Version bump types include `MAJOR`, `MINOR`, and `PATCH`.
 
 ## Installation
 
@@ -22,7 +22,7 @@ Or install it yourself as:
 
 ## Usage
 
-From within your Git repository you can run the gem using the `versionify`'s `bump` command in combination with a valid version bump type.
+From within your Git repository you can run the gem using the `versionify bump` command, in combination with a valid version bump type.
 
 ```
 versionify bump TYPE

data/lib/git_version_bumper/cli.rb

@@ -42,11 +42,11 @@ module GitVersionBumper
     def bumper_for(version_type)
       case version_type.upcase
       when MAJOR_VERSION_TYPE
-        GitVersionBumper::VersionBumper::MajorVersionBumper.new(FileUtils.pwd)
+        VersionBumper::MajorVersionBumper.new(FileUtils.pwd)
       when MINOR_VERSION_TYPE
-        GitVersionBumper::VersionBumper::MinorVersionBumper.new(FileUtils.pwd)
+        VersionBumper::MinorVersionBumper.new(FileUtils.pwd)
       when PATCH_VERSION_TYPE
-        GitVersionBumper::VersionBumper::PatchVersionBumper.new(FileUtils.pwd)
+        VersionBumper::PatchVersionBumper.new(FileUtils.pwd)
       else
         fail Errors::InvalidVersionBumpType
       end

data/lib/git_version_bumper/version.rb

@@ -1,3 +1,3 @@
 module GitVersionBumper
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/lib/git_version_bumper/version_bumper/bumper.rb

@@ -1,5 +1,5 @@
 require 'git_version_bumper'
-require 'git_version_bumper/version_bumper/null_tag'
+require 'git_version_bumper/version_bumper/tag'
 require 'git'
 
 module GitVersionBumper
@@ -33,25 +33,20 @@ module GitVersionBumper
         fail NotImplementedError
       end
 
-      def current_version
-        @current_version ||= current_tag.name.sub('v', '')
-      end
-
       def current_tag
-        @current_tag ||=
-          git.tags.last || VersionBumper::NullTag.new
+        @current_tag ||= Tag.current(git)
       end
 
       def current_major_version
-        @current_major_version ||= Integer(current_version.split('.').first)
+        @current_major_version ||= current_tag.major
       end
 
       def current_minor_version
-        @current_minor_version ||= Integer(current_version.split('.')[1])
+        @current_minor_version ||= current_tag.minor
       end
 
       def current_patch_version
-        @current_patch_version ||= Integer(current_version.split('.').last)
+        @current_patch_version ||= current_tag.patch
       end
 
       def git_object(path)

data/lib/git_version_bumper/version_bumper/tag.rb

@@ -0,0 +1,50 @@
+module GitVersionBumper
+  module VersionBumper
+    # Local represenation of Git::Object::Tag
+    # Created to allow for custom sorting of git tags
+    class Tag
+      include Comparable
+
+      attr_reader :major, :minor, :patch
+
+      def initialize(major, minor, patch)
+        @major = Integer(major)
+        @minor = Integer(minor)
+        @patch = Integer(patch)
+      end
+
+      def self.current(git_object)
+        tags = git_object.tags
+        return Tag.new(0, 0, 0) if tags.empty?
+
+        tags
+          .map { |tag| Tag.from_name(tag.name) }
+          .sort
+          .last
+      end
+
+      def self.from_name(tag_name)
+        tag_name = tag_name.sub('v', '')
+        major, minor, patch = tag_name.split('.')
+
+        Tag.new(major, minor, patch)
+      end
+
+      def to_s
+        "v#{major}.#{minor}.#{patch}"
+      end
+
+      def <=>(other)
+        if major == other.major
+          if minor == other.minor
+            patch <=> other.patch
+          else
+            minor <=> other.minor
+          end
+        else
+          major <=> other.major
+        end
+      end
+    end
+  end
+end

data/spec/git_version_bumper/version_bumper/tag_spec.rb

@@ -0,0 +1,129 @@
+require 'spec_helper'
+require 'git'
+require 'git_version_bumper/version_bumper/tag'
+
+describe GitVersionBumper::VersionBumper::Tag do
+  describe '.current' do
+    context 'when there are no tags' do
+      it 'start with version 0.0.0' do
+        with_repo do
+          git_object = Git.open('./')
+          current_tag = described_class.current(git_object)
+
+          expect(current_tag.to_s).to eq 'v0.0.0'
+        end
+      end
+    end
+
+    context 'when there are tags' do
+      context 'when there is only one version tag' do
+        it 'returns the single version tag' do
+          with_repo do
+            tag('v1.0.0')
+            git_object = Git.open('./')
+
+            current_tag = described_class.current(git_object)
+
+            expect(current_tag.to_s).to eq 'v1.0.0'
+          end
+        end
+      end
+
+      context 'when there are multiple version tags' do
+        it 'returns the highest version' do
+          with_repo do
+            tag('v0.0.9')
+            tag('v0.0.10')
+            tag('v0.0.11')
+
+            git_object = Git.open('./')
+
+            current_tag = described_class.current(git_object)
+
+            expect(current_tag.to_s).to eq 'v0.0.11'
+          end
+        end
+      end
+    end
+  end
+
+  describe '.from_name' do
+    it 'can map a version string formatted like "vX.Y.Z"' do
+      tag = described_class.from_name('v1.2.3')
+
+      expect(tag.major).to eq(1)
+      expect(tag.minor).to eq(2)
+      expect(tag.patch).to eq(3)
+    end
+  end
+
+  describe '#<=>' do
+    describe '#>' do
+      it 'compares major, minor, and patch' do
+        expect(described_class.new(2, 3, 4) > described_class.new(0, 0, 1))
+          .to be_truthy
+        expect(described_class.new(2, 3, 4) > described_class.new(0, 5, 6))
+          .to be_truthy
+        expect(described_class.new(2, 3, 4) > described_class.new(1, 2, 3))
+          .to be_truthy
+
+        expect(described_class.new(2, 3, 4) > described_class.new(2, 3, 5))
+          .to be_falsey
+        expect(described_class.new(2, 3, 4) > described_class.new(2, 4, 0))
+          .to be_falsey
+        expect(described_class.new(2, 3, 4) > described_class.new(3, 0, 0))
+          .to be_falsey
+
+        expect(described_class.new(2, 3, 4) > described_class.new(2, 3, 4))
+          .to be_falsey
+      end
+    end
+
+    describe '#<' do
+      it 'compares major, minor, and patch' do
+        expect(described_class.new(2, 3, 4) < described_class.new(2, 3, 5))
+          .to be_truthy
+        expect(described_class.new(2, 3, 4) < described_class.new(3, 0, 0))
+          .to be_truthy
+        expect(described_class.new(2, 3, 4) < described_class.new(2, 4, 0))
+          .to be_truthy
+
+        expect(described_class.new(2, 3, 4) < described_class.new(0, 0, 1))
+          .to be_falsey
+        expect(described_class.new(2, 3, 4) < described_class.new(0, 5, 6))
+          .to be_falsey
+        expect(described_class.new(2, 3, 4) < described_class.new(1, 2, 3))
+          .to be_falsey
+
+        expect(described_class.new(2, 3, 4) < described_class.new(2, 3, 4))
+          .to be_falsey
+      end
+    end
+
+    describe '#==' do
+      it 'compares major, minor, and patch' do
+        expect(described_class.new(2, 3, 4) == described_class.new(2, 3, 4))
+          .to be_truthy
+
+        expect(described_class.new(2, 3, 4) == described_class.new(2, 3, 5))
+          .to be_falsey
+        expect(described_class.new(2, 3, 4) == described_class.new(3, 0, 0))
+          .to be_falsey
+        expect(described_class.new(2, 3, 4) == described_class.new(2, 4, 0))
+          .to be_falsey
+
+        expect(described_class.new(2, 3, 4) == described_class.new(0, 0, 1))
+          .to be_falsey
+        expect(described_class.new(2, 3, 4) == described_class.new(0, 5, 6))
+          .to be_falsey
+        expect(described_class.new(2, 3, 4) == described_class.new(1, 2, 3))
+          .to be_falsey
+      end
+    end
+  end
+
+  def tag(tag_name)
+    `git commit --message='test commit' --allow-empty`
+    `git tag -a #{tag_name} -m '#{tag_name}'`
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 # Based on Rubocop
 # https://github.com/bbatsov/rubocop/blob/master/spec/support/coverage.rb
 if ENV['TRAVIS']
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
+  require 'simplecov'
+  SimpleCov.start
 end
 
 # This file was generated by the `rspec --init` command. Conventionally, all
@@ -119,7 +119,7 @@ RSpec.configure do |config|
 
     yield
   ensure
-    FileUtils.rm_rf(path)
     FileUtils.chdir(File.realpath("#{__FILE__}/../../"))
+    FileUtils.rm_rf(path)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_version_bumper
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Troy Rosenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2017-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -122,15 +122,15 @@ files:
 - lib/git_version_bumper/version_bumper/bumper.rb
 - lib/git_version_bumper/version_bumper/major_version_bumper.rb
 - lib/git_version_bumper/version_bumper/minor_version_bumper.rb
-- lib/git_version_bumper/version_bumper/null_tag.rb
 - lib/git_version_bumper/version_bumper/patch_version_bumper.rb
-- spec/cli_spec.rb
+- lib/git_version_bumper/version_bumper/tag.rb
+- spec/git_version_bumper/cli_spec.rb
+- spec/git_version_bumper/version_bumper/bumper_spec.rb
+- spec/git_version_bumper/version_bumper/major_version_bumper_spec.rb
+- spec/git_version_bumper/version_bumper/minor_version_bumper_spec.rb
+- spec/git_version_bumper/version_bumper/patch_version_bumper_spec.rb
+- spec/git_version_bumper/version_bumper/tag_spec.rb
 - spec/spec_helper.rb
-- spec/version_bumper/bumper_spec.rb
-- spec/version_bumper/major_version_bumper_spec.rb
-- spec/version_bumper/minor_version_bumper_spec.rb
-- spec/version_bumper/null_tag_spec.rb
-- spec/version_bumper/patch_version_bumper_spec.rb
 homepage: https://github.com/tmr08c/git_version_bumper/
 licenses:
 - MIT
@@ -151,17 +151,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CLI tool to create version bump commit and tag with newest version in a Git
   repository.
 test_files:
-- spec/cli_spec.rb
+- spec/git_version_bumper/cli_spec.rb
+- spec/git_version_bumper/version_bumper/bumper_spec.rb
+- spec/git_version_bumper/version_bumper/major_version_bumper_spec.rb
+- spec/git_version_bumper/version_bumper/minor_version_bumper_spec.rb
+- spec/git_version_bumper/version_bumper/patch_version_bumper_spec.rb
+- spec/git_version_bumper/version_bumper/tag_spec.rb
 - spec/spec_helper.rb
-- spec/version_bumper/bumper_spec.rb
-- spec/version_bumper/major_version_bumper_spec.rb
-- spec/version_bumper/minor_version_bumper_spec.rb
-- spec/version_bumper/null_tag_spec.rb
-- spec/version_bumper/patch_version_bumper_spec.rb
-has_rdoc: 

data/lib/git_version_bumper/version_bumper/null_tag.rb

@@ -1,12 +0,0 @@
-module GitVersionBumper
-  module VersionBumper
-    # Null Object represenation of Git::Object::Tag
-    class NullTag
-      def initialize; end
-
-      def name
-        'v0.0.0'.freeze
-      end
-    end
-  end
-end

data/spec/version_bumper/null_tag_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-require 'git_version_bumper/version_bumper/null_tag'
-
-describe GitVersionBumper::VersionBumper::NullTag do
-  describe '#name' do
-    subject { described_class.new }
-
-    it 'return version 0' do
-      expect(subject.name).to eq 'v0.0.0'
-    end
-  end
-end