dryrun 1.1.5 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1862ff6adeb2c92762b43e39c4ce6aac84741bfe
-  data.tar.gz: 32d6d6ff45602167fb5d4823b45d593c019023fd
+SHA256:
+  metadata.gz: ef5d696972b561a9e75e695b01aac14ed4eea7d2fe7a3a4916065daf07e0bea5
+  data.tar.gz: 3a2cc74431ba8bf621970a3a4896eab3af5892676ec661c4d12b3ea13ce58b4b
 SHA512:
-  metadata.gz: bdaae990fc570470c535d376816bd163466e45022af4bd983cd64ef48193fa63c36d7e7cbe42a3aab34c383ff67bb0fd90d12bddc8b5dd2ccdbc4065ddc92051
-  data.tar.gz: 4fb03a38a6113fb2aaac5d237539ba03bf12d786032b9507a3d6b5ebb6052e7d64730cb2285c0a2019001fa729958b595f3473a02f6518781b6982cf829d9b0a
+  metadata.gz: 7da519009f46b4abd610d2cb4d135cdf3efcacc6f155e2350a909839d2bbbb084a81f87752d9c1c2c304131690f4422cffc25b182ca186934a1769dc92042aa0
+  data.tar.gz: 9818efe115ab85f76c900b25c186608729ed9ed26ffd5f9ab176d7fbca7d2e37524cbf37a3c7724cb745c38ad88cf937f14f4c1f55711638f173fd5126a79dcb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dryrun (1.1.5)
+    dryrun (1.3.2)
       bundler
       colorize
       highline
@@ -12,42 +12,40 @@ GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
-    ast (2.4.0)
-    byebug (9.1.0)
-    coderay (1.1.1)
+    ast (2.4.1)
+    byebug (11.1.3)
+    coderay (1.1.3)
     colorize (0.8.1)
-    diff-lcs (1.3)
-    highline (1.7.10)
-    method_source (0.8.2)
-    oga (2.14)
+    diff-lcs (1.4.4)
+    highline (2.0.3)
+    method_source (1.0.0)
+    oga (3.3)
       ast
       ruby-ll (~> 2.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.5.0)
-      byebug (~> 9.1)
-      pry (~> 0.10)
-    rake (10.5.0)
-    rjb (1.5.5)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rake (13.0.1)
+    rjb (1.6.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     ruby-ll (2.1.2)
       ansi
       ast
-    slop (3.6.0)
 
 PLATFORMS
   ruby
@@ -59,4 +57,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/README.md

@@ -1,20 +1,17 @@
-<p align="center">
+<!--<p align="center">
   <a href="https://github.com/cesarferreira/dryrun" target="_blank">
     <img width="200"src="extras/gift.gif">
   </a>
-</p>
+</p>-->
 <h1 align="center">dryrun</h1>
 <p align="center"><strong>Try any android library</strong> hosted online <strong>directly</strong> from the <strong>command line</strong></p>
 <p align="center">
   <a href="https://github.com/cesarferreira/dryrun"><img src="http://ruby-gem-downloads-badge.herokuapp.com/dryrun?type=total" alt="downloads"></a>
   <a href="https://github.com/cesarferreira/dryrun"><img src="https://badge.fury.io/rb/dryrun.svg" alt="npm"></a>
-  <a href="https://travis-ci.org/cesarferreira/dryrun"><img src="https://travis-ci.org/cesarferreira/dryrun.svg?branch=master" alt="Build Status"></a>
-  <!-- <a href="http://android-arsenal.com/details/1/2361"><img src="https://img.shields.io/badge/Android%20Arsenal-dryrun-brightgreen.svg?style=flat" alt="Android Arsenal"></a> -->
   <a href="http://androidweekly.net/issues/issue-200"><img src="https://img.shields.io/badge/Android%20Weekly-%23200-blue.svg" alt="Android Weekly"></a>
   <a href="https://www.codacy.com/app/cesarferreira/dryrun?utm_source=github.com&utm_medium=referral&utm_content=cesarferreira/dryrun&utm_campaign=badger"><img src="https://api.codacy.com/project/badge/Grade/c9f73e75e72547008558b3e337acbff3" alt="Codacy Badge"></a>
-  
-  <!-- <a href="https://github.com/cesarferreira/dryrun/issues"><img src="https://img.shields.io/github/issues-raw/cesarferreira/dryrun.svg" alt="issues"></a>
-  <a href="https://github.com/cesarferreira/dryrun/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License"></a> -->
+<a href="https://github.com/cesarferreira/dryrun/issues?q=is%3Aissue+is%3Aclosed"><img src="https://img.shields.io/github/issues-closed-raw/cesarferreira/dryrun.svg?color=%23FF69B4" alt="Closed"></a>
+
 </p>
 
 <p align="center">
@@ -77,11 +74,7 @@ Options
 
 ## Notes
 
-Be aware that ANDROID_HOME needs to be set with the adb path:
- - MAC -> ```ANDROID_HOME=/usr/local/opt/android-sdk```
- - Linux -> ```ANDROID_HOME=/usr/local/opt/android-sdk```
- - Windows -> ```ANDROID_HOME="...sdk"```
-In windows this ANDROID_HOME is not automatically created, see more in [here](https://github.com/facebook/react-native/blob/0.24-stable/docs/DevelopmentSetupAndroid.md#define-the-android_home-environment-variable)
+Be aware that `$ANDROID_SDK_ROOT` environment variable needs to be set. See more in [here](https://developer.android.com/studio/command-line/variables#set)
 
 Additionally, on windows in order to use git commands, the following path should be on the environment variable
   - ```...\Git\cmd ```

data/docs/css/main.css

@@ -0,0 +1,76 @@
+div.notification.notification-producthunt {
+  border-radius: 0 !important;
+  background: #da552f;
+}
+
+p.install-text code {
+  border-radius: 5px;
+  padding: 0.75rem;
+}
+
+p.install-text code::before {
+  content: '$ ';
+}
+
+p.install-text code:hover {
+  cursor: text;
+}
+
+p.install-text code:hover span {
+  background: pink;
+}
+
+.hero .hero-foot {
+  margin-bottom: 1rem;
+}
+
+#madeWithBulma {
+  vertical-align: bottom;
+}
+
+div.column.has-content-vcentered {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+div.notification.copy-notification {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 999;
+}
+
+.makerlink {
+    font-family: BlinkMacSystemFont, -apple-system, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    right: 0px;
+    bottom: 0px;
+    position: fixed;
+    z-index: 100;
+    border-top-left-radius: 5px;
+    color: rgb(111, 111, 111);
+    padding: 6px;
+    border-top: 1px solid rgb(239, 239, 239);
+    border-left: 1px solid rgb(239, 239, 239);
+    background: rgb(255, 255, 255);
+    text-decoration: none;
+}
+
+.makerlink .makerlink__img {
+    width: 22px;
+    vertical-align: middle;
+    border-radius: 100%;
+}
+
+.makerlink .makerlink__author {
+    vertical-align: middle;
+    display: inline;
+    font-weight: 500;
+    font-size: 14px;
+    margin: 0px 0px 0px 7px;
+}
+
+h1 a {
+    color:inherit; 
+    text-decoration: none;
+ }

data/docs/index.html

@@ -0,0 +1,73 @@
+<!-- Generated with: https://github.com/cesarferreira/facelift -->
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>dryrun - ☁️ Try the demo project of any Android Library</title>
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.1/css/bulma.min.css" />
+  <link rel="stylesheet" href="./css/main.css" />
+  <!-- Twitter Meta -->
+  <meta name="twitter:card" content="summary" />
+  <meta name="twitter:title" content="dryrun" />
+  <meta name="twitter:url" content="https://github.com/cesarferreira/dryrun" />
+  <meta name="twitter:description" content="☁️ Try the demo project of any Android Library" />
+  <meta property="og:url" content="https://github.com/cesarferreira/dryrun" />
+
+  <meta property="og:title" content="dryrun" />
+  <meta property="og:description" content="☁️ Try the demo project of any Android Library" />
+</head>
+<body>
+  <div class="hero is-fullheight">
+    <div class="hero-body">
+      <div class="container">
+        <div class="columns is-variable is-6">
+          <!-- Content Left -->
+          <div class="column is-5 has-content-vcentered">
+            <h1 class="title is-1"><a href="https://github.com/cesarferreira/dryrun">dryrun</a></h1>
+            <h2 class="subtitle">☁️ Try the demo project of any Android Library</h2>
+            <div class="call-to-action content">
+              <p class="install-text is-size-4">
+                <code><span>gem install dryrun</span></code>
+              </p>
+              <div class="notification is-link is-hidden copy-notification">Copied to clipboard!</div>
+            </div>
+
+            <div class="features content">
+              <strong>Features</strong>
+              <ul>
+                <li>Try any android library hosted online directly from the command line</li>
+                <li>Specify any custom branch to run</li>
+                <li>Specify any flavour to run</li>
+                <li>Specify any app module to run</li>
+                <li>Checkout tag/commit hash to clone (e.g. "v0.4.5", "6f7dd4b")</li>
+              </ul>
+            </div>
+            <div class="features content">
+              <strong>Links</strong>
+              <ul>
+                <li>GitHub: <a href='https://github.com/cesarferreira/dryrun'>https://github.com/cesarferreira/dryrun</a></li>
+                <li>rubygems: <a href='https://rubygems.org/gems/dryrun/'>https://rubygems.org/gems/dryrun/</a></li>
+              </ul>
+            </div>
+
+          </div>
+          <!-- Media Right -->
+          <div class="column is-7 has-content-vcentered">
+            <figure class="image is-4by2">
+              <img src="https://raw.githubusercontent.com/cesarferreira/dryrun/master/extras/ss.gif" />
+            </figure>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <a target="_blank" rel="noopener" class="makerlink" href="http://cesarferreira.com">
+    <img class="makerlink__img" src="https://pbs.twimg.com/profile_images/884351017097322496/2mmpORsM_400x400.jpg" style="display: inline-block">
+    <p class="makerlink__author">by cesar ferreira</p>
+  </a>
+  <script async type="text/javascript" src="./js/index.js"></script>
+</body>
+</html>

data/docs/js/index.js

@@ -0,0 +1,42 @@
+// `copyToClipboard()` courtesy @chalarangelo (Angelos Chalaris)
+// refs: https://hackernoon.com/copying-text-to-clipboard-with-javascript-df4d4988697f
+const copyToClipboard = (str) => {
+  const el = document.createElement('textarea');  // Create a <textarea> element
+  el.value = str;                                 // Set its value to the string that you want copied
+  el.setAttribute('readonly', '');                // Make it readonly to be tamper-proof
+  el.style.position = 'absolute';
+  el.style.left = '-9999px';                      // Move outside the screen to make it invisible
+  document.body.appendChild(el);                  // Append the <textarea> element to the HTML document
+  const selected =
+    document.getSelection().rangeCount > 0        // Check if there is any content selected previously
+      ? document.getSelection().getRangeAt(0)     // Store selection if found
+      : false;                                    // Mark as false to know no selection existed before
+  el.select();                                    // Select the <textarea> content
+  document.execCommand('copy');                   // Copy - only works as a result of a user action (e.g. click events)
+  document.body.removeChild(el);                  // Remove the <textarea> element
+  if (selected) {                                 // If a selection existed before copying
+    document.getSelection().removeAllRanges();    // Unselect everything on the HTML document
+    document.getSelection().addRange(selected);   // Restore the original selection
+  }
+};
+
+const showCopyNotification = () => {
+  const notification = document.querySelector('div.notification.copy-notification');
+  notification.classList.remove('is-hidden');
+  setTimeout(() => {
+    notification.classList.add('is-hidden');
+  }, 2000);
+};
+
+const installTextCode = document.querySelector('p.install-text code');
+const installTextSpan = document.querySelector('p.install-text code span');
+
+const clickableElements = [installTextCode, installTextSpan];
+
+clickableElements.forEach((el) => {
+  const npmInstallText = installTextSpan.textContent; // 'npm i -g amo-cli'
+  el.addEventListener('click', () => {
+    copyToClipboard(npmInstallText);
+    showCopyNotification();
+  });
+});

data/dryrun.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.require_paths << 'lib'
   s.executables   << 'dryrun'
 
-  s.required_ruby_version = '>= 2.0.0'
+  # s.required_ruby_version = '>= 2.0.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'pry-byebug'

data/facelift.json

@@ -0,0 +1,30 @@
+{
+    "title": "dryrun",
+    "subtitle": "☁️ Try the demo project of any Android Library",
+    "installation": "gem install dryrun",
+    "url": "https://github.com/cesarferreira/dryrun",
+    "screenshot": "https://raw.githubusercontent.com/cesarferreira/dryrun/master/extras/ss.gif",
+    "author": {
+        "name": "cesar ferreira",
+        "thumbnail": "https://pbs.twimg.com/profile_images/884351017097322496/2mmpORsM_400x400.jpg",
+        "homepage": "http://cesarferreira.com"
+    },
+    "highlights": [{
+            "title": "Features",
+            "items": [
+                "Try any android library hosted online directly from the command line",
+                "Specify any custom branch to run",
+                "Specify any flavour to run",
+                "Specify any app module to run",
+                "Checkout tag/commit hash to clone (e.g. \"v0.4.5\", \"6f7dd4b\")"
+            ]
+        },
+        {
+            "title": "Links",
+            "items": [
+                "GitHub: <a href='https://github.com/cesarferreira/dryrun'>https://github.com/cesarferreira/dryrun</a>",
+                "rubygems: <a href='https://rubygems.org/gems/dryrun/'>https://rubygems.org/gems/dryrun/</a>"
+            ]
+        }
+    ]
+}

data/lib/dryrun.rb

@@ -101,13 +101,13 @@ module Dryrun
       @device = nil
 
       if !Gem.win_platform?
-        @sdk = `echo $ANDROID_HOME`.delete("\n")
-        @sdk += '/platform-tools/adb'
+        @sdk = `echo $ANDROID_SDK_ROOT`.delete("\n")
       else
-        @sdk = `echo %ANDROID_HOME%`.delete("\n")
-        @sdk += '/platform-tools/adb.exe'
+        @sdk = `echo %ANDROID_SDK_ROOT%`.delete("\n")
       end
 
+      @sdk = 'adb' if @sdk.empty?
+
       $sdk = @sdk
 
       puts 'Searching for devices...'.yellow
@@ -142,11 +142,11 @@ module Dryrun
       puts "Picked #{@device.name.to_s.green}" unless @device.nil?
     end
 
-    def android_home_is_defined
+    def android_sdk_root_is_defined
       @sdk = if !Gem.win_platform?
-               `echo $ANDROID_HOME`.delete('\n')
+               `echo $ANDROID_SDK_ROOT`.delete('\n')
              else
-               `echo %ANDROID_HOME%`.delete('\n')
+               `echo %ANDROID_SDK_ROOT%`.delete('\n')
              end
       !@sdk.empty?
     end
@@ -160,9 +160,9 @@ module Dryrun
     end
 
     def call
-      unless android_home_is_defined
-        puts "\nWARNING: your #{'$ANDROID_HOME'.yellow} is not defined\n"
-        puts "\nhint: in your #{'~/.bashrc'.yellow} or #{'~/.bash_profile'.yellow}  add:\n  #{"export ANDROID_HOME='/Users/cesarferreira/Library/Android/sdk/'".yellow}"
+      unless android_sdk_root_is_defined
+        puts "\nWARNING: your #{'$ANDROID_SDK_ROOT'.yellow} is not defined\n"
+        puts "\nhint: in your #{'~/.bashrc'.yellow} or #{'~/.bash_profile'.yellow}  add:\n  #{"export ANDROID_SDK_ROOT='/Users/cesarferreira/Library/Android/sdk/'".yellow}"
         puts "\nNow type #{'source ~/.bashrc'.yellow}\n\n"
         exit 1
       end

data/lib/dryrun/android_project.rb

@@ -14,7 +14,7 @@ module Dryrun
       @base_path = @custom_app_path ? File.join(path, @custom_app_path) : path
       @flavour = flavour
       @device = device
-
+      @gradle_file_extension = gradle_file_extension
       @settings_gradle_path = settings_gradle_file
       @main_gradle_file = main_gradle_file
 
@@ -23,6 +23,14 @@ module Dryrun
       @modules = find_modules
     end
 
+    def gradle_file_extension
+      gradle_file = File.join(@base_path, 'settings.gradle.kts')
+      if (File.exist?(gradle_file))
+        return ".gradle.kts"
+      end
+      ".gradle"
+    end
+
     def check_custom_app_path
       return unless @custom_app_path
 
@@ -50,7 +58,7 @@ module Dryrun
       # Open temporary file
       tmp = Tempfile.new('extract')
 
-      file = "#{@path_to_sample}/build.gradle"
+      file = "#{@path_to_sample}/build#{@gradle_file_extension}"
 
       # Write good lines to temporary file
       File.open(file, 'r') do |f|
@@ -65,11 +73,11 @@ module Dryrun
     end
 
     def settings_gradle_file(path = @base_path)
-      File.join(path, 'settings.gradle')
+      File.join(path, "settings#{@gradle_file_extension}")
     end
 
     def main_gradle_file(path = @base_path)
-      File.join(path, 'build.gradle')
+      File.join(path, "build#{@gradle_file_extension}")
     end
 
     def valid?(main_gradle_file = @main_gradle_file)
@@ -81,7 +89,10 @@ module Dryrun
       return [] unless valid?
 
       content = File.open(@settings_gradle_path, 'rb').read
-      modules = content.scan(/'([^']*)'/)
+      
+      content = content.split(/\n/).delete_if { |x| !x.start_with?("include")}.join("\n")
+      modules = content.scan(/'([^']*)'/) + content.scan(/\"([^"]*)\"/)
+      
       modules.each {|replacement| replacement.first.tr!(':', '')}
     end
 
@@ -112,7 +123,7 @@ module Dryrun
     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
+        return @path_to_sample if parse_manifest(@path_to_sample)
       else
         @modules.each do |child|
           full_path = File.join(@base_path, child.first)

data/lib/dryrun/dryrun_utils.rb

@@ -27,7 +27,7 @@ module Dryrun
           page_string = f.read
         end
       else
-        open(url) do |f|
+        URI.open(url) do |f|
           page_string = f.read
         end
       end
@@ -40,7 +40,7 @@ module Dryrun
       latest.to_s <= Dryrun::VERSION.to_s
     end
 
-    def self.run_adb(args) # :yields: stdout
+    def self.run_adb(args)
       adb_arg = " -s #{$device.name} " unless $device.nil?
       path = "#{$sdk} #{adb_arg} #{args} "
       run(path)

data/lib/dryrun/version.rb

@@ -1,3 +1,3 @@
 module Dryrun
-  VERSION = '1.1.5'.freeze
+  VERSION = '1.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryrun
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.3.2
 platform: ruby
 authors:
 - cesar ferreira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - cesar.manuel.ferreira@gmail.com
 executables:
@@ -141,6 +141,11 @@ files:
 - README.md
 - Rakefile
 - bin/dryrun
+- docs/css/main.css
+- docs/index.html
+- docs/js/index.js
+- docs/js/vendor/.keep
+- docs/res/.keep
 - dryrun.gemspec
 - extras/gift.gif
 - extras/logo.png
@@ -149,6 +154,7 @@ files:
 - extras/usage_v2.gif
 - extras/usage_v3.gif
 - extras/usage_v4.gif
+- facelift.json
 - lib/dryrun.rb
 - lib/dryrun/android_project.rb
 - lib/dryrun/android_utils.rb
@@ -167,7 +173,7 @@ homepage: http://cesarferreira.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,16 +182,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Tool to try any android library hosted online directly from the command line
 test_files: []