apu 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbcc0524e6c73dbfe9e3b76e40856c185194a301
-  data.tar.gz: b7260a02ffd86e05bc44d20f78e1b4a27f94cfbd
+  metadata.gz: 79a4291c2d7d4fa0182bd9820bae6dc572638a95
+  data.tar.gz: a1b89f71ff77a1e5b029b6143ef80f530ce458dd
 SHA512:
-  metadata.gz: d18ec2e3f9097c2b2c79dfce6894f96841f766211321370a571331178a939871efc068be1316f39f3448d93cf3281dc8578a7629ce19562e2d36a673c5f5451f
-  data.tar.gz: 2772c2593cec8744b2da4cfe4acf858b94b5d5b098eab41e745c04a7e594ca712fd66616f4c9646387141ec124bf027a6f508bf475f031854ec2c1df31897692
+  metadata.gz: 186c43a987624768a5bea9a63d10d7985f7f1a2e0b43502bf5401e708f5eb484bada85cb3a8554fbd0f2a4897a7f326ab1aa496fbae41c894ba9b793890acf3b
+  data.tar.gz: 609602635b7625be3b02efbf25befb6c0f71284a934991392d521e0336f13de00194a819c6080e6c1e25492a44771a453bd989e2e0f203a4707b5e03f698a9ae

data/README.md

