dryrun 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c3082778efe82e43ad48bb739937bdf0ee4c018
-  data.tar.gz: a15a5d662f0651489318f4eba7dcfaa8c4dc36e3
+  metadata.gz: 76567467625da0c51f4bc39f919defb04f806a5a
+  data.tar.gz: 156aa3d9b9ea03f578bc946e18c372b0bbd50f28
 SHA512:
-  metadata.gz: 34883503135b1bc6c5c1c8796dc0c4ef413200718153a6efe76001ca8bd1b1d6f0410ce79185503f572778b130b2ef5a08b9c2dc108c9ad05699cf28b3308d36
-  data.tar.gz: 369b3efa12d45947fb16283b87b6340ba08d6cde082666cf5e4a888dbac5112fe8c1c58c79b1581934526067232fc6e489ae3e289e93a04904c28b527f2e657d
+  metadata.gz: 209ceae395b9f7fccc581c5f991cbf30ba430cb67ce888255ccf32cd7f048d95ff934357429c97545d3abbba3b5b88336924e91ba26388f3289f121f2814a10e
+  data.tar.gz: 3b9d1d333aedd35ef8ad0eeb4705a3e4fce0355bee783c990447ba26acfdffc711d8d789d81582c8d896615e9fc27d42e2b16eede7bbda7bf91792a3cf9b367b

data/README.md

@@ -21,11 +21,12 @@ Usage: dryrun GIT_URL [OPTIONS]
 
 Options
     -m, --module MODULE_NAME         Custom module to run
-    -f, --flavour FLAVOUR            Specifies the flavour (e.g. dev, qa, prod)
+    -b, --branch BRANCH_NAME         Checkout custom branch to run
+    -f, --flavour FLAVOUR            Custom flavour (e.g. dev, qa, prod)
     -p, --path PATH                  Custom path to android project
-    -t, --tag TAG                    Specifies a custom tag/commit hash to clone (e.g. "v0.4.5", "6f7dd4b")
+    -t, --tag TAG                    Checkout tag/commit hash to clone (e.g. "v0.4.5", "6f7dd4b")
     -h, --help                       Displays help
-    -v, --version                    Displays version
+    -v, --version                    Displays the version
 ```
 
 ## Installation

data/lib/dryrun.rb

@@ -17,6 +17,7 @@ module DryRun
       @custom_module = nil
       @flavour = ''
       @tag = nil
+      @branch = "master"
 
       # Parse Options
       arguments.push "-h" unless @url
@@ -33,7 +34,11 @@ module DryRun
           @custom_module = custom_module
         end
 
-         opts.on('-f', '--flavour FLAVOUR', 'Specifies the flavour (e.g. dev, qa, prod)') do |flavour|
+        opts.on('-b BRANCH_NAME', '--branch BRANCH_NAME', 'Checkout custom branch to run') do |branch|
+          @branch = branch
+        end
+
+        opts.on('-f', '--flavour FLAVOUR', 'Custom flavour (e.g. dev, qa, prod)') do |flavour|
           @flavour = flavour.capitalize
         end
 
@@ -41,7 +46,7 @@ module DryRun
           @app_path = app_path
         end
 
-        opts.on('-t TAG', '--tag TAG', 'Specifies a custom tag/commit hash to clone (e.g. "v0.4.5", "6f7dd4b")') do |tag|
+        opts.on('-t TAG', '--tag TAG', 'Checkout tag/commit hash to clone (e.g. "v0.4.5", "6f7dd4b")') do |tag|
           @tag = tag
         end
 
@@ -68,7 +73,7 @@ module DryRun
     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 "\nhint: in your #{'~/.bashrc'.yellow} or #{'~/.bash_profile'.yellow}  add:\n  #{"export ANDROID_HOME=\"/Users/cesarferreira/Library/Android/sdk/\"".yellow}"
         puts "\nNow type #{'source ~/.bashrc'.yellow}\n\n"
         exit 1
       end
@@ -81,7 +86,7 @@ module DryRun
       end
 
       # clone the repository
-      repository_path = github.clone @tag
+      repository_path = github.clone(@branch, @tag)
 
       android_project = AndroidProject.new(repository_path, @app_path, @custom_module, @flavour)
 

data/lib/dryrun/github.rb

@@ -46,7 +46,7 @@ module DryRun
     ##
     ## CLONE THE REPOSITORY
     ##
-    def clone(tag)
+    def clone(branch, tag)
       clonable = self.clonable_url
 
       tmpdir = Dir.tmpdir+"/dryrun/#{@destination}"
@@ -59,12 +59,13 @@ module DryRun
         if !is_git_repo
           FileUtils.rm_rf(tmpdir)  
           DryrunUtils.execute("git clone #{clonable} #{tmpdir}")  
+          DryrunUtils.execute("git checkout #{branch}")
         else
           puts "Found project in #{tmpdir.green}..."
           DryrunUtils.execute("git reset --hard HEAD")
           DryrunUtils.execute("git fetch --all")
-          DryrunUtils.execute("git checkout master")
-          DryrunUtils.execute("git pull origin master")
+          DryrunUtils.execute("git checkout #{branch}")
+          DryrunUtils.execute("git pull origin #{branch}")
         end
 
       else

data/lib/dryrun/version.rb

@@ -1,3 +1,3 @@
 module DryRun
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dryrun
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - cesar ferreira