longbow 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4938e79d5273991698fd2851465887929a1a44e6
-  data.tar.gz: 6788bb77060caf9c7851ccaf6b3e08d778d94986
+  metadata.gz: 1f87106345d087aa1e5f706aec86e5fe1c75bc38
+  data.tar.gz: b99f85461d9c7113eb7aa3e416e4ced2efac45c5
 SHA512:
-  metadata.gz: dec36b67b07ae1b4c8cd55bd9e044179d5d448d43085fdddd59d42b54616d6d3375b5dd3bc5d45e83c52267f76200708efde6f1f04b2a3cad58eda984b7fabe7
-  data.tar.gz: bcd18a88d98959ed9e94a2586f88550f865bdd002f99542a7f1b4f1202b85000a23f1f5116deea0806ab45e89bfb62b5c90503ed4f32f945f0c3d43eac457e52
+  metadata.gz: aa191c29489e00e43b81baa3ef374a0f86bac9342379357ca8f43c53f45fd8fefa46382612dfc7f559f7a4e7144601cde7dfd63646bcf58fc5d745a84c55b0dd
+  data.tar.gz: 5fda5b997d8a085245fdd701049ac1f1d07f4fbdacc8358830fa247ba2e82a29834f5840bcf3f596e529c436666885db8f36514f37a7d6c616d15e3e9034756b

data/Gemfile.lock

@@ -0,0 +1,42 @@
+PATH
+  remote: .
+  specs:
+    longbow (0.5.1)
+      bundler (~> 1.3)
+      commander (~> 4.1)
+      dotenv (~> 0.7)
+      fileutils
+      json
+      rmagick (~> 2.13.2)
+      xcodeproj
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.16)
+      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.9)
+    json (1.8.1)
+    multi_json (1.9.3)
+    rake (10.1.1)
+    rmagick (2.13.2)
+    xcodeproj (0.17.0)
+      activesupport (~> 3.0)
+      colored (~> 1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  longbow!
+  rake

data/lib/longbow/commands/shoot.rb

@@ -13,6 +13,7 @@ command :shoot do |c|
   c.option '-n', '--name NAME', 'Target name from the corresponding longbow.json file.'
   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 '-i', '--images IMAGES', 'Set this flag to not recreate images in the longbow file.'
 
   c.action do |args, options|
     # Check for newer version
@@ -21,6 +22,7 @@ command :shoot do |c|
     # Set Up
     @target_name = options.name ? options.name : nil
     @directory = options.directory ? options.directory : Dir.pwd
+    @noimages = options.images ? true : false
     @url = options.url ? options.url : nil
     @targets = []
 
@@ -57,7 +59,7 @@ command :shoot do |c|
       icon = t['icon_url'] || t['icon_path']
       launch = t['launch_phone_p_url'] || t['launch_phone_p_path'] || t['launch_phone_l_url'] || t['launch_phone_l_path'] || t['launch_tablet_p_url'] || t['launch_tablet_p_path'] || t['launch_tablet_l_url'] || t['launch_tablet_l_path']
       Longbow::update_target @directory, t['name'], obj['global_info_keys'], t['info_plist'], icon, launch
-      Longbow::create_images @directory, t, obj
+      Longbow::create_images(@directory, t, obj) unless @noimages
       Longbow::green "  Finished: #{t['name']}\n" unless $nolog
     end
   end

data/lib/longbow/version.rb

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

data/resources/capture.js

@@ -43,7 +43,7 @@ function captureLocalizedScreenshot(name) {
 
   if (model.match(/iPhone/)) {
     if ((orientation == "portrait" && rect.size.height > 480) || (orientation == "landscape" && rect.size.width > 480)) {
-      model = "iOS-4-in";
+      model = "iPhone-6";
     } else {
       model = "iOS-3.5-in";
     }

data/resources/ui-screen-shooter.sh

@@ -25,34 +25,25 @@ set -e
 
 # We require a parameter for where to put the results and the test script
 destination="$1"
-scheme_name="$2"
-ui_script="$3"
+ui_script="$2"
 
 # 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"
+languages="en-US fr ja"
 
 # 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 Retina (3.5-inch) - Simulator - iOS 7.1"
-"iPhone Retina (4-inch) - Simulator - iOS 7.1"
+"Resizable iPad"
 )
 
 function main {
   _check_destination
   _check_ui_script
-  _check_scheme_name
   _xcode clean build
-  _reset_sim
 
   for simulator in "${simulators[@]}"; do
     for language in $languages; do
@@ -81,8 +72,8 @@ function _check_destination {
     destination="$HOME/Desktop/screenshots"
   fi
   if [ -d "$destination" ]; then
-    echo "Destination directory \"$destination\" already exists! Moving Directory."
-    mv "$destination" "$HOME/Desktop/screenshots$(date +"%Y%m%d%H%M")"
+    echo "Destination directory \"$destination\" already exists! Aborting."
+    exit 1
   fi
 }
 
@@ -98,13 +89,6 @@ function _check_ui_script {
   fi
 }
 
-function _check_scheme_name {
-  if [ -z "$scheme_name" ]; then
-    scheme_name=$(basename *.xcworkspace .xcworkspace)
-    echo "No scheme name specified, using the default."
-  fi
-}
-
 function _xcode {
   # A wrapper around `xcodebuild` that tells it to build the app in the temp
   # directory. If your app uses workspaces or special schemes, you'll need to
@@ -119,7 +103,7 @@ 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 $base -configuration AdHoc \
       DSTROOT=$build_dir \
       OBJROOT=$build_dir \
       SYMROOT=$build_dir \
@@ -128,7 +112,7 @@ 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 $base -configuration AdHoc \
       DSTROOT=$build_dir \
       OBJROOT=$build_dir \
       SYMROOT=$build_dir \
@@ -164,7 +148,7 @@ function _run_automation {
           in language \"${language}\"..."
 
   dev_tools_dir=`xcode-select -print-path`
-  tracetemplate="$dev_tools_dir/../Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate"
+  tracetemplate="$dev_tools_dir/../Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.xrplugin/Contents/Resources/Automation.tracetemplate"
 
   # Check out the `unix_instruments.sh` script to see why we need this wrapper.
   DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -193,14 +177,6 @@ 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.

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: longbow
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Intermark Interactive
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-23 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,26 +131,27 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ./Gemfile
-- ./lib/longbow/colors.rb
-- ./lib/longbow/commands/aim.rb
-- ./lib/longbow/commands/install.rb
-- ./lib/longbow/commands/shoot.rb
-- ./lib/longbow/commands.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
-- ./lib/longbow.rb
-- ./LICENSE.txt
-- ./Rakefile
-- ./README.md
-- ./resources/banner.png
-- ./resources/capture.js
-- ./resources/ui-screen-shooter.sh
-- ./resources/unix_instruments.sh
+- "./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"
 - bin/longbow
 homepage: https://github.com/intermark/longbow
 licenses:
@@ -162,17 +163,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.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Better target creation for one iOS codebase.