combat 0.9.6 → 0.9.7

data/lib/combat.rb

@@ -36,7 +36,8 @@ class Combat < Thor
       :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'
+      :remote_user => defaults[:remote_user] || 'www-data',
+      :enterprise => true
     }    
 
     unless File.exists?(COMBAT_CONFIG_FILE)
@@ -65,7 +66,7 @@ class Combat < Thor
       system "ssh #{@config.user_and_host} 'rm -fr #{@config.path}/*'"
       
       if @config.type == 'iphone'
-        system "scp deployed/#{@config.provision_file_name} #{@config.user_and_host}:#{@config.path}"      
+        system "scp deployed/#{@config.provision_file_name} #{@config.user_and_host}:#{@config.path}" unless @config.is_enterprise     
         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

data/lib/settings.rb

@@ -1,5 +1,5 @@
 class Settings
-  attr_accessor :name, :url, :path, :filename, :plist_file, :provision_file_name, :remote_user, :host, :type, :template_file, :ipa_file
+  attr_accessor :name, :url, :path, :filename, :plist_file, :provision_file_name, :remote_user, :host, :type, :template_file, :ipa_file, :is_enterprise
   attr_accessor :deployed_at, :icon_source_path, :icon_path
   
   def initialize(options)
@@ -11,6 +11,7 @@ class Settings
     @path = options[:path]
     @type = options[:type]
     @remote_user = options[:remote_user]
+    @is_enterprise = options[:enterprise]
 
     if @filename.nil? || @filename.empty?
       @filename = @name.gsub(" ", "_") 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Combat
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

data/templates/template.erb

@@ -94,12 +94,14 @@
       </p>
       <ol>
         <% if @type == 'iphone' %>
+			<% unless @is_enterprise %>
           <li>
             <a href="<%= @provision_file_name %>">
               Install provisioning file<br/>
               (only first time)
             </a>
           </li>
+			<% end %>
           <li>
             <a href="itms-services://?action=download-manifest&url=<%= @plist_file_url %>">
               Install <%= @name %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combat
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2012-05-16 00:00:00.000000000Z
 dependencies: []
 description: Deploy your iPhone and Android apps to clients with ease. It's like Capistrano,
   only for mobile apps.