lesspainful 0.0.3 → 0.8.0

data/bin/lesspainful

@@ -32,11 +32,14 @@ def is_android?
   app.end_with? ".apk"
 end
 
+def calabash_android_version
+  `bundle exec calabash-android version`.strip
+end
+
 def test_server_path
   require 'digest/md5'
   digest = Digest::MD5.hexdigest(File.read(app))
-  version = `calabash-android version`.strip
-  "#{workspace}test_servers/#{digest}_#{version}.apk"
+  "#{workspace}test_servers/#{digest}_#{calabash_android_version}.apk"
 end
 
 def all_files
@@ -45,7 +48,6 @@ def all_files
   if is_android?
     files << test_server_path
   end
-  files << "Gemfile"
   files.find_all { |file_or_dir| File.file? file_or_dir }
 end
 
@@ -71,8 +73,63 @@ def self.log_header(message)
   end
 end
 
+def self.usage
+  "Usage: lesspainful <app> <api_key>"
+end
+
+def self.verify_arguments
+  log_and_abort(usage) unless app
+  log_and_abort(usage) unless api_key
+  abort_unless(File.exist?(app)) do
+    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
+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@lesspainf.com about this bug"
+    end
+  end
+end
+
+
+
+
 start_at = Time.now
 
+verify_arguments
+
 log_header("Checking for Gemfile")
 unless File.exist?("Gemfile")
   log("Gemfile missing.")
@@ -87,12 +144,19 @@ unless File.exist?("Gemfile")
 end
 
 log_header("Packaging")
-raise "Bundler failed. Please check command: bundle package" unless system("bundle package")
+log_and_abort "Bundler failed. Please check command: bundle package" unless system("bundle package")
+
 
 log_header("Collecting files")
 hashes = all_files.collect { |f| digest(f) }
 hashes << digest(app)
 
+log_header("Verifying files")
+
+verify_files
+
+
+
 
 log_header("Negotiating upload")
 response = http_post("check_hash", {"hashes" => hashes})

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lesspainful
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client for uploading calabash test to www.lesspainful.com