longbow 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f95934d5cf17c32f132c28f1bcf58cf55c792a
-  data.tar.gz: b5c3aecf5eebabeb4382b3a6462d9791049c2760
+  metadata.gz: 46fbbd327d526495745c97c3cc037053119370ec
+  data.tar.gz: 4656656db3a2dff91be06591fa333ff3edd41427
 SHA512:
-  metadata.gz: de4004db97b741fb0e69c4931126d37a1310924bd204837e6a059d39fd3a9f7834d49c6de28dc88937cf0afe162220531a991bf22ac94ea969eb5ed98172b30c
-  data.tar.gz: 9e22e2301503257cefd03ad33e00c26bc14f08256673857aa1084d901bf9d8c4448b77db16cefd972308f4edec7c928281ba169e662b8ef78c3ef040a009386d
+  metadata.gz: 13dea7fb7afdbb1e0d06516e62b9601b5de7baa6ae08f6d8060606cb51753380227e337dbaeef9d4d0394d609aa7d8f64818102efda85648a6d16a0a7afcf3a9
+  data.tar.gz: 669a8a1a5393692c6a2808dc053a3c5fc61e0ceb8b95c64070882415ea96fe7f258cb7e39df9c265b2e680993614356be925345dba5a50a5a8e2b5f2ab32add1

data/README.md

@@ -109,6 +109,7 @@ If you leave off the `-n` option, it will run for all targets in the `longbow.js
 
 * `-d, --directory` - if not in the current directory, specify a new path
 * `-u, --url` - the url of a longbow formatted JSON file
+* `-i, --images` - set this flag to not recreate images in the longbow file
 
 `longbow shoot -n NameOfTarget -d ~/Path/To/App -u http://someurl.com/longbow.json`
 

data/lib/longbow/commands/aim.rb

@@ -13,6 +13,7 @@ command :aim do |c|
   c.option '-d', '--directory DIRECTORY', 'Path where the .xcodeproj or .xcworkspace file && the longbow.json file live.'
   c.option '-u', '--url URL', 'URL of a longbow formatted JSON file.'
   c.option '-n', '--name NAME', 'Name of the target to get a screenshot for.'
+  c.option '-v', '--verbose', 'Output all logs from UIAutomation/xcodebuild'
 
   c.action do |args, options|
     # Check for newer version
@@ -55,16 +56,16 @@ command :aim do |c|
     resources_path = File.dirname(__FILE__) + '/../../../resources'
 
     FileUtils.cp "#{resources_path}/capture.js", "capture.js"
-
+    FileUtils.cp "#{resources_path}/config-screenshots.sh", "config-screenshots.sh"
+    FileUtils.cp "#{resources_path}/ui-screen-shooter.sh", "ui-screen-shooter.sh"
+    FileUtils.cp "#{resources_path}/unix_instruments.sh", "unix_instruments.sh"
+    @target_names = []
     @targets.each do |t|
-      Longbow::blue "  Running screenshooter for #{t['name']}"
-      begin
-        `#{resources_path}/ui-screen-shooter.sh ~/Desktop/screenshots/#{t['name']} #{t['name']} #{@script}`
-      rescue
-        Longbow::red "Failed while running screenshooter for #{t['name']}"
-      end
+      @target_names << t['name']
     end
-
-    FileUtils.rm "capture.js"
+    target_string = @target_names.join(',')
+    Longbow::blue "  Beginning screenshots..."
+    exec "#{resources_path}/aim.sh #{target_string} verbose" if options.verbose
+    exec "#{resources_path}/aim.sh #{target_string}" if !options.verbose
   end
 end

data/lib/longbow/targets.rb

@@ -83,7 +83,7 @@ module Longbow
     deployment_target = main_target.deployment_target
 
     # Create New Target
-    new_target = Xcodeproj::Project::ProjectHelper.new_target project, :application, target, :ios, deployment_target, project.products_group
+    new_target = Xcodeproj::Project::ProjectHelper.new_target project, :application, target, :ios, deployment_target, project.products_group, 'en'
     if new_target
       # Add Build Phases
       main_target.build_phases.objects.each do |b|

data/lib/longbow/version.rb

@@ -2,7 +2,7 @@ $:.push File.expand_path('../', __FILE__)
 require 'colors'
 
 module Longbow
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 
   def self.check_for_newer_version
     unless Gem.latest_version_for('longbow').to_s == VERSION

data/resources/aim.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+set -e  # Bomb on any script errors
+target_string="$1"
+verbose=false
+if [ -n "$2" ]; then
+  verbose=true
+fi
+
+function main {
+	# Get targets into an array, run 'em
+	IFS=',' read -a targets <<< "$target_string"
+	for target in "${targets[@]}"; do
+		_run_target $target;
+	done
+	# Remove files added by ruby script
+	rm "capture.js"
+	rm "config-screenshots.sh"
+	rm "ui-screen-shooter.sh"
+	rm "unix_instruments.sh"
+}
+
+function _run_target {
+	echo "  Running $1"
+	if [ "$verbose" = true ]; then
+		source ui-screen-shooter.sh "$HOME/Desktop/screenshots/$1" "$1"
+	else
+		source ui-screen-shooter.sh "$HOME/Desktop/screenshots/$1" "$1" >/dev/null 2>/dev/null
+	fi
+}
+
+main

data/resources/capture.js

@@ -18,6 +18,25 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+var kPortraitString = "portrait"
+var kLandscapeString = "landscape"
+
+var kMaxDimension4inch = 568;
+var kMaxDimension4point7inch = 667;
+var kMaxDimension5point5inch = 736;
+
+// rectMaxSizeMatchesPhoneWithMaxDimensionForOrientation(rect, maxDimension, orientation)
+//
+// Returns whether the given rect matches a given max dimension in a particular orientation.
+//
+// `rect` is the rectangle representing the image size you want to check
+// `maxDimension` is the size of the longest side of the screen on a given device
+// `orientation` is...well...duh!
+//
+function rectMaxSizeMatchesPhoneWithMaxDimensionForOrientation(rect, maxDimension, orientation) {
+  return (orientation == kPortraitString && rect.size.height == maxDimension) || (orientation == kLandscapeString && rect.size.width == maxDimension)
+}
+
 // captureLocalizedScreenshot(name)
 //
 // Tells the local target to take a screen shot and names the file after the
@@ -38,13 +57,22 @@ function captureLocalizedScreenshot(name) {
   var model = target.model();
   var rect = target.rect();
 
-  var orientation = "portrait";
-  if (rect.size.height < rect.size.width) orientation = "landscape";
+  var orientation = kPortraitString;
+  if (rect.size.height < rect.size.width) {
+    orientation = kLandscapeString;
+  }
 
   if (model.match(/iPhone/)) {
-    if ((orientation == "portrait" && rect.size.height > 480) || (orientation == "landscape" && rect.size.width > 480)) {
+    if (rectMaxSizeMatchesPhoneWithMaxDimensionForOrientation(rect, kMaxDimension4inch, orientation)) {
       model = "iOS-4-in";
-    } else {
+    }
+    else if (rectMaxSizeMatchesPhoneWithMaxDimensionForOrientation(rect, kMaxDimension4point7inch, orientation)) {
+      model = "iOS-4.7-in";
+    }
+    else if (rectMaxSizeMatchesPhoneWithMaxDimensionForOrientation(rect, kMaxDimension5point5inch, orientation)) {
+      model = "iOS-5.5-in";
+    }
+    else {
       model = "iOS-3.5-in";
     }
   } else {
@@ -54,4 +82,3 @@ function captureLocalizedScreenshot(name) {
   var parts = [model, orientation, name];
   target.captureScreenWithName(parts.join("___"));
 }
-

data/resources/config-screenshots.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+# This is an example configuration file to be used with ui-screen-shooter
+# It is designed to work with the Hello World International application
+# Please copy to config-screenshots.sh and edit for your needs
+
+
+# LOCALE
+# ======
+# Set the locales here in which your screenshots should be made.
+# Use format like en-US zh-Hans for filenames compatible with iTMSTransporter
+# Note: to get the locale names for your existing app:
+#  - Download .itmsp file with iTMSTransporter
+#  - Run `grep locale ~/Desktop/*.itmsp/metadata.xml  | grep name | sort -u`
+
+export languages="en-US"
+
+
+# SIMULATORS
+# ==========
+# The simulators we want to run the script against, declared as a Bash array.
+# Run `instruments -s devices` to get a list of all the possible string values.
+
+declare -xa simulators=(
+"iPhone 6 (8.1 Simulator)",
+"iPhone 6 Plus (8.1 Simulator)",
+"iPhone 5S (8.1 Simulator)",
+"iPhone 4S (8.1 Simulator)"
+)

data/resources/ui-screen-shooter.sh

@@ -28,33 +28,28 @@ destination="$1"
 scheme_name="$2"
 ui_script="$3"
 
-# The locale identifiers for the languages you want to shoot
-# Use the format like en-US zh-Hans for filenames compatible with iTunes
-# connect upload tool
-# FYI: get the locale names for you existing app with iTMSTransporter and: 
-# grep locale ~/Desktop/*.itmsp/metadata.xml  | grep name | sort -u
-languages="en-US"
-
-# The simulators we want to run the script against, declared as a Bash array.
-# Run `instruments -w help` to get a list of all the possible string values.
-#declare -a simulators=(
-#"iPhone Retina (3.5-inch) - Simulator - iOS 7.1"
-#"iPhone Retina (4-inch) - Simulator - iOS 7.1"
-#"iPad Retina - Simulator - iOS 7.1"
-#)
-declare -a simulators=(
-"iPhone 4s"
-"iPhone 5s"
-"iPhone 6"
-"iPhone 6 Plus"
-)
-
 function main {
+  # Load configuration
+  # Not in a separate function because you can't exort arrays
+  # https://stackoverflow.com/questions/5564418/exporting-an-array-in-bash-script
+  # Will export languages and simulators bash variables
+  export UISS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+  if [ -f "$UISS_DIR"/config-screenshots.sh ]; then
+    source "$UISS_DIR"/config-screenshots.sh
+  else
+    if [ -f "$UISS_DIR"/config-screenshots.example.sh ]; then
+      source "$UISS_DIR"/config-screenshots.example.sh
+      echo "WARNING: Using example config-screenshots file, you should create your own"
+    else
+      echo "Configuration \"config-screenshots.sh\" does not exist! Aborting."
+      exit 1
+    fi
+  fi
+
   _check_destination
   _check_ui_script
   _check_scheme_name
   _xcode clean build
-  _reset_sim
 
   for simulator in "${simulators[@]}"; do
     for language in $languages; do
@@ -92,11 +87,16 @@ function _check_ui_script {
   # Abort if the UI script does not exist.
 
   if [ -z "$ui_script" ]; then
-    ui_script="./shoot_the_screens.js"
+    ui_script="./config-automation.js"
   fi
   if [ ! -f "$ui_script" ]; then
-    echo "UI script \"$ui_script\" does not exist! Aborting."
-    exit 1
+    if [ -f "./config-automation.example.js" ]; then
+      ui_script="./config-automation.js"
+      echo "WARNING: Using example config-automation, please create your own"
+    else
+      echo "Config-automation does not exist! Aborting."
+      exit 1
+    fi
   fi
 }
 
@@ -121,7 +121,8 @@ function _xcode {
     # or how I became to know this fact
     xcodebuild -sdk "iphonesimulator$ios_version" \
       CONFIGURATION_BUILD_DIR="$build_dir/build" \
-      -workspace $base.xcworkspace -scheme $scheme_name -configuration AdHoc \
+      -workspace "$base.xcworkspace" -scheme "$scheme_name" -configuration Debug \
+      PRODUCT_NAME="$scheme_name" \
       DSTROOT=$build_dir \
       OBJROOT=$build_dir \
       SYMROOT=$build_dir \
@@ -129,14 +130,15 @@ function _xcode {
     "$@"
     xcodebuild -sdk "iphonesimulator$ios_version" \
       CONFIGURATION_BUILD_DIR="$build_dir/build" \
-      PRODUCT_NAME=app \
-      -workspace $base.xcworkspace -scheme $scheme_name -configuration AdHoc \
+      -workspace "$base.xcworkspace" -scheme "$scheme_name" -configuration Debug \
+      PRODUCT_NAME="$scheme_name" \
       DSTROOT=$build_dir \
       OBJROOT=$build_dir \
       SYMROOT=$build_dir \
       ONLY_ACTIVE_ARCH=NO \
     "$@"
-    cp -r "$build_dir/build/app.app" "$build_dir"
+    cp -r "$build_dir/build/$scheme_name.app" "$build_dir"
+    bundle_dir="$build_dir/$scheme_name.app"
   else
     xcodebuild -sdk "iphonesimulator$ios_version" \
       CONFIGURATION_BUILD_DIR=$build_dir \
@@ -166,7 +168,7 @@ function _run_automation {
           in language \"${language}\"..."
 
   dev_tools_dir=`xcode-select -print-path`
-  tracetemplate="$dev_tools_dir/../Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.xrplugin/Contents/Resources/Automation.tracetemplate"
+  tracetemplate="Automation"
 
   # Check out the `unix_instruments.sh` script to see why we need this wrapper.
   DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -174,12 +176,11 @@ function _run_automation {
     -w "$simulator" \
     -D "$trace_results_dir/trace" \
     -t "$tracetemplate" \
-    $bundle_dir \
+    "$bundle_dir" \
     -e UIARESULTSPATH "$trace_results_dir" \
     -e UIASCRIPT "$automation_script" \
     -AppleLanguages "($language)" \
-    -AppleLocale "$language" \
-    "$@"
+    -AppleLocale "$language"
 
   find $trace_results_dir/Run\ 1/ -name *landscape*png -type f -exec sips -r -90 \{\} \;
 }
@@ -195,18 +196,11 @@ function _copy_screenshots {
   cp $trace_results_dir/Run\ 1/*.png "$destination/$language"
 }
 
-function _reset_sim {
-  count=`ps aux | grep [l]aunchd_sim | wc -l`
-  if [ $count -ne 0 ]
-  then
-    kill -9 $(ps -ef | grep [l]aunchd_sim | awk {'print $2'})
-  fi
-}
-
 function _close_sim {
   # I know, I know. It says "iPhone Simulator". For some reason,
   # that's the only way Applescript can identify it.
   osascript -e "tell application \"iPhone Simulator\" to quit"
 }
 
-main
+main
+

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: longbow
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Intermark Interactive
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: fileutils
   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: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.2
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   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: json
   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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: One codebase. Multiple App Store submission targets with different icons,
@@ -131,27 +131,28 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- "./Gemfile"
-- "./Gemfile.lock"
-- "./LICENSE.txt"
-- "./README.md"
-- "./Rakefile"
-- "./lib/longbow.rb"
-- "./lib/longbow/colors.rb"
-- "./lib/longbow/commands.rb"
-- "./lib/longbow/commands/aim.rb"
-- "./lib/longbow/commands/install.rb"
-- "./lib/longbow/commands/shoot.rb"
-- "./lib/longbow/images.rb"
-- "./lib/longbow/json.rb"
-- "./lib/longbow/plist.rb"
-- "./lib/longbow/targets.rb"
-- "./lib/longbow/utilities.rb"
-- "./lib/longbow/version.rb"
-- "./resources/banner.png"
-- "./resources/capture.js"
-- "./resources/ui-screen-shooter.sh"
-- "./resources/unix_instruments.sh"
+- ./Gemfile
+- ./LICENSE.txt
+- ./README.md
+- ./Rakefile
+- ./lib/longbow.rb
+- ./lib/longbow/colors.rb
+- ./lib/longbow/commands.rb
+- ./lib/longbow/commands/aim.rb
+- ./lib/longbow/commands/install.rb
+- ./lib/longbow/commands/shoot.rb
+- ./lib/longbow/images.rb
+- ./lib/longbow/json.rb
+- ./lib/longbow/plist.rb
+- ./lib/longbow/targets.rb
+- ./lib/longbow/utilities.rb
+- ./lib/longbow/version.rb
+- ./resources/aim.sh
+- ./resources/banner.png
+- ./resources/capture.js
+- ./resources/config-screenshots.sh
+- ./resources/ui-screen-shooter.sh
+- ./resources/unix_instruments.sh
 - bin/longbow
 homepage: https://github.com/intermark/longbow
 licenses:
@@ -163,17 +164,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Better target creation for one iOS codebase.

data/Gemfile.lock

@@ -1,44 +0,0 @@
-PATH
-  remote: .
-  specs:
-    longbow (0.6.3)
-      bundler (~> 1.3)
-      commander (~> 4.1)
-      dotenv (~> 0.7)
-      fileutils
-      json
-      rmagick (~> 2.13.2)
-      xcodeproj
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.2.8)
-    activesupport (3.2.19)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    colored (1.2)
-    commander (4.2.0)
-      highline (~> 1.6.11)
-    dotenv (0.11.1)
-      dotenv-deployment (~> 0.0.2)
-    dotenv-deployment (0.0.2)
-    fileutils (0.7)
-      rmagick (>= 2.13.1)
-    highline (1.6.21)
-    i18n (0.6.11)
-    json (1.8.1)
-    multi_json (1.10.1)
-    rake (10.1.1)
-    rmagick (2.13.3)
-    xcodeproj (0.19.1)
-      CFPropertyList (~> 2.2)
-      activesupport (~> 3.0)
-      colored (~> 1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  longbow!
-  rake