calabash-android 0.0.2 → 0.0.3

data/bin/calabash-android

@@ -31,7 +31,7 @@ elsif cmd == 'gen'
   calabash_scaffold
   exit 0
 elsif cmd == 'setup'
-  calabash_setup(ARGV)
+  calabash_setup
   exit 0
 elsif cmd == 'submit'
   calabash_submit(ARGV)

data/bin/calabash-android-build.rb

@@ -1,4 +1,6 @@
 def calabash_build(args)
+  run_setup_if_settings_does_not_exist
+
   @settings = JSON.parse(IO.read(".calabash_settings"))  
     test_server_template_dir = File.join(File.dirname(__FILE__), '..', 'test-server')
   

data/bin/calabash-android-generate.rb

@@ -17,10 +17,8 @@ def calabash_scaffold
   FileUtils.mv "#{@features_dir}/irb_android.sh", "."
 
   msg("Info") do
-    #TODO Jonas
     puts "features subdirectory created. \n"
-    puts "Try executing \n\nDEVICE=iphone OS=ios5 cucumber"
-    puts "\n (replace ios5 with ios4 if running iOS 4.x simulator.\nReplace iphone with ipad if running iPad simulator.).\n"
+    puts "Try executing \n\ncalabash-android run"
   end
 
 end

data/bin/calabash-android-helpers.rb

@@ -9,7 +9,6 @@ def msg(title, &block)
   puts "-"*10 + "-------" + "-"*10 + "\n"
 end
 
-#TODO Jonas
 def print_usage
   puts <<EOF
   Usage: calabash-android <command-name> [parameters]
@@ -18,10 +17,13 @@ def print_usage
       prints more detailed help information.
     gen
       generate a features folder structure.
-    setup
-      setup your project for calabash
-    submit [path] [secret] [opt_features path]?
-      submits an apk and features folder to www.lesspainful.com
+    setup will ask you some questions about you application, development
+      environment and key store to user for signing.
+
+    build builds the test server that will be used when testing the app.
+      You need to run this command everytime you make changes to app.
+
+    run runs Cucumber in the current folder with the enviroment needed.
 EOF
 end
 
@@ -66,6 +68,34 @@ def calabash_submit(args)
   else
     puts result
   end
+end
+
+
+def run_build_if_test_server_does_not_exist
+  unless File.exists?(File.join(@support_dir, "Test.apk"))
+    puts "Could not find the test server"
+    puts "Should I run calabash-android build for you?"
+    puts "Please answer yes (y) or no (n)"
+    if ['yes', 'y'].include? STDIN.gets.chomp
+      calabash_build([])
+    else
+      puts "Please run: calabash-android build"
+      exit 1
+    end
+  end
+end
 
+def run_setup_if_settings_does_not_exist
+  unless File.exists?(".calabash_settings")
+    puts "Could not find .calabash_settings."
+    puts "Should I run calabash-android setup for you?"
+    puts "Please answer yes (y) or no (n)"
+    if ['yes', 'y'].include? STDIN.gets.chomp
+      calabash_setup
+    else
+      puts "Please run: calabash-android setup"
+      exit 1
+    end
+  end
 end
 

data/bin/calabash-android-run.rb

@@ -1,9 +1,7 @@
 def calabash_run(args)
