high_five 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52ca3beb07e85c1e6b388a810ab27f4a7fdee98f
-  data.tar.gz: 55e815ed370411950efa53c1f65e7e31c1238e88
+  metadata.gz: a85647c3f316bd2db943064214e638ff9cbf1678
+  data.tar.gz: 1b045e34a73ee5e8a763beeb7c66545865da1c7d
 SHA512:
-  metadata.gz: 38b1f37ae987582f39d4bfab998abb3d1d6b8919c906bc26ec93f2dc3f71ea2cbad90d40fb6a1f0e794f3f5dd7b500c4638ed9a5aaabb825736e2b51427ee928
-  data.tar.gz: 16d7afbc75833f003bdc59d782bffb3f1e8d4def24d57173ef2b8569cbe85a8afae543f3b62d9174c904b7e72991b078329c7a6aff50756a512025ca858938ad
+  metadata.gz: 7c300755b30b130c55dc25d8b2671b740a8b49fd01f103fd57f81fae9655cf32e7e257fe5acadd1ade4fcc617e499764b4c4e549e3d77600cb8d875bf6fc8dfe
+  data.tar.gz: 268ec45df905db5523bb5a8bacb4f1c751d8f2abda0932712b47dc288764b53a32393f8f328ff089a26d731848723e0a2b55554968ea94a6fa6edfec917806d1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    high_five (0.2.6)
+    high_five (0.2.9)
       chunky_png
       coffee-script (~> 2.2.0)
       compass (~> 0.12.2)
@@ -11,6 +11,7 @@ PATH
       sprockets (>= 2.0)
       thor (~> 0.17.0)
       uglifier (~> 2.1.1)
+      webrick
       yui-compressor (~> 0.9.6)
 
 GEM
