briar 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWQxYjFjZTk0YzdhM2U1ZDE1OGNhMGJiMTM1YzdiM2ViNDJjN2I3Ng==
+    ZGUwMTZlM2YwODZmMTIwMzI3YjBiYWIzYjcwNGRiYjcxMzRmNjQ2NQ==
   data.tar.gz: !binary |-
-    YzUwZTIwMzg1YjRlMjllYjhiZDhiNzkzYzcyZTliOWI3ZDYzNWM3Mg==
-!binary "U0hBNTEy":
+    YjM4NWExMzEyNGU3Nzk3MWFlZjdhYmRkYTg5ZWExOWFhNzZjODA5MA==
+SHA512:
   metadata.gz: !binary |-
-    MTc4NzUwMzUxYjc3OTkwOGYxNjdhNWEwZDYwZTQ3OGM3ZDFmODlhM2Q5Nzg4
-    ZGVjZTJhMWU3NDcxMGIxNzExMzk3MzFiNDE4OTUzNjYxMTM0MzkxY2ViY2Zk
-    YTIzNTU4MDBhOWE5NWQ1NTM2ZDBjZjQzNzMyMjlkZjMxZGM3ZjA=
+    ZGQ3NmUzYTQwY2M0YzU4Y2Q0OThhMDIzYWVlNzU0NTA5MDZlOWIxYmQ4OWQz
+    YzQ3YmI1NDg3OWRiMGRlYjQ5ZmRkODU0MmViMDE4YWNkMTg5NWRhYTZjZmI0
+    NmE5MzNhMGVmNDc3YTE5YjdiMmZkYjZhOTc0NmY1YWM3MDM5Njc=
   data.tar.gz: !binary |-
-    YjA3YTRhNTFlODZlMGU1ODJhMzMzM2Q1ZTZhYjg0ZWUxN2E4ZmQ4ZTI2YzE4
-    OGRiMTA4YjM4MDZiZWRkZjE3MjdlMzI0OWM3MDRjOGUyMjk1MThkYzYxNWFi
-    NGY3NTg3OWZkOTNmOTk5MWU0N2Y2ZWQxMGM3YzQ3YjUzMDFmMzM=
+    YTNhNGQ1OTg3NjFlNmMzNGI3NjBiOWUwZDE1MzZjNmZhYmI3ODc1MDUzNGVk
+    Yzg2NDNmZTFhNzU2ODFmMmNmNTVmMDYwOWNjNGJkYjZlOGMzZTRjZTMzNTVl
+    YWIzMWE5MjkzMDIwYzNlNWYwMjhlMjYyOTU2YTY1NThkNjc1MTQ=

data/README.md

@@ -1,30 +1,28 @@
 # Briar
 
