lesspainful 0.9.14 → 0.10.0

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    lesspainful (0.9.13)
+    lesspainful (0.10.0)
       bundler (~> 1.2)
       json
-      rest-client
-      rubyzip
+      rest-client (= 1.6.7)
+      rubyzip (= 0.9.9)
+      thor (= 0.17.0)
 
 GEM
   remote: http://rubygems.org/
@@ -15,6 +16,7 @@ GEM
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rubyzip (0.9.9)
+    thor (0.17.0)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1,2 +1,11 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+ t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/bin/lesspainful

@@ -1,339 +1,26 @@
 #!/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"
-end
-
-def digest(file)
-  Digest::SHA256.file(file).hexdigest
-end
-
-def unzip_file (file, destination)
-  Zip::ZipFile.open(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]
-    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
-
-def api_key
-  ARGV[1]
-end
-
-def is_android?
-  app.end_with? ".apk"
-end
-
-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.file(app).hexdigest
-  File.join("test_servers","#{digest}_#{calabash_android_version}.apk")
-end
-
-def all_files
-  dir = workspace
-  if features_zip
-    dir = Dir.mktmpdir
-    unzip_file(features_zip, dir)
-    dir = File.join(dir,File::Separator)
-  end
-
-
-  files = Dir.glob(File.join("#{dir}features","**","*"))
-
-  if File.directory?("#{dir}playback")
-    files += Dir.glob(File.join("#{dir}playback","*"))
-  end
-
-
-  files += Dir.glob(File.join("#{workspace}vendor","cache","*"))
-
-  if workspace and workspace.strip != ""
-    files += Dir.glob("#{workspace}Gemfile")
-    files += Dir.glob("#{workspace}Gemfile.lock")
-  end
-
-  if is_android?
-    files << test_server_path
-  end
-  p files
-  {:feature_prefix => dir, :workspace_prefix => workspace, :files => files.find_all { |file_or_dir| File.file? file_or_dir }}
-end
-
-def http_post(address, args, &block)
-  if block_given?
-    response = RestClient.post "#{host}/#{address}", args, {:content_type => "multipart/form-data"} do |response, request, result, &other_block|
-        block.call(response,request,result, &other_block)
-    end
-  else
-    response = RestClient.post "#{host}/#{address}", args
-  end
-
-  response.body
-end
-
-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 = false
-  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
-
-    unless result
-      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
-  #end
-  result
-end
-
-
-def self.log(message)
- puts "#{Time.now } #{message}"
- $stdout.flush
-end
-
-def self.log_header(message)
-  if is_windows?
-    puts "\n### #{message} ###"
-  else
-    puts "\n\e[#{35}m### #{message} ###\e[0m"
-  end
-end
-
-def usage
-  "Usage: lesspainful <app> <api_key> <opt workspace>? <opt feature.zip>?"
-end
-
-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 or Frank")
-    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)
-  yield block
-  exit 1
-end
-
-def abort_unless(condition, &block)
-  unless condition
-    yield block
-    exit 1
-  end
-end
-
-def log_and_abort(message)
-  abort do 
-    puts message
-  end
-end
-
-
-def self.verify_files
-  if is_android?
-    abort_unless(File.exist?(test_server_path)) do
-      puts "No test server found. Please run:"
-      puts "  calabash-android build #{app}"
-    end
-
-    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@lesspainful.com about this bug."
-    end
-  end
-end
-
 
+require 'lesspainful/cli'
 
+begin
 