@@ -1,6 +1,6 @@
 # apu
  [![Build Status](https://travis-ci.org/cesarferreira/apu.svg?branch=master)](https://travis-ci.org/cesarferreira/apu) [![Gem Version](https://badge.fury.io/rb/apu.svg)](http://badge.fury.io/rb/apu)
- 
+
 **A**ndroid a**p**plication **u**tils
 
 > A set of useful tools for android developers
@@ -33,6 +33,8 @@ Options
     -p, --path PATH                  Custom path to android project
     -r, --run                        Run the build on the device
     -c, --clear                      Clear app data
+    -h, --help                       Displays help
+    -v, --version                    Displays version
 ```
 
 ## Installation

data/apu.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'pry-byebug', '~> 3.1'
+  spec.add_development_dependency 'pry-byebug', '~> 3.2'
   spec.add_development_dependency 'rspec'
 
   spec.add_dependency 'bundler', '~> 1.7'

data/lib/apu/version.rb

@@ -1,3 +1,3 @@
 module Apu
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/apu.rb

@@ -3,85 +3,138 @@ require 'colorize'
 require 'fileutils'
 require 'apu/version'
 require 'apu/android_project'
+require 'pry'
 
 module Apu
   class MainApp
     def initialize(arguments)
 
-      @app_path = `pwd`.tr("\n","")
+      # defaults
+      @app_path = Dir.pwd
+      @package_flag = false
+      @uninstall_flag = false
+      @install_flag = false
+      @android_home_flag = false
+      @launcher_flag = false
+      @run_flag = false
+      @clear_flag = false
 
-      create_options_parser
-      @line = ['-h', '--help', '-v', '--version'].include?(arguments.first) ? nil : arguments.shift
+      @require_analyses = true
 
-      @opt_parser.parse!(arguments)
+      if !!arguments
+          arguments.push '-h'
+      end
+
+      # Parse Options
+      create_options_parser(arguments)
+
+      manage_opts
+
+    end
+
+    ##
+    ## Manage options
+    ##
+    def manage_opts
+      puts "manage_opts"
+
+      if @require_analyses
+        puts "I REQUIRE ANALYSIES"
+        # instatiate android project
+        android_project = AndroidProject.new(@app_path)
+
+        # is a valid android project?
+        unless android_project.is_valid
+          puts "#{@app_path.red} is not a valid android project"
+          exit
+        end
+      end
+
+      puts @package_flag # TODO DELETE
+
+      if @package_flag
+        puts android_project.get_package_name.green
+      end
+
+      if @uninstall_flag
+        android_project.uninstall_application
+      end
+
+      if @install_flag
+        android_project.install
+      end
+
+      if @android_home_flag
+        puts android_home_is_defined
+      end
+
+      if @launcher_flag
+        puts android_project.get_launchable_activity.green
+      end
+
+      if @run_flag
+        android_project.install
+        system(android_project.get_execute_line)
+      end
 
-      unless @line
-        puts @opt_parser.help
-        exit
+      if @clear_flag
+        android_project.clear_app_data
       end
     end
 
-    def create_options_parser
-      @opt_parser = OptionParser.new do |opts|
-        opts.banner = "Usage: apu PATH [OPTIONS]"
+    def create_options_parser(args)
+      #@opt_parser = OptionParser.new do |opts|
+      args.options do |opts|
+        opts.banner = "Usage: apu [OPTIONS]"
         opts.separator  ''
         opts.separator  "Options"
 
-        opts.on('-k', '--package', 'Retrieves package name (eg. com.example.app)') do |app_path|
-          android_project = get_android_project_object
-          puts android_project.get_package_name.green
-          exit
+        opts.on('-p PATH', '--path PATH', 'Custom path to android project') do |app_path|
+          puts "Path #{app_path}"
+          @app_path = app_path if @app_path != '.'
+        end
+
+        opts.on('-k', '--package', 'Retrieves package name (eg. com.example.app)') do |value|
+          puts "--package"
+          @package_flag = true
         end
 
         opts.on('-u', '--uninstall', 'Uninstalls the apk from your device') do |app_path|
-          android_project = get_android_project_object
-          android_project.uninstall_application
-          exit
+          @uninstall_flag = true
         end
 
-        opts.on('-i', '--install', 'Installs the apk on your device') do |app_path|
-          android_project = get_android_project_object
-          android_project.install
-          exit
+        opts.on('-i', '--install', 'Installs the apk on your device') do |install|
+          @install_flag = true
         end
 
         opts.on('-a', '--android-home', 'Checks if the ANDROID_HOME variable is defined') do |home|
-          p android_home_is_defined
-          exit
+          @android_home_flag = true
+          @require_analyses = false
         end
 
         opts.on('-l', '--launcher', 'Get the launcher activity path') do |app_path|
-          android_project = get_android_project_object
-          puts android_project.get_launchable_activity.green
-          exit
-        end
-
-        opts.on('-p PATH', '--path PATH', 'Custom path to android project') do |app_path|
-          @app_path = app_path if @app_path != '.'
+          @launcher_flag = true
         end
 
         opts.on('-r', '--run', 'Run the build on the device') do |flavour|
-          android_project = get_android_project_object
-
-          android_project.install
-          system(android_project.get_execute_line)
-          exit
+          @run_flag = true
         end
 
         opts.on('-c', '--clear', 'Clear app data') do |flavour|
-          android_project = get_android_project_object
-          android_project.clear_app_data
+          @clear_flag = true
         end
 
         opts.on('-h', '--help', 'Displays help') do
+          @require_analyses = false
           puts opts.help
           exit
         end
         opts.on('-v', '--version', 'Displays version') do
+          @require_analyses = false
           puts Apu::VERSION
           exit
         end
-
+        opts.parse!
 
       end
     end
@@ -91,17 +144,6 @@ module Apu
       !sdk.empty?
     end
 
-    def get_android_project_object
-      android_project = AndroidProject.new(@app_path)
-
-      # is a valid android project?
-      unless android_project.is_valid
-        puts "#{@app_path.red} is not a valid android project"
-        exit
-      end
-      return android_project
-    end
-
     def call
       unless android_home_is_defined
         puts "\nWARNING: your #{'$ANDROID_HOME'.yellow} is not defined\n"
@@ -109,8 +151,6 @@ module Apu
         puts "\nNow type #{'source ~/.bashrc'.yellow}\n\n"
         exit 1
       end
-
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apu
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - cesar ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,8 +114,6 @@ files:
 - apu.gemspec
 - bin/apu
 - extras/apu.gif
-- extras/apu2.gif
-- extras/apu3.gif
 - lib/apu.rb
 - lib/apu/android_project.rb
 - lib/apu/version.rb