high_five 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 192f45c14ceb6b22f3295ec3b67a4286e02c6bbe
-  data.tar.gz: 751b4ba435a73839670b0e707e664f8c5f60f190
+  metadata.gz: 932099f62b8ec28afb959082728cf512dcf606f1
+  data.tar.gz: 464a691c5287be6306ff4d7635621787db9dd1ec
 SHA512:
-  metadata.gz: a941288a80cba76393d45cb6ed86f78c0f8532ee8fb68bc16db9ae4cbeda67ffc33c6635e1175030828aa032befb5135fe25dd07bc1b174741d7c1e284fa071c
-  data.tar.gz: 9353ab1668fed5479928b871c269341bf59defe028a9ec59283b685d9cd731bbc2028ebe4f73c8d0bfe13d9e652455736cfa3ec569c82480f51159d29802638e
+  metadata.gz: ea8f0a5654d386aee3a820b98d645ae0451391e3f68b07ad17203c2bba1ec8b178bf6a1e58c9b635f9435ae8c842b8657aa3ed4dcd71e9bf5106241cdbc7df6b
+  data.tar.gz: feeb0b9091a8fcfb965730f75601479b8363464c402062fca96310ed61e2a861ba1d5dccf925c7a529eb3a3e4819e20583cd66f2cf414bc71d48c86508449c10

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    high_five (0.3.2)
+    high_five (0.3.4)
       chunky_png
       coffee-script (~> 2.2.0)
       compass (~> 0.12.2)
       multi_json (~> 1.0)
       nokogiri (>= 1.5.0)
       plist (>= 3.0)
-      sprockets (>= 2.0)
+      sprockets (~> 2.12.3)
       thor (~> 0.18.0)
       uglifier (~> 2.1.1)
       webrick
@@ -28,8 +28,9 @@ GEM
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
     diff-lcs (1.2.5)
-    execjs (2.5.2)
+    execjs (2.6.0)
     fssm (0.2.10)
+    hike (1.2.3)
     method_source (0.8.2)
     mini_portile (0.6.2)
     multi_json (1.11.2)
@@ -51,9 +52,13 @@ GEM
     rspec-mocks (2.13.1)
     sass (3.2.19)
     slop (3.6.0)
-    sprockets (3.2.0)
+    sprockets (2.12.4)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.18.1)
+    tilt (1.4.1)
     uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)

data/high_five.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "compass", "~>0.12.2"
   s.add_runtime_dependency "yui-compressor", "~>0.12.0"
   s.add_runtime_dependency "uglifier", "~>2.1.1"
-  s.add_runtime_dependency "sprockets", ">=2.0"
+  s.add_runtime_dependency "sprockets", "~>2.12.3"
   s.add_runtime_dependency "coffee-script", "~>2.2.0"
   s.add_runtime_dependency "plist", ">=3.0"
   s.add_runtime_dependency "nokogiri", ">=1.5.0"

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

@@ -52,9 +52,10 @@ module HighFive
             uuid = HighFive::IosHelper.uuid_from_mobileprovision(@provisioning_profile)
             ENV['uuid'] = uuid
             FileUtils.cp(@provisioning_profile, "#{ENV['HOME']}/Library/MobileDevice/Provisioning Profiles/#{uuid}.mobileprovision")
-            system(%Q(cd "#{ios_path}";
+            system_or_die("rm #{ios_path}/build/*")
+            system_or_die(%Q(cd "#{ios_path}";
               /usr/bin/xcodebuild -target "#{ios_target}" -configuration Release clean build "CONFIGURATION_BUILD_DIR=#{ios_path}/build" "CODE_SIGN_IDENTITY=#{@sign_identity}" PROVISIONING_PROFILE=$uuid))
-            system(%Q(/usr/bin/xcrun -sdk iphoneos PackageApplication -v "#{ios_path}/build/#{ios_target}.app" -o "#{ios_path}/build/#{@output_file_name}.ipa" --embed "#{@provisioning_profile}" --sign "#{@sign_identity}"))
+            system_or_die(%Q(/usr/bin/xcrun -sdk iphoneos PackageApplication -v "#{ios_path}/build/#{ios_target}.app" -o "#{ios_path}/build/#{@output_file_name}.ipa" --embed "#{@provisioning_profile}" --sign "#{@sign_identity}"))
           end
         end
 
@@ -64,8 +65,8 @@ module HighFive
         def dist_android(android_path)
           @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' clean release #{ant_flags}")
+          system_or_die("android update project --path #{android_path} --subprojects")
+          system_or_die("ant -file '#{android_path}/build.xml' clean release #{ant_flags}")
 
           android_name = HighFive::AndroidHelper.project_name_from_build_xml("#{android_path}/build.xml")
 
@@ -77,11 +78,18 @@ module HighFive
 
         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")
+          system_or_die("ant -file '#{android_path}/build.xml' installr")
         end
 
         private
 
+        def system_or_die(cmd)
+          system(cmd)
+          if $?.exitstatus != 0
+            exit $?.exitstatus
+          end
+        end
+
         def config
           base_config.build_platform_config(@platform).build_platform_config(@environment)
         end

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

@@ -16,19 +16,29 @@ 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_version
-          if (options[:version])
-            puts "Changing version from #{plist["CFBundleShortVersionString"]} => #{options[:version]}"
-            plist["CFBundleShortVersionString"] = options[:version]
+          if options[:version]
+            set_plist_property "CFBundleShortVersionString", options[:version]
           end
 
-          if (options[:build_number])
-            puts "Changind build number from #{plist["CFBundleVersion"]} => #{options[:build_number]}"
-            plist["CFBundleVersion"] = options[:build_number]
+          if options[:build_number]
+            set_plist_property "CFBundleVersion", options[:build_number]
           end
-          File.open(plist_path, 'w') do |f|
-            f.write(Plist::Emit.dump(plist))
+
+          write_plist
+        end
+
+        desc "set_property", "Set an info.plist property"
+        method_option :key, :aliases => "-k", :desc => "Key to change"
+        method_option :value, :aliases => "-v", :desc => "New value for the specified key"
+        method_option :environment, :aliases => '-e', :desc => "environment"
+        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_property
+          unless options[:key] && options[:value]
+            raise "Need to set key and value options"
           end
-          puts "Wrote #{plist_path} succesfully"
+          set_plist_property options[:key], options[:value]
+          write_plist
         end
 
         desc "set_icon", "Generate app icons from base png image"
@@ -62,6 +72,18 @@ module HighFive
 
         private
 
+        def set_plist_property(key, value)
+          puts "Changing #{key} from #{plist[key]} => #{value}"
+          plist[key] = value
+        end
+
+        def write_plist
+          File.open(plist_path, 'w') do |f|
+            f.write(Plist::Emit.dump(plist))
+          end
+          puts "Wrote #{plist_path} succesfully"
+        end
+
         def target
           options[:target] || base_config.build_platform_config(:ios).build_platform_config(options[:environment]).ios_target
         end

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/dummy/ios/Info.plist

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API Endpoint</key>
+	<string>https://test.api.com/</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.cloudfiveapp.dummy.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>fetch</string>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleLightContent</string>
+	<key>UIStatusBarTintParameters</key>
+	<dict>
+		<key>UINavigationBar</key>
+		<dict>
+			<key>Style</key>
+			<string>UIBarStyleDefault</string>
+			<key>Translucent</key>
+			<false/>
+		</dict>
+	</dict>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

data/spec/ios_tasks_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'chunky_png'
+
+describe HighFive::Thor::Tasks::Ios do
+  include HighFive::TestHelper
+  include HighFive::IosHelper
+
+  before(:all) do
+    create_dummy_app!
+    HighFive::Config.configure do |config|
+      config.root = @project_root
+
+      config.destination = "www"
+      config.platform :ios do |ios|
+        ios.destination = 'ios/www'
+      end
+    end
+  end
+
+  after(:all) do
+    destroy_dummy_app!
+  end
+
+  context "Set version" do
+    it 'updates version number' do
+      cli(HighFive::Thor::Tasks::Ios, version: '2.0').set_version
+      plist = File.read(File.join(@project_root, 'ios', 'Info.plist'))
+      expect(plist).to match(/<key>CFBundleShortVersionString<\/key>\s+<string>2.0<\/string>/)
+    end
+  end
+
+  context "set_property" do
+    it 'updates changes a property' do
+      cli(HighFive::Thor::Tasks::Ios, key: 'Api Endpoint', value: 'https://api.different.com').set_property
+      plist = File.read(File.join(@project_root, 'ios', 'Info.plist'))
+      expect(plist).to match(/<key>Api Endpoint<\/key>\s+<string>https:\/\/api.different.com<\/string>/)
+    end
+
+    it 'adds a new property' do
+            cli(HighFive::Thor::Tasks::Ios, key: 'New Property', value: 'test').set_property
+      plist = File.read(File.join(@project_root, 'ios', 'Info.plist'))
+      expect(plist).to match(/<key>New Property<\/key>\s+<string>test<\/string>/)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -84,16 +84,16 @@ dependencies:
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.12.3
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +246,8 @@ files:
 - spec/dummy/config/high_five/app-web.js
 - spec/dummy/config/high_five/index.html.erb
 - spec/dummy/fake.mobileprovision
+- spec/dummy/ios/Dummy.xcodeproj
+- spec/dummy/ios/Info.plist
 - spec/dummy/javascripts/app.js
 - spec/dummy/javascripts/app/component.js
 - spec/dummy/public/custom_path/custom_app.js
@@ -255,6 +257,7 @@ files:
 - spec/dummy/test_icon.png
 - spec/init_spec.rb
 - spec/ios_helper_spec.rb
+- spec/ios_tasks_spec.rb
 - spec/spec_helper.rb
 - template/config/high_five.rb
 - template/config/high_five/app-common.js
@@ -300,6 +303,8 @@ test_files:
 - spec/dummy/config/high_five/app-web.js
 - spec/dummy/config/high_five/index.html.erb
 - spec/dummy/fake.mobileprovision
+- spec/dummy/ios/Dummy.xcodeproj
+- spec/dummy/ios/Info.plist
 - spec/dummy/javascripts/app.js
 - spec/dummy/javascripts/app/component.js
 - spec/dummy/public/custom_path/custom_app.js
@@ -309,4 +314,5 @@ test_files:
 - spec/dummy/test_icon.png
 - spec/init_spec.rb
 - spec/ios_helper_spec.rb
+- spec/ios_tasks_spec.rb
 - spec/spec_helper.rb