overview 0.0.2.1.40 → 0.0.2.43

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTA4Y2U4ZTI1ZmQ3Y2FjMzBiMjQ1YTM2NjRiMzFhODgxMDZhNWQxZQ==
+    MWY3ZDhmZDQ3OTkwNmFjOTg4YjIzMmI0ZWU2M2UwODY2ZjM1MzVkNw==
   data.tar.gz: !binary |-
-    NjE3MjBlNzc2NGFmMTQxZmNiZGIzNmQxZWU3NmZjYWM0YzVjOTY5Mg==
+    NzU4NzJiM2YzMjdkODlkNzgzYTQ5MjBmYTJkMDQ3OWNmNTBiMTFjOA==
 SHA512:
   metadata.gz: !binary |-
-    MGU4ZGI0YTIxMTA0NTVkMDFjNTgxZTE2ZTA0ZDZlNTcyMzJkZGU1ZTI0ODc3
-    OTk4YzI5NTJlNDdiYTI5MGM5MzA4MWYxY2M1MDIwODBmZDliOWZmMTQ3ODM5
-    NzM2OWZlY2Y0ODFhM2NhM2I2ODkwY2NhNGQ2NTk0NDZkYzU1Zjg=
+    YmQxYWI3ODJiYzc3ZGVkZmQzMjkwMWFjZGYzYmY2YzI4OGI4MDY4ZjM1MzFh
+    MmY1MjQ1YTQyYmE2Zjk3YjAxNmNhMDZiMmUwZjIzYTlhMDM2MWEwMWI3YThh
+    YzdmMzY4OWViNWNhYjlhYzc3YTEwNjc2MDRkMWU5ODc1ZjUxMTY=
   data.tar.gz: !binary |-
-    NTUyMjVlZjdkZjEzMzE1NzVhMmYyNWMzNmU3YmNiNmYwZGQzMTVmZmUwNjFl
-    ZTY1ZDk3NWI5ZTA2MzI3NzMzYWI3ZWMwZDQ0NzFmNTg5ZjNmMTczNDgwZmZl
-    NzUwMzI1MzY3YmY5ZGE3NDhhMDIzMjE3YjM5YjQxYTlkZGM4MmE=
+    MzRjZWIzN2E4YmNiOGRkOGQ2MGVhYzAxYWI2OTg2MGE4YzRiOTEzZDVjMDAx
+    YmNkNGVlYzYyYjMwZjRmMmRkZmVmY2Q4M2VkYzM0NGZlZWNhNDgzODQ5ZDll
+    MzZmNTNiODQ0YmJlNzg5ZGMwNTVhZmUzMTM3MzRhYzYxNGE5OGY=

data/README.rdoc

@@ -1,4 +1,4 @@
-= overview {<img src="https://codeclimate.com/github/overllc/overview/badges/gpa.svg" />}[https://codeclimate.com/github/overllc/overview] {<img src="https://codeclimate.com/github/overllc/overview/badges/coverage.svg" />}[https://codeclimate.com/github/overllc/overview] {<img src="https://travis-ci.org/overllc/overview.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/overllc/overview]
+= overview {<img src="https://badge.fury.io/rb/overview.svg" alt="Gem Version" />}[http://badge.fury.io/rb/overview] {<img src="https://codeclimate.com/github/overllc/overview/badges/gpa.svg" />}[https://codeclimate.com/github/overllc/overview] {<img src="https://codeclimate.com/github/overllc/overview/badges/coverage.svg" />}[https://codeclimate.com/github/overllc/overview] {<img src="https://travis-ci.org/overllc/overview.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/overllc/overview]
 
 Describe your project here
 

data/lib/appversion/appversion.rb

@@ -49,11 +49,11 @@ module Overview
           commit_count = 0
           clean_tag = '0.0.1'
         else
-          commit_count_since_tag = Git.commit_count_since_tag(latest_tag)
+          commit_count = Git.commit_count_since_tag(latest_tag)
           clean_tag = Git.clean_tag
         end
         #Only increment version after production release, so that we retain a single version during beta and RCs
-        if commit_count_since_tag == 0 || Release.is_pre_release?(latest_tag)
+        if commit_count == 0 || Release.is_pre_release?(latest_tag)
           short_version = clean_tag
         else
           short_version = clean_tag.increment_version

data/lib/appversion/git.rb

@@ -21,8 +21,8 @@ module Overview
     def self.tag
       (`git describe --tags --match 'v*' --abbrev=0 2>/dev/null` || 'HEAD').strip
     end
-    def self.clean_tag
-      tag.strip.sub('v','').split('.').select { |e| e.is_number?}.join('.')
+    def self.clean_tag(tag=self.tag)
+      tag.strip.sub('v','').split(/[\.,-]/).select { |e| e.is_number?}.first(3).join('.')
     end
     def self.commit_count
       `git rev-list --count HEAD`
@@ -39,4 +39,3 @@ module Overview
   end
 end
 
-#puts Overview::Git.clean_tag

data/lib/overview/version.rb

@@ -1,3 +1,3 @@
 module Overview
-  VERSION = '0.0.2.1.40'
+  VERSION = '0.0.2.43'
 end

data/spec/appversion_spec.rb

@@ -1,17 +1,47 @@
 require 'spec_helper'
 require 'appversion/ci'
+require 'appversion/git'
+
 
 
 RSpec.describe '#build_no' do
 
- include Overview
+  include Overview
+
+  it 'returns build number' do
+    build_no = ENV['TRAVIS_BUILD_NUMBER'] || ENV['CIRCLE_BUILD_NUM'] || '1'
+    expect(Overview::CI.build_no).to eq(build_no)
+  end
+end
 
- context 'running on CI' do
-   it 'returns build number' do
-     build_no = ENV['TRAVIS_BUILD_NUMBER'] || ENV['CIRCLE_BUILD_NUM'] || '1'
-     expect(Overview::CI.build_no).to eq(build_no)
-   end
+RSpec.describe '#clean_tag' do
+  it '1.2.3-rc4 returns semantic version' do
+    expect(Overview::Git.clean_tag('1.2.3-rc4')).to eq('1.2.3')
+  end
+  it '1.2-rc4 returns semantic version' do
+    expect(Overview::Git.clean_tag('1.2-rc4')).to eq('1.2')
+  end
+  it '1.2-rc4 returns semantic version' do
+    expect(Overview::Git.clean_tag('1.2-rc4')).to eq('1.2')
+  end
+  it '1.2.3 returns semantic version' do
+    expect(Overview::Git.clean_tag('1.2.3')).to eq('1.2.3')
+  end
+  it '1.2.3.4 returns semantic version' do
+    expect(Overview::Git.clean_tag('1.2.3.4')).to eq('1.2.3')
+  end
+  it '1.2.rc4 returns semantic version' do
+    expect(Overview::Git.clean_tag('1.2.rc4')).to eq('1.2')
+  end
+  it '1.2.3.rc4 returns semantic version' do
+    expect(Overview::Git.clean_tag('1.2.3.rc4')).to eq('1.2.3')
+  end
+  it '1.rc4 returns semantic version' do
+    expect(Overview::Git.clean_tag('1.rc4')).to eq('1')
+  end
+  it '1 returns semantic version' do
+    expect(Overview::Git.clean_tag('1')).to eq('1')
+  end
+end
 
- end
 
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overview
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1.40
+  version: 0.0.2.43
 platform: ruby
 authors:
 - Jonathan Orford