-start_at = Time.now
-
-server = verify_arguments
-
-log_header("Checking for Gemfile")
-unless File.exist?("Gemfile")
-  log("Gemfile missing.")
-  if is_android?
-    log("Creating Gemfile for Android")
-    tgt = File.join(File.dirname(__FILE__),"..","lib","GemfileAndroid")
-  elsif is_ios?
-    log("Creating Gemfile for iOS")
-    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
-
-log_header("Packaging")
-log_and_abort "Bundler failed. Please check command: bundle package" unless system("bundle package --all")
-
-
-log_header("Collecting files")
-collected_files = all_files
-file_paths = collected_files[:files]
-feature_prefix = collected_files[:feature_prefix]
-workspace_prefix = collected_files[:workspace_prefix]
-
-hashes = file_paths.collect { |f| digest(f) }
-hashes << digest(app)
-
-log_header("Verifying files")
-
-verify_files
-
-
-
-
-log_header("Negotiating upload")
-
-response = http_post("check_hash", {"hashes" => hashes})
-
-cache_status = JSON.parse(response)
-
-curl_args = []
-files = []
-paths = []
-file_paths.each do |file|
-  if cache_status[digest(file)]
-    #Server already knows about this file. No need to upload it.
-    files << digest(file)
+  script = LessPainful::CLI.new
+  if ARGV.count == 0
+    script.invoke(:help)
+  elsif LessPainful::CLI.all_tasks.keys.include?(ARGV[0])
+    LessPainful::CLI.start
+  elsif ARGV.count >= 2
+    #For backwards compat allow "old-style"
+    script.invoke(:submit, ARGV)
   else
-    #Upload file
-    files << File.new(file)
+    script.invoke(:help)
   end
 
-  if file.start_with?(feature_prefix)
-    prefix = feature_prefix
-  else
-    prefix = workspace_prefix
+rescue Exception=>e
+  if ENV['DEBUG']
+    puts e.backtrace.join("\n") if e.backtrace
+    puts "Message:"
   end
-  paths << file.sub(prefix, "")
+  puts e.message
+  exit(false)
 end
-
-app_file = cache_status[digest(app)] ? digest(app) : File.new(app)
-
-log_header("Uploading negotiated files")
-response = http_post("upload", {"files" => files,
-                                "paths" => paths,
-                                "app" => app_file,
-                                "api_key" => api_key,
-                                "app_filename" => File.basename(app)}) do  |response, request, result, &block|
-  case response.code
-   when 200
-     response
-   when 403
-     abort do
-        puts "Invalid API key"
-     end
-    when 413
-      abort do
-        puts "Files too large"
-     end
-   else
-     abort do
-       log "Unexpected Error. Please contact contact@lesspainful.com and provide the timestamp on your left."
-     end
-   end
-end
-
-end_at = Time.now
-
-log_header("Done (took %.1fs)" % (end_at - start_at))
-log response
-

data/lesspainful.gemspec

@@ -12,11 +12,13 @@ Gem::Specification.new do |s|
   s.summary     = %q{Client for uploading calabash test to www.lesspainful.com}
   s.description = %q{www.lesspainful.com lets you run calabash tests for native and hybrid apps on physical devices}
   s.files         = `git ls-files`.split("\n")
+  s.test_files  = Dir.glob("test/**/*.rb")
   s.executables   = "lesspainful"
   s.require_paths = ["lib"]
 
+  s.add_dependency( "thor", "0.17.0")
   s.add_dependency( "bundler","~> 1.2")
   s.add_dependency( "json")
-  s.add_dependency( "rubyzip")
-  s.add_dependency( "rest-client")
+  s.add_dependency( "rubyzip","0.9.9")
+  s.add_dependency( "rest-client","1.6.7")
 end

data/lib/lesspainful/cli.rb

