high_five 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTAyMzUzMWYxNDFiMzc0NzEzMzQyNTQ0ZThjY2MwMGMzY2EzZTQwZA==
+    N2FjZTU0YjUwYzZjY2E3ZmJiOTA3NTM1ZDE0NzQ4ZGNlOTU1N2MyNw==
   data.tar.gz: !binary |-
-    MjZjMmY4N2Q1ZTdlZjkwYzBiMDAzMjFiN2RlY2RmMzg4MDJlZjJhMg==
+    ZWU0ZTIzMGI1YzlmMDI0MzhiNjVlMzMwYzk1MDNkMWJkYmRmYTVkMg==
 SHA512:
   metadata.gz: !binary |-
-    ZGNlY2QyZDEwNDRiMzJiYjRjZDM4ZjY4YmZkZWZmNDA1YWExN2M5ZTJhMWQ3
-    MGQ0M2Y4ZjYxNGM1ZjVmNDc4NTM5NDc1YzYyYjYyMmQ2ODRlNDUxZjQ3YmJk
-    NWQ2Y2QzMjVhZjU1YmZhOWFmODZiNTMwODNhODNkOTZkM2QzZDY=
+    NzI5YmJjNTYyNjUzYTk2YzIyYTAzNDhlN2FkZTk4MDAyMTdhMGRhYjZlZjFh
+    NWMzNWRhMmRkOWFhYTExM2RlMTM3M2IzM2E4YWViOTU5NTFmYjM3MDZjODlh
+    ZDE1MmEwN2QyOGU1NmY4OTg0ZmIyNTQxNmIyODEyZWFkNzE3YWQ=
   data.tar.gz: !binary |-
-    YzYyZjk0YzA2MTQ3ZmE5ZDA4NDBmOGJmY2IwZGI4ZTdkNjJlNTUwMjM0NDQ2
-    NzNjNDI3OTQyYTMwNTFjZWNmYzhlNmQyYTc2Njg5OGYzZWRjMzMzYjJmY2Rm
-    MTM4NmMyYmQxNGQwYTU5YWE1MjQ1YWEwMTFkY2U0YjI5NzMzNDI=
+    ZjQ3NDU2MzQ0ODRiMmIyYjJmMTdhZDFjODk2MmEyYzE2YTA5ZGRhYTkzM2Ix
+    MGEzZDJiNjZiYTI4NzYxMGRkNzQ2YmIxNmQxMjlmYTBkYzlkYjI5ZWFkMTYy
+    NzYyOGUwZmU3MTlkMDg5MWU0OWU4M2I1YTRiMzljNzRkM2E0NWQ=

data/lib/high_five/config.rb

@@ -13,7 +13,7 @@ module HighFive
 
 
     # shorthand for me to define lots and lots of config settings that need to be handled
-    # as attr_accessible, settable via setting(blah) instead of settings=blah, and also 
+    # as attr_accessible, settable via setting(blah) instead of settings=blah, and also
     # persisted to derived platform configs
     def self.config_setting(*settings)
       config_variables = []
@@ -29,7 +29,7 @@ module HighFive
       @@config_variables = config_variables
     end
 
-    config_setting :root,         # Root of the project 
+    config_setting :root,         # Root of the project
                    :destination,  # generated folder for project('www')
                    :page_title,   # <title>#{page_title}</title>
                    :compass_dir,  # directory that contaings compass' config.rb
@@ -37,9 +37,10 @@ module HighFive
                    :minify,       # defaults to true in production mode and false otherwise, overridable
                    :manifest,     # generate html5 manifest
                    :app_name,     # App Name
-                   :app_id        # App id (com.tenforwardconsulting.myapp)
+                   :app_id,        # App id (com.tenforwardconsulting.myapp)
+                   :android_manifest # Path to the android manifest, relative to the project root
 
-    def self.configure(&block) 
+    def self.configure(&block)
       @@instance = HighFive::Config.new
       yield @@instance
 
@@ -54,7 +55,7 @@ module HighFive
       rescue LoadError
         raise "high_five configuration not found, forgot to run 'hi5 init'?"
       end
-      return @@instance 
+      return @@instance
     end
 
     def self.instance
@@ -78,7 +79,7 @@ module HighFive
             new_config.instance_variable_set(svar, self.instance_variable_get(svar))
           end
         end
-        new_config.js_settings.merge! self.js_settings do |key, new_setting, old_setting| 
+        new_config.js_settings.merge! self.js_settings do |key, new_setting, old_setting|
           new_setting || old_setting #don't clobber settings from the parent
         end
         new_config.platform_configs = @platform_configs.reject do |key, platform_config|
@@ -122,7 +123,7 @@ module HighFive
         @js_settings = {}
       end
       @is_environment = false
-    end 
+    end
 
     def assets(path)
       @static_assets << path.dup
@@ -132,7 +133,7 @@ module HighFive
       @static_javascripts << path.dup
     end
 
-    def sass(path) 
+    def sass(path)
       @sass_files << path.dup
     end
 
@@ -173,4 +174,4 @@ module HighFive
     end
 
   end
-end
+end

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

@@ -15,7 +15,11 @@ module HighFive
         method_option :sign_identity, :aliases => "-s", :desc => "Full name of the code sign identity for use by xcode"
         method_option :provisioning_profile, :aliases => "-p", :desc => "Path to the provisioning profile"
         method_option :target, :desc => "iOS target to build"
+        method_option :install, :aliases => "-i", type: :boolean, :desc => "Install on device after building"
+        method_option :environment, :aliases => "-e", :desc => "Environemnt [production|development]", :default => "development"
+
         def dist(platform)
+          @environment            = options[:environment]
           @output_file_name       = options[:output_file_name]
           @sign_identity          = options[:sign_identity]
           @provisioning_profile   = options[:provisioning_profile]
@@ -27,10 +31,13 @@ module HighFive
           self.destination_root = @config.destination
 
           if @platform == "android" || @platform == "amazon"
-            manifest_path = android_manifest_path
+            manifest_path = @config.android_manifest || android_manifest_path
             android_path = File.dirname(manifest_path)
 
             dist_android(android_path)
+            if options[:install]
+              install_android android_path
+            end
           elsif @platform == "ios"
             raise "Please pass in the code sign identity to build an ios app. -s [sign_identity]" if @sign_identity.nil?
             raise "Please pass in the path to the provisioning profile to build an ios app. -p [provisioning_profile]" if @provisioning_profile.nil?
@@ -68,7 +75,12 @@ module HighFive
             FileUtils.cp("#{android_path}/bin/#{android_name}-release.apk", "#{android_path}/bin/#{@output_file_name}.apk")
           end
         end
+
+        desc "install_android [ANDROID_PATH]", "Install the distribution package on the connected android device or emulator"
+        def install_android(android_path)
+          system("ant -file '#{android_path}/build.xml' installr")
+        end
       end
     end
   end
-end
+end

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-  VERSION = "0.2.3"
-end
+  VERSION = "0.2.4"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json