high_five 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODliMzU0MzVmNjgzZGY4NWRlODYwM2RlYzM5MGY5NmIwOGRlM2NmYQ==
-  data.tar.gz: !binary |-
-    YjEzMjcwM2UwNTE5YTJkY2FmNWYzNzVkYzdmN2UwMTRmNDdkMmQzNg==
+SHA1:
+  metadata.gz: e5fc25c5aa37ca5a2283a88b7cb2dad46e66423b
+  data.tar.gz: ca7b7b5583209ff0c92f0c11a94a0d0a0f471410
 SHA512:
-  metadata.gz: !binary |-
-    ZjdmMWVhYjhhOTJhODhhMWZhMTkyODNjNWEyNDRmZTE1NmMzODdiMTFjYjBm
-    MGMwYWVjYzlmYmZiY2VhZjdkMTE0NGUzNTdiZDMxYzE4ZmFhMmEzNjQ3YTRk
-    ZWEyN2QyNGFiNTQzMzFkMDRkMzk0ZTVjYzhlM2Y3MzUyZTljNjQ=
-  data.tar.gz: !binary |-
-    OGRmY2RhMWRmZTgwOTU4YjQwOGFlODU2YmE4ZjdlYWRmMWI2ZTIxYWRjODU2
-    NGI3M2Q5ZWEyOGU3MDFhMmY1NDE1ZGIxNDYwNDE2YTdlMzcwN2I5NmM2ZDNj
-    Yjc3YTEyNzU4MDQwYjZjNjM2YTY3ZWM4YjFhMjljNjZlZTkwZjQ=
+  metadata.gz: c9b5e81d53e7998e4d9c6e1ae3addf200cb39979f9b3f2bb01c93324a36629cc5d9cc22a2fa9a11e027bcc3f12f5cc00036850f105c5a77558e2f1ca52027c68
+  data.tar.gz: eb9756286630d751c54280713f612acfb3db3601b4a3597dbe5b060f321ca22938d5a3c1f6ed0d5e2dce1ffe7b495c55f35e0be232eff481bfa087f9b3732353

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in asdf.gemspec
+# Specify your gem's dependencies in high_five.gemspec
 gemspec

data/Gemfile.lock

@@ -2,6 +2,7 @@ PATH
   remote: .
   specs:
     high_five (0.2.0)
+      chunky_png
       coffee-script (~> 2.2.0)
       compass (~> 0.12.2)
       multi_json (~> 1.0)

data/high_five.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "coffee-script", "~>2.2.0"
   s.add_runtime_dependency "plist", ">=3.0"
   s.add_runtime_dependency "nokogiri", ">=1.5.0"
+  s.add_runtime_dependency "chunky_png"
   s.add_development_dependency "rspec", "~>2.13.0"
 
 

data/lib/high_five/android_helper.rb

@@ -20,5 +20,31 @@ module HighFive
         raise "Couldn't find android manifest near #{destination_dir}" if root_dir == '/'
       end
     end
+
+    def res_map
+      {
+        ldpi: 36,
+        mdpi: 48,
+        hdpi: 72,
+        xhdpi: 96,
+        drawable: 512
+      }
+    end
+
+    def parse_resolution(dir)
+      dir.gsub(/.*\//, '').gsub('drawable-', '').to_sym
+    end
+
+    # drawable_dir: The directory containing drawable/, drawable-hdpi, drawable-mdpi, etc
+    # Returns directories which are present & whose resolutions are supported
+    def valid_directories(drawable_dir)
+      valid_dirs = []
+      Dir.glob(File.join drawable_dir, "drawable*") do |dir|
+        res = parse_resolution(dir)
+        size = res_map[res]
+        valid_dirs << dir unless size.nil?
+      end
+      valid_dirs
+    end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+require 'chunky_png'
 require 'high_five/android_helper'
 require 'nokogiri'
 
@@ -21,7 +22,7 @@ module HighFive
             Buildfile: /Users/Shared/Jenkins/Home/jobs/modern resident/workspace/modern_resident-mobile/android/build.xml')
         end
 
-        desc "set_version", "build the debug apk via ant debug"
+        desc "set_version", "Change the version and build number"
         method_option :version, :aliases => "-v", :desc => "Set main version"
         method_option :build_number, :aliases => '-b', :desc => "set build number"
         def set_version
@@ -48,7 +49,23 @@ module HighFive
             f.write xml.to_xml
           end
         end
+
+        desc "set_icon", "Generate app icons from base png image"
+        def set_icon(path)
+          image = ChunkyPNG::Image.from_file(path)
+
+          manifest = File.read(android_manifest_path)
+          icon_name = manifest.match(/android:icon="@drawable\/(.*?)"/)[1] + '.png'
+
+          drawable_dir = File.join File.dirname(android_manifest_path), 'res'
+          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)}"
+          end
+        end
       end
     end
   end
