combat 0.7 → 0.8

data/Readme.md

@@ -20,9 +20,18 @@ This creates a new <tt>config.yml</tt>.
 To run a new deploy type
 
     combat deploy
+    
+# Configuration
+
+Create a <tt>~/.combatrc</tt> with default configuration for all combat projects, like this example:
+
+    --- 
+    :host: my.server.com
+    :path: /var/www/myserver/mobile_apps/
+    :url: http://my.server.com/mobile_apps    
 
 # TODO
 
 Todo stuff:
 
- * Android support
+ * Test Android support

data/bin/combat

@@ -18,18 +18,47 @@ class Combat < Thor
 
   desc "setup", "Setup a new mobile project for deploying"
   def setup
+    defaults = load_defaults
+    name = Dir['*.xcodeproj']
+
+    if name.size == 1
+      name.first.gsub(/.xcodeproj/, '')
+      type = 'iphone'
+    else
+      name = Dir['AndroidManifest.xml']
+      
+      if name.size == 1
+        name = File.basename(Dir.pwd)
+        type = 'android'
+      else
+        name = 'New project'
+        type = 'iphone'
+      end
+    end
+
+    defaults[:path] = File.join(defaults[:path], type, name) if defaults[:path]
+    defaults[:url] = File.join(defaults[:url], type, name) if defaults[:url]
+
     settings = {
-      :type => 'iphone',
-      :name => 'New project',
-      :host => 'my.hostname.com',
-      :path => '/var/www/my.hostname.com/deploy_folder',
-      :url => 'http://my.hostname.com/deploy_folder',
-      :remote_user => 'www-data'
+      :type => type,
+      :name => name,
+      :host => defaults[:host] || 'my.hostname.com',
+      :path => defaults[:path] || '/var/www/my.hostname.com/deploy_folder',
+      :url => defaults[:url] || 'http://my.hostname.com/deploy_folder',
+      :remote_user => defaults[:remote_user] || 'www-data'
     }    
 
     unless File.exists?('combat.yml')
       create_file 'combat.yml', settings.to_yaml
     end
+    
+    system "mkdir -p deployed"
+    
+    if settings[:type] == 'iphone'
+      say "Combat has been setup for #{name}. Copy your #{name}.mobileprovision, #{name}.plist and #{name}.ipa to the deploy/ folder"
+    else
+      say "Combat has been setup for #{name}."
+    end
   end
   
   desc "deploy", "Deploy a project to the server for testing"
@@ -39,13 +68,20 @@ class Combat < Thor
     if @config.valid?
       system "ssh #{@config.user_and_host} 'mkdir -p #{@config.path}'"
       system "ssh #{@config.user_and_host} 'rm -fr #{@config.path}/*'"
-      File.open('index.html', 'w+'){|x| 
-        str = generate_html_file
+      
+      if @config.type == 'iphone'
+        system "scp deployed/#{@config.provision_file_name} #{@config.user_and_host}:#{@config.path}"      
+        system "scp deployed/#{@config.plist_file} #{@config.user_and_host}:#{@config.path}"
+        system "scp deployed/#{@config.ipa_file} #{@config.user_and_host}:#{@config.path}"
+      else
+        system "scp bin/*.apk #{@config.user_and_host}:#{@config.path}"
+      end
+      
+      File.open('deployed/index.html', 'w+'){|x| 
         x.puts generate_html_file
       }
-      system "scp index.html #{@config.user_and_host}:#{@config.path}"
-      remove_file 'index.html'
-      # system "scp -r app/config www-data@vz1.infinum.hr:l/labs.infinum.hr/rba/stage/config"    
+      system "scp deployed/index.html #{@config.user_and_host}:#{@config.path}"      
+      remove_file 'deployed/index.html'
       
       say "Successfully deployed to #{@config.url}"
     else
@@ -54,6 +90,15 @@ class Combat < Thor
   end
 
   no_tasks do
+    def load_defaults
+      defaults_file_path = File.expand_path('~/.combatrc')
+      if File.exists?(defaults_file_path)
+        YAML::load(File.read(defaults_file_path))
+      else
+        {}
+      end
+    end
+    
     def load_config
       string = File.read("combat.yml")
       yml = YAML::load(string)

data/lib/settings.rb

@@ -1,19 +1,22 @@
 class Settings
-  attr_accessor :name, :url, :path, :filename, :plist_file, :provision_file_name, :remote_user, :host, :type, :template_file
+  attr_accessor :name, :url, :path, :filename, :plist_file, :provision_file_name, :remote_user, :host, :type, :template_file, :ipa_file
   
   def initialize(options)
     @name = options[:name]
     @url = options[:url]
+    @url+= "/" unless @url.match(/\/$/)
     @host = options[:host]
     @path = options[:path]
     @type = options[:type]
     @remote_user = options[:remote_user]
 
-    @filename = @name.downcase.gsub(" ", "_")
-    @provision_file_name = "#{@filename}_AdHoc.mobileprovision"
+    @filename = @name.gsub(" ", "_")
+    @provision_file_name = "#{@filename}.mobileprovision"
     @plist_file = "#{@filename}.plist"
+    @ipa_file = "#{@filename}.ipa"
     @plist_file_url = "#{@url}#{@plist_file}"
-    @template_file = "#{COMBAT_ROOT}/templates/template_#{@type}.erb"
+    @template_file = options[:template] || "#{COMBAT_ROOT}/templates/template.erb"
+    @qrcode = "http://qrcode.kaywa.com/img.php?s=8&d=#{ERB::Util.url_encode(@url)}"
   end
   
   def user_and_host

data/templates/{template_iphone.erb → template.erb}

@@ -40,9 +40,14 @@
     <div id="container">
       <h1><%= @name %></h1>
       <p>
-        To install <%= @name %> take 2 steps on your iPhone or iPad device:
+        <% if @type == 'iphone' %>
+          To install <%= @name %> take 2 steps on your iPhone or iPad device:
+        <% else %>
+          To install just click on the following link on your Android device:        
+        <% end %>
       </p>
       <ol>
+        <% if @type == 'iphone' %>
           <li>
             <a href="<%= @provision_file_name %>">
               Install provisioning file<br/>
@@ -54,7 +59,18 @@
               Install <%= @name %>
             </a>
           </li>
+        <% else %>
+          <li>
+            <a href="<%= @filename %>.apk">
+              Install <%= @name %>
+            </a>
+          </li>        
+        <% end %>
       </ol>
+      <p>
+        QR code to this page
+        <img src="<%= @qrcode %>" />
+      </p>
     </div>
   </body>
 </html>

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  version: "0.7"
+  - 8
+  version: "0.8"
 platform: ruby
 authors: 
 - Tomislav Car
@@ -13,15 +13,15 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 +02:00
+date: 2011-07-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: Deploy your iPhone and Android apps to clients with ease. It's like Capistrano, only for mobile apps.
 email: 
 - tomislav@infinum.hr
-executables: []
-
+executables: 
+- combat
 extensions: []
 
 extra_rdoc_files: 
@@ -34,7 +34,7 @@ files:
 - Gemfile.lock
 - bin/combat
 - lib/settings.rb
-- templates/template_iphone.erb
+- templates/template.erb
 has_rdoc: true
 homepage: http://github.com/infinum/combat
 licenses: []