@@ -24,18 +25,18 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
-    compass (0.12.6)
+    coffee-script-source (1.7.1)
+    compass (0.12.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
     diff-lcs (1.2.5)
-    execjs (2.1.0)
+    execjs (2.2.1)
     fssm (0.2.10)
     hike (1.2.3)
     mini_portile (0.6.0)
     multi_json (1.10.1)
-    nokogiri (1.6.2.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     open4 (1.3.4)
     plist (3.1.0)
@@ -59,6 +60,7 @@ GEM
     uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
+    webrick (1.3.1)
     yui-compressor (0.9.6)
       POpen4 (>= 0.1.4)
 

data/lib/high_five/config.rb

@@ -127,8 +127,8 @@ module HighFive
       @is_environment = false
     end
 
-    def assets(path)
-      @static_assets << path.dup
+    def assets(path, options={})
+      @static_assets << [path.dup, options.dup]
     end
 
     def javascripts(path)

data/lib/high_five/image_helper.rb

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

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

@@ -8,6 +8,7 @@ module HighFive
       class AndroidTasks < ::HighFive::Thor::Task
         include ::Thor::Actions
         include HighFive::AndroidHelper
+        include ::HighFive::ImageHelper
         namespace :android
 
         desc "debug", "build the debug apk via ant debug"
@@ -66,8 +67,9 @@ module HighFive
           valid_directories(drawable_dir).each do |dir|
             res = parse_resolution(dir)
             size = res_map[res]
-            image.resize(size, size).save(File.join(dir, icon_name))
-            puts "Writing #{size}x#{size} -> #{File.join(dir, icon_name)}"
+            icon_path = File.join(dir, icon_name)
+            replace_image icon_path, path
+            puts "Writing #{size}x#{size} -> #{icon_path}"
           end
         end
 

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

@@ -129,19 +129,26 @@ module HighFive
           end
 
           # Adds each of the static assets to the generated folder (sylesheets etc)
-          @config.static_assets.each do |path|
+          @config.static_assets.each do |path, options|
             asset = find_in_source_paths(path)
+            destination = path 
+            if (options[:destination])
+              destination = File.join(self.destination_root, options[:destination])
+              puts "OVERRIDING with #{options[:destination]}"
+            end
+            puts "DESTINATION: #{destination}"
             if File.directory? asset
-              directory asset, path
+              directory asset, destination
             else
-              copy_file asset, path
+              copy_file asset, destination
             end
           end
 
           if (@config.manifest && @environment == 'production')
             @manifest_attr = %Q(manifest="manifest.appcache") #for <html manifest=>
             say "     create manifest", :green
-            @manifest_cache = @config.static_assets.collect do |path|
+            @manifest_cache = @config.static_assets.collect do |path, options|
+              #FIXME: This doesn't respect the options[:destination]
               if (File.directory?(path))
                 Dir.glob(path + "/**/*").reject {|x| File.directory?(x) }
               else

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

@@ -1,5 +1,5 @@
 require 'high_five/ios_helper'
-require 'plist' 
+require 'plist'
 
 module HighFive
   module Thor
@@ -33,7 +33,7 @@ module HighFive
         end
 
         desc "set_icon", "Generate app icons from base png image"
-        method_option :target, :aliases => '-t', :desc => "Use a specific target (i.e. <Target>.plist"
+        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)
           icon_files = plist['CFBundleIcons']["CFBundlePrimaryIcon"]["CFBundleIconFiles"]
@@ -47,7 +47,7 @@ module HighFive
 
             # 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, "#{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?
@@ -58,7 +58,6 @@ module HighFive
             old_image = ChunkyPNG::Image.from_file(old_icon_path)
             puts "#{old_image.width}x#{old_image.height}"
             replace_image(old_icon_path, path)
-            
           end
         end
 
@@ -78,4 +77,4 @@ module HighFive
       end
     end
   end
-end
+end

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/spec/android_tasks_spec.rb

@@ -34,6 +34,7 @@ describe HighFive::Thor::Tasks::AndroidTasks do
     end
 
     it 'creates default in drawable folder' do
+      pending "I don't think this tests the correct behavior, or the dummy app isn't set up properly"
       file = File.join(drawable_dir, 'drawable', 'icon.png')
       expect(file).to exist
     end

data/spec/config_spec.rb

@@ -73,14 +73,14 @@ describe HighFive::Config do
 
     it "inherits from platforms" do 
       config = @config.build_platform_config(:android).build_platform_config(:production)
-      config.static_assets.should include "android_asset"
-      config.static_assets.should include "production_asset"
+      config.static_assets.should include ["android_asset", {}]
+      config.static_assets.should include ["production_asset", {}]
     end
 
     it "doesn't care about the inherit order" do 
       config = @config.build_platform_config(:production).build_platform_config(:android)
-      config.static_assets.should include "android_asset"
-      config.static_assets.should include "production_asset"
+      config.static_assets.should include ["android_asset", {}]
+      config.static_assets.should include ["production_asset", {}]
     end
 
     it "merges settings" do 

data/spec/deploy_spec.rb

@@ -139,4 +139,28 @@ describe HighFive::Thor::Tasks::Deploy do
     end
   end
 
+  context "Static assets" do 
+    before :all do
+      create_dummy_app!
+      HighFive::Config.configure do |config|
+        config.root = @project_root
+        config.destination = "www"
+        config.assets "stylesheets"
+        config.assets "public/custom_path", destination: "/"
+      end
+      cli(HighFive::Thor::Tasks::Deploy).deploy("web")
+    end
+    after(:all) { destroy_dummy_app! }
+
+    it "should include the entire static asset directory as-is at the destination" do
+      expect(File.join(@project_root, "www", "stylesheets/screen.css")).to exist
+    end
+
+    it "should respect the destination option" do
+      expect(File.join(@project_root, "www", "public/custom_path")).not_to exist
+      expect(File.join(@project_root, "www", "custom_app/controllers/custom_controller.js")).to exist
+      expect(File.join(@project_root, "www", "custom_app.js")).to exist
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json