appsendr 0.0.3 → 0.0.5

data/lib/appsendr/commands/build.rb

@@ -1,5 +1,7 @@
 require 'zip/zip'
-require 'ftools'
+require 'fileutils'
+require 'appsendr/progressbar'
+
 module AppSendr::Command
   class Build < Base
       attr_accessor :app_path, :app_dir, :app_name, :ipa_path, :provisioning_name, :provisioning_path, :configuration, :project_info
@@ -8,18 +10,30 @@ module AppSendr::Command
       def index
           if require_project(1,"build","your active configuration name")
               @configuration = load_configuration
-              display "=== Building Xcode project with configuration #{@configuration}"    
+              message "Building Xcode project with configuration #{@configuration}"    
               compile(@configuration)   
               
-              @app_dir = path_to_app_dir
-              @app_path = @app_dir+"/#{app_name}"
-              @ipa_path = build_ipa_with_app_at_path
-              info = app_info  
-              bundle_identifier ||= info['CFBundleIdentifier']
-              icon_path = icon_path(info)
-              appsendr.upload(read_app_id,@ipa_path, profile_path,nil,bundle_identifier,icon_path)            
-              FileUtils.rm_rf @ipa_path
+              
+                @app_dir = path_to_app_dir
+                @app_path = @app_dir+"/#{app_name}"
+                if @app_name
+                    @notes = ask_for_notes
+                    message "Building IPA File"    
 
+                    @ipa_path = build_ipa_with_app_at_path                  
+                    info = app_info              
+                    bundle_identifier ||= info['CFBundleIdentifier']
+                    icon_path = icon_path(info)
+                    if is_file_to_large?(@ipa_path)
+                        upload_large_ipa(read_app_id,@ipa_path, profile_path,notify,@notes,bundle_identifier,icon_path)
+                    else
+                        appsendr.upload(read_app_id,@ipa_path, profile_path,notify,@notes,bundle_identifier,icon_path)
+                        message "App deployed"
+                    end
+                    FileUtils.rm_rf @ipa_path
+                else
+                    error "No .app file was built for the configuration \"#{@configuration}\"."
+                end
           end
       end
       
@@ -50,7 +64,7 @@ module AppSendr::Command
       
       def build_ipa_with_app_at_path
           payload_path = @app_dir+"/Payload"
-          ipa_path = @app_dir+"/#{ipa_app_name(app_name)}"
+          ipa_path = @app_dir+"/#{ipa_app_name(app_name).delete('^A-Za-z0-9\.\_\-')}"
           
           
           FileUtils.rm_rf payload_path
@@ -72,6 +86,94 @@ module AppSendr::Command
           system(ditto_exec)
       end
       
+      def upload_large_ipa(app_id, ipa, provisioning ,notify, notes, bundle_id, icon)
+          resp = appsendr.upload(app_id,ipa, provisioning,notify,notes,bundle_id,icon, true)
+          
+          @upload_id = nil
+          @app_version_id = resp['message']['version']['id']
+          if @app_version_id
+              begin
+                  split_file(ipa) 
+                  upload_as_multipart(app_id, @app_version_id, ipa)
+              rescue Exception => e
+                  clean_split_files(File.dirname(ipa))
+                  appsendr.abort_multipart(app_id, @app_version_id, ipa, @upload_id)
+                  raise e
+              end
+          end
+          
+      end
+
+      def upload_as_multipart(app_id, version_id, ipa)
+
+          ipa_name = File.basename(ipa)
+          ipa_dir = File.dirname(ipa)      
+
+          @split_files = organize_split_files(ipa_dir)
+          
+          resp = appsendr.initialize_multipart(app_id, version_id, ipa)    	 
+    	  @upload_id = resp['message']['upload_id']
+    	  unless @upload_id
+              clean_split_files(ipa_dir)
+              raise "A error has occured with the upload"
+          end
+
+          parts = {}
+          pbar = ProgressBar.new("Uploading IPA", @split_files.length * 2)
+
+          @split_files.each_with_index{|file, i|
+              pbar.inc
+              
+              resp = appsendr.upload_part(app_id, version_id, ipa, @upload_id, i+1, file)
+              etag = resp['message']['etag']
+              parts["#{i}"]={:part_num=>i+1, :e_tag=>etag}
+              
+              pbar.inc
+
+           }
+           pbar.finish
+
+           appsendr.finish_multipart(app_id, version_id, ipa, @upload_id, parts)
+
+           clean_split_files(ipa_dir)
+
+      end
+      
+      def clean_split_files(ipa_dir)
+          if File.directory? "#{ipa_dir}/appsendr_splits"
+              FileUtils.rm_r Dir.glob("#{ipa_dir}/appsendr_splits/*")
+              FileUtils.rmdir "#{ipa_dir}/appsendr_splits"
+          end
+      end
+
+      def organize_split_files(ipa_dir)
+          dir_contents = Dir["#{ipa_dir}/appsendr_splits/AppSendrSplit*"]
+          dir_contents.sort! { |a,b| a <=> b }
+          unless dir_contents.length > 1
+
+              clean_split_files(ipa_dir)
+              raise "A error has occured with the upload"
+
+          end
+          return dir_contents
+      end
+
+      def split_file(file_path)
+          return unless file_path
+          file_dir = File.dirname(file_path)      
+
+          file_path = file_path.cl_escape
+          clean_split_files(file_dir)
+
+          file_dir << "/appsendr_splits"
+
+          FileUtils.mkdir file_dir 
+
+          name = File.basename(file_path)
+          `split -b 5mb #{file_path} AppSendrSplit`
+
+          FileUtils.mv Dir.glob("AppSendrSplit*"), file_dir
+      end
       
       
       #povisioning
