combat 0.9.2 → 0.9.5

data/lib/combat.rb

@@ -1,5 +1,7 @@
 class Combat < Thor
   include Thor::Actions
+  
+  COMBAT_CONFIG_FILE = 'combat.yml'
 
   map '-s' => 'setup'
   map '-d' => 'deploy'
@@ -37,8 +39,8 @@ class Combat < Thor
       :remote_user => defaults[:remote_user] || 'www-data'
     }    
 
-    unless File.exists?('combat.yml')
-      create_file 'combat.yml', settings.to_yaml
+    unless File.exists?(COMBAT_CONFIG_FILE)
+      create_file COMBAT_CONFIG_FILE, settings.to_yaml
     end
     
     system "mkdir -p deployed"
@@ -51,8 +53,9 @@ class Combat < Thor
   end
   
   desc "deploy", "Deploy a project to the server for testing"
+  method_options :config => :string  
   def deploy
-    load_config
+    load_config(options[:config] || COMBAT_CONFIG_FILE)
     
     if @config.valid?
       deploy_html_file = 'combat_deployed_page.html'
@@ -82,8 +85,9 @@ class Combat < Thor
   end
   
   desc "open", "Open the deploy page in the browser (Mac OS only)"
+  method_options :config => :string
   def open
-    load_config
+    load_config(options[:config] || COMBAT_CONFIG_FILE)
     %x{open #{@config.url}}
   end  
 
@@ -97,8 +101,8 @@ class Combat < Thor
       end
     end
     
-    def load_config
-      string = File.read("combat.yml")
+    def load_config(file)
+      string = File.read(file)
       yml = YAML::load(string)
       @config = Settings.new(yml)      
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Combat
-  VERSION = '0.9.2'
+  VERSION = '0.9.5'
 end

metadata

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