-  unless File.exists?(".calabash_settings")
-    puts "Could not find .calabash_settings"
-    puts "Please run: calabash-android setup"
-    exit 1
-  end
+  run_build_if_test_server_does_not_exist
+
+
   settings = JSON.parse(IO.read(".calabash_settings"))
   
   env ={"PACKAGE_NAME" => settings["package_name"],

data/bin/calabash-android-setup.rb

@@ -1,30 +1,6 @@
 require "calabash-android/version"
 
-#TODO Jonas
-#require 'rexml/rexml'
-#require "rexml/document"
-#
-#
-#def detect_accessibility_support
-#  dirs = Dir.glob(File.join(File.expand_path("~/Library"),"Application Support","iPhone Simulator","*.*","Library","Preferences"))
-#  dirs.each do |sim_pref_dir|
-#    fp = File.expand_path("#{sim_pref_dir}/com.apple.Accessibility.plist")
-#    out = `defaults read "#{fp}" ApplicationAccessibilityEnabled`
-#
-#    if not(File.exists?(fp)) || out.split("\n")[0] == "0"
-#        msg("Warn") do
-#          puts "Accessibility is not enabled for simulator: #{sim_pref_dir}"
-#          puts "Enabled accessibility as described here:"
-#          puts "https://github.com/calabash/calabash-android/wiki/01-Getting-started-guide"
-#          puts "Alternatively run command:"
-#          puts "calabash-android sim acc"
-#        end
-#    end
-#
-#  end
-#end
-#
-def calabash_setup(args)
+def calabash_setup
   unless File.exists?(ENV["ANDROID_HOME"] || "")
     puts "Please set ANDROID_HOME to point to the Android SDK"
     exit 1
@@ -62,51 +38,6 @@ def calabash_setup(args)
     f.puts @settings.to_json
   end
   puts "Saved your settings to .calabash_settings. You can edit the settings manually or run this setup script again"
-
-  #TODO Jonas
-#  puts "Checking if Xcode is running..."
-#  res = `ps x -o pid,command | grep -v grep | grep Xcode.app/Contents/MacOS/Xcode`
-#  if res==""
-#    puts "Xcode not running."
-#    project_name, project_path, xpath = find_project_files(args)
-#    setup_project(project_name, project_path, xpath)
-#
-#    detect_accessibility_support
-#
-#    msg("Setup done") do
-#
-#      puts "Please validate by running the -cal target"
-#      puts "from Xcode."
-#      puts "When starting the iOS Simulator using the"
-#      puts "new -cal target, you should see:\n\n"
-#      puts '  "Started LPHTTP server on port 37265"'
-#      puts "\nin the application log in Xcode."
-#      puts "\n\n"
-#      puts "After validating, you can generate a features folder:"
-#      puts "Go to your project (the dir containing the .xcodeproj file)."
-#      puts "Then run calabash-android gen"
-#      puts "(if you don't already have a features folder)."
-#    end
-#
-#  else
-#    puts "Xcode is running. We'll be changing the project file so we'd better stop it."
-#    puts "Shall I stop Xcode? Please answer yes (y) or no (n)"
-#    answer = STDIN.gets.chomp
-#    if (answer == 'yes' or answer == 'y')
-#      res.split("\n").each do |line|
-#        pid = line.split(" ")[0]
-#        if system("kill #{pid}")
-#          puts "Stopped XCode. Retrying... "
-#          calabash_setup(args)
-#        else
-#          puts "Killing Xcode seemed to fail :( Aborting..."
-#        end
-#      end
-#    else
-#      puts "Please stop Xcode and try again."
-#      exit(0)
-#    end
-#  end
 end
 
 def ask_for_setting(key, msg)
@@ -116,277 +47,4 @@ end
 
 def platform_versions
   Dir["#{ENV["ANDROID_HOME"]}/platforms/android-*"].collect{|platform| platform.split("-").last.to_i}.sort
-end
-
-
-#
-#def find_project_files(args)
-#  dir_to_search, project_files = ensure_correct_path(args)
-#
-#  xc_project_file = project_files[0]
-#  project_name = xc_project_file.split(".xcodeproj")[0]
-#  puts "Found Project: #{project_name}"
-#  pbx_dir = "#{dir_to_search}/#{xc_project_file}"
-#  pbx_files = Dir.foreach(pbx_dir).find_all { |x| /\.pbxproj$/.match(x) }
-#  if pbx_files.empty?
-#    puts "Found no *.pbxproj files in dir #{xc_project_file}."
-#    puts "Please setup calabash manually."
-#    exit 1
-#  elsif pbx_files.count > 1
-#    puts "Found several *.pbxproj files in dir #{xc_project_file}."
-#    puts "Found: #{pbx_files.join("\n")}"
-#    puts "We don't yet support this. Please setup calabash manually."
-#    exit 1
-#  end
-#
-#  return project_name, dir_to_search, File.expand_path("#{dir_to_search}/#{xc_project_file}")
-#end
-#
-#def calabash_download(args)
-#  download_calabash(File.expand_path("."))
-#end
-#
-#def has_proxy?
-#  ENV['http_proxy'] ? true : false
-#end
-#
-#def proxy
-#  url_parts = URI.split(ENV['http_proxy'])
-#  [url_parts[2], url_parts[3]]
-#end
-#
-#def download_calabash(project_path)
-#  file = 'calabash.framework'
-#  ##Download calabash.framework
-#  if not File.directory?(File.join(project_path, file))
-#    msg("Info") do
-#      zip_file = "calabash.framework-#{ENV['FRAMEWORK_VERSION']||Calabash::Android::FRAMEWORK_VERSION}.zip"
-#      puts "Did not find calabash.framework. I'll download it...'"
-#      puts "http://cloud.github.com/downloads/calabash/calabash-android/#{zip_file}"
-#      require 'uri'
-#
-#      uri = URI.parse "http://cloud.github.com/downloads/calabash/calabash-android/#{zip_file}"
-#      success = false
-#      if has_proxy?
-#        proxy_url = proxy
-#        connection = Net::HTTP::Proxy(proxy_url[0], proxy_url[1])
-#      else
-#        connection = Net::HTTP
-#      end
-#      connection.start(uri.host, uri.port) do |http|
-#        request = Net::HTTP::Get.new uri.request_uri
-#
-#        http.request request do |response|
-#          if response.code == '200'
-#            open zip_file, 'wb' do |io|
-#              response.read_body do |chunk|
-#                print "."
-#                io.write chunk
-#              end
-#            end
-#            success = true
-#          else
-#             puts "Got bad response code #{response.code}."
-#             puts "Aborting..."
-#          end
-#        end
-#      end
-#      if success
-#        puts "\nDownload done: #{file}. Unzipping..."
-#        if not system("unzip -C -K -o -q -d #{project_path} #{zip_file}")
-#          msg("Error") do
-#            puts "Unable to unzip file: #{zip_file}"
-#            puts "You must install manually."
-#          end
-#          exit 1
-#        end
-#        FileUtils.rm(zip_file)
-#      else
-#        exit 0
-#      end
-#    end
-#  else
-#    msg("Info") do
-#      puts "Found calabash.framework in #{File.expand_path(project_path)}."
-#      puts "Shall I delete it and download the latest matching version?"
-#      puts "Please answer yes (y) or no (n)"
-#      answer = STDIN.gets.chomp
-#      if (answer == 'yes' or answer == 'y')
-#        FileUtils.rm_r File.join(project_path, file)
-#        return download_calabash(project_path)
-#      else
-#        puts "Not downloading..."
-#      end
-#    end
-#  end
-#  file
-#end
-#
-#def setup_project(project_name, project_path, path)
-#  ##Ensure exists and parse
-#  proj_file = "#{path}/project.pbxproj"
-#  if not File.exists?(proj_file)
-#    msg("Error") do
-#      puts "Directory #{path} doesn't contain #{proj_file}"
-#    end
-#    exit 1
-#  end
-#
-#  pwd = FileUtils.pwd
-#  FileUtils.cd project_path
-#  ##Backup
-#  if File.exists? "#{proj_file}.bak"
-#    msg("Error") do
-#      puts "Backup file already exists. #{proj_file}.bak"
-#      puts "For safety, I won't overwrite this file."
-#      puts "You must manually move this file, if you want to"
-#      puts "Run calabash-android setup again."
-#    end
-#    exit 1
-#  end
-#
-#  file = download_calabash(project_path)
-#
-#  msg("Info") do
-#    puts "Setting up project file for calabash-android."
-#  end
-#
-#
-#  FileUtils.cd pwd
-#
-#  ##Backup
-#  msg("Info") do
-#    puts "Making backup of project file: #{proj_file}"
-#    FileUtils.cp(proj_file, "#{proj_file}.bak")
-#    puts "Saved as #{proj_file}.bak"
-#  end
-#
-#  path_to_setup = File.join(File.dirname(__FILE__), 'CalabashSetup')
-#  setup_cmd = %Q[#{path_to_setup} "#{path}" "#{project_name}"]
-#  system(setup_cmd)
-#
-#end
-#
-#
-#
-#require 'calabash-android/launch/simulator_helper'
-#def validate_setup(args)
-#  if args.length > 0
-#    if args[0].end_with?(".ipa")
-#      validate_ipa(args[0])
-#    elsif args[0].end_with?(".app")
-#      validate_app(args[0])
-#    else
-#      msg("Error") do
-#        puts "File should end with .app or .ipa"
-#      end
-#      exit 1
-#    end
-#  else
-#    dd_dir = Calabash::Android::SimulatorHelper.derived_data_dir_for_project
-#      if not dd_dir
-#        puts "Unable to find iOS project."
-#        puts "You should run this command from an iOS project directory."
-#        exit 1
-#      end
-#      app_bundles = Dir.glob(File.join(dd_dir, "Build", "Products", "*", "*.app"))
-#      sim_dirs = Dir.glob(File.join(dd_dir, "Build", "Products", "Debug-iphonesimulator", "*.app"))
-#      sim_dirs = sim_dirs.concat(Dir.glob(File.join(dd_dir, "Build", "Products", "Calabash-iphonesimulator", "*.app")))
-#      if sim_dirs.empty?
-#        msg = ["Have you built your app for simulator?"]
-#        msg << "You should build the -cal target and your normal target"
-#        msg << "(with configuration Debug)."
-#        msg << "Searched dir: #{dd_dir}/Build/Products"
-#        msg("Error") do
-#          puts msg.join("\n")
-#        end
-#        exit 1
-#      elsif sim_dirs.count != 2
-#        msg = ["Have you built your app for simulator?"]
-#        msg << "You should build the -cal target and your normal target"
-#        msg << "(with configuration Debug)."
-#        msg << "Searched dir: #{dd_dir}/Build/Products"
-#        msg("Error") do
-#          puts msg.join("\n")
-#        end
-#        exit 1
-#      end
-#      out_debug = `otool "#{sim_dirs[0]}"/* -o 2> /dev/null | grep CalabashServer`
-#      out_cal = `otool "#{sim_dirs[1]}"/* -o 2> /dev/null | grep CalabashServer 2> /dev/null`
-#      ok = (not /CalabashServer/.match(out_debug)) and /CalabashServer/.match(out_cal)
-#      if ok
-#        msg("OK") do
-#          puts "Your configuration seems ok."
-#          puts "app in directory:"
-#          puts sim_dirs[0]
-#          puts "does not have calabash.framework linked in."
-#          puts "directory:"
-#          puts sim_dirs[1]
-#          puts "does."
-#        end
-#      else
-#        msg("Fail") do
-#          puts "Your configuration looks bad."
-#          if (not /CalabashServer/.match(out_debug))
-#            puts "WARNING: You Debug build seems to be linking with Calabash."
-#            puts "You should restore your xcodeproject file from backup."
-#          else
-#            puts "app in directory"
-#            puts sim_dirs[1]
-#            puts "does not have calabash.framework linked in."
-#          end
-#        end
-#      end
-#  end
-#
-#
-#end
-#
-#def validate_ipa(ipa)
-#  require 'tmpdir'
-#  fail = false
-#  Dir.mktmpdir do |dir|
-#    if not system("unzip -C -K -o -q -d #{dir} #{ipa}")
-#      msg("Error") do
-#        puts "Unable to unzip ipa: #{ipa}"
-#      end
-#      Dir
-#      fail = true
-#    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`
-#    msg("Info") do
-#      if /CalabashServer/.match(res)
-#        puts "Ipa: #{ipa} *contains* calabash.framework"
-#      else
-#        puts "Ipa: #{ipa} *does not contain* calabash.framework"
-#      end
-#    end
-#
-#  end
-#  if fail
-#    exit(1)
-#  end
-#
-#end
-#
-#def validate_app(app)
-#  if not File.directory?app
-#    msg("Error") do
-#      puts "Path: #{app} is not a directory."
-#    end
-#    exit 1
-#  end
-#  out = `otool "#{File.expand_path(app)}"/* -o 2> /dev/null | grep CalabashServer`
-#
-#  msg("Info") do
-#    if /CalabashServer/.match(out)
-#      puts "App: #{app} *contains* calabash.framework"
-#    else
-#      puts "App: #{app} *does not contain* calabash.framework"
-#    end
-#  end
-#
-#end
+end

data/doc/calabash-android-help.txt

@@ -1,4 +1,3 @@
-#TODO Jonas
 Usage: calabash-android <command-name> [parameters]
   <command-name> can be one of
     help
@@ -18,4 +17,4 @@ Usage: calabash-android <command-name> [parameters]
   build builds the test server that will be used when testing the app.
       You need to run this command everytime you make changes to app.
 
-  run runs cucumber in the current folder with the enviroment needed.
+  run runs Cucumber in the current folder with the enviroment needed.

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.0.2"
-    FRAMEWORK_VERSION = "0.0.2"
+    VERSION = "0.0.3"
+    FRAMEWORK_VERSION = "0.0.3"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: calabash-android
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jonas Maturana Larsen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-27 00:00:00 -03:00
+date: 2012-04-30 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - Gemfile
 - LICENSE
 - Rakefile
+- bin/.DS_Store
 - bin/calabash-android
 - bin/calabash-android-build.rb
 - bin/calabash-android-generate.rb