@@ -142,20 +244,34 @@ module AppSendr::Command
           if icon_files.nil? or icon_files.count == 0
               icon_file = info['CFBundleIconFile']
           else
-              large_icon = icon_files.grep(/@2x/i)
-              if large_icon.nil?
-                  large_icon = icon_files.first
-              end
-              icon_file = large_icon
+              icon_file = icon_files.grep(/@2x/i)
           end
+          
           if icon_file and !icon_file.empty?
               all_dir_contents = Dir["**/*"]
               all_dir_contents = all_dir_contents - all_dir_contents.grep(/^build/)
-          
               icon = all_dir_contents.grep(%r{#{icon_file}}).flatten.first
               if icon
                   icon_path = Dir.pwd+"/#{icon}"
               end
+          elsif icon_files
+              
+               all_dir_contents = Dir["**/*"]
+                all_dir_contents = all_dir_contents - all_dir_contents.grep(/^build/)
+                icon = all_dir_contents.grep(%r{#{icon_files.first}}).flatten.first
+                icon_dir = icon.sub(icon_files.first,"");
+
+                icon_full_path =  Dir.pwd+"/#{icon_dir}"
+                biggest_icon_size = 0 
+                biggest_icon = ""
+                for icon_file in icon_files
+                    size = File.size(icon_full_path+icon_file)
+                    if  size > biggest_icon_size
+                        biggest_icon = icon_full_path+icon_file
+                    end
+                end
+                icon_path = biggest_icon
+
           end
           return icon_path
       end
@@ -183,8 +299,12 @@ module AppSendr::Command
               @app_dir = path_to_app_dir
           end
           return @app_name if @app_name
-          @app_name = Dir.entries(@app_dir).grep(/.+\.app$/).first
-          @app_name
+          if File.directory? @app_dir
+              @app_name = Dir.entries(@app_dir).grep(/.+\.app$/).first
+              @app_name
+          else
+              error "#{@app_dir} does not exisit"
+          end
       end
       
       def ipa_app_name(app_name)

data/lib/appsendr/commands/collaborators.rb

@@ -10,7 +10,7 @@ module AppSendr::Command
 
                   testers = appsendr.collaborators(read_app_id)
                   if testers["message"].size > 0
-                    display "=== Your collaborators"
+                    message "Your collaborators"
                     i = 0
                     display testers["message"].map {|app, id|
                         "#{i+=1}. #{app['name']} - #{app['email']}"
@@ -20,5 +20,33 @@ module AppSendr::Command
                   end
               end
       end
+      
+      
+      def add
+          
+          if require_project(2,"add collaborators","an email", true)
+              email = args.shift.strip
+
+              begin 
+              response = appsendr.add_collaborator(read_app_id,email)
+              rescue RestClient::RequestFailed => e
+                  message "Errors"
+                  response = JSON.parse(e.http_body)
+                  response['message'].each{|err|
+                      display err.join(" ")
+                  }
+              end
+              
+          end
+      end
+      
+      def remove
+          if require_project(1,"remove testers","an email")
+              entered_email = args.shift.strip
+              
+              appsendr.remove_collaborator(read_app_id,entered_email)
+              
+          end
+      end
   end
 end

data/lib/appsendr/commands/deploy.rb

@@ -11,20 +11,31 @@ module AppSendr::Command
           # opts.parse!(args) rescue return false
           #       
           #       
+          notify = option_exists?('--notify', false)
           
           @configuration = load_configuration          
           if require_project(1,"deploy","your active configuration name",true)
+              
               @app_dir = path_to_app_dir
               @app_path = @app_dir+"/#{app_name}"
               if @app_name
+                  
                   @notes = ask_for_notes
+                  message "Deploying #{@app_name}"    
+                  
+                  message "Building IPA File"    
 
                   @ipa_path = build_ipa_with_app_at_path                  
                   info = app_info              
                   bundle_identifier ||= info['CFBundleIdentifier']
                   icon_path = icon_path(info)
-                  notify = option_exists?('--notify', false)
-                  appsendr.upload(read_app_id,@ipa_path, profile_path,notify,@notes,bundle_identifier,icon_path)
+                  if is_file_to_large?(@ipa_path)
+                      upload_large_ipa(read_app_id,@ipa_path, profile_path,notify,@notes,bundle_identifier,icon_path)
+                  else
+                      appsendr.upload(read_app_id,@ipa_path, profile_path,notify,@notes,bundle_identifier,icon_path)
+                      message "App deployed"
+                      
+                  end
                   FileUtils.rm_rf @ipa_path
               else
                   error "No .app file was built for the configuration \"#{@configuration}\". Compile your app or use the \"build\" command."

data/lib/appsendr/commands/groups.rb

@@ -0,0 +1,63 @@
+module AppSendr::Command
+  class Groups < Base
+      def index #output testers
+            if in_project_dir?
+
+            	groups = appsendr.groups(read_app_id)
+            	    if groups["message"].size > 0
+            	      message "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 add
+          if in_project_dir?
+              name = args.join(" ").strip
+              appsendr.add_group(read_app_id,name)
+              message "Group added"
+          else
+          	error("You are not in a project directory")
+          end
+      end
+      
+      def remove
+          if in_project_dir?
+              name = args.join(" ").strip
+              appsendr.remove_group(read_app_id,name)
+              message "Removed group"
+          else
+          	error("You are not in a project directory")
+          end
+      end
+      
+      def add_tester #<group> #<email>
+          
+          if in_project_dir?
+              email = args.shift.strip
+              name = args.join(" ").strip
+              appsendr.add_group_tester(read_app_id,name, email)
+              message "Added tester to group"
+          else
+          	error("You are not in a project directory")
+          end
+      end
+      def remove_tester #<group> #<email> 
+          if in_project_dir?
+              email = args.shift.strip
+              name = args.join(" ").strip
+              appsendr.remove_group_tester(read_app_id,name, email)
+              message "Added tester to group"
+          else
+          	error("You are not in a project directory")
+          end
+      end
+  end
+end

data/lib/appsendr/commands/help.rb

@@ -49,12 +49,19 @@ module AppSendr::Command
         group.command 'testers:remove <email> ',     'remove a tester'
         group.command 'testers:clear',               'remove all testers'
         group.command 'testers:notify <group>',  'notify testers about the latest build. group is optional.'
-        group.space
-        group.command 'groups',               'list groups'
+        group.command 'testers:devices',  'devices of your testers'
+        
+        # group.space
+        # group.command 'groups',               'list groups'
+        # group.command 'groups:add <name>',               'add group'
+        # group.command 'groups:remove <name>',               'remove group'
+        # group.command 'groups:add_tester <email> <group name>',     'add tester to group'
+        # group.command 'groups:remove_tester <email> <group name>',  'remove tester from group'
+        
         group.space
         group.command 'collaborators',               'list collaborators'
         group.command 'collaborators:add <email>',   'add collaborators'
-        group.command 'collaborators:remove <email>','add collaborators'
+        group.command 'collaborators:remove <email>','remove collaborators'
       end
 
     end