overview 0.0.4.17 → 0.0.5.pre.22

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDY5ODQ1ZDI0ZDEzYWJjNzNlOGI2NTBjNmViZDgzZWM0ZmJmZWI2YQ==
+    ZmVmZDE3YjMxNmFiYmUzNDlmOWM4YWZhYmE5OWJhNzUyYWQyMWE3ZA==
   data.tar.gz: !binary |-
-    YzZjY2IzZjZmNjY1OTU2ZTk0YjU4Y2QyNDY5MDFkOTA3NDNiZjdlMw==
+    NzI4NzYxNzMyODczMmY2MTdkMzcxY2M0Y2Q5NGM2ZGY2N2Q0ZDVhMw==
 SHA512:
   metadata.gz: !binary |-
-    YTAxMjkxNzliYTY3ZjY2MDIzY2RiZWU5YWZmOTVhZmMwZDY3NmQ4N2YyODc5
-    MjE0ZGIzZjU1MGM1YWI0NjUzNzRkZjMzMDc5MGUyMGVjN2ZjMjMxN2EwZTM3
-    OWZmYjgzYWY0NjFlZDZhYWZiYjhkZDFjNDNiMjc5OTYxOGE5Yjc=
+    ODhjMzkwMGUxNzFkYTI3NzhmYTdhYjBiNjljYTdkYjgwNjE3MjAwOGE3Mjll
+    NDU3OWU0OTEyMzIzYmZkNTA5MmRlOTA5MjIxMDdiNTRjYzlmODQwNThlOGQ4
+    MmVhZGY1Y2NmYmQ0YTE0YzBkYmY2OWE4MTQ1MDlmNzM0ODVmNDI=
   data.tar.gz: !binary |-
-    MWI5MDMzNmMxNDY1NzVhMDAyZjljZTAzNDNmMTdjMTAzMDZmYmUzMjhhZjJm
-    YjE1MTQzNzA3Yzk3YWZmNTQwMzcxYmVmZTM3NDgyZTZjMjczZDBlNzAwZTI2
-    YzMwZDYzMjViMDk5ZTg5Yjc5M2VhZDNiZDIwZWIyNGU1M2FlYzE=
+    ZDM0OGY4YmJmMTZkMzMzZGZkMjYyOWFjMGRjOTM2YTYxM2E1OWVhOTdmOGRk
+    Yzg3ZWZiNWY1MWJiYzc5ODJlNmM0Nzk4YjY1YTM4YjUzYTkxNDhjYTYxOWY3
+    OTI2N2JmNDZkNGI3NjkxMzM0ODYzNjdjNmJlMmIxM2RjYTE4YzY=

data/bin/overview

@@ -92,20 +92,20 @@ command :appversion do |c|
   c.switch :b
   c.desc 'Version (no build) with branch e.g. 0.1.1-feature'
   c.switch :v
-  c.desc 'Rubygem compatible version with build appended e.g. 0.1.1-feature-534'
+  c.desc 'Rubygem compatible version with build appended e.g. 0.1.1.pre-feature-534'
   c.switch :r
   c.desc 'Google App Engine compatible version with build appended e.g. 0-1-1-feature-534'
   c.switch :a
   c.action do |global_options,options,args|
     include AppVersion
     if options[:s]
-      puts AppVersion::Version.new.version(true).to_s
+      puts AppVersion::Version.new.version(semantic:true).to_s
     elsif options[:b]
       puts AppVersion::Version.new.build_no.to_s
     elsif options[:v]
       puts AppVersion::Version.new.version.to_s
     elsif options[:r]
-      puts "#{AppVersion::Version.new.version.to_s}.#{AppVersion::Version.new.build_no.to_s}"
+      puts "#{AppVersion::Version.new.version(rubygem:true).to_s}.#{AppVersion::Version.new.build_no.to_s}"
     elsif options[:a]
       puts "#{AppVersion::Version.new.version.to_s}".gsub('.','-')
     else

data/lib/appversion.rb