-end
+end

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

@@ -6,6 +6,7 @@ module HighFive
       class Distribution < ::HighFive::Thor::Task
         include ::Thor::Actions
         include IosHelper
+        include AndroidHelper
 
         default_task :dist
 
@@ -25,20 +26,10 @@ module HighFive
           self.destination_root = @config.destination
 
           if @platform == "android" || @platform == "amazon"
-            path = self.destination_root
-            while path != base_config.root
-              if File.exists? File.join(path, 'AndroidManifest.xml')
-                android_path = path
-                break
-              else
-                path = File.expand_path('..', path)
-              end
-            end
-
-            if !android_path
-              raise "Couldn't find the path of the android manifest."
-            end
+            manifest_path = android_manifest_path
+            android_path = File.dirname(manifest_path)
 
+            system("android update project --path #{android_path} --subprojects")
             system("ant -file '#{android_path}/build.xml' release")
 
             android_name = HighFive::AndroidHelper.project_name_from_build_xml("#{android_path}/build.xml")
@@ -50,7 +41,7 @@ module HighFive
             raise "Please pass in the path to the provisioning profile to build an ios app. -p [provisioning_profile]" if @provisioning_profile.nil?
 
             ios_path = File.dirname(xcodeproj_path())
-            
+
             if !ios_path
               raise "Couldn't find the path of the xcodeproj."
             end

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/android_tasks_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'chunky_png'
+
+describe HighFive::Thor::Tasks::AndroidTasks do
+  include HighFive::TestHelper
+  include HighFive::AndroidHelper
+
+  before(:all) do
+    create_dummy_app!
+    HighFive::Config.configure do |config|
+      config.root = @project_root
+      config.destination = "www"
+      config.platform :android do |android|
+        android.destination = 'android/assets/www'
+      end
+    end
+  end
+
+  after(:all) do
+    destroy_dummy_app!
+  end
+
+  context 'Set icon' do
+    let(:drawable_dir) { File.join(@project_root, 'android', 'res') }
+    before(:all) do
+      cli(HighFive::Thor::Tasks::AndroidTasks).set_icon File.join(@project_root, 'test_icon.png')
+    end
+
+    it 'creates icons for each drawable- folder' do
+      valid_directories(drawable_dir).each do |dir|
+        file = File.join(dir, 'icon.png')
+        expect(file).to exist
+      end
+    end
+
+    it 'creates default in drawable folder' do
+      file = File.join(drawable_dir, 'drawable', 'icon.png')
+      expect(file).to exist
+    end
+
+    it 'resizes to correct dimensions' do
+      valid_directories(drawable_dir).each do |dir|
+        res = parse_resolution(dir)
+        size = res_map[res]
+        file = File.join(dir, 'icon.png')
+        image = ChunkyPNG::Image.from_file(file)
+        expect(image.dimension.height).to eq size
+        expect(image.dimension.width).to eq size
+      end
+    end
+  end
+
+  context "Set version" do
+    it 'updates version number' do
+      cli(HighFive::Thor::Tasks::AndroidTasks, version: '2.0').set_version
+      manifest = File.read(File.join(@project_root, 'android', 'AndroidManifest.xml'))
+      expect(manifest).to match(/android:versionName="2.0"/)
+    end
+  end
+end

data/spec/deploy_spec.rb

@@ -1,37 +1,19 @@
 require 'spec_helper'
 
