appsendr 0.0.3 → 0.0.5

data/Manifest

@@ -1,6 +1,7 @@
 Manifest
 README.rdoc
 Rakefile
+appsendr.gemspec
 bin/appsendr
 lib/appsendr.rb
 lib/appsendr/binary_plist.rb
@@ -12,9 +13,12 @@ lib/appsendr/commands/base.rb
 lib/appsendr/commands/build.rb
 lib/appsendr/commands/collaborators.rb
 lib/appsendr/commands/deploy.rb
+lib/appsendr/commands/groups.rb
 lib/appsendr/commands/help.rb
+lib/appsendr/commands/portal.rb
 lib/appsendr/commands/testers.rb
 lib/appsendr/commands/version.rb
 lib/appsendr/constants.rb
 lib/appsendr/helpers.rb
+lib/appsendr/progressbar.rb
 terms

data/Rakefile

@@ -7,10 +7,10 @@ Echoe.new('appsendr', AppSendr::VERSION) do |p|
   p.description    = "A gem that will build and distribute an iphone/ipad app to the web for remote install"
   p.url            = "http://www.appsendr.com/gem"
   p.author         = "AppSendr"
-  p.email          = "nolanbrown@gmail.com"
+  p.email          = "nolan@appsendr.com"
   p.ignore_pattern = ["tmp/*", "script/*"]
   p.development_dependencies = []
-  p.runtime_dependencies = ["rest-client >=1.4.0", "rubyzip", "json_pure >=1.2.0", "aws-s3"]
+  p.runtime_dependencies = ["rest-client >=1.4.0", "rubyzip", "json_pure >=1.2.0"]
   p.has_rdoc = true  
 
 end

data/appsendr.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{appsendr}
-  s.version = "0.0.3"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["AppSendr"]
-  s.date = %q{2010-12-27}
+  s.date = %q{2011-01-23}
   s.default_executable = %q{appsendr}
   s.description = %q{A gem that will build and distribute an iphone/ipad app to the web for remote install}
-  s.email = %q{nolanbrown@gmail.com}
+  s.email = %q{nolan@appsendr.com}
   s.executables = ["appsendr"]
-  s.extra_rdoc_files = ["README.rdoc", "bin/appsendr", "lib/appsendr.rb", "lib/appsendr/binary_plist.rb", "lib/appsendr/client.rb", "lib/appsendr/command.rb", "lib/appsendr/commands/app.rb", "lib/appsendr/commands/auth.rb", "lib/appsendr/commands/base.rb", "lib/appsendr/commands/build.rb", "lib/appsendr/commands/collaborators.rb", "lib/appsendr/commands/deploy.rb", "lib/appsendr/commands/help.rb", "lib/appsendr/commands/testers.rb", "lib/appsendr/commands/version.rb", "lib/appsendr/constants.rb", "lib/appsendr/helpers.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "bin/appsendr", "lib/appsendr.rb", "lib/appsendr/binary_plist.rb", "lib/appsendr/client.rb", "lib/appsendr/command.rb", "lib/appsendr/commands/app.rb", "lib/appsendr/commands/auth.rb", "lib/appsendr/commands/base.rb", "lib/appsendr/commands/build.rb", "lib/appsendr/commands/collaborators.rb", "lib/appsendr/commands/deploy.rb", "lib/appsendr/commands/help.rb", "lib/appsendr/commands/testers.rb", "lib/appsendr/commands/version.rb", "lib/appsendr/constants.rb", "lib/appsendr/helpers.rb", "terms", "appsendr.gemspec"]
+  s.extra_rdoc_files = ["README.rdoc", "bin/appsendr", "lib/appsendr.rb", "lib/appsendr/binary_plist.rb", "lib/appsendr/client.rb", "lib/appsendr/command.rb", "lib/appsendr/commands/app.rb", "lib/appsendr/commands/auth.rb", "lib/appsendr/commands/base.rb", "lib/appsendr/commands/build.rb", "lib/appsendr/commands/collaborators.rb", "lib/appsendr/commands/deploy.rb", "lib/appsendr/commands/groups.rb", "lib/appsendr/commands/help.rb", "lib/appsendr/commands/portal.rb", "lib/appsendr/commands/testers.rb", "lib/appsendr/commands/version.rb", "lib/appsendr/constants.rb", "lib/appsendr/helpers.rb", "lib/appsendr/progressbar.rb"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "bin/appsendr", "lib/appsendr.rb", "lib/appsendr/binary_plist.rb", "lib/appsendr/client.rb", "lib/appsendr/command.rb", "lib/appsendr/commands/app.rb", "lib/appsendr/commands/auth.rb", "lib/appsendr/commands/base.rb", "lib/appsendr/commands/build.rb", "lib/appsendr/commands/collaborators.rb", "lib/appsendr/commands/deploy.rb", "lib/appsendr/commands/groups.rb", "lib/appsendr/commands/help.rb", "lib/appsendr/commands/portal.rb", "lib/appsendr/commands/testers.rb", "lib/appsendr/commands/version.rb", "lib/appsendr/constants.rb", "lib/appsendr/helpers.rb", "lib/appsendr/progressbar.rb", "terms", "appsendr.gemspec"]
   s.homepage = %q{http://www.appsendr.com/gem}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Appsendr", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -28,17 +28,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rest-client>, [">= 1.4.0"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 0"])
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<aws-s3>, [">= 0"])
     else
       s.add_dependency(%q<rest-client>, [">= 1.4.0"])
       s.add_dependency(%q<rubyzip>, [">= 0"])
       s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_dependency(%q<aws-s3>, [">= 0"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 1.4.0"])
     s.add_dependency(%q<rubyzip>, [">= 0"])
     s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-    s.add_dependency(%q<aws-s3>, [">= 0"])
   end
 end

data/lib/appsendr/client.rb

@@ -4,7 +4,7 @@ require 'uri'
 require 'time'
 require 'appsendr/constants'
 require 'json/pure' unless {}.respond_to?(:to_json)
-require 'aws/s3'
+
 # A Ruby class to call the AppSendr REST API. 
 # 
 # Example:
@@ -64,6 +64,17 @@ class AppSendr::Client
       post('/api/app/create.json', {:name=>name})
   end
 
+  def devices(app_id,plist=true)
+      format = "json"
+      format = "plist" if plist
+      
+      if app_id
+          get("/api/tester/devices.#{format}", {:app_id=>app_id})
+      else
+          get("/api/tester/devices.#{format}")
+      end
+  end
+
   def add_tester(app_id,email,name,udid=nil)
       post('/api/tester/create.json',{:email=>email, :name=>name, :app_id=>app_id.to_s});
   end
@@ -88,6 +99,16 @@ class AppSendr::Client
       get('/api/app/groups/'+app_id.to_s+'.json')
   end
   
+  
+  def add_group_tester(app_id,name, email)
+      post('/api/group/add_tester.json',{:name=>name,:app_id=>app_id.to_s, :email=>email});
+  end
+  
+  def remove_group_tester(app_id, name, email)
+      post('/api/group/remove_tester.json',{:name=>name,:app_id=>app_id.to_s, :email=>email});
+  end
+  
+  
   ### add_collaborator
   
   def add_collaborator(app_id,emaill)
@@ -105,11 +126,11 @@ class AppSendr::Client
   def testers(app_id)
       get('/api/app/testers/'+app_id.to_s+'.json')
   end
-  def notify(app_id)
-      get('/api/app/notify/'+app_id.to_s+'.json')
+  def notify(app_id,group=nil)
+      post('/api/app/notify/'+app_id.to_s+'.json',{:group=>group})
   end 
   
-  def upload(app_id, ipa,provisioning,notify, notes, bundle_id, icon)
+  def upload(app_id, ipa,provisioning, notify, notes, bundle_id, icon, later=false)
 		params = {
         :provisioning_profile => File.new(provisioning, 'rb'),
         :notes=>notes,
@@ -119,41 +140,82 @@ class AppSendr::Client
         :app_id => app_id.to_s
     #    :ipa=>
       }
-      
 		if icon
 			params[:icon] = File.new(icon,'rb')
 		end
-        if(is_file_to_large?(ipa))
-            puts "IPA is too large to upload."
-        else
-			params[:ipa] = File.new(ipa, 'rb')
-  
-			post('/api/version/create/', {:version=>params})
-		end
+		
+		if later
+		    params[:upload_later] = File.basename(ipa)
+            
+	    else
+	        params[:ipa] = File.new(ipa, 'rb')
+    		
+        end
+
+		post('/api/version/create.json', {:version=>params})
   end
   
-  protected
-  def is_file_to_large?(file)
-      in_mb = size_of_file(file).to_f
-		if in_mb > 10
-			return true
-		else
-			return false
-		end
-		
+  def initialize_multipart(app_id, version_id, ipa)
+      ipa_name = File.basename(ipa)
+      
+      params = {}
+	  params[:ipa_path] = upload_path(app_id,version_id,ipa_name)
+	  params[:ipa_name] = ipa_name
+      params[:id] = version_id
+      
+      post('/api/version/multipart_init.json', {:version=>params})
   end
+  
+  def upload_part(app_id, version_id, ipa, upload_id, part_number, chunk)
+        ipa_name = File.basename(ipa)
+        ipa_size = File.size(ipa)
+        
+        params = {}
+        params[:ipa_chunk] = File.new(chunk,'rb')
+        params[:ipa_size] = ipa_size
+        params[:ipa_path] = upload_path(app_id,version_id,ipa_name)
+        params[:upload_id] = upload_id
+        params[:part_number] = part_number
+        params[:id] = version_id
 
-  def size_of_file(file)
-      	size = File.size(file)
-		mb = 1024.0 * 1024.0
-		in_mb = size / mb
-	
+        retryable( :tries => 5 ) do
+            resp = post('/api/version/multipart_upload_part.json', {:version=>params})
+            return resp 
+        end      
   end
+  
+  def finish_multipart(app_id, version_id, ipa, upload_id, parts)
+        ipa_name = File.basename(ipa)
+        ipa_size = File.size(ipa)
 
+        params = {}
+        params[:ipa_size] = ipa_size
+        params[:ipa_path] = upload_path(app_id,version_id,ipa_name)
+        params[:upload_id] = upload_id
+        params[:parts] = parts
+        params[:id] = version_id
 
-  def upload_to_s3_directly
-		@s3_url = "http://appsendr.s3.amazonaws.com/"
-    
+        post('/api/version/multipart_finished.json', {:version=>params})
+
+                
+  end
+  
+  def abort_multipart(app_id, version_id, ipa, upload_id)
+      params = { :version=> {
+                    :ipa_path=>upload_path(app_id,version_id,File.basename(ipa)),
+                    :upload_id=>upload_id, 
+                    :id=>version_id 
+                    }
+                }
+      post('/api/version/abort_multipart.json',params)
+      
+  end
+  
+  protected
+  
+  
+  def upload_path(app_id,version_id,ipa_name)
+      "app/#{app_id}/#{version_id}/ipa/#{ipa_name}"
   end
 
   def api_params(params={})
@@ -161,6 +223,20 @@ class AppSendr::Client
       
   end
   
+  def retryable(options = {}, &block)
+        opts = { :tries => 1, :on => Exception }.merge(options)
+
+        retry_exception, retries = opts[:on], opts[:tries]
+
+        begin
+            return yield
+        rescue retry_exception
+            retry if (retries -= 1) > 0
+        end
+
+        yield
+  end
+  
   def get(uri,params={})
       params[:api_key] ||= @api_key
       resp = RestClient.get @resource.url+uri, {:params=>params}

data/lib/appsendr/command.rb

@@ -1,6 +1,7 @@
 require 'appsendr/helpers'
 require 'appsendr/binary_plist'
 require 'appsendr/commands/base'
+require 'appsendr/progressbar'
 
 Dir["#{File.dirname(__FILE__)}/commands/*.rb"].each { |c| require c }
 
@@ -27,13 +28,23 @@ module AppSendr
             error "Authentication failure"
           end
         rescue RestClient::ResourceNotFound
-            error "Resouce not found."
-        rescue RestClient::RequestFailed
-            error "Something went wrong with the server."
+            error "Record not found. Are you allowed to access this record?"
+        rescue RestClient::RequestFailed => e
+            begin
+            response = JSON.parse(e.http_body)
+            display "=== Errors"
+            response['message'].each{|err|
+                display err.join(" ")
+            }
+            rescue
+                error "Something went wrong with the server."
+            end
         rescue CommandFailed => e
           error e.message
         rescue Interrupt => e
           error "\n[canceled]"
+        rescue Exception => e
+            error e
         end
       end
 

data/lib/appsendr/commands/app.rb

@@ -7,7 +7,7 @@ module AppSendr::Command
     def list
       list = appsendr.list
       if list["message"].size > 0
-        display "=== Your apps"
+        message "Your apps"
         i = 0
         display list["message"].map {|app, id|
             "#{i+=1}. #{app['name'].ljust(35)}"
@@ -23,15 +23,42 @@ module AppSendr::Command
         # password  = extract_option('--password')
         # display password
         # 
+        name = args.join(" ").strip
         
-        if require_in_project_and_no_droppr(1,"an app name","a name to create an app on appsendr",true)            
-            name = args.join(" ").strip
-            resp = appsendr.create(name)
-            make_appsendr_dir if resp['message']
-            @app = [resp['message']['id'],resp['message']['name']] 
-            write_app
-            display "Your app has been created."
-            
+        if require_project(1,"an app name","a name to create an app on appsendr",true)            
+            if has_project_droppr?
+                list = appsendr.list
+                if list["message"].size > 0
+                    list["message"].each{|app|
+                        if app['name'] == name
+                            remove_appsendr_dir
+                            make_appsendr_dir
+
+                            @app = [ app['id'], app['name']] 
+                            write_app
+                            display "Your app has been linked."
+                           return
+                        end
+                    }
+
+                    resp = appsendr.create(name)
+                    remove_appsendr_dir
+                    make_appsendr_dir if resp['message']
+                    @app = [resp['message']['id'],resp['message']['name']] 
+                    write_app
+                    display "Your app has been created."
+
+                else
+                    error "This app is linked to another account's app"    
+                end
+            else
+                resp = appsendr.create(name)
+                make_appsendr_dir if resp['message']
+                @app = [resp['message']['id'],resp['message']['name']] 
+                write_app
+                display "Your app has been created."
+            end
+           
         end
     end
     
@@ -40,7 +67,7 @@ module AppSendr::Command
         
 			resp = appsendr.current_version(get_app_id)
 			    if resp["message"].size > 0
-			      display "=== Your last install url is:"
+			      message "Your last install url is:"
 			      url = resp["message"][0]['install_url']
 			      display url
 			      do_copy = option_exists?('--copy', false)
@@ -83,7 +110,7 @@ module AppSendr::Command
         lines = []
         list = appsendr.list
         if list["message"].size > 0
-          display "=== Your apps"
+          message "Your apps"
           i = 0
           list["message"].each{|app|
               apps.push({"name"=>app['name'], "id"=>app['id']})
@@ -100,32 +127,13 @@ module AppSendr::Command
           display "You have no apps."
         end    
     end
-    
-	def groups
-		if in_project_dir?
-        
-			groups = appsendr.groups(get_app_id)
-			    if groups["message"].size > 0
-			      display "=== Your groups"
-			      i = 0
-			      display groups["message"].map {|app, id|
-			          "#{i+=1}. #{app['name'].ljust(35)}"
-			      }.join("\n")
-			    else
-			      display "You have no groups."
-			    end
-		else
-			error("You are not in a project directory")
-		end
-	end
-	
-	
+
 	def versions
 		if in_project_dir?
         
 			groups = appsendr.versions(get_app_id)
 			    if groups["message"].size > 0
-			      display "=== Your versions"
+			      message "Your versions"
 			      i = 0
 			      display groups["message"].map {|app, id|
 			          "#{i+=1}. #{app['notes']} #{app['install_url']}"
@@ -189,7 +197,12 @@ module AppSendr::Command
     #  end
      
      protected
-          
+     def remove_appsendr_dir
+         if in_project_dir?
+             FileUtils.rm_r(Dir.pwd+"/"+AppSendr::PROJECT_DIR)
+         end
+     end
+     
      def make_appsendr_dir
          if in_project_dir?
              FileUtils.mkdir_p(Dir.pwd+"/"+AppSendr::PROJECT_DIR)

data/lib/appsendr/commands/auth.rb

@@ -22,7 +22,9 @@ module AppSendr::Command
     end
 
     def host
-      ENV['APPDROPPR_HOST'] || 'appsendr.com' ##'appsendr.heroku.com' #
+      ENV['APPDROPPR_HOST'] || 'appsendr.com'
+      #ENV['APPDROPPR_HOST'] || '0.0.0.0:3000'
+      
     end
 
     def reauthorize
@@ -73,33 +75,15 @@ module AppSendr::Command
     def ask_for_credentials
       puts "Enter your AppSendr credentials."
 
-      print "Username: "
+      print "Email: "
       user = ask
 
       print "Password: "
-      password = running_on_windows? ? ask_for_password_on_windows : ask_for_password
+      password = ask_for_password
 
       [ user, password ]
     end
 
-    def ask_for_password_on_windows
-      require "Win32API"
-      char = nil
-      password = ''
-
-      while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
-        break if char == 10 || char == 13 # received carriage return or newline
-        if char == 127 || char == 8 # backspace and delete
-          password.slice!(-1, 1)
-        else
-          # windows might throw a -1 at us so make sure to handle RangeError
-          (password << char.chr) rescue RangeError
-        end
-      end
-      puts
-      return password
-    end
-
     def ask_for_password
       echo_off
       password = ask

data/lib/appsendr/commands/base.rb

@@ -51,6 +51,7 @@ module AppSendr::Command
     def option_exists?(options, default=true)
       values = options.is_a?(Array) ? options : [options]
       return false unless opt_index = args.select { |a| values.include? a }.first
+      args.delete(opt_index)
       return true
     end