lasertag 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cba8453f70d25300d93b0ed7bd38091d6eb58d0
-  data.tar.gz: 31b59dc849797a5060b2e5fab8204db60c38f286
+  metadata.gz: 9426e016e328362a09deadd681d53319d2ad8a6e
+  data.tar.gz: c6035f6b106dee761e40e24f891314e1d2c8c46b
 SHA512:
-  metadata.gz: 9a746042144bb40e3ff59c5ee40a5445ac21a9556e37d7894b244220c674f2e7069ebe83af25c971a0d02cf7cbaf59164395d7ffb4b6b6c0556a642624133908
-  data.tar.gz: 1ea63e8dc865466aa6ee5d1db68a8e7667ddc0d46a4e2668ec6caa48bd164223ebf9ab0a61632dfc3b01bb8f9491b1260050e3cb47b7e5976f73bf6c8d31bff1
+  metadata.gz: a8823d5eec834807eb5e451acb0cf40cf290e136f5723ecfbe8ffd7e5642bd2238d0880e8d69f2c21c192af2a93981d265b9518e119ae2beea53a6ea7612b628
+  data.tar.gz: 0380b6e3b4a54ebd027970b71629a18643870373861a69d94c5eb4d65ca9a416ef941258e8f2e843c83dc0004ae87dfc1f28412fbe626db060f4f0bc558aa051

data/.rspec

@@ -0,0 +1,5 @@
+--require spec_helper
+--tty
+--color
+--format documentation
+--format html -o "tmp/rspec_result.html"

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+sudo: false
+rvm:
+  - 2.2.1
+  - 2.0.0

data/README.md

@@ -1,21 +1,37 @@
 # Lasertag
