high_five 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9983d2d8a9d41762af3195ac71914522ff060ea1
-  data.tar.gz: ec49b865129915335ab092809057db0953950f0c
+  metadata.gz: 8202946d48fdbaaa511d60c60e0125316af76eb5
+  data.tar.gz: b453e7da8d2f6668b7232943af63d8552ff149d4
 SHA512:
-  metadata.gz: f18a81f961c7b489b04769cad4e3b1c0e0bce71fcbeaf1b21e433cc491a8a3e2ea7ecedf7617fbd2604df6a693fa44ed84506fa9344aa9eb6c5b253b2f000f6b
-  data.tar.gz: 6180cb691162ac39a2a1d20540dff9a8f7430660208f8afdbdf0c79bfc4f33705ce081616b85af2dec4fb89a558ef35136a650212f3697317844cb3cb4a8fc1e
+  metadata.gz: d8df8b070ad2b59c0e5edcbf65bd6f5e18fd6c69ace3f2d35cc09b335ec21f60172a97ec71ac3103ab22c7a03e4a44f5c118b0b6ec7395869f84dfc02b857fbf
+  data.tar.gz: b0fe438022e55aab408c3825d6f67055bc970d9868e3ff729cc342eff2051b1bbba99b75975643137ec4a5b95b3d5d6460f83c1f58dbc623e62157f52a23c5b8

data/lib/high_five/thor/tasks/android.rb

@@ -50,21 +50,24 @@ module HighFive
           end
 
           if gradle_file_path
-            puts "========================================="
-            puts "#{gradle_file_path}"
-            puts "========================================="
             gradle_file = File.read(gradle_file_path)
+            match = gradle_file.match(/versionName\s"(.+)"$/)
+            if match
+              puts "========================================="
+              puts "#{gradle_file_path}"
+              puts "========================================="
+
+              old = match[1]
+              gradle_file.gsub!(/versionName\s"(.+)"$/, "versionName \"#{options[:version]}\"")
+              puts "Setting version #{old} => #{options[:version]}"
 
-            old = gradle_file.match(/versionName\s"(.+)"$/)[1]
-            gradle_file.gsub!(/versionName\s"(.+)"$/, "versionName \"#{options[:version]}\"")
-            puts "Setting version #{old} => #{options[:version]}"
-
-            old = gradle_file.match(/versionCode\s(\d+)$/)[1]
-            gradle_file.gsub!(/versionCode\s\d+$/, "versionCode #{options[:build_number]}")
-            puts "Setting versionCode #{old} => #{options[:build_number]}"
+              old = gradle_file.match(/versionCode\s(\d+)$/)[1]
+              gradle_file.gsub!(/versionCode\s\d+$/, "versionCode #{options[:build_number]}")
+              puts "Setting versionCode #{old} => #{options[:build_number]}"
 
-            File.open(gradle_file_path, "w") do |f|
-              f.write gradle_file
+              File.open(gradle_file_path, "w") do |f|
+                f.write gradle_file
+              end
             end
           end
 

data/lib/high_five/thor/tasks/dist.rb

@@ -21,6 +21,7 @@ module HighFive
         method_option :"ant-flags", :desc => "Additional flags to pass directly to ant (android only)"
         method_option :platform_path, :desc => "Path to ios or android directory"
         method_option :ant, type: :boolean, :desc => "Force using ant to build"
+        method_option :debug, type: :boolean, :desc => "Create debug version of app (android only)"
         def dist(platform)
           @environment            = options[:environment]
           @output_file_name       = options[:output_file_name]
@@ -70,29 +71,69 @@ module HighFive
           system_or_die("android update project --path #{android_path} --subprojects")
           gradle_file = File.join(android_path, "build.gradle")
           gradle = File.exists?(gradle_file) && !options[:ant]
+          debug = options[:debug]
           if gradle
-            system_or_die("gradle -b #{gradle_file} clean assembleRelease")
+            if debug
+              system_or_die("gradle -b #{gradle_file} clean assembleDebug")
+            else
+              system_or_die("gradle -b #{gradle_file} clean assembleRelease")
+            end
           else
-            system_or_die("ant -file '#{android_path}/build.xml' clean release #{ant_flags}")
+            if debug
+              system_or_die("ant -file '#{android_path}/build.xml' clean debug")
+            else
+              system_or_die("ant -file '#{android_path}/build.xml' clean release #{ant_flags}")
+            end
           end
 
           android_name = HighFive::AndroidHelper.project_name_from_build_xml("#{android_path}/build.xml")
 
           if @output_file_name
             if gradle
-              apk = Dir["#{android_path}/build/outputs/apk/*-release.apk"][0]
-              say "copying final build #{apk} -> #{android_path}/build/outputs/apk/#{@output_file_name}.apk"
-              FileUtils.cp("#{apk}", "#{android_path}/build/outputs/apk/#{@output_file_name}.apk")
+              if debug
+                apk = Dir["#{android_path}/build/outputs/apk/*-release.apk"][0]
+              else
+                apk = Dir["#{android_path}/build/outputs/apk/*-debug.apk"][0]
+              end
+              @final_apk_path = "#{android_path}/build/outputs/apk/#{@output_file_name}.apk"
+              say "copying final build #{apk} -> #{@final_apk_path}"
+              FileUtils.cp("#{apk}", @final_apk_path)
             else
-              say "copying final build #{android_path}/bin/#{android_name}-release.apk -> #{android_path}/bin/#{@output_file_name}.apk"
-              FileUtils.cp("#{android_path}/bin/#{android_name}-release.apk", "#{android_path}/bin/#{@output_file_name}.apk")
+              if debug
+                apk = Dir["#{android_path}/bin/#{android_name}-debug.apk"][0]
+              else
+                apk = Dir["#{android_path}/bin/#{android_name}-release.apk"][0]
+              end
+              @final_apk_path = "#{android_path}/bin/#{@output_file_name}.apk"
+              say "copying final build #{apk} -> #{@final_apk_path}"
+              FileUtils.cp("#{apk}", @final_apk_path)
             end
           end
         end
 
         desc "install_android [ANDROID_PATH]", "Install the distribution package on the connected android device or emulator"
         def install_android(android_path)
-          system_or_die("ant -file '#{android_path}/build.xml' installr")
+          @output_file_name = options[:output_file_name]
+          gradle_file = File.join(android_path, "build.gradle")
+          gradle = File.exists?(gradle_file) && !options[:ant]
+          debug = options[:debug]
+          if debug
+            if @output_file_name
+              if gradle
+                system_or_die("adb install -r #{android_path}/build/outputs/apk/#{@output_file_name}.apk")
+              else
+                system_or_die("adb install -r #{android_path}/bin/#{@output_file_name}.apk")
+              end
+            else
+              if gradle
+                system_or_die("adb install -r #{Dir["#{android_path}/build/outputs/apk/*-debug.apk"][0]}")
+              else
+                system_or_die("adb install -r #{Dir["#{android_path}/bin/#{android_name}-debug.apk"][0]}")
+              end
+            end
+          else
+            system_or_die("ant -file '#{android_path}/build.xml' installr")
+          end
         end
 
         private

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-  VERSION = "0.3.17"
+  VERSION = "0.3.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -282,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: HighFive is a set of build scripts and tools for packing HTML5 apps both