lesspainful 0.8.0 → 0.9.0

data/.gitignore

@@ -0,0 +1,5 @@
+test/ipa/vendor
+test/vendor
+vendor
+pkg
+.idea

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    lesspainful (0.0.2)
+    lesspainful (0.9.0)
       bundler (~> 1.2)
       json
       rest-client
+      rubyzip
 
 GEM
   remote: http://rubygems.org/
@@ -13,6 +14,7 @@ GEM
     mime-types (1.19)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rubyzip (0.9.9)
 
 PLATFORMS
   ruby

data/bin/lesspainful

@@ -1,8 +1,11 @@
 #!/usr/bin/env ruby
+require 'rubygems'
+require 'zip/zip'
 require 'digest'
 require 'rest_client'
 require 'json'
 require 'rbconfig'
+require 'tmpdir'
 
 def host
   ENV["LP_HOST"] || "https://www.lesspainful.com"
@@ -12,14 +15,36 @@ def digest(file)
   Digest::SHA256.file(file).hexdigest
 end
 
+def unzip_file (file, destination)
+  Zip::ZipFile.open(File.new(file)) { |zip_file|
+   zip_file.each { |f|
+     f_path=File.join(destination, f.name)
+     FileUtils.mkdir_p(File.dirname(f_path))
+     zip_file.extract(f, f_path) unless File.exist?(f_path)
+   }
+  }
+end
+
 def workspace
   if ARGV[2]
-    "#{ARGV[2]}/"
+    abort_unless(File.exist?(ARGV[2])) do
+      puts "Provided workspace: #{ARGV[2]} does not exist."
+    end
+    File.join(File.expand_path(ARGV[2]),File::Separator)
   else
     ""
   end
 end
 
+def features_zip
+  if ARGV[3] and ARGV[3].end_with?".zip"
+    abort_unless(File.exist?(ARGV[3])) do
+      puts "No file found #{ARGV[3]}"
+    end
+    File.expand_path(ARGV[3])
+  end
+end
+
 def app
   ARGV[0]
 end
@@ -36,19 +61,30 @@ def calabash_android_version
   `bundle exec calabash-android version`.strip
 end
 
+def is_ios?
+    app.end_with? ".ipa"
+end
+
 def test_server_path
   require 'digest/md5'
   digest = Digest::MD5.hexdigest(File.read(app))
-  "#{workspace}test_servers/#{digest}_#{calabash_android_version}.apk"
+  File.join(workspace,"test_servers","#{digest}_#{calabash_android_version}.apk")
 end
 
 def all_files
-  files = Dir.glob("#{workspace}features/**/*")
+  dir = workspace
+  if features_zip
+    dir = Dir.mktmpdir
+    unzip_file(features_zip, dir)
+    dir = File.join(dir,File::Separator)
+  end
+
+  files = Dir.glob("#{dir}features/**/*") ##no need to File.join here
   files += Dir.glob("#{workspace}vendor/**/*")
   if is_android?
     files << test_server_path
   end
-  files.find_all { |file_or_dir| File.file? file_or_dir }
+  {:prefix => dir, :files => files.find_all { |file_or_dir| File.file? file_or_dir }}
 end
 
 def http_post(address, args)