+[![Gem Version](https://badge.fury.io/rb/lasertag.svg)](https://badge.fury.io/rb/lasertag) [![Build Status](https://travis-ci.org/cesarferreira/lasertag.svg?branch=master)](https://travis-ci.org/cesarferreira/lasertag)  [![security](https://hakiri.io/github/cesarferreira/lasertag/master.svg)](https://hakiri.io/github/cesarferreira/lasertag/master) [![Code Climate](https://codeclimate.com/github/cesarferreira/lasertag/badges/gpa.svg)](https://codeclimate.com/github/cesarferreira/lasertag) [![Inline docs](http://inch-ci.org/github/cesarferreira/lasertag.svg?branch=master)](http://inch-ci.org/github/cesarferreira/lasertag)
 
-Match your CVS tags with the android versions in laser speed!
+> Like most VCSs, Git has the ability to tag specific points in history as being important. Typically people use this functionality to mark release points (v1.0.0, and so on)
 
+<!-- Match your CVS tags with your android versions with laser speed! -->
 
-## Usage
+<p align="center">
+<img src="https://raw.githubusercontent.com/cesarferreira/lasertag/master/extras/terminal.gif" width="100%" />
+</p>
 
-    $ lasertag -m app
 
-If you want to specify a flavour:
+## Basic Usage
 
-    $ lasertag --module app --flavour prod
+    $ lasertag --module [module_name]
+
+#### Going deeper
+
+If you want to specify a flavor:
+
+    $ lasertag --module app --flavor prod
 
 
 ## Installation
 
     $ gem install lasertag
 
+## Under the hood
+
+- Tries to compile the project
+- Find out the package and the app version
+- executes git tag -a v[tag_version] -m "tag [tag_name]"
+- executes git push origin [tag_name]
+
 
 ## License
 

data/lasertag.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["cesarferreira"]
   spec.email         = ["cesar.manuel.ferreira@gmail.com"]
 
-  spec.summary       = %q{Match your CVS tags with the android versions in laser speed!}
-  spec.description   = %q{Match your CVS tags with the android versions in laser speed!}
+  spec.summary       = %q{Automatically map android app version to git tags}
+  spec.description   = %q{Automatically map android app version to git tags}
   spec.homepage      = "https://github.com/cesarferreira/lasertag"
   spec.license       = "MIT"
 
@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bundler', '~> 1.7'
   spec.add_dependency 'colorize',  '~> 0.7'
   spec.add_dependency 'oga',  '~> 1.3.1'
-  spec.add_dependency 'hirb'
+  spec.add_dependency 'git', '~> 1.2'
 
 end

data/lib/lasertag.rb

@@ -1,9 +1,8 @@
 require 'optparse'
 require 'colorize'
-require 'hirb'
 require 'oga'
 require 'lasertag/version'
-require 'pry'
+require 'git'
 
 module Lasertag
   class MainApp
@@ -12,7 +11,7 @@ module Lasertag
       # defaults
       @app_path = Dir.pwd
       @app_module = nil
-      @app_flavour = nil
+      @app_flavor = nil
 
       @require_analyses = true
 
@@ -31,16 +30,16 @@ module Lasertag
         opts.separator  ''
         opts.separator  "Options"
 
-        opts.on('-p PATH', '--path PATH', 'Custom path to android project') do |app_path|
-          @app_path = app_path if @app_path != '.'
+        opts.on('-m', '--module MODULE', 'Specifies the app module') do |app_module|
+          @app_module = app_module
         end
 
-        opts.on('-f', '--flavour FLAVOUR', 'Specifies the flavour (e.g. dev, qa, prod)') do |app_flavour|
-          @app_flavour = app_flavour
+        opts.on('-f', '--flavor FLAVOR', 'Specifies the flavor (e.g. dev, qa, prod)') do |app_flavor|
+          @app_flavor = app_flavor
         end
 
-        opts.on('-m', '--module MODULE', 'Specifies the app module') do |app_module|
-          @app_module = app_module
+        opts.on('-p PATH', '--path PATH', 'Custom path to android project') do |app_path|
+          @app_path = app_path if @app_path != '.'
         end
 
         opts.on('-h', '--help', 'Displays help') do
@@ -74,10 +73,6 @@ module Lasertag
         # end
       end
 
-      if @clear_flag
-        android_project.clear_app_data
-      end
-
       unless @app_module
         puts "Please give me an app module name".yellow
         exit 1
@@ -91,8 +86,19 @@ module Lasertag
 
       Dir.chdir @app_path
 
+      ### dont let uncommited stuffgit commit
+      if has_uncommited_code
+        puts "You have uncommited code, please commit it first".red
+        exit 1
+      end
+
       ### Assemble
-      system assemble_command
+      is_success = system assemble_command
+
+      unless is_success
+        puts "\n\nSomething went wrong so I stopped all the madness!!\n".red
+        exit 1
+      end
 
       ### Get project properties
       @hash = project_properties @app_module
@@ -102,24 +108,66 @@ module Lasertag
       ### Find app info
       app_info = get_app_info
 
-      puts "For package #{app_info[:package].green}"
+      puts "For package #{app_info[:package].yellow}\n"
 
-      ### dont let uncommited stuffgit commit
+      ### git tag -a "versionNumber" -m "versionName"
 
+      package = app_info[:package]
+      name = @app_module # not quite correct
+      version = app_info[:versionName]
+
+      builded = "#{@app_module}/build/outputs/apk/#{@app_module}#{"-#{@app_flavor}" if @app_flavor}-release-unsigned.apk"
+
+      puts "#{name} #{version} built to #{builded}.".green
+
+      tag_code "v#{version}"
+      puts "Tagged v#{version}.".green
+
+      #$ git push origin v1.5
+      push_tag "v#{version}"
+
+      puts "Pushed git commits and tags.".green
+      puts "Pushed #{name} #{version} to remote.".green
+
+    end
 
-      ### git tag -a "versionNumber" -m "versionName"
 
-      version = "v#{app_info[:versionName]}"
-      tag = "git tag -a #{version} -m 'versionCode: #{app_info[:versionCode]}'"
+    ### HAS UNCOMMITED CODE?
+    def has_uncommited_code
+      g = Git.open(Dir.pwd)
+      g.status.changed.size > 0
+    end
 
-      puts "Trying to tag #{version}...".yellow
+    ### PUSH TAG
+    def push_tag(version)
+      g = Git.open(Dir.pwd)
+      begin
+        g.push(g.remote('origin'), version)
+      rescue Exception => e
+        puts "Can't push tag\n reason: #{e.to_s.red}"
+        exit 1
+      end
+    end
 
-      puts "Tagged #{version}\n".green
 
+    ### TAG CODE
+    def tag_code(version)
+      g = Git.open(Dir.pwd)
+      begin
+        g.add_tag(version)
+      rescue Exception => e
+        expected = "'#{version}' already exists"
+        if e.to_s.include? expected
+          puts "Error ocurred: #{expected.red}"
+        else
+          puts "Can't tag the code\n reason: #{e.to_s.red}"
+        end
 
-      ### git push --tags
+        exit 1
+      end
     end
 
+    ### IS THE ANDROID HOME DEFINED?
     def android_home_is_defined
       sdk = `echo $ANDROID_HOME`.gsub("\n",'')
       !sdk.empty?
@@ -142,8 +190,7 @@ module Lasertag
       File.exist?(settings_path)
     end
 
-##############
-
+    #########################################################
 
     def convert_values_to_hash (str)
       hash = Hash.new
@@ -167,9 +214,7 @@ module Lasertag
       project = "#{project}:" if project
 
       result = %x[gradle #{project}properties]
-      hash = convert_values_to_hash result
-      #puts Hirb::Helpers::AutoTable.render(hash)
-      hash
+      convert_values_to_hash result
     end
 
 
@@ -179,9 +224,6 @@ module Lasertag
 
       parser = Oga.parse_xml(handle)
 
-      #  package="com.cesarferreira.testout"
-      #  versionCode="10000"
-      #  versionName="1.0.0"
       package     = parser.xpath("//manifest").attr('package').last.value
       versionCode = parser.xpath("//manifest").attr('android:versionCode').last.value
       versionName = parser.xpath("//manifest").attr('android:versionName').last.value
@@ -196,7 +238,7 @@ module Lasertag
     def get_path_to_merged_manifest
       build_dir = @hash['buildDir']
 
-      flavor = @app_flavour ? "/#{@app_flavour}/" : "/"
+      flavor = @app_flavor ? "/#{@app_flavor}/" : "/"
 
       path = "#{build_dir}/intermediates/manifests/full"
       path = "#{path}#{flavor}release/"
@@ -206,8 +248,9 @@ module Lasertag
       exists = File.exist?(full_path)
 
       unless exists
-        puts "#{full_path.red} could not be found"
-        puts "Try specifying a Flavor".yellow
+        puts "The merged manifest could not be found\n"
+        puts "   Try specifying a Flavor\n".green
+        system("lasertag -h")
         exit 1
       end
 
@@ -216,7 +259,7 @@ module Lasertag
     end
 
     def assemble_command
-      "gradle assemble#{(@app_flavour or "").capitalize}Release"
+      "gradle :#{@app_module}:assemble#{(@app_flavor or "").capitalize}Release"
     end
 
   end

data/lib/lasertag/version.rb

@@ -1,3 +1,3 @@
 module Lasertag
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lasertag
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - cesarferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,20 +95,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: hirb
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Match your CVS tags with the android versions in laser speed!
+        version: '1.2'
+description: Automatically map android app version to git tags
 email:
 - cesar.manuel.ferreira@gmail.com
 executables:
@@ -117,11 +117,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/lasertag
+- extras/terminal.gif
 - lasertag.gemspec
 - lib/lasertag.rb
 - lib/lasertag/version.rb
@@ -148,6 +151,6 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Match your CVS tags with the android versions in laser speed!
+summary: Automatically map android app version to git tags
 test_files: []
 has_rdoc: