overview 0.0.4.14 → 0.0.4.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmIxZTJhZDc2NjY2YmRhMDEyZmVlZGJiMjIyMzE2M2YxZWZjNWRmZQ==
+    NDY5ODQ1ZDI0ZDEzYWJjNzNlOGI2NTBjNmViZDgzZWM0ZmJmZWI2YQ==
   data.tar.gz: !binary |-
-    NTJiZTBjYTRlZjc4YjkxN2FhZGY2M2FlM2RkNWU2NzBmMTY3ODcxZg==
+    YzZjY2IzZjZmNjY1OTU2ZTk0YjU4Y2QyNDY5MDFkOTA3NDNiZjdlMw==
 SHA512:
   metadata.gz: !binary |-
-    ZGM1MDE3NWM5M2Y4ZTA2OTc2NjY5N2E3OTVkYzc5N2E3NDE2MjU4ZGJkYzRh
-    Njg4N2QzODAxMThmM2Q2NjIwMWZmMTI1MWJiNjMzMjVmYjgyMDQ1OTcxOTJi
-    ZGYxZTgyMmUwMDNiODAyZTgwOGU5OGFkNmNmNzkyYmE2ZTllMDc=
+    YTAxMjkxNzliYTY3ZjY2MDIzY2RiZWU5YWZmOTVhZmMwZDY3NmQ4N2YyODc5
+    MjE0ZGIzZjU1MGM1YWI0NjUzNzRkZjMzMDc5MGUyMGVjN2ZjMjMxN2EwZTM3
+    OWZmYjgzYWY0NjFlZDZhYWZiYjhkZDFjNDNiMjc5OTYxOGE5Yjc=
   data.tar.gz: !binary |-
-    ZTk4MTM0MTEyNWU4OThkZWFhM2EwZGQ3ZGY0MTA2MDkxMzQ3OTY0Y2Q4MjIw
-    N2ZjNmRiODE1ZjM5ODBkZWVjOWY1YzI3ZDc1YjVhMjkzMDI3NzljYjQ1ZDUw
-    NzQwZTJmMGYyOTFiZmE5MjdiODIxM2ZiMTdmMjk0YTMyMjk4ZDA=
+    MWI5MDMzNmMxNDY1NzVhMDAyZjljZTAzNDNmMTdjMTAzMDZmYmUzMjhhZjJm
+    YjE1MTQzNzA3Yzk3YWZmNTQwMzcxYmVmZTM3NDgyZTZjMjczZDBlNzAwZTI2
+    YzMwZDYzMjViMDk5ZTg5Yjc5M2VhZDNiZDIwZWIyNGU1M2FlYzE=

data/lib/appversion.rb

@@ -5,18 +5,18 @@ module AppVersion
       default = TRUE #default to true if running locally
       begin
         if tag.empty?
-          p 'No tag, so unable to check Github release status.'
+          p 'No tag, so unable to check Github release status'
           default
         else
           require 'octokit'
           repo = CI.repo || Git.repo
-          p "Repo slug is #{repo}."
+          $stdout.puts  "Repo slug is #{repo}"
           if repo.empty? || ENV['GITHUB_TOKEN'].nil? #for local builds
-            p 'GITHUB_TOKEN missing, running locally.'
+            $stdout.puts  'GITHUB_TOKEN missing, running locally'
             default
           else
             client = Octokit::Client.new(:access_token => ENV['GITHUB_TOKEN'])
-            p 'Connecting to Github.'
+            $stdout.puts  'Connecting to Github'
             client.user.login
             client.default_media_type = "application/vnd.github.moondragon+json"
             release = client.release_for_tag(repo, tag)
@@ -29,7 +29,7 @@ module AppVersion
         end
 
       rescue LoadError
-        p 'Octokit gem missing, running locally.'
+        $stdout.puts  'Octokit gem missing, running locally'
         default
       end
     end
@@ -44,35 +44,42 @@ module AppVersion
    #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)
       version_suffix = CI.version_suffix