-extends calabash-ios steps to provide steps for controlling complex ui
-elements like tables and pickers. 
+extends the steps defined in [calabash-ios](https://github.com/calabash/calabash-ios.git) to help
+your write cucumber Scenarios that interact with complex ui elements like tables, pickers, and sliders.
 
-briar is not trying to provide steps that will work for every project
-- it is neccessary that every project develop its own venacular.
-instead, briar provides a library [lib] of ruby methods to build
-application-specific steps from.  the steps in the features directory
-are meant to be examples of what briar can offer.
+### WARNING: briar is not trying to provide steps that will work for every project
 
-https://github.com/calabash/calabash-ios.git
+Every project should cultivate its own [venacular](http://en.wikipedia.org/wiki/Vernacular) - 
+a shared language between developers, clients, and users.  the steps that briar provides
+are not meant to be dropped into into your projects (although they can be).  briar provides a 
+library [lib] of ruby methods to build application-specific steps from.  the steps in the features 
+directory are meant to be examples of what briar can offer.
 
-to see briar in action, have a look at
-https://github.com/jmoody/briar-ios-example
+to see briar in action, take a look at https://github.com/jmoody/briar-ios-example
 
 ### motivation
 
-DRY: i have several ios projects that use calabash-cucumber and i
-found i was rewriting lots of steps and supporting code.  
+DRY: i have several ios projects that use calabash-cucumber and i found i was rewriting lots of steps
+and supporting code.  
 
 ## version numbers
 
-i will try my best to follow http://semver.org/ when naming the
-versions.
+i will try my best to follow http://semver.org/ when naming the versions.
 
-## Why briar? 
+## Why call it briar? 
 
 * http://en.wikipedia.org/wiki/Smoking_pipe_(tobacco)#Calabash
 * http://en.wikipedia.org/wiki/Smoking_pipe_(tobacco)#Briar
@@ -34,8 +32,8 @@ versions.
 getting closer to stability
 
 * there are still major problems with date picking
-* still problems running tests on lesspainful - can upload to LP but
-  still cannot get all tests to run
+* can now run tests on lesspainful! woot!
+* there are lot's of wait_for_animation calls that should be replaced with wait_for methods
    
 ## Usage
 

data/bin/briar

@@ -4,16 +4,100 @@ require 'find'
 
 
 require File.join(File.dirname(__FILE__), 'briar_helpers')
+require File.join(File.dirname(__FILE__), 'briar_resign')
 
 if ARGV.length == 0
   print_usage
   exit 0
 end
 
+if ARGV.length == 2
+  arg1 = ARGV[0]
+  unless arg1 == BRIAR_CMD_INSTALL
+    print_usage
+    exit 1
+  end
+  allowed =  [BRIAR_INSTALL_GEM, BRIAR_INSTALL_CALABASH_GEM, BRIAR_INSTALL_CALABASH_SERVER]
+  arg2 = ARGV[1]
+  unless allowed.include?(arg2)
+    print_usage
+    exit 1
+  end
+
+  if arg2 == BRIAR_INSTALL_GEM
+
+    puts 'will install briar gem'
+    gem_dir = "#{ENV['HOME']}/git/briar"
+    unless File.exists?(gem_dir)
+      puts "expected gem '#{gem_dir}' - cannot install the briar gem"
+      exit 1
+    end
+    system("cd #{gem_dir}; rake install")
+    exit 0
+  elsif arg2 == BRIAR_INSTALL_CALABASH_GEM
+
+    puts 'will install calabash-cucumber gem'
+    gem_dir = "#{ENV['HOME']}/git/calabash-ios/calabash-cucumber"
+    unless File.exists?(gem_dir)
+      puts "expected gem '#{gem_dir}' - cannot install the calabash-cucumber gem"
+      exit 1
+    end
+    system("cd #{gem_dir}; rake install")
+    exit 0
+  elsif arg2 == BRIAR_INSTALL_CALABASH_SERVER
+
+    puts 'will install calabash-ios server'
+    cal_framework = 'calabash.framework'
+    unless File.exists?(cal_framework)
+      puts "expected '#{cal_framework}' to be in the local directory."
+      puts "run this command in the directory that contins '#{cal_framework}'"
+      exit 1
+    end
+
+    gem_dir = "#{ENV['HOME']}/git/calabash-ios/calabash-cucumber"
+    unless File.exists?(gem_dir)
+      puts "expected gem '#{gem_dir}' - cannot install the calabash server"
+      exit 1
+    end
+
+    server_dir = "#{ENV['HOME']}/git/calabash-ios-server"
+    unless File.exists?(server_dir)
+      puts "expected calabash-ios server to be in dir '#{server_dir}'"
+      puts "will not be able run '#{gem_dir}/rake build_server'"
+      exit 1
+    end
+
+    version_file = File.read("#{server_dir}/calabash/Classes/FranklyServer/Routes/LPVersionRoute.h")
+    tokens = version_file.split(/define kLPCALABASHVERSION/)
+    line = tokens[1].split("\n").first
+    version = line.tr('^A-Za-z0-9.\-\_', '')
+
+    puts "building calabash server using 'rake build_server'"
+    system("cd #{gem_dir}; rake build_server")
+    puts 'remove old cal simulator targets'
+    system('briar rm-cal-targets')
+    puts 'copying new framework to ./'
+    system("cp #{gem_dir}/staticlib/#{cal_framework}.zip ./")
+    puts 'removing old framework'
+    system("rm -rf #{cal_framework}")
+    puts 'unzipping new framework'
+    system("unzip #{cal_framework}.zip")
+    puts 'cleaning up'
+    system("rm -rf #{cal_framework}.zip")
+    puts "installed new server version '#{version}'"
+
+    exit 0
+  end
+  puts 'fell through install conditional'
+  exit 1
+end
+
 cmd = ARGV.shift
 if cmd == 'help'
   print_usage
   exit 0
+elsif cmd == BRIAR_VERSION_CMD
+  puts "#{Briar::VERSION}"
 elsif cmd == BRIAR_RM_CAL_TARGETS
   puts 'quiting the simulator'
   `/usr/bin/osascript -e 'tell application "iPhone Simulator" to quit'`
@@ -39,63 +123,18 @@ elsif cmd == BRIAR_RM_CAL_TARGETS
   end
 
 elsif cmd == BRIAR_INSTALL_CALABASH_GEM
-  puts 'will install calabash-cucumber gem'
-  gem_dir = "#{ENV['HOME']}/git/calabash-ios/calabash-cucumber"
-  unless File.exists?(gem_dir)
-    puts "expected gem '#{gem_dir}' - cannot install the calabash-cucumber gem"
-    exit 1
-  end
-  system("cd #{gem_dir}; rake install")
-
+  puts "use 'briar install calabash-gem'"
+  exit 1
 elsif cmd == BRIAR_INSTALL_GEM
-    puts 'will install briar gem'
-  gem_dir = "#{ENV['HOME']}/git/briar"
-  unless File.exists?(gem_dir)
-    puts "expected gem '#{gem_dir}' - cannot install the briar gem"
-    exit 1
-  end
-  system("cd #{gem_dir}; rake install")
-
+  puts "use 'briar install gem'"
+  exit 1
 elsif cmd == BRIAR_INSTALL_CALABASH_SERVER
-  puts 'will install calabash-ios server'
-  cal_framework = 'calabash.framework'
-  unless File.exists?(cal_framework)
-    puts "expected '#{cal_framework}' to be in the local directory."
-    puts "run this command in the directory that contins '#{cal_framework}'"
-    exit 1
-  end
-  
-  gem_dir = "#{ENV['HOME']}/git/calabash-ios/calabash-cucumber"
-  unless File.exists?(gem_dir)
-    puts "expected gem '#{gem_dir}' - cannot install the calabash server"
-    exit 1
-  end
-
-  server_dir = "#{ENV['HOME']}/git/calabash-ios-server"
-  unless File.exists?(server_dir)
-    puts "expected calabash-ios server to be in dir '#{server_dir}'"
-    puts "will not be able run '#{gem_dir}/rake build_server'"
-    exit 1
-  end
-
-  version_file = File.read("#{server_dir}/calabash/Classes/FranklyServer/Routes/LPVersionRoute.h")
-  tokens = version_file.split(/define kLPCALABASHVERSION/)
-  line = tokens[1].split("\n").first
-  version = line.tr('^A-Za-z0-9.\-\_', '')
-
-  puts "building calabash server using 'rake build_server'"
-  system("cd #{gem_dir}; rake build_server")
-  puts 'remove old cal simulator targets'
-  system('briar rm-cal-targets')
-  puts 'copying new framework to ./'
-  system("cp #{gem_dir}/staticlib/#{cal_framework}.zip ./")
-  puts 'removing old framework'
-  system("rm -rf #{cal_framework}")
-  puts 'unzipping new framework'
-  system("unzip #{cal_framework}.zip")
-  puts 'cleaning up'
-  system("rm -rf #{cal_framework}.zip")
-  puts "installed new server version '#{version}'"
+  puts "use 'briar install calabash-server'"
+  exit 1
+elsif cmd == BRIAR_RESIGN_IPA
+  puts 'will resign'
+  briar_resign(ARGV)
+  exit 0
 else
   print_usage
   exit 1

data/bin/briar_helpers.rb

@@ -1,14 +1,22 @@
 require 'briar'
 
 BRIAR_RM_CAL_TARGETS='rm-cal-targets'
-BRIAR_INSTALL_CALABASH_GEM='install-calabash-gem'
-BRIAR_INSTALL_CALABASH_SERVER='install-calabash-server'
+BRIAR_INSTALL_CALABASH_GEM='calabash-gem'
+BRIAR_INSTALL_CALABASH_SERVER='calabash-server'
 BRIAR_INSTALL_GEM='gem'
+BRIAR_RESIGN_IPA='resign'
+BRIAR_VERSION_CMD='version'
+
+BRIAR_CMD_INSTALL='install'
+
 
 def print_usage
   puts <<EOF
   briar #{Briar::VERSION}
 
+  briar #{BRIAR_VERSION_CMD}
+    print the current briar version
+
   briar #{BRIAR_RM_CAL_TARGETS}
     WARN: this is a destructive operation!
           * deletes all *-cal targets from simulator
@@ -17,16 +25,19 @@ def print_usage
     targets and deletes the enclosing directory.  useful for clearing out old
     calabash targets when the framework needs to be updated.
 
-  briar #{BRIAR_INSTALL_GEM}
+  briar #{BRIAR_CMD_INSTALL} { gem | calabash-gem | calabash-server }
+    subcommand to perform various installation tasks
+
+  briar #{BRIAR_CMD_INSTALL} #{BRIAR_INSTALL_GEM}
     looks for ~/git/briar and runs 'rake install'. useful for developing and
     testing the briar gem
 
-  briar #{BRIAR_INSTALL_CALABASH_GEM}
+  briar #{BRIAR_CMD_INSTALL} #{BRIAR_INSTALL_CALABASH_GEM}
     looks for ~/git/calabash-ios/calabash-cucumber directory and runs
     'rake install' to install the calabash-cucumber gem.  useful for developing
     and testing the calabash-cucumber gem.
 
-  briar #{BRIAR_INSTALL_CALABASH_SERVER}
+  briar #{BRIAR_CMD_INSTALL} #{BRIAR_INSTALL_CALABASH_SERVER}
     WARN: this is a destructive operation!
           * replaces calabash.framework in current directory
           * deletes all *-cal targets from simulator
@@ -36,5 +47,7 @@ def print_usage
     'rake rake build_server', removes all *-cal targets from simulator, and
     replaces calabash.framework in local directory.  useful for developing and
     testing the calabash-ios-server.
+
+   briar: #{BRIAR_RESIGN_IPA} (experimental)
 EOF
 end

data/bin/briar_resign.rb

@@ -0,0 +1,272 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'CFPropertyList'
+require 'rexml/document'
+require 'tmpdir'
+require 'find'
+
+def msg(title, &block)
+  puts "\n" + '-'*10 + title + '-'*10
+  block.call
+  puts '-'*10 + '-------' + '-'*10 + "\n"
+end
+
+def briar_resign(args)
+  if args.length != 4
+    msg('Usage') do
+      puts 'briar resign </path/to/your.ipa> </path/to/your.mobileprovision> <wildcard-prefix> <signing-identity>'
+    end
+    exit 1
+  end
+
+  ipa = args[0]
+  unless ipa.end_with?('.ipa')
+    msg('Error') do
+      puts 'first arg must be an ipa'
+    end
+    exit 1
+  end
+
+  unless File.exist? ipa
+    msg('Error') do
+      puts ".ipa must exist at path '#{ipa}'"
+    end
+    exit 1
+  end
+
+  mobile_prov = args[1]
+  unless mobile_prov.end_with?('.mobileprovision')
+    msg('Error') do
+      puts 'second arg must be a path to a mobileprovision'
+    end
+    exit 1
+  end
+
+  unless File.exist? mobile_prov
+    msg('Error') do
+      puts "'#{mobile_prov}' must exist at path"
+    end
+    exit 1
+  end
+
+  wildcard = args[2]
+  unless wildcard.length == 10
+    msg 'error' do
+      puts "'#{wildcard}' must have 10 characters eg 'RWTD8QPG2C'"
+    end
+    exit 1
+  end
+
+  unless system("grep #{wildcard} #{mobile_prov}")
+    msg 'error' do
+      puts "could not find wildcard '#{wildcard}' in '#{mobile_prov}'"
+    end
+    exit 1
+  end
+
+  signing_id = args[3]
+  msg ('Info') do
+    puts "will resign with identity '#{signing_id}'"
+  end
+
+  resign_ipa({ipa:ipa, provision:mobile_prov, id:signing_id, wildcard:wildcard})
+
+end
+
+def resign_ipa(options)
+  work_dir = 'resigned'
+  ipa = File.join(work_dir, File.basename(options[:ipa]))
+  mp = File.join(work_dir, File.basename(options[:provision]))
+
+  puts 'INFO: making a directory to put the resigned ipa in'
+  if File.exist? work_dir
+    puts "INFO: found an existing work directory at '#{work_dir}' - removing it"
+    unless system("rm -rf #{work_dir}")
+      msg 'Error' do
+        puts "could not remove existing work dir '#{work_dir}'"
+      end
+      exit 1
+    end
+  end
+
+  unless system("mkdir #{work_dir}")
+    msg 'Error' do
+      puts "could not create a work directory '#{work_dir}'"
+    end
+    exit 1
+  end
+
+  puts "INFO: copying assets to '#{work_dir}'"
+  unless system("cp #{options[:ipa]} #{ipa}")
+    msg 'Error' do
+      puts "could not copy '#{options[:ipa]}' to '#{ipa}'"
+    end
+    exit 1
+  end
+
+  unless system("cp #{options[:provision]} #{mp}")
+    msg 'Error' do
+      puts "could not copy #{options[:provision]} to #{mp}"
+    end
+    exit 1
+  end
+
+  puts "unzipping '#{ipa}'"
+  unless system("unzip -qq #{ipa} -d #{work_dir}")
+    msg ('Error') do
+      puts "could not unzip -qq #{ipa} to '#{work_dir}'"
+    end
+    exit 1
+  end
+
+  payload_dir = "#{work_dir}/Payload"
+  unless File.directory?(payload_dir)
+    msg 'error' do
+      puts "Did not find a 'Payload' directory inside .ipa"
+    end
+    exit 1
+  end
+
+  app_path = Dir.foreach(payload_dir).find { |x| /.*\.app/.match(x) }
+
+  abs_app_path = "#{payload_dir}/#{app_path}"
+  puts "INFO: found app at '#{abs_app_path}'"
+
+
+  info_plist = Dir.foreach(abs_app_path).find { |x| /^Info\.plist$/.match(x) }
+
+  if info_plist.nil?
+    msg 'error' do
+      puts 'could not find an *-Info.plist file'
+    end
+    exit 1
+  end
+
+  info_plist_path = "#{abs_app_path}/#{info_plist}"
+  puts "INFO: found info plist at '#{info_plist_path}'"
+
+
+  mp_id = File.basename(mp, '.mobileprovision')
+  puts "INFO: found mobile provision id '#{mp_id}'"
+
+  puts "INFO: replacing embedded.mobileprovision with '#{mp}'"
+
+  unless system("cp \"#{mp}\" \"#{abs_app_path}/embedded.mobileprovision\"")
+    msg 'error' do
+      puts "could not cp '#{mp}' to '#{abs_app_path}/embedded.mobileprovision'"
+    end
+    exit 1
+  end
+
+
+  plist = CFPropertyList::List.new(:file => info_plist_path)
+  data = CFPropertyList.native_types(plist.value)
+
+  if data.nil? or !data.is_a? Hash
+    msg 'error' do
+      puts "Unable to parse binary plist: #{info_plist_path}"
+    end
+  end
+
+  puts "INFO: parsed plist at '#{info_plist_path}'"
+
+  app_id = data['CFBundleIdentifier']
+
+  unless app_id
+    msg 'error' do
+      puts "Unable to find CFBundleIdentifier in plist '#{data}'"
+    end
+    exit 1
+  end
+
+  puts "INFO: found bundle identifier '#{app_id}'"
+
+
+  bundle_exec = data['CFBundleExecutable']
+  
+  unless bundle_exec
+    msg 'error' do
+      puts "unable to find CFBundleExecutable in plist '#{data}'"
+    end
+    exit 1
+  end
+  
+  puts "INFO: found bundle executable '#{bundle_exec}'"
+
+  appname = app_path.split('.app')[0]
+
+  puts "INFO: found appname '#{appname}'"
+
+  wildcard = options[:wildcard]
+  puts "INFO: creating new entitlements with '#{wildcard}'"
+  ios_entitlements_path = File.join(work_dir, 'new-entitlements.plist')
+  File.open(ios_entitlements_path, 'a+') do |file|
+    file.puts "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+    file.puts "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">"
+    file.puts "<plist version=\"1.0\">"
+    file.puts '<dict>'
+    file.puts '  <key>application-identifier</key>'
+    file.puts "    <string>#{wildcard}.#{app_id}</string>"
+    file.puts '  <key>keychain-access-groups</key>'
+    file.puts '    <array>'
+    file.puts "      <string>#{wildcard}.#{app_id}</string>"
+    file.puts '    </array>'
+    file.puts '  <key>get-task-allow</key>'
+    file.puts '    <true/>'
+    file.puts '</dict>'
+    file.puts '</plist>'
+  end
+
+  # did _not_ work
+  #entitlements = CFPropertyList::List.new(:file => ios_entitlements_path)
+  #data = CFPropertyList.native_types(entitlements.value)
+  #data['application-identifier']= "#{wildcard}.#{app_id}"
+  #data['keychain-access-groups']=["#{wildcard}.#{app_id}"]
+  #data['get-task-allow'] = true
+  #
+  #
+  #plist = CFPropertyList::List.new
+  #plist.value = CFPropertyList.guess(data)
+  #plist.save(ios_entitlements_path, CFPropertyList::List::FORMAT_XML)
+  #puts "INFO: saved new entitlements to '#{ios_entitlements_path}'"
+
+  sign_cmd = "codesign -f -s \"#{options[:id]}\" -vv \"#{abs_app_path}\" --entitlements \"#{ios_entitlements_path}\""
+  puts "INFO: signing with '#{sign_cmd}'"
+
+  unless system(sign_cmd)
+    msg 'error' do
+      puts 'could not sign application'
+    end
+    exit 1
+  end
+
+  unless system("rm -rf '#{ipa}'")
+    msg 'error' do
+      puts "could not remove the old ipa at '#{ipa}'"
+    end
+    exit 1
+  end
+
+  puts 'INFO: zipping up Payload'
+
+  FileUtils.cd(work_dir) do
+
+    unless system("zip -qr #{File.basename(options[:ipa])} Payload")
+      msg 'error' do
+        puts "could not zip '#{File.basename(options[:ipa])}' from 'Payload'"
+      end
+      exit 1
+    end
+
+  end
+
+  puts "INFO: finished signing '#{ipa}'"
+
+
+  system("open #{work_dir}")
+
+
+end
+
+