combat 0.8.6 → 0.9.1

data/Readme.md

@@ -15,12 +15,16 @@ In your mobile applications directory run
 
     combat setup
     
-This creates a new <tt>config.yml</tt>.
+This creates a new <tt>combat.yml</tt>.
 
 To run a new deploy type
 
     combat deploy
     
+To open the deploy page run
+
+    combat open
+    
 # Configuration
 
 Create a <tt>~/.combatrc</tt> with default configuration for all combat projects, like this example:
@@ -34,4 +38,11 @@ Create a <tt>~/.combatrc</tt> with default configuration for all combat projects
 
 Todo stuff:
 
- * Test Android support
+ * Slicker ui, better design
+ * Dynamic behaviour: when you start the download process the button should turn to "Downloading in progress"
+ * Refactor code
+ * Support for private deploys (via .htaccess or some other password scheme)
+ 
+# Author
+
+Copyright © 2011 Tomislav Car, [Infinum](http://www.infinumdigital.com)

data/lib/combat.rb

@@ -1,6 +1,10 @@
 class Combat < Thor
   include Thor::Actions
 
+  map '-s' => 'setup'
+  map '-d' => 'deploy'
+  map '-o' => 'open'
+
   desc "setup", "Setup a new mobile project for deploying"
   def setup
     defaults = load_defaults
@@ -51,6 +55,9 @@ class Combat < Thor
     load_config
     
     if @config.valid?
+      deploy_html_file = 'combat_deployed_page.html'
+      
+      @config.deployed_at = Time.now
       system "ssh #{@config.user_and_host} 'mkdir -p #{@config.path}'"
       system "ssh #{@config.user_and_host} 'rm -fr #{@config.path}/*'"
       
@@ -61,18 +68,24 @@ class Combat < Thor
       else
         system "scp bin/*.apk #{@config.user_and_host}:#{@config.path}"
       end
+
+      system "scp '#{@config.icon_source_path}' #{@config.user_and_host}:#{@config.path}/#{@config.icon_path}"        
       
-      File.open('deployed/index.html', 'w+'){|x| 
-        x.puts generate_html_file
-      }
-      system "scp deployed/index.html #{@config.user_and_host}:#{@config.path}"      
-      remove_file 'deployed/index.html'
+      File.open(deploy_html_file, 'w+'){|x| x.puts generate_html_file  }
+      system "scp #{deploy_html_file} #{@config.user_and_host}:#{@config.path}/index.html"      
+      remove_file deploy_html_file
       
       say "Successfully deployed to #{@config.url}"
     else
       say "Config not valid, please check"
     end
   end
+  
+  desc "open", "Open the deploy page in the browser (Mac OS only)"
+  def open
+    load_config
+    %x{open #{@config.url}}
+  end  
 
   no_tasks do
     def load_defaults

data/lib/settings.rb

@@ -1,5 +1,6 @@
 class Settings
   attr_accessor :name, :url, :path, :filename, :plist_file, :provision_file_name, :remote_user, :host, :type, :template_file, :ipa_file
+  attr_accessor :deployed_at, :icon_source_path, :icon_path
   
   def initialize(options)
     @name = options[:name]
@@ -16,12 +17,17 @@ class Settings
     @ipa_file = "#{@filename}.ipa"
     @plist_file_url = "#{@url}#{@plist_file}"
     @template_file = options[:template] || "#{COMBAT_ROOT}/templates/template.erb"
+    @deployer = %x(whoami).strip
     
     if (type == 'android')
-      @qrcode = "http://qrcode.kaywa.com/img.php?s=8&d=#{ERB::Util.url_encode(@url)}#{@filename}.apk"
+      @icon_source_path = "res/drawable-hdpi/icon.png"
+#      @qrcode = "http://qrcode.kaywa.com/img.php?s=6&d=#{ERB::Util.url_encode(@url)}#{@filename}.apk"
     else
-      @qrcode = "http://qrcode.kaywa.com/img.php?s=8&d=#{ERB::Util.url_encode(@url)}"
+      @icon_source_path = "Icon@2x.png"
     end
+    @qrcode = "http://qrcode.kaywa.com/img.php?s=6&d=#{ERB::Util.url_encode(@url)}"
+    
+    @icon_path = "icon.png"
   end
   
   def user_and_host

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Combat
-  VERSION = '0.8.6'
+  VERSION = '0.9.1'
 end

data/templates/template.erb

@@ -4,7 +4,7 @@
     <title><%= @name %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no" />
     <style type="text/css" media="screen">
-      @media only screen and (max-device-width: 480px) {
+      @media only screen and (max-device-width: 640px) {
     	    .desktop_only {
     	        display:none;
     	    }
@@ -13,14 +13,20 @@
         font-family: Helvetica;
       }
       h1{
-        text-align: center;
+        padding-left: 10px;
+        margin-bottom: 5px;
       }
       p{
-        text-align: center;
+        padding-left: 10px;
+        margin-top: 0px;
+      }
+      table{
+        margin-bottom: 10px;
       }
       #container{
         width: 100%;
         max-width: 300px;
+        width: 300px;
         margin: 10px auto;
       }
       a{
@@ -41,16 +47,49 @@
       li{
         margin-bottom: 20px;
       }
+      .date{
+        font-size: 0.8em;
+        color: #666;
+        text-align: right;
+        font-style: italic;        
+      }
+      .instructions{
+        font-size: 0.8em;
+      }
+      .icon{
+        margin-top: 10px;
+      }
+      .text_center{
+        text-align: center;
+      }
     </style>
   </head>
   <body>
     <div id="container">
-      <h1><%= @name %></h1>
-      <p>
-        <% 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:        
+      <table>
+        <tr>
+        <% if @icon_path %>
+        <td valign="top">
+          <img class="icon" src="<%= @icon_path %>" width="72" height="72" />
+        </td>
+        <% end %>
+        
+        <td>
+        <h1><%= @name %></h1>
+        <p class="instructions">
+          <% if @type == 'iphone' %>
+            To install <%= @name %> take two steps on your iPhone or iPad device:
+          <% else %>
+            To install just click the following link on your Android device:        
+          <% end %>
+        </p>
+        </td>        
+        </tr>
+      </table>
+      <p class="date">
+        Deployed <%= @deployed_at.strftime("%B %d, %Y at %I:%M") %>
+        <% if @deployer %>
+        by <%= @deployer %>
         <% end %>
       </p>
       <ol>
@@ -74,7 +113,7 @@
           </li>        
         <% end %>
       </ol>
-      <p class="desktop_only">
+      <p class="desktop_only text_center">
         <% if @type == 'android' %>
           Use QR code to install APK
           <img src="<%= @qrcode %>" />

metadata

@@ -2,7 +2,7 @@
 name: combat
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.6
+  version: 0.9.1
 platform: ruby
 authors: 
 - Tomislav Car
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 Z
+date: 2011-10-25 00:00:00 Z
 dependencies: []
 
 description: Deploy your iPhone and Android apps to clients with ease. It's like Capistrano, only for mobile apps.