overview 0.0.3.61 → 0.0.4.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmZhZTVjNjZkZTEwNTQ0YzFmNzE4Y2FjYjZkMDE1YjAxMTBkNTUxMA==
+    Y2Q0ZmMzNjVlYWIyNGQ3YWQxZjk5MDgxYTg3MWEyY2Y4ZTNkMWU1Mg==
   data.tar.gz: !binary |-
-    MmYxNjEzZTc0MGZmNGRmYTYwZTViY2M5YmZkZTQ5MGU3YmJhY2Y1Yw==
+    MjJjNGE2YmUzMzc4NjNkNDZiYzc3MGEyMjQ0ZDgyZWUxMGRkZWFmMg==
 SHA512:
   metadata.gz: !binary |-
-    ZmUyMDNiNzVhNmYxNDBmNjE3N2IyOWUyMmIxZDFlOTkyNGI4NmRhYjg0NTU0
-    MzZiYTNmMmZlZTllZTQ2NjJmOGUwOGNjM2VjZDM1N2ZkOTQyYzg3MWM4ZmE0
-    OTI0YmRjOGFmMDdkNTI1MmJlMDBlNTFjZmMzZmFiNTRjMmYxYWY=
+    MTcxZTQ0MDE3ZGQ0NGM0MjQxYjdiZjg0MzIyMTE3ZWIwNjRkMzQ4YTlmZTUy
+    OWViYzI5MmUyMGQ5NmU5YmM3MTEzOTk0MjEyYTI0OGEyMTRlN2YzZjMwMDM1
+    NWM2MDJhMWMyNGQ4ZGRiMmY1ZDIzYzc3NTFkYmRlMmM2ZWM4NGI=
   data.tar.gz: !binary |-
-    NWQ2MDAyMWZhOTU2YTc5YmE5YmMwYTU4ZmJjZjY0ZGFkMmI2NGZmN2IxZWZj
-    OTg3MWUyNjNkZjU5MWM4ZDdjN2QwM2RjMGY0MjE0ZmE0NTI5Y2ZhODVmMmFh
-    ZGIyMDdiYjlhNWM4MmMzYTQ5Yjc2MzU4MTYwMmU2NDg3OTM0MjA=
+    NzE2OTdjOWYzMjBmZjUxMmMyNDAxMWI0ZDgyNmEzOGQxMTA2OGU0NGI1OWZi
+    ZDQwMTc4NGJjYjI1YmRmMTlmMDI4M2NjMzg3Mzc1NDUxYmVlYTMxODg0MWZj
+    N2QxYmQzNDQ5NGI3NTcwMWMwODY1NjFiNmI3YTc2MDI4MjM3YjY=

data/.gitignore

@@ -1,2 +1,23 @@
 .idea
 Gemfile.lock
+
+bin/overview.log
+
+lib/overview.yml
+
+lib/releases.yml
+
+lib/overview.log
+
+overview.log
+
+lib/cache.yml
+
+lib/changelog_apicache.yml
+
+lib/github.cache
+
+lib/github.yml
+
+spec/coverage/
+coverage/

data/.travis.yml

@@ -7,14 +7,14 @@ notifications:
   email: false
 rvm:
 - 2.0.0
-before_script: 
+before_script:
 - bundle exec ./bin/overview appversion -r
 - bundle exec gem bump --version $(bundle exec ./bin/overview appversion -r | tail -1) --no-commit
 deploy:
   provider: rubygems
   api_key:
-    secure: gh0GksPAZk6veUZpsfq15UwZfVgslrUaNcqsNapq2oCB4TiHX3e6UCF8xFfLJZriML9tQNZWtC2u61gzZWqG788rUVMuJRVTci99BNTqj4xrMfkhyqxLlRMB961jzo3vJU4cLNjjir6paZKsfwVdyPbHjZq973dVn6+2bPcmiHI=
+    secure: RU4uH/gIFJ7nZFRsINXV04bbJDNSpA4VhJcxDXxN+sOoiy107zr62GdrGm7YhMRAt5jeGPE8xX9MKwFxbJotLj0XAplkGrzx1L5B2tmxWoHRrNpb9IKyxu5Q9PWuch06jL7rQLW9BmaYZNtEiKUGSI9nD4291fV9r9vTNqiuj08=
   gem: overview
   on:
     tags: true
-    repo: overllc/overview
+    repo: overhq/overview

data/README.rdoc

@@ -1,6 +1,6 @@
-= 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]
+= 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/overhq/overview.svg" alt="Build Status" />}[https://travis-ci.org/overhq/overview]
 
-Describe your project here
+Config management tool to automate our iOS CI / CD process
 
 :include:overview.rdoc
 

data/Rakefile

@@ -6,7 +6,7 @@ require 'rdoc/task'
 Rake::RDocTask.new do |rd|
   rd.main = "README.rdoc"
   rd.rdoc_files.include("README.rdoc", "lib/**/*.rb", "bin/**/*")
-  rd.title = 'Your application title'
+  rd.title = 'Overview'
 end
 
 spec = eval(File.read('overview.gemspec'))

data/bin/overview

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
+#run via terminal e.g. bundle exec ./bin/overview appversion -a
 require 'gli'