@@ -0,0 +1,547 @@
+require 'thor'
+require 'yaml'
+require 'rubygems'
+require 'zip/zip'
+require 'digest'
+require 'rest_client'
+require 'json'
+require 'rbconfig'
+require 'tmpdir'
+require 'fileutils'
+
+module LessPainful
+  class CLI < Thor
+    include Thor::Actions
+
+    attr_accessor :host, :app, :api_key, :workspace, :config, :profile, :features_zip, :skip_check, :reset_between_scenarios, :dry_run
+
+    attr_accessor :endpoint_path
+
+    def self.source_root
+      File.join(File.dirname(__FILE__), '..')
+    end
+
+    desc "submit <APP> <API_KEY>", "Submits your app and test suite to LessPainful's device labs"
+
+    method_option :host,
+                  :desc => "Device Lab Host to submit to.",
+                  :aliases => '-h', :type => :string,
+                  :default => (ENV["LP_HOST"] || 'https://www.lesspainful.com')
+
+    method_option :workspace,
+                  :desc => "Workspace containing Gemfile and features.",
+                  :aliases => '-w',
+                  :type => :string,
+                  :default => File.expand_path(".")
+
+    method_option :features,
+                  :desc => "Zip file with features, step definitions, etc.",
+                  :aliases => '-f',
+                  :type => :string
+
+    method_option :config,
+                  :desc => "Cucumber configuration file (cucumber.yml).",
+                  :aliases => '-c',
+                  :type => :string
+
+    method_option :profile,
+                  :desc => "Profile to run (profile from cucumber.yml).",
+                  :aliases => '-p',
+                  :type => :string
+
+    method_option "skip-check",
+                  :desc => "Skip checking for ipa linked with Calabash (iOS only).",
+                  :type => :boolean
+
+    method_option "reset-between-scenarios",
+                  :desc => "Reinstall app between each scenario (iOS only).",
+                  :type => :string,
+                  :default => ENV['RESET_BETWEEN_SCENARIOS']=='1' ? '1': "0"
+
+    method_option "dry-run",
+                  :desc => "Sanity check only, don't upload.",
+                  :aliases => '-d',
+                  :type => :boolean,
+                  :default => false #do upload by default
+
+    def submit(app, api_key, *args)
+
+      self.host = options[:host]
+
+      unless self.host
+        self.endpoint_path = "upload" #invoked old-style
+        self.host =  ENV["LP_HOST"] || 'https://www.lesspainful.com'
+      else
+        self.endpoint_path = "upload2" #nginx receives upload
+      end
+
+      app_path = File.expand_path(app)
+      unless File.exist?(app_path)
+        raise "App is not a file: #{app_path}"
+      end
+
+      self.app = app_path
+
+      self.dry_run = options["dry-run"]
+
+      self.api_key = api_key
+
+      self.skip_check = ENV['CHECK_IPA'] == '0'
+      self.skip_check = options["skip-check"] unless options["skip-check"].nil?
+
+      self.reset_between_scenarios = options["reset-between-scenarios"]
+
+      parse_and_set_config_and_profile
+
+
+
+      workspace_path = options[:workspace] || File.expand_path(".")
+
+      if args[0]
+        workspace_path = args[0]
+      end
+
+      unless File.directory?(workspace_path)
+        raise "Provided workspace: #{workspace_path} is not a directory."
+      end
+      self.workspace = File.join(File.expand_path(workspace_path), File::Separator)
+
+
+      features_path = options[:features]
+      features_path = args[1] if args[1]
+
+      unless features_path.nil?
+        if File.exist?(features_path)
+          self.features_zip = File.expand_path(features_path)
+        else
+          raise "Provided features file does not exist #{features_path}"
+        end
+      end
+
+      if ENV['DEBUG']
+        puts "Host = #{self.host}"
+        puts "App = #{self.app}"
+        puts "API Key = #{self.api_key}"
+        puts "Workspace = #{self.workspace}"
+        puts "Features Zip = #{self.features_zip}"
+        puts "Config = #{self.config}"
+        puts "Profile = #{self.profile}"
+        puts "Skip Check = #{self.skip_check}"
+        puts "Reset Between Scenarios = #{self.reset_between_scenarios}"
+      end
+
+      #Argument parsing done
+      json = submit_test_job
+
+      unless dry_run
+        if JSON.respond_to?(:pretty_generate)
+          puts JSON.pretty_generate(json)
+        else
+          puts json
+        end
+      end
+
+    end
+
+    default_task :submit
+
+    no_tasks do
+
+      def submit_test_job
+        start_at = Time.now
+
+        server = verify_app_and_extract_test_server
+
+
+        log_header("Checking for Gemfile")
+        gemfile_path = File.join(self.workspace, "Gemfile")
+        unless File.exist?(gemfile_path)
+          copy_default_gemfile(gemfile_path, server)
+        end
+
+        log_header("Packaging")
+        FileUtils.cd(self.workspace) do
+          unless system("bundle package --all")
+            log_and_abort "Bundler failed. Please check command: bundle package"
+          end
+        end
+
+
+        log_header("Verifying dependencies")
+        verify_dependencies
+
+
+        if dry_run
+          log_header("Dry run only")
+          log("Dry run completed OK")
+          return
+        end
+
+        app_file, files, paths = gather_files_and_paths_to_upload(all_files)
+
+
+        log_header("Uploading negotiated files")
+
+        upload_data = {"files" => files,
+                       "paths" => paths,
+                       "reset_between_scenarios" => reset_between_scenarios,
+                       "app" => app_file,
+                       "api_key" => api_key,
+                       "app_filename" => File.basename(app)}
+
+        if profile  #only if config and profile
+          upload_data["profile"] = profile
+        end
+
+        if ENV['DEBUG']
+          puts JSON.pretty_generate(upload_data)
+        end
+
+
+        response = http_post(endpoint_path,upload_data) do |response, request, result, &block|
+          case response.code
+            when 200..202
+              response
+            when 403
+              abort do
+                puts "Invalid API key"
+              end
+            when 413
+              abort do
+                puts "Files too large"
+              end
+            else
+              abort do
+                log "Unexpected Error. Please contact contact@lesspainful.com and provide the timestamp on your left."
+              end
+          end
+        end
+
+        end_at = Time.now
+
+        log_header("Done (took %.1fs)" % (end_at - start_at))
+
+        return :status => response.code, :body => JSON.parse(response)
+      end
+
+
+      def copy_default_gemfile(gemfile_path, server)
+        log("")
+        log("Gemfile missing.")
+        log("You must provide a Gemfile in your workspace.")
+        log("A Gemfile must describe your dependencies and their versions")
+        log("See: http://gembundler.com/v1.2/gemfile.html")
+        log("")
+        log("Warning proceeding with default Gemfile.")
+        log("It is strongly recommended that you create a custom Gemfile.")
+        tgt = nil
+        if is_android?
+          log("Creating Gemfile for Android")
+          tgt = File.join(CLI.source_root, "GemfileAndroid")
+        elsif is_ios?
+          log("Creating Gemfile for iOS")
+          gemfile = "GemfileIOS"
+          if server == :frank
+            gemfile = "GemfileIOSFrank"
+          end
+          tgt = File.join(CLI.source_root, gemfile)
+        else
+          raise "Your app must be an ipa or apk file."
+        end
+        log("Proceeding with Gemfile: #{gemfile_path}")
+
+
+        FileUtils.cp(File.expand_path(tgt), gemfile_path)
+
+        puts(File.read(gemfile_path))
+
+        log("")
+
+      end
+
+      def gather_files_and_paths_to_upload(collected_files)
+
+        log_header("Calculating digests")
+
+        file_paths = collected_files[:files]
+        feature_prefix = collected_files[:feature_prefix]
+        workspace_prefix = collected_files[:workspace_prefix]
+
+        hashes = file_paths.collect { |f| digest(f) }
+        hashes << digest(app)
+
+
+        log_header("Negotiating upload")
+
+        response = http_post("check_hash", {"hashes" => hashes})
+
+        cache_status = JSON.parse(response)
+
+        log_header("Gathering files based on negotiation")
+
+        files = []
+        paths = []
+        file_paths.each do |file|
+          if cache_status[digest(file)]
+            #Server already knows about this file. No need to upload it.
+            files << digest(file)
+          else
+            #Upload file
+            files << File.new(file)
+          end
+
+          if file.start_with?(feature_prefix)
+            prefix = feature_prefix
+          else
+            prefix = workspace_prefix
+          end
+          paths << file.sub(prefix, "")
+        end
+
+        if config
+          files << File.new(config)
+          paths << "config/cucumber.yml"
+        end
+
+        app_file = cache_status[digest(app)] ? digest(app) : File.new(app)
+
+        return app_file, files, paths
+      end
+
+      def digest(file)
+        Digest::SHA256.file(file).hexdigest
+      end
+
+      def unzip_file (file, destination)
+        Zip::ZipFile.open(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 is_android?
+        app.end_with? ".apk"
+      end
+
+      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.file(app).hexdigest
+        File.join("test_servers", "#{digest}_#{calabash_android_version}.apk")
+      end
+
+      def all_files
+        dir = workspace
+        if features_zip
+          dir = Dir.mktmpdir
+          unzip_file(features_zip, dir)
+          dir = File.join(dir, File::Separator)
+        end
+
+
+        files = Dir.glob(File.join("#{dir}features", "**", "*"))
+
+        if File.directory?("#{dir}playback")
+          files += Dir.glob(File.join("#{dir}playback", "*"))
+        end
+
+        if config
+          files << config
+        end
+
+
+        files += Dir.glob(File.join("#{workspace}vendor", "cache", "*"))
+
+        if workspace and workspace.strip != ""
+          files += Dir.glob("#{workspace}Gemfile")
+          files += Dir.glob("#{workspace}Gemfile.lock")
+        end
+
+        if is_android?
+          files << test_server_path
+        end
+        p files
+        {:feature_prefix => dir, :workspace_prefix => workspace, :files => files.find_all { |file_or_dir| File.file? file_or_dir }}
+      end
+
+      def http_post(address, args, &block)
+        if block_given?
+          response = RestClient.post "#{host}/#{address}", args, {:content_type => "multipart/form-data"} do |response, request, result, &other_block|
+            block.call(response, request, result, &other_block)
+          end
+        else
+          response = RestClient.post "#{host}/#{address}", args
+        end
+
+        response.body
+      end
+
+      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 = false
+        dir = Dir.mktmpdir #do |dir|
+
+        unzip_file(ipa, dir)
+        unless File.directory?("#{dir}/Payload") #macos only
+          raise "Unzipping #{ipa} to #{dir} failed: Did not find a Payload directory (invalid .ipa)."
+        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
+
+        unless result
+          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 log(message)
+        puts "#{Time.now } #{message}"
+        $stdout.flush
+      end
+
+      def log_header(message)
+        if is_windows?
+          puts "\n### #{message} ###"
+        else
+          puts "\n\e[#{35}m### #{message} ###\e[0m"
+        end
+      end
+
+
+      def verify_app_and_extract_test_server
+        server = nil
+
+        unless File.exist?(app)
+          raise "No such file: #{app}"
+        end
+        unless (/\.(apk|ipa)$/ =~ app)
+          raise "<APP> should be either an ipa or apk file."
+        end
+        if is_ios? and is_macosx? and not skip_check
+          log_header("Checking ipa for linking with Calabash or Frank")
+          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 --skip-check or set Environment Variable CHECK_IPA=0"
+          end
+        end
+        server
+      end
+
+      def abort(&block)
+        yield block
+        exit 1
+      end
+
+      def abort_unless(condition, &block)
+        unless condition
+          yield block
+          exit 1
+        end
+      end
+
+      def log_and_abort(message)
+        abort do
+          puts message
+        end
+      end
+
+
+      def verify_dependencies
+        if is_android?
+          abort_unless(File.exist?(test_server_path)) do
+            puts "No test server found. Please run:"
+            puts "  calabash-android build #{app}"
+          end
+
+          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@lesspainful.com about this bug."
+          end
+        end
+      end
+
+
+      def parse_and_set_config_and_profile
+        config_path = options[:config]
+        if config_path
+          config_path = File.expand_path(config_path)
+          unless File.exist?(config_path)
+            raise "Config file does not exist #{config_path}"
+          end
+
+
+          begin
+            config_yml = YAML.load_file(config_path)
+          rescue Exception => e
+            puts "Unable to parse #{config_path} as yml. Is this your Cucumber.yml file?"
+            raise e
+          end
+
+          if ENV['DEBUG']
+            puts "Parsed Cucumber config as:"
+            puts config_yml.inspect
+          end
+
+          profile = options[:profile]
+          unless profile
+            raise "Config file provided but no profile selected."
+          else
+            unless config_yml[profile]
+              raise "Config file provided did not contain profile #{profile}."
+            else
+              puts "Using profile #{profile}..."
+              self.profile = profile
+            end
+          end
+        else
+          if options[:profile]
+            raise "Profile selected but no config file provided."
+          end
+        end
+
+        self.config = config_path
+      end
+
+    end
+
+
+  end
+end
+
+

data/lib/version.rb

@@ -1,3 +1,3 @@
 module LessPainful
-  VERSION = "0.9.14"
+  VERSION = "0.10.0"
 end

data/test/config/cucumber.yml

@@ -0,0 +1 @@
+a: 42

data/test/test_parser.rb

@@ -0,0 +1,62 @@
+require 'test/unit'
+require 'thor'
+require 'fileutils'
+require 'lesspainful/cli'
+
+class TestParser < Test::Unit::TestCase
+  def test_should_raise_if_no_app_or_api_key_is_given
+    script = LessPainful::CLI.new([])
+    assert_raise Thor::InvocationError do
+      script.invoke(:submit)
+    end
+
+    script = LessPainful::CLI.new(["test/ipa/2012 Olympics_cal.ipa"])
+    assert_raise Thor::InvocationError do
+      script.invoke(:submit)
+    end
+
+
+  end
+
+  def test_should_raise_if_app_is_not_file_ipa_or_apk
+    script = LessPainful::CLI.new(["test/ipa/NONE_EXIST_2012 Olympics_cal.ipa","JIFZCTPZJJXJLEKMMYRY","."])
+    assert_raise RuntimeError do
+      script.invoke(:submit)
+    end
+
+    script = LessPainful::CLI.new(["test/ipa/features.zip","JIFZCTPZJJXJLEKMMYRY","."])
+
+    assert_raise RuntimeError do
+      script.invoke(:submit)
+    end
+  end
+
+  def test_should_parse_all_configuration_options
+    FileUtils.rm_f(File.join("test","vendor"))
+    FileUtils.rm_f(File.join("test","Gemfile"))
+    FileUtils.rm_f(File.join("test","Gemfile.lock"))
+
+    config_options = {
+        :host => "http://localhost:8080",
+        :workspace => "test",
+        :features => "test/ipa/features.zip",
+        :config => "test/config/cucumber.yml",
+        :profile => "a",
+        "skip-check" => false,
+        "reset-between-scenarios" => false,
+        "dry-run" => true
+    }
+    script = LessPainful::CLI.new(["test/ipa/2012 Olympics_cal.ipa","JIFZCTPZJJXJLEKMMYRY"],config_options)
+
+
+    script.invoke(:submit)
+
+    FileUtils.rm_f(File.join("test","vendor","cache"))
+    FileUtils.rm_f(File.join("test","Gemfile"))
+    FileUtils.rm_f(File.join("test","Gemfile.lock"))
+
+
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lesspainful
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -48,33 +64,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.7
 description: www.lesspainful.com lets you run calabash tests for native and hybrid
   apps on physical devices
 email:
@@ -93,7 +109,9 @@ files:
 - lib/GemfileAndroid
 - lib/GemfileIOS
 - lib/GemfileIOSFrank
+- lib/lesspainful/cli.rb
 - lib/version.rb
+- test/config/cucumber.yml
 - test/ipa/.irbrc
 - test/ipa/2012 Olympics_cal.ipa
 - test/ipa/2012 Olympics_no_cal.ipa
@@ -108,6 +126,7 @@ files:
 - test/ipa/features/support/launch.rb
 - test/ipa/irb_ios4.sh
 - test/ipa/irb_ios5.sh
+- test/test_parser.rb
 homepage: http://www.lesspainful.com
 licenses: []
 post_install_message: 
@@ -132,5 +151,11 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client for uploading calabash test to www.lesspainful.com
-test_files: []
+test_files:
+- 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/test_parser.rb
 has_rdoc: