dryrun 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c67f2fe04c2d7ccdba7e7bd50ddf7ae355f22c3c
-  data.tar.gz: 3794bbba77ed2e187b8cac839e66eeebea564b32
+  metadata.gz: 3d3f3a98a45ab58ac45426e6c806a5b6bd773cc9
+  data.tar.gz: 04cacfaa410713424d3c67e570e79864ab30f6a5
 SHA512:
-  metadata.gz: 89d80fad215e3bf72c9ae0e89ec51cb6e018a361b96f6ddfc73885275f0c393be4529c8a6d5fee5bf79f6a436259762bf4a4478e1273c292af1009059ae8902c
-  data.tar.gz: 78a26051d414064d937fa83db821e18ab0747af93f30bd721b26d5aab1333916bd4ad66c6d21d89382c27e48c9ba7fc7d34b7805f970da7ec727cf9b9d450ff7
+  metadata.gz: 56e0f7b045e2ab959a96f007016ae362d8d97a62be4b583989e313bceafbb77623aca311df3db72381f5b8f117a782a1623591043e16b6f56cc283c8678dd9c4
+  data.tar.gz: 65f34a5ef5c2d48fab4a841431876d60694597b777fe616bdcb376ca63607a9a811f74c257909ef1f8af772bb9a4f92d97b259308709833e7a2df0310699b6f0

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.2.3

data/README.md

@@ -11,11 +11,29 @@
 
 
 ## Usage
-> dryrun https://github.com/cesarferreira/android-helloworld
-
+```shell
+dryrun https://github.com/cesarferreira/android-helloworld
+```
 
 Wait a few seconds... and `voilà`! The app is opened on your phone :smiley:
 
+
+#### From a custom repository folder:
+```shell
+dryrun repository_url -p custom/path/to/gradle_application
+```
+
+#### A custom module
+```shell
+dryrun repository_url -m custom_application_module
+```
+
+#### Help at any time:
+```shell
+dryrun -h
+```
+
+
 ### Goodies
 
 - Private repos can be tested too :smiley:
@@ -57,3 +75,11 @@ Wait a few seconds... and `voilà`! The app is opened on your phone :smiley:
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/cesarferreira/dryrun.
+
+To install gem as local you can use this:
+```shell
+# In the project folder:
+rake install
+# Next in the any gemset or place:
+gem install --local path_to_dryrun/pkg/dryrun-<builded_version>.gem
+```

data/bin/dryrun

@@ -2,10 +2,4 @@
 require 'bundler/setup'
 require 'dryrun'
 
-# ARGUMENTS validation
-if ARGV.length != 1
-  puts "You need to provide the github URL"
-  exit 1
-end
-
-DryRun::MainApp.initialize(ARGV[0])
+DryRun::MainApp.new(ARGV).call

data/lib/dryrun.rb

@@ -1,3 +1,4 @@
+require 'optparse'
 require 'colorize'
 require 'tmpdir'
 require 'fileutils'
@@ -5,47 +6,77 @@ require 'dryrun/github'
 require 'dryrun/android_project'
 
 module DryRun
-
   class MainApp
+    def initialize(arguments)
+      create_options_parser
+      @url = ['-h', '--help'].include?(arguments.first) ? nil : arguments.shift
+      @app_path = nil
+      @custom_module = nil
+      @opt_parser.parse!(arguments)
 
-    def self.ANDROID_HOME_is_defined
-      sdk = `echo $ANDROID_HOME`.gsub("\n",'')
-      !sdk.empty?
+      unless @url
+        puts @opt_parser.help
+        exit
+      end
     end
 
+    def create_options_parser
+      @opt_parser = OptionParser.new do |opts|
+        opts.banner = "Usage: dryrun GITHUB_URL [OPTIONS]"
+        opts.separator  ''
+        opts.separator  "Options"
+
+        opts.on('-m MODULE_NAME', '--module MODULE_NAME', 'Custom module to run') do |custom_module|
+          @custom_module = custom_module
+        end
+        opts.on('-p PATH', '--path PATH', 'Custom path to android project') do |app_path|
+          @app_path = app_path
+        end
+        opts.on('-h', '--help', 'Displays help') do
+          puts opts.help
+          exit
+        end
+      end
+    end
 
-    def self.initialize(url)
+    def android_home_is_defined
+      sdk = `echo $ANDROID_HOME`.gsub("\n",'')
+      !sdk.empty?
+    end
 
-      unless self.ANDROID_HOME_is_defined
+    def call
+      unless android_home_is_defined
         puts "\nWARNING: your #{'$ANDROID_HOME'.yellow} is not defined\n"
         puts "\nhint: in your #{'~/.bashrc'.yellow} add:\n  #{"export ANDROID_HOME=\"/Users/cesarferreira/Library/Android/sdk/\"".yellow}"
         puts "\nNow type #{'source ~/.bashrc'.yellow}\n\n"
         exit 1
       end
 
-      github = Github.new(url)
+      github = Github.new(@url)
 
       unless github.is_valid
-        puts "#{url.red} is not a valid github url"
+        puts "#{@url.red} is not a valid github @url"
         exit 1
       end
 
       # clone the repository
       repository_path = github.clone
 
-      android_project = AndroidProject.new(repository_path)
+      android_project = AndroidProject.new(repository_path, @app_path, @custom_module)
 
       # is a valid android project?
       unless android_project.is_valid
-        puts "#{url.red} is not a valid android project"
+        puts "#{@url.red} is not a valid android project"
         exit 1
       end
 
+      puts "Using custom app folder: #{@app_path.green}" if @app_path
+      puts "Using custom module: #{@custom_module.green}" if @custom_module
+
       # clean and install the apk
       android_project.install
 
       puts "\n> If you want to remove the app you just installed, execute:\n#{android_project.get_uninstall_command.yellow}\n\n"
-
     end
   end
 end

data/lib/dryrun/android_project.rb

@@ -3,22 +3,34 @@ require 'fileutils'
 require 'tempfile'
 
 module DryRun
-
   class AndroidProject
-
-    def initialize(path)
+    def initialize(path, custom_app_path, custom_module)
+      @custom_app_path = custom_app_path
+      @custom_module = custom_module
       @base_path = path
-      @settings_gradle_path = settings_gradle
+      @settings_gradle_path = settings_gradle_file
+
+      check_custom_app_path
+
       @modules = find_modules
     end
 
+    def check_custom_app_path
+      return unless @custom_app_path
+
+      full_custom_path = File.join(@base_path, @custom_app_path)
+      settings_path = settings_gradle_file(full_custom_path)
+      return unless is_valid(settings_path)
+
+      @settings_gradle_path = settings_path
+      @base_path = full_custom_path
+    end
+
     def remove_local_properties
       Dir.chdir @base_path
       file_name = 'local.properties'
 
-      if File.exist?(file_name)
-        File.remove(file_name)
-      end
+      File.delete(file_name) if File.exist?(file_name)
 
       system("touch #{file_name}")
     end
@@ -35,34 +47,30 @@ module DryRun
 
       # Move temp file to origin
       FileUtils.mv(tmp.path, file)
-
     end
 
-    def settings_gradle
-      "#{@base_path}/settings.gradle"
+    def settings_gradle_file(path = @base_path)
+      File.join(path, 'settings.gradle')
     end
 
-    def is_valid
-      File.exist?(@settings_gradle_path)
+    def is_valid(settings_path = @settings_gradle_path)
+      File.exist?(settings_path)
     end
 
     def find_modules
-      if self.is_valid
-        content = File.open(@settings_gradle_path, "rb").read
-        modules = content.scan(/'([^']*)'/)
-        modules.each {|replacement| replacement.first.gsub!(':', '/')}
-      else
-        return []
-      end
+      return [] unless is_valid
+
+      content = File.open(@settings_gradle_path, "rb").read
+      modules = content.scan(/'([^']*)'/)
+      modules.each {|replacement| replacement.first.gsub!(':', '/')}
     end
 
     def install
-
       Dir.chdir @base_path
 
-      path, execute_line = self.sample_project
+      path, execute_line = sample_project
 
-      if path == false and execute_line==false
+      if path == false and execute_line == false
         puts "Couldn't open the sample project, sorry!".red
         exit 1
       end
@@ -76,60 +84,72 @@ module DryRun
       end
 
       # Generate the gradle/ folder
-      if File.exist?('gradlew') and !is_gradle_wrapped
-        system('gradle wrap')
-      end
+      system('gradle wrap') if File.exist?('gradlew') and !is_gradle_wrapped
+
+      remove_application_id
+      remove_local_properties
 
-      self.uninstall
-      self.remove_application_id
-      self.remove_local_properties
+      if @custom_module
+        system("#{builder} clean :#{@custom_module}:installDebug")
+      else
+        system("#{builder} clean installDebug")
+      end
 
-      system("#{builder} clean assembleDebug installDebug")
+      clear_app_data
 
       puts "Installing #{@package.green}...\n"
       puts "executing: #{execute_line.green}\n\n"
+
       system(execute_line)
 
     end
 
     def is_gradle_wrapped
-
-      if !File.directory?('gradle/')
-        return false
-      end
+      return false if !File.directory?('gradle/')
 
       File.exist?('gradle/wrapper/gradle-wrapper.properties') and File.exist?('gradle/wrapper/gradle-wrapper.jar')
     end
 
     def sample_project
+      if @custom_module && @modules.any? { |m| m.first == "/#{@custom_module}" }
+        @path_to_sample = File.join(@base_path, "/#{@custom_module}")
+        return @path_to_sample, get_execution_line_command(@path_to_sample)
+      else
+        @modules.each do |child|
+          full_path = File.join(@base_path, child.first)
+          @path_to_sample = full_path
 
-      @modules.each do |child|
-        full_path = "#{@base_path}/#{child.first}"
-        @path_to_sample = full_path
-
-        execute_line = get_execute_line("#{full_path}/src/main/AndroidManifest.xml")
-        return full_path, execute_line if execute_line
-
+          execution_line_command = get_execution_line_command(full_path)
+          return full_path, execution_line_command if execution_line_command
+        end
       end
-      return false, false
+      [false, false]
+    end
+
+    def get_clear_app_command
+      "adb shell pm clear #{@package}"
     end
 
     def get_uninstall_command
       "adb uninstall #{@package}"
     end
 
-    def uninstall
-      system("#{self.get_uninstall_command}") # > /dev/null 2>&1")
+    def clear_app_data
+      system(get_clear_app_command)
     end
 
+    def uninstall_application
+      system(get_uninstall_command) # > /dev/null 2>&1")
+    end
 
-    def get_execute_line(path_to_sample)
+    def get_execution_line_command(path_to_sample)
+      path_to_manifest = File.join(path_to_sample, 'src/main/AndroidManifest.xml')
 
-      if !File.exist?(path_to_sample)
+      if !File.exist?(path_to_manifest)
         return false
       end
 
-      f = File.open(path_to_sample)
+      f = File.open(path_to_manifest)
       doc = Nokogiri::XML(f)
 
       @package = get_package(doc)
@@ -142,7 +162,6 @@ module DryRun
       f.close
 
       "adb shell am start -n \"#{get_launchable_activity}\" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER"
-
     end
 
     def get_launchable_activity
@@ -164,7 +183,5 @@ module DryRun
       end
       false
     end
-
   end
-
 end

data/lib/dryrun/version.rb

@@ -1,3 +1,3 @@
 module DryRun
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: dryrun
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - cesar ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.6.2
 description: Tool which allows to quickly try the demo project of any Android Library
@@ -102,11 +102,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -129,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Tool which allows to quickly try the demo project of any Android Library