@@ -1,6 +1,8 @@
 module AppVersion
 
   class Release
+    include Helpers
+
     def self.is_pre_release?(tag)
       default = TRUE #default to true if running locally
       begin
@@ -36,13 +38,15 @@ module AppVersion
   end
 
   class Version
+    include Helpers
 
     def to_s
       "#{version} (#{build_no})"
     end
 
    #TODO: refactor so that every permutation can be tested. E.g. github release where is_pre_release=false, what is the commit count?
-    def version(semantic = false)
+   #Make this a class method
+    def version(semantic:false, rubygem:false)
       version_suffix = CI.version_suffix
       if !Git.installed? then
         $stderr.puts 'Git required, not installed'
@@ -58,7 +62,7 @@ module AppVersion
         clean_tag = '0.0.1'
       else
         commit_count = Git.commit_count_since_tag(latest_tag)
-        clean_tag = Git.clean_tag
+        clean_tag = Git.clean_tag(rubygem:rubygem)
       end
       #Only increment version after production release, so that we retain a single version during beta and RCs
       #TODO: check if this is a tagged build, and then always use the clean_tag. Not need to check pre_release or increment

data/lib/helpers/git.rb

@@ -1,5 +1,5 @@
 require_relative 'string.rb'
-
+module Helpers
   class Git
     def self.remote
       begin
@@ -18,8 +18,13 @@ require_relative 'string.rb'
     def self.tag
       (`git describe --tags --match 'v*' --abbrev=0 2>/dev/null` || 'HEAD').strip
     end
-    def self.clean_tag(tag=self.tag)
-      tag.strip.sub('v','').split(/[\.,-]/).select { |e| e.is_number?}.first(3).join('.')
+    def self.clean_tag(tag=self.tag, rubygem:false)
+      array = tag.strip.sub('v','').split(/[\.,-]/).select { |e| e.is_number? || (rubygem && e == 'pre') }
+      if rubygem then
+        array.join('.')
+      else
+        array.first(3).join('.')
+      end
     end
     def self.commit_count
       `git rev-list --count HEAD`.to_i
@@ -27,14 +32,28 @@ require_relative 'string.rb'
     def self.commit_count_since_tag(tag)
       `git rev-list --count #{tag}.. 2>/dev/null`.to_i
     end
+    def self.commit_author
+      `git --no-pager show -s --format='%an' -1`
+    end
+    def self.commit_email
+      `git --no-pager show -s --format='%ae' -1`
+    end
     def self.installed?
       system 'git --version >>/dev/null 2>&1'
     end
     def self.parse_deploy(commitMessage)
-      commands = %w(deploy DEPLOY force_deploy FORCE_DEPLOY).collect{ |x| "\\b#{x}\\b" }.join("|")
-      re = Regexp.new(/<(#{commands}):?\s*(.*?)(?:>)/)
-      deploy = commitMessage.scan(re).flatten.compact
-      return !deploy[0].nil? && !deploy[0].empty?, deploy[1] || ''
+      deploy = {}
+      commands = %w(deploy DEPLOY force_deploy FORCE_DEPLOY).collect{ |command| "\\b#{command}\\b" }.join("|")
+      re_command_and_message = Regexp.new(/<(#{commands}):?\s*(.*?)(?:>)/)
+      result = commitMessage.scan(re_command_and_message).flatten.compact
+      deploy[:match] = !result[0].nil? && !result[0].empty?
+      re_channel = Regexp.new(/\s*([@#][A-z]+)\s*/)
+      deploy[:message] = result[1] ? result[1].gsub(re_channel, '') : ''
+      if result[1] && result[1].scan(re_channel) && result[1].scan(re_channel).first then
+        deploy[:channel] = result[1].scan(re_channel).first.first || ''
+      end
+      deploy[:author] = commit_author || ''
+      return deploy
     end
     def self.parse_crashlytics(commitMessage)
       return commitMessage.scan(/(c|C):(?<crashlytics>\d+)/).flatten.collect { |x| x.to_i }.uniq
@@ -46,7 +65,7 @@ require_relative 'string.rb'
       return commitMessage.downcase.scan(re).flatten.collect{ |x| x.to_i }.uniq
     end
     def self.parse_commit_message(commitMessage)
-      h = Hash.new
+      h = {}
       deploy, message = self.parse_deploy(commitMessage)
       sprintly_tickets = self.parse_sprintly(commitMessage)
       crashlytics_ids = self.parse_crashlytics(commitMessage)
@@ -63,5 +82,5 @@ require_relative 'string.rb'
       `git rev-parse --short HEAD`.strip
     end
   end
-
+end
 

data/lib/helpers/string.rb

@@ -1,9 +1,18 @@
 class String
   def increment_version
-    short_version_parts = self.split('.')
-    last_digit = short_version_parts.last.to_i + 1
+    array = self.split('.')
+    digits = 0
+    index_of_last_digit = 0
+    array.each_with_index {|x, i|
+      if x.is_number? then
+        digits += 1
+        index_of_last_digit = i
+      end
+      break if (digits==3 || i==array.count-1) && x.is_number?
+    }
+    array[index_of_last_digit] = (array[index_of_last_digit].to_i + 1).to_s
     $stdout.puts 'Incrementing version...'
-    "#{short_version_parts.first(short_version_parts.length-1).join(".")}.#{last_digit}"
+    array.join('.')
   end
   def increment_version!
     replace increment_version

data/lib/overview/version.rb

@@ -1,3 +1,3 @@
 module Overview
-  VERSION = '0.0.4.17'
+  VERSION = '0.0.5.pre.22'
 end

data/overview.gemspec

@@ -4,11 +4,13 @@ require File.join([File.dirname(__FILE__),'lib/overview','version.rb'])
 spec = Gem::Specification.new do |s| 
   s.name = 'overview'
   s.version = Overview::VERSION
+  s.licenses = ['MIT']
+  s.required_ruby_version = '>= 2.0.0'
   s.author = 'Jonathan Orford'
   s.email = 'jono@overllc.com'
   s.homepage = 'http://www.overllc.com'
   s.platform = Gem::Platform::RUBY
-  s.summary = "Over's custom CI / CD toolchain, integrating Sprint.ly, Github, Github and ITC"
+  s.summary = "Over's custom CI / CD toolchain, integrating Sprint.ly, Github, Travis CI and ITC"
   s.files = `git ls-files`.split("
 ")
   s.require_paths << 'lib'

data/spec/helpers_spec.rb

@@ -1,6 +1,29 @@
 require 'spec_helper'
 require 'helpers/ci'
 require 'helpers/git'
+require 'helpers/string'
+
+
+include Helpers
+
+RSpec.describe 'String#increment_version' do
+
+  it '1.2.3 returns 1.2.4' do
+    expect('1.2.3'.increment_version).to eq('1.2.4')
+  end
+
+  it '1.2.3.pre returns 1.2.4.pre' do
+    expect('1.2.3.pre'.increment_version).to eq('1.2.4.pre')
+  end
+
+  it '1.2.3.1 returns 1.2.4.1' do
+    expect('1.2.3.1'.increment_version).to eq('1.2.4.1')
+  end
+
+  it '1.2 returns 1.3' do
+    expect('1.2'.increment_version).to eq('1.3')
+  end
+end
 
 RSpec.describe 'CI#build_no' do
 
@@ -11,6 +34,15 @@ RSpec.describe 'CI#build_no' do
 end
 
 RSpec.describe 'Git#clean_tag' do
+
+  it '1.2.1.1 returns ruby version' do
+    expect(Git.clean_tag('1.2.1.1', rubygem:true)).to eq('1.2.1.1')
+  end
+
+  it '1.2.1.pre returns ruby version' do
+    expect(Git.clean_tag('1.2.1.pre', rubygem:true)).to eq('1.2.1.pre')
+  end
+
   context '1.2.3-rc4' do
     it 'returns semantic version' do
       expect(Git.clean_tag('1.2.3-rc4')).to eq('1.2.3')
@@ -58,37 +90,43 @@ RSpec.describe 'CI#tagged_build?' do
 end
 
 RSpec.describe 'Git#parse_deploy' do
-
-  it '<DEPLOY: deploy message> returns true, deploy message' do
-    deploy, message = Git.parse_deploy('This is my change <DEPLOY: deploy message>. Ref #123. This is my second <deploy>')
-    expect(deploy).to eq(true)
-    expect(message).to eq('deploy message')
+  it '<DEPLOY: deploy message #channel> returns true, deploy message, channel' do
+    result = Git.parse_deploy('This is my change <DEPLOY: #channel deploy message #channel>. Ref #123. This is my second <deploy>')
+    expect(result[:match]).to eq(true)
+    expect(result[:message]).to eq('deploy message')
+    expect(result[:channel]).to eq('#channel')
+  end
+  it '<DEPLOY: @jono deploy message> returns true, deploy message' do
+    result = Git.parse_deploy('This is my change <DEPLOY: @jono deploy message>. Ref #123. This is my second <deploy>')
+    expect(result[:match]).to eq(true)
+    expect(result[:message]).to eq('deploy message')
+    expect(result[:channel]).to eq('@jono')
   end
   it '<deploy:deploy message> returns true, deploy message' do
-    deploy, message = Git.parse_deploy('This is my change <deploy:deploy message>. Ref #123')
-    expect(deploy).to eq(true)
-    expect(message).to eq('deploy message')
+    result = Git.parse_deploy('This is my change <deploy:deploy message>. Ref #123')
+    expect(result[:match]).to eq(true)
+    expect(result[:message]).to eq('deploy message')
 
   end
-  it '<deploy> returns true, message' do
-    deploy, message = Git.parse_deploy('This is my change <deploy>. Ref #123')
-    expect(deploy).to eq(true)
-    expect(message).to eq('')
+  it '<deploy> returns true, empty message' do
+    result = Git.parse_deploy('This is my change <deploy>. Ref #123')
+    expect(result[:match]).to eq(true)
+    expect(result[:message]).to eq('')
   end
   it 'No brackets returns false, empty message' do
-    deploy, message = Git.parse_deploy('This is my change. deploy. Ref #123')
-    expect(deploy).to eq(false)
-    expect(message).to eq('')
+    result = Git.parse_deploy('This is my change. deploy. Ref #123')
+    expect(result[:match]).to eq(false)
+    expect(result[:message]).to eq('')
   end
   it "Empty string returns false, empty message" do
-    deploy, message = Git.parse_deploy('')
-    expect(deploy).to eq(false)
-    expect(message).to eq('')
+    result = Git.parse_deploy('')
+    expect(result[:match]).to eq(false)
+    expect(result[:message]).to eq('')
   end
-  it 'Missing closing bracket returns true, deploy message' do
-    deploy, message = Git.parse_deploy('This is my change <DEPLOY: deploy message')
-    expect(deploy).to eq(false)
-    expect(message).to eq('')
+  it 'Missing closing bracket returns false, empty message' do
+    result = Git.parse_deploy('This is my change <DEPLOY: deploy message')
+    expect(result[:match]).to eq(false)
+    expect(result[:message]).to eq('')
   end
 
 end
@@ -194,3 +232,4 @@ end
 
 
 
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overview
 version: !ruby/object:Gem::Version
-  version: 0.0.4.17
+  version: 0.0.5.pre.22
 platform: ruby
 authors:
 - Jonathan Orford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -251,7 +251,8 @@ files:
 - spec/helpers_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.overllc.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -267,17 +268,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Over's custom CI / CD toolchain, integrating Sprint.ly, Github, Github and
-  ITC
+summary: Over's custom CI / CD toolchain, integrating Sprint.ly, Github, Travis CI
+  and ITC
 test_files: []