-      if Git.installed?
-        latest_tag = Git.tag
-        if latest_tag == 'HEAD'
-          commit_count = Git.commit_count
-          clean_tag = '0.0.1'
-        elsif latest_tag.empty? #not a git directory
-          commit_count = 0
-          clean_tag = '0.0.1'
-        else
-          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
-        #TODO: check if this is a tagged build, and then always use the clean_tag. Not need to check pre_release or increment
-        if commit_count == 0 || Release.is_pre_release?(latest_tag)
-          short_version = clean_tag
-        else
-          short_version = clean_tag.increment_version
-        end
+      if !Git.installed? then
+        $stderr.puts 'Git required, not installed'
+        exit 1
+      end
 
-        target = !version_suffix.empty? ? ":#{version_suffix.upcase}" : ''
-        if semantic
-          short_version
-        else
-          short_version + target + suffix
-        end
+      latest_tag = Git.tag
+      if latest_tag == 'HEAD'
+        commit_count = Git.commit_count
+        clean_tag = '0.0.1'
+      elsif latest_tag.empty? #not a git directory
+        commit_count = 0
+        clean_tag = '0.0.1'
       else
-        $stderr.puts 'Git required, not installed.'
-        exit 1
+        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
+      #TODO: check if this is a tagged build, and then always use the clean_tag. Not need to check pre_release or increment
+      is_pre_release = Release.is_pre_release?(latest_tag)
+      $stdout.puts  "Latest tag = #{latest_tag}"
+      $stdout.puts  "Commit count since tag = #{commit_count}"
+      $stdout.puts  "Was tag from a Github pre-release? #{is_pre_release}"
+      $stdout.puts  "Is this a Github release? #{CI.tagged_build?}"
+
+      #Don't increment version for Github releases, if no commits have been made since last tag, or if last Github release was a pre_release
+      if CI.tagged_build? || commit_count == 0 || is_pre_release
+        short_version = clean_tag
+      else
+        short_version = clean_tag.increment_version
+      end
+
+      if semantic
+        short_version
+      else
+        target = !version_suffix.empty? ? ":#{version_suffix.upcase}" : ''
+        short_version + target + suffix
       end
     end
 
@@ -82,7 +89,7 @@ module AppVersion
 
     def suffix
       branch = CI.branch || Git.branch
-      p "Branch = #{branch}."
+      $stdout.puts "Branch = #{branch}"
       case branch
         when /develop/
           suffix = '-develop'
@@ -99,7 +106,7 @@ module AppVersion
       end
       #special case for github releases
       if CI.tagged_build?
-        p 'Tagged build, suppressing branch suffix.'
+        $stdout.puts  'Tagged build, suppressing branch suffix'
         suffix = ''
       end
       return suffix

data/lib/helpers/ci.rb

@@ -3,9 +3,7 @@
     DEFAULT_BUILD_NO = '1'
 
     def self.tagged_build?(travis_tag='')
-      p "TRAVIS_TAG=#{ENV['TRAVIS_TAG']}"
       travis_tag = !travis_tag.empty? ? travis_tag : ENV['TRAVIS_TAG'] || ''
-      p "travis_tag=#{travis_tag}."
       !travis_tag.empty? && !(travis_tag == 'EMPTY') #magic default value used by legacy build scripts
     end
 

data/lib/helpers/git.rb

@@ -25,7 +25,7 @@ require_relative 'string.rb'
       `git rev-list --count HEAD`.to_i
     end
     def self.commit_count_since_tag(tag)
-      `git rev-list --count ${tag}.. 2>/dev/null`.to_i
+      `git rev-list --count #{tag}.. 2>/dev/null`.to_i
     end
     def self.installed?
       system 'git --version >>/dev/null 2>&1'

data/lib/overview/version.rb

@@ -1,3 +1,3 @@
 module Overview
-  VERSION = '0.0.4.14'
+  VERSION = '0.0.4.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overview
 version: !ruby/object:Gem::Version
-  version: 0.0.4.14
+  version: 0.0.4.17
 platform: ruby
 authors:
 - Jonathan Orford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake