high_five 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f86f1d189b6004fcf4d9a7789cbd3bc0122508b1
-  data.tar.gz: 4aeb3bcac8a145dc620e470bfe1b3aaa2cf3e5d1
+  metadata.gz: 697b43cd0c99875dfad86b3c5fc37a17aa23f6bc
+  data.tar.gz: 30f7fd136bf0957cd7176b1447cdd094ab03527b
 SHA512:
-  metadata.gz: 5b346f72f41ca7c65591307782e91a81f590f605479526ea2661bb8ae8b539a87577440a6a9957caa57ed690c43fc3e4d1b50503b3fadc0f73b4eb1d76982c81
-  data.tar.gz: db63e4acb6a6e52ad9b51061fd7b5068817b01c7ecdf0493cdfd864b41bd7e6439ab5ad16cbac1d974ac50ce8a7cdf3c9e75742697d4aae701ec95b88eb51cf8
+  metadata.gz: 12879143bfd2679e67115533ef97fd19ae5d7c99f71a0b53536be4ad8e8f072da799c5bfeb2821ba2b592042ce03f4dc4b63cb9dceb1d826e1843429ffbb5727
+  data.tar.gz: ed566404e0909c2650a83a859ea8fb2b4659e944ed0915f9301b295646977123b0424f05db915118a610a6bfd8b38a44f5db2e55b1054049ea605e5c96fbaf44

data/lib/high_five/android_helper.rb

@@ -16,6 +16,9 @@ module HighFive
       end
 
       platform_config = base_config.build_platform_config(:android)
+      if options[:environment]
+        platform_config = platform_config.build_platform_config(options[:environment])
+      end
       return platform_config.android_manifest if platform_config.android_manifest
 
       destination_dir = platform_config.destination

data/lib/high_five/image_helper.rb

@@ -0,0 +1,31 @@
+module HighFive
+  module ImageHelper
+
+    # replace the image at path `image` with a resized version of the image at `source`
+    def replace_image(image_path, source_path)
+      image = ChunkyPNG::Image.from_file(image_path)
+
+      if (rmagick?)
+        source = Magick::Image.read(source_path).first
+        resized = source.scale(image.height, image.width)
+        resized.write(image_path)
+      else
+        source = ChunkyPNG::Image.from_file(path)
+        source.resize(image.height, image.width).save(image_path)
+      end
+
+    end
+
+    private
+    def rmagick?
+      @rmagick ||= begin
+        require "rmagick"
+        puts "Using rmagick..."
+        true
+      rescue LoadError
+        puts "using ChunkyPNG..."
+        false
+      end
+    end
+  end
+end

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

@@ -54,10 +54,12 @@ module HighFive
 
         desc "set_icon", "Generate app icons from base png image"
         method_option :platform_path, desc: "Path to the ios or android directory"
+        method_option :environment, :aliases => '-e', :desc => "Set environment"
         def set_icon(path)
           image = ChunkyPNG::Image.from_file(path)
 
           manifest = File.read(android_manifest_path)
+          puts "Using android manifest: #{android_manifest_path}"
           icon_name = manifest.match(/android:icon="@drawable\/(.*?)"/)[1] + '.png'
 
           drawable_dir = File.join File.dirname(android_manifest_path), 'res'

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

@@ -65,7 +65,7 @@ module HighFive
           @output_file_name       = options[:output_file_name]
           ant_flags = options[:"ant-flags"] || ""
           system("android update project --path #{android_path} --subprojects")
-          system("ant -file '#{android_path}/build.xml' release #{ant_flags}")
+          system("ant -file '#{android_path}/build.xml' clean release #{ant_flags}")
 
           android_name = HighFive::AndroidHelper.project_name_from_build_xml("#{android_path}/build.xml")
           if @output_file_name

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

@@ -7,6 +7,7 @@ module HighFive
       class IosTasks < ::HighFive::Thor::Task
         include ::Thor::Actions
         include ::HighFive::IosHelper
+        include ::HighFive::ImageHelper
         namespace :ios
 
         desc "set_version", "build the debug apk via ant debug"
@@ -35,19 +36,20 @@ module HighFive
         method_option :target, :aliases => '-t', :desc => "Use a specific target (i.e. <Target>.plist"
         method_option :platform_path, :desc => "Path to ios or android directory"
         def set_icon(path)
-          image = ChunkyPNG::Image.from_file(path)
-
           icon_files = plist['CFBundleIcons']["CFBundlePrimaryIcon"]["CFBundleIconFiles"]
           icon_files += [ plist['CFBundleIconFile'] ]
           icon_files += plist['CFBundleIcons~ipad']["CFBundlePrimaryIcon"]["CFBundleIconFiles"]
-          
           icon_files.each do |icon_entry|
             icon_file_name = icon_entry
             unless icon_entry.end_with? ".png"
               icon_file_name += ".png"
             end
 
-            old_icon_path = Dir[File.join(ios_path, "**/#{icon_file_name}")].first
+            # look in a directory named after the target first, if it's present
+            # This helps with multi-target apps
+            old_icon_path = Dir[File.join(ios_path, "#{target}/**/#{icon_file_name}")].first 
+            old_icon_path = Dir[File.join(ios_path, "**/#{icon_file_name}")].first if old_icon_path.nil?
+
             if old_icon_path.nil?
               puts "Skipping #{icon_entry} because the file is missing.  This will cause problems with app store submission"
               next
@@ -55,8 +57,8 @@ module HighFive
             print "Replacing #{old_icon_path}..."
             old_image = ChunkyPNG::Image.from_file(old_icon_path)
             puts "#{old_image.width}x#{old_image.height}"
+            replace_image(old_icon_path, path)
             
-            image.resize(old_image.height, old_image.width).save(old_icon_path)
           end
         end
 

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/high_five.rb

@@ -1,5 +1,6 @@
 require "high_five/config"
 require "high_five/version"
+require "high_five/image_helper"
 
 module HighFive
   TEMPLATE_PATH = File.join(File.dirname(__FILE__), '..', 'template')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -206,6 +206,7 @@ files:
 - lib/high_five/cli.rb
 - lib/high_five/config.rb
 - lib/high_five/generators/manifest.erb
+- lib/high_five/image_helper.rb
 - lib/high_five/ios_helper.rb
 - lib/high_five/thor/runner.rb
 - lib/high_five/thor/task.rb