high_five 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2FjZTU0YjUwYzZjY2E3ZmJiOTA3NTM1ZDE0NzQ4ZGNlOTU1N2MyNw==
+    MWU1YmFlNWExOGYzNzM1Yzg4NzVjZjE0YmJjMWM1ODc3ZTNkMGI5OQ==
   data.tar.gz: !binary |-
-    ZWU0ZTIzMGI1YzlmMDI0MzhiNjVlMzMwYzk1MDNkMWJkYmRmYTVkMg==
+    OTgxMjUyMThjYzU1ZjcyZDRjYzE5ZmVmZTU3MjU1NmU4ODY4MWVmNg==
 SHA512:
   metadata.gz: !binary |-
-    NzI5YmJjNTYyNjUzYTk2YzIyYTAzNDhlN2FkZTk4MDAyMTdhMGRhYjZlZjFh
-    NWMzNWRhMmRkOWFhYTExM2RlMTM3M2IzM2E4YWViOTU5NTFmYjM3MDZjODlh
-    ZDE1MmEwN2QyOGU1NmY4OTg0ZmIyNTQxNmIyODEyZWFkNzE3YWQ=
+    Nzk0NzYwZjY1ZWMwYzg1Y2EwYjZhMmIwYTFjMWNiZGM2NDhmYWZhYmI3OGVl
+    ZjA3NGRlMjk5ZjkzNDdlMGFlY2Q1MmFkMWMwMThhYTMxNzhjYWQ2ZTZkODUy
+    NzYxZWJiMmU2MTE3NjY1ZjcxODMzYzA0NmQxNmRhZjAxZDEzMzg=
   data.tar.gz: !binary |-
-    ZjQ3NDU2MzQ0ODRiMmIyYjJmMTdhZDFjODk2MmEyYzE2YTA5ZGRhYTkzM2Ix
-    MGEzZDJiNjZiYTI4NzYxMGRkNzQ2YmIxNmQxMjlmYTBkYzlkYjI5ZWFkMTYy
-    NzYyOGUwZmU3MTlkMDg5MWU0OWU4M2I1YTRiMzljNzRkM2E0NWQ=
+    ZDg0ZGIyZWQyZTE2NGMxNjNhNmMyNWUwN2YxMjA5MjQ3ZDhlZDg1Yjk3ZmFi
+    ZWRmZmExNGM3ZTQ0MGU4ZWNhM2FhMDMwMzcwOGRmNGI2NmZjZWU3NGExM2E1
+    ZGQxZTUxNmE4NmE2MzU5OWJiYTg0ZjhlNjE2ZDZiN2E1Njc0OGE=

data/lib/high_five/config.rb

@@ -29,16 +29,18 @@ module HighFive
       @@config_variables = config_variables
     end
 
-    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
-                   :dev_index,    # copy generated index.html to here on build for use in development
-                   :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)
-                   :android_manifest # Path to the android manifest, relative to the project root
+    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
+                   :dev_index,        # copy generated index.html to here on build for use in development
+                   :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)
+                                      # config options below are used in the dist/build tasks
+                   :android_manifest, # Path to the android manifest, relative to the project root
+                   :ios_target        # ios target to be used by dist tasks
 
     def self.configure(&block)
       @@instance = HighFive::Config.new

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

@@ -25,9 +25,11 @@ module HighFive
         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"
+        method_option :environment, :aliases => '-e', :desc => "Set environment"
         def set_version
+          config = base_config.build_platform_config(:android).build_platform_config(options[:environment])
           # read and parse the old file
-          file = File.read(android_manifest_path)
+          file = File.read(config.android_manifest || android_manifest_path)
           xml = Nokogiri::XML(file)
 
           # replace \n and any additional whitespace with a space

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

@@ -14,7 +14,7 @@ module HighFive
         method_option :output_file_name, :aliases => "-o", :desc => "Name of the final output file. Defaults to project_name.apk/ipa"
         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 :target, :desc => "iOS target to build (can also be set in environment)"
         method_option :install, :aliases => "-i", type: :boolean, :desc => "Install on device after building"
         method_option :environment, :aliases => "-e", :desc => "Environemnt [production|development]", :default => "development"
 
@@ -49,7 +49,7 @@ module HighFive
             end
 
             ios_project_name = File.basename(Dir[ios_path + "/*.xcodeproj"].first, '.xcodeproj')
-            ios_target = options[:target] || ios_project_name
+            ios_target = options[:target] || @config.ios_target || ios_project_name
             keychain = ios_project_name.gsub(/\s/, '').gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').tr("-", "_").downcase + '-ios.keychain'
 
             @output_file_name ||= ios_target

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

@@ -12,9 +12,12 @@ module HighFive
         desc "set_version", "build the debug apk via ant debug"
         method_option :version, :aliases => "-v", :desc => "Set main version"
         method_option :build_number, :aliases => '-b', :desc => "set build number"
+        method_option :environment, :aliases => '-e', :desc => "environment"
         method_option :target, :aliases => '-t', :desc => "Use a specific target (i.e. <Target>.plist"
         def set_version
-          info = info_plist_path(options[:target])
+          config = base_config.build_platform_config(:ios).build_platform_config(options[:environment])
+          target = options[:target] || config.ios_target
+          info = info_plist_path(target)
           puts "Using #{info}"
           plist = Plist::parse_xml(info)
 

data/lib/high_five/version.rb

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

metadata

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