@@ -60,6 +96,41 @@ def is_windows?
    (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
 end
 
+def is_macosx?
+  (RbConfig::CONFIG['host_os'] =~ /darwin/)
+end
+
+def validate_ipa(ipa)
+  result = true
+  dir = Dir.mktmpdir #do |dir|
+
+    unzip_file(ipa,dir)
+    unless File.directory?("#{dir}/Payload")  #macos only
+      abort do
+        puts "Unzipping #{ipa} to #{dir} failed: Did not find a Payload directory (invalid .ipa)."
+      end
+    end
+    app_dir = Dir.foreach("#{dir}/Payload").find {|d| /\.app$/.match(d)}
+    app = app_dir.split(".")[0]
+    res = `otool "#{File.expand_path(dir)}/Payload/#{app_dir}/#{app}" -o 2> /dev/null | grep CalabashServer`
+
+    if /CalabashServer/.match(res)
+      puts "ipa: #{ipa} *contains* calabash.framework"
+      result = :calabash
+    end
+    res = `otool "#{File.expand_path(dir)}/Payload/#{app_dir}/#{app}" -o 2> /dev/null | grep FrankServer`
+    if /FrankServer/.match(res)
+      puts "ipa: #{ipa} *contains* FrankServer"
+      result = :frank
+    else
+      puts "ipa: #{ipa} *does not contain* calabash.framework"
+      result = false
+    end
+  #end
+  result
+end
+
+
 def self.log(message)
  puts "#{Time.now } #{message}"
  $stdout.flush
@@ -73,20 +144,32 @@ def self.log_header(message)
   end
 end
 
-def self.usage
+def usage
   "Usage: lesspainful <app> <api_key>"
 end
 
-def self.verify_arguments
+def verify_arguments
+  server = nil
   log_and_abort(usage) unless app
   log_and_abort(usage) unless api_key
   abort_unless(File.exist?(app)) do
+    puts usage
     puts "No such file: #{app}"
   end
   abort_unless(/\.(apk|ipa)$/ =~ app) do
     puts usage
     puts "<app> should be either an ipa or apk file"
   end
+  if is_ios? and is_macosx? and not ENV['CHECK_IPA'] == '0'
+    log_header("Checking ipa for linking with Calabash iOS")
+    server = validate_ipa(app)
+    abort_unless(server) do
+      puts "The .ipa file does not seem to be linked with Calabash."
+      puts "Verify that your app is linked correctly."
+      puts "To disable this check run with Environment Variable CHECK_IPA=0"
+    end
+  end
+  server
 end
 
 def abort(&block)
@@ -118,7 +201,7 @@ def self.verify_files
     calabash_gem = Dir.glob("vendor/cache/calabash-android-*").first
     abort_unless(calabash_gem) do
       puts "calabash-android was not packaged correct."
-      puts "Please tell contact@lesspainf.com about this bug"
+      puts "Please tell contact@lesspainful.com about this bug."
     end
   end
 end
@@ -128,7 +211,7 @@ end
 
 start_at = Time.now
 
-verify_arguments
+server = verify_arguments
 
 log_header("Checking for Gemfile")
 unless File.exist?("Gemfile")
@@ -136,9 +219,19 @@ unless File.exist?("Gemfile")
   if is_android?
     log("Creating Gemfile for Android")
     tgt = File.join(File.dirname(__FILE__),"..","lib","GemfileAndroid")
-  else
+  elsif is_ios?
     log("Creating Gemfile for iOS")
-    tgt = File.join(File.dirname(__FILE__),"..","lib","GemfileIOS")
+    gemfile = "GemfileIOS"
+    if server == :frank
+      gemfile = "GemfileIOSFrank"
+    end
+    tgt = File.join(File.dirname(__FILE__),"..","lib",gemfile)
+  else
+    abort do
+      puts usage
+      puts "Your app (second argument) must be an ipa or apk file."
+    end
+
   end
   FileUtils.cp(File.expand_path(tgt), "Gemfile")
 end
@@ -148,7 +241,11 @@ log_and_abort "Bundler failed. Please check command: bundle package" unless syst
 
 
 log_header("Collecting files")
-hashes = all_files.collect { |f| digest(f) }
+collected_files = all_files
+file_paths = collected_files[:files]
+prefix = collected_files[:prefix]
+
+hashes = file_paths.collect { |f| digest(f) }
 hashes << digest(app)
 
 log_header("Verifying files")
@@ -166,7 +263,7 @@ cache_status = JSON.parse(response)
 curl_args = []
 files = []
 paths = []
-all_files.each do |file|
+file_paths.each do |file|
   if cache_status[digest(file)]
     #Server already knows about this file. No need to upload it.
     files << digest(file)
@@ -174,7 +271,7 @@ all_files.each do |file|
     #Upload file
     files << File.new(file)
   end
-  paths << file.sub(workspace, "")
+  paths << file.sub(prefix, "")
 end
 
 app_file = cache_status[digest(app)] ? digest(app) : File.new(app)

data/lesspainful.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency( "bundler","~> 1.2")
   s.add_dependency( "json")
+  s.add_dependency( "rubyzip")
   s.add_dependency( "rest-client")
 end

data/lib/GemfileIOSFrank

@@ -0,0 +1,4 @@
+source 'http://rubygems.org'
+gem "frank-cucumber"
+gem "httpclient"
+gem "slowhandcuke"

data/lib/version.rb

@@ -1,3 +1,3 @@
 module LessPainful
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/test/ipa/.irbrc

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'irb/completion'
+require 'irb/ext/save-history'
+
+ARGV.concat [ "--readline",
+              "--prompt-mode",
+              "simple" ]
+
+# 25 entries in the list
+IRB.conf[:SAVE_HISTORY] = 50
+
+# Store results in home directory with specified file name
+IRB.conf[:HISTORY_FILE] = ".irb-history"
+
+require 'calabash-cucumber/operations'
+include Calabash::Cucumber::Operations
+
+def embed(x,y=nil,z=nil)
+   puts "Screenshot at #{x}"
+end

data/test/ipa/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+gem 'calabash-cucumber'
+

data/test/ipa/Gemfile.lock

@@ -0,0 +1,47 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    CFPropertyList (2.1.1)
+    builder (3.1.3)
+    calabash-cucumber (0.9.104)
+      CFPropertyList
+      bundler (~> 1.1)
+      cucumber
+      httpclient (~> 2.2.7)
+      json
+      location-one (~> 0.0.6)
+      sim_launcher (= 0.3.8)
+      slowhandcuke
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    geocoder (1.1.3)
+    gherkin (2.11.2)
+      json (>= 1.4.6)
+    httpclient (2.2.7)
+    json (1.7.5)
+    location-one (0.0.6)
+      geocoder (~> 1.1)
+      httpclient
+      json
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    sim_launcher (0.3.8)
+      sinatra
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    slowhandcuke (0.0.3)
+      cucumber
+    tilt (1.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  calabash-cucumber

data/test/ipa/features/my_first.feature

@@ -0,0 +1,10 @@
+Feature: Running a test
+  As an iOS developer
+  I want to have a sample feature file
+  So I can begin testing quickly
+
+Scenario: Example steps
+  Given I am on the Welcome Screen
+  And take picture
+
+

data/test/ipa/features/step_definitions/calabash_steps.rb

@@ -0,0 +1 @@
+require 'calabash-cucumber/calabash_steps'

data/test/ipa/features/step_definitions/my_first_steps.rb

@@ -0,0 +1,4 @@
+Given /^I am on the Welcome Screen$/ do
+  element_exists("view")
+  sleep(STEP_PAUSE)
+end

data/test/ipa/features/support/env.rb

@@ -0,0 +1 @@
+require 'calabash-cucumber/cucumber'

data/test/ipa/features/support/launch.rb

@@ -0,0 +1,77 @@
+########################################
+#                                      #
+#       Important Note                 #
+#                                      #
+#   When running calabash-ios tests at #
+#   www.lesspainful.com                #
+#   this file will be overwritten by   #
+#   a file which automates             #
+#   app launch on devices.             #
+#                                      #
+#   Don't rely on this file being      #
+#   present when running at            #
+#   www.lesspainful.com.               #
+#                                      #
+#  Only put stuff here to automate     #
+#  iOS Simulator.                      #
+#                                      #
+#  You can put your app bundle path    #
+#  for automating simulator app start: #
+#  Uncomment APP_BUNDLE_PATH =..       #
+#                                      #
+########################################
+
+require 'calabash-cucumber/launch/simulator_helper'
+require 'sim_launcher'
+
+# Uncomment and replace ?? appropriately
+# This should point to your Simulator build
+# which includes calabash framework
+# this is usually the Calabash build configuration
+# of your production target.
+#APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
+#
+
+def reset_app_jail(sdk, app_path)
+  app = File.basename(app_path)
+  bundle = `find "#{ENV['HOME']}/Library/Application Support/iPhone Simulator/#{sdk}/Applications/" -type d -depth 2 -name #{app} | head -n 1`
+  return if bundle.empty? # Assuming we're already clean
+
+  sandbox = File.dirname(bundle)
+  ['Library', 'Documents', 'tmp'].each do |dir|
+    FileUtils.rm_rf(File.join(sandbox, dir))
+  end
+end
+
+def relaunch
+  if ENV['NO_LAUNCH']!="1"
+    sdk = ENV['SDK_VERSION'] || SimLauncher::SdkDetector.new().latest_sdk_version
+    path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
+    if ENV['RESET_BETWEEN_SCENARIOS']=="1"
+      reset_app_jail(sdk, path)
+    end
+
+    Calabash::Cucumber::SimulatorHelper.relaunch(path,sdk,ENV['DEVICE'] || 'iphone')
+  end
+end
+
+def app_path
+  ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
+end
+
+def calabash_notify
+  if self.respond_to?(:on_launch)
+    self.on_launch
+  end
+end
+
+Before do |scenario|
+  relaunch
+  calabash_notify
+end
+
+at_exit do
+  if ENV['NO_LAUNCH']!="1" and ENV['NO_STOP']!="1"
+    Calabash::Cucumber::SimulatorHelper.stop
+  end
+end

data/test/ipa/irb_ios4.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+IRBRC=.irbrc OS=ios4 irb

data/test/ipa/irb_ios5.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+IRBRC=.irbrc irb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lesspainful
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +84,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -75,7 +92,22 @@ files:
 - lesspainful.gemspec
 - lib/GemfileAndroid
 - lib/GemfileIOS
+- lib/GemfileIOSFrank
 - lib/version.rb
+- test/ipa/.irbrc
+- test/ipa/2012 Olympics_cal.ipa
+- test/ipa/2012 Olympics_no_cal.ipa
+- test/ipa/Gemfile
+- test/ipa/Gemfile.lock
+- test/ipa/features.zip
+- test/ipa/features/my_first.feature
+- test/ipa/features/step_definitions/calabash_steps.rb
+- test/ipa/features/step_definitions/my_first_steps.rb
+- test/ipa/features/support/env.rb
+- test/ipa/features/support/hooks.rb
+- test/ipa/features/support/launch.rb
+- test/ipa/irb_ios4.sh
+- test/ipa/irb_ios5.sh
 homepage: http://www.lesspainful.com
 licenses: []
 post_install_message: 
@@ -96,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client for uploading calabash test to www.lesspainful.com