-describe HighFive::Thor::Tasks::Deploy do 
-  def create_dummy_app!
-    @original_dir = Dir.pwd
-    @project_root = Dir.mktmpdir("hi5")
-    Dir.chdir @project_root
-    FileUtils.cp_r(Dir[File.join(File.dirname(__FILE__), "dummy", "*")], @project_root)
-  end
-
-  def cli(options={environment: 'development'})
-    cli = HighFive::Thor::Tasks::Deploy.new([], options)
-    cli.instance_variable_set("@base_config", HighFive::Config.instance)
-    cli
-  end
+describe HighFive::Thor::Tasks::Deploy do
+  include HighFive::TestHelper
 
-  def destroy_dummy_app!
-    puts "Cleaning up deploy directory.  Contents: "
-    system("find #{@project_root} -print | sed 's;[^/]*/;|___;g;s;___|; |;g'")
-    Dir.chdir @original_dir
-    FileUtils.rm_rf @project_root
-  end
-    
   context "Basic Deployment" do
-    before :all do  
+    before :all do
       create_dummy_app!
       HighFive::Config.configure do |config|
         config.root = @project_root
         config.destination = "www"
         config.platform :android do |android|
-        
+
         end
       end
-      cli.deploy("android")
+      cli(HighFive::Thor::Tasks::Deploy).deploy("android")
     end
 
     after(:all) { destroy_dummy_app! }
@@ -47,7 +29,7 @@ describe HighFive::Thor::Tasks::Deploy do
 
   end
 
-  context "SASS Deployment" do 
+  context "SASS Deployment" do
     before :all do
       create_dummy_app!
       HighFive::Config.configure do |config|
@@ -56,25 +38,25 @@ describe HighFive::Thor::Tasks::Deploy do
         config.compass_dir = "."
         config.assets "stylesheets"
         config.platform :android do |android|
-        
+
         end
       end
-      cli.deploy("android")
+      cli(HighFive::Thor::Tasks::Deploy).deploy("android")
     end
 
     after(:all) { destroy_dummy_app! }
 
-    it "should invoke compass to compile stylesheets" do 
+    it "should invoke compass to compile stylesheets" do
       expect(File.join(@project_root, "stylesheets", "sass.css")).to exist
       expect(File.join(@project_root, "www", "stylesheets", "sass.css")).to exist
     end
 
-    it "should copy the css sheets to the deploy directory" do 
+    it "should copy the css sheets to the deploy directory" do
       expect(File.join(@project_root, "www", "stylesheets", "screen.css")).to exist
     end
   end
 
-  context "Development environment" do 
+  context "Development environment" do
     before :all do
       create_dummy_app!
       HighFive::Config.configure do |config|
@@ -87,19 +69,19 @@ describe HighFive::Thor::Tasks::Deploy do
           config.dev_index "index-debug.html"
         end
       end
-      cli.deploy("web")
+      cli(HighFive::Thor::Tasks::Deploy).deploy("web")
     end
 
     after(:all) { destroy_dummy_app! }
 
-    it "should clone index.html to index-debug.html when directed" do 
+    it "should clone index.html to index-debug.html when directed" do
       index = File.read(File.join(@project_root, "www-web", "index.html"))
       index_debug = File.read(File.join(@project_root, "index-debug.html"))
       index.should eq index_debug
     end
   end
 
-  context "Production environment" do 
+  context "Production environment" do
     before :all do
       create_dummy_app!
       HighFive::Config.configure do |config|
@@ -114,20 +96,20 @@ describe HighFive::Thor::Tasks::Deploy do
         config.environment :production do |prod|
           prod.minify = :yui
         end
-        
+
       end
-      cli(environment: 'production').deploy("web")
+      cli(HighFive::Thor::Tasks::Deploy, environment: 'production').deploy("web")
     end
 
     after(:all) { destroy_dummy_app! }
 
-    it "should produce just one javascript file" do 
+    it "should produce just one javascript file" do
       expect(File.join(@project_root, "www", "app.js")).to exist
     end
-    it "should not clone index.html to index-debug.html" do 
+    it "should not clone index.html to index-debug.html" do
       File.exist?(File.join(@project_root, "index-debug.html")).should be_false
     end
-    it "should generate an html manifest" do 
+    it "should generate an html manifest" do
       expect(File.join(@project_root, "www", "manifest.appcache")).to exist
     end
   end
@@ -141,9 +123,9 @@ describe HighFive::Thor::Tasks::Deploy do
         config.asset_paths = ["public/custom_path"]
         config.platform :custom_asset_paths do |custom_asset_paths|
         end
-        
+
       end
-      cli.deploy("custom_asset_paths")
+      cli(HighFive::Thor::Tasks::Deploy).deploy("custom_asset_paths")
     end
 
     after(:all) { destroy_dummy_app! }
@@ -157,4 +139,4 @@ describe HighFive::Thor::Tasks::Deploy do
     end
   end
 
-end
+end

data/spec/dummy/android/AndroidManifest.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.tenforwardconsulting.highfive.dummy" android:versionName="1.0" android:versionCode="1" android:hardwareAccelerated="true">
+    <supports-screens android:largeScreens="true" android:normalScreens="true" android:smallScreens="true" android:xlargeScreens="true" android:resizeable="true" android:anyDensity="true"/>
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17"/>
+    <application android:icon="@drawable/icon">
+      <activity android:name="HighFiveActivity" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+    </application>
+
+</manifest>

data/spec/spec_helper.rb

@@ -24,4 +24,26 @@ RSpec::Matchers.define :exist do
   match do |actual|
     File.exists?(actual)
   end
-end
+end
+
+module HighFive::TestHelper
+  def create_dummy_app!
+    @original_dir = Dir.pwd
+    @project_root = Dir.mktmpdir("hi5")
+    Dir.chdir @project_root
+    FileUtils.cp_r(Dir[File.join(File.dirname(__FILE__), "dummy", "*")], @project_root)
+  end
+
+  def cli(task_class, options={environment: 'development'})
+    cli = task_class.new([], options)
+    cli.instance_variable_set("@base_config", HighFive::Config.instance)
+    cli
+  end
+
+  def destroy_dummy_app!
+    puts "Cleaning up deploy directory.  Contents: "
+    system("find #{@project_root} -print | sed 's;[^/]*/;|___;g;s;___|; |;g'")
+    Dir.chdir @original_dir
+    FileUtils.rm_rf @project_root
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -84,14 +84,14 @@ dependencies:
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -112,30 +112,44 @@ dependencies:
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -150,8 +164,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
-description: ! "Build, minify, and deal with different platforms and environments
-  for your HTML5 app.\n    This is often used with PhoneGap but designed not to require
+description: "Build, minify, and deal with different platforms and environments for
+  your HTML5 app.\n    This is often used with PhoneGap but designed not to require
   it, and high_five can be used to deploy any kind of HTML/JS/CSS-based\n    application
   that requires different deployment configurations.\n  "
 email:
@@ -189,8 +203,10 @@ files:
 - lib/high_five/thor/tasks/ios_tasks.rb
 - lib/high_five/version.rb
 - spec/android_helper_spec.rb
+- spec/android_tasks_spec.rb
 - spec/config_spec.rb
 - spec/deploy_spec.rb
+- spec/dummy/android/AndroidManifest.xml
 - spec/dummy/build.xml
 - spec/dummy/config.rb
 - spec/dummy/config/high_five.rb
@@ -207,6 +223,7 @@ files:
 - spec/dummy/public/custom_path/custom_app/controllers/custom_controller.js
 - spec/dummy/sass/sass.scss
 - spec/dummy/stylesheets/screen.css
+- spec/dummy/test_icon.png
 - spec/init_spec.rb
 - spec/ios_helper_spec.rb
 - spec/spec_helper.rb
@@ -223,12 +240,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -240,8 +257,10 @@ summary: HighFive is a set of build scripts and tools for packing HTML5 apps bot
   for the web and for phonegap
 test_files:
 - spec/android_helper_spec.rb
+- spec/android_tasks_spec.rb
 - spec/config_spec.rb
 - spec/deploy_spec.rb
+- spec/dummy/android/AndroidManifest.xml
 - spec/dummy/build.xml
 - spec/dummy/config.rb
 - spec/dummy/config/high_five.rb
@@ -258,6 +277,7 @@ test_files:
 - spec/dummy/public/custom_path/custom_app/controllers/custom_controller.js
 - spec/dummy/sass/sass.scss
 - spec/dummy/stylesheets/screen.css
+- spec/dummy/test_icon.png
 - spec/init_spec.rb
 - spec/ios_helper_spec.rb
 - spec/spec_helper.rb