-require 'overview'
+require 'overview.rb'
 
 include GLI::App
-include Overview
 
 program_desc "Config management tool connecting Over's CI / CD toolchain"
 
@@ -12,15 +12,29 @@ version Overview::VERSION
 subcommand_option_handling :normal
 arguments :strict
 
+=begin
 desc 'Describe some switch here'
 switch [:s,:switch]
+=end
+desc 'Sprint.ly API KEY'
+#default_value 'the default'
+arg_name 'API_KEY'
+flag [:sprintly_api_key]
 
-desc 'Describe some flag here'
-default_value 'the default'
-arg_name 'The name of the argument'
-flag [:f,:flagname]
+desc 'Sprint.ly USER'
+arg_name 'USER'
+flag [:sprintly_user]
 
-desc 'Describe deploy here'
+desc 'Github token'
+arg_name 'TOKEN'
+flag [:travis_token]
+
+
+desc 'Github token'
+arg_name 'TOKEN'
+flag [:github_token]
+
+desc 'Mark Sprint.ly tickets as deployed via Github'
 arg_name 'Describe arguments to deploy here'
 command :deploy do |c|
   c.desc 'Describe a switch to deploy'
@@ -40,6 +54,19 @@ command :deploy do |c|
   end
 end
 
+desc 'Mark Sprint.ly tickets as released via Github Releases'
+arg_name 'Describe arguments to deploy here'
+command :release do |c|
+  c.action do |global_options,options,args|
+
+    # Your command logic here
+
+    # If you have any errors, just raise them
+    # raise "that command made no sense"
+
+    puts "release command ran"
+  end
+end
 
 
 desc 'Retrieve the changelog for the latest commit'
@@ -51,7 +78,8 @@ command :changelog do |c|
   c.default_value 'production'
   c.flag :a
   c.action do |global_options,options,args|
-    puts "alphalog command ran"
+    include Changelog
+    Changelog::Log.new.display
   end
 end
 
@@ -64,27 +92,34 @@ 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.534'
+  c.desc 'Rubygem compatible version with build appended e.g. 0.1.1-feature-534'
   c.switch :r
-  c.desc 'Github token'
-  c.flag :g
+  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|
-    ENV['GITHUB_TOKEN'] = options[:g] unless options[:g].nil?
+    include AppVersion
     if options[:s]
-      puts Overview::AppVersion.new.version(true).to_s
+      puts AppVersion::Version.new.version(true).to_s
     elsif options[:b]
-      puts Overview::AppVersion.new.build_no.to_s
+      puts AppVersion::Version.new.build_no.to_s
     elsif options[:v]
-      puts Overview::AppVersion.new.version.to_s
+      puts AppVersion::Version.new.version.to_s
     elsif options[:r]
-      puts "#{Overview::AppVersion.new.version.to_s}.#{Overview::AppVersion.new.build_no.to_s}"
+      puts "#{AppVersion::Version.new.version.to_s}.#{AppVersion::Version.new.build_no.to_s}"
+    elsif options[:a]
+      puts "#{AppVersion::Version.new.version.to_s}.#{AppVersion::Version.new.build_no.to_s}".gsub('.','-')
     else
-      puts Overview::AppVersion.new.to_s
+      puts AppVersion::Version.new.to_s
     end
   end
 end
 
 pre do |global,command,options,args|
+  ENV['GITHUB_TOKEN'] = global[:github_token] unless global[:github_token].nil?
+  ENV['TRAVIS_TOKEN'] = global[:travis_token] unless global[:travis_token].nil?
+  ENV['SPRINTLY_USER'] = global[:sprintly_user] unless global[:sprintly_user].nil?
+  ENV['SPRINTLY_API_KEY'] = global[:sprintly_api_key] unless global[:sprintly_api_key].nil?
+
   # Pre logic here
   # Return true to proceed; false to abort and not call the
   # chosen command

data/lib/{appversion/appversion.rb → appversion.rb}

@@ -1,4 +1,4 @@
-module Overview
+module AppVersion
 
   class Release
     def self.is_pre_release?(tag)
@@ -9,7 +9,7 @@ module Overview
           default
         else
           require 'octokit'
-          repo = Git.repo
+          repo = CI.repo || Git.repo
           p "Repo slug is #{repo}."
           if repo.empty? || ENV['GITHUB_TOKEN'].nil? #for local builds
             p 'GITHUB_TOKEN missing, running locally.'
@@ -20,8 +20,11 @@ module Overview
             client.user.login
             client.default_media_type = "application/vnd.github.moondragon+json"
             release = client.release_for_tag(repo, tag)
-            p 'Checking Github release status.'
-            release[:prerelease]
+            if !release
+              default
+            else
+              release[:prerelease]
+            end
           end
         end
 
@@ -32,12 +35,13 @@ module Overview
     end
   end
 
-  class AppVersion
+  class Version
 
     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)
       version_suffix = CI.version_suffix
       if Git.installed?
@@ -53,6 +57,7 @@ module Overview
           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
@@ -76,7 +81,7 @@ module Overview
     end
 
     def suffix
-      branch = Git.branch
+      branch = CI.branch || Git.branch
       p "Branch = #{branch}."
       case branch
         when /develop/