combat 0.6 → 0.7

data/{main.thor → bin/combat}

@@ -1,10 +1,14 @@
-$LOAD_PATH.unshift File.dirname(__FILE__)
+#!/usr/bin/env ruby
+COMBAT_ROOT = File.join(File.dirname(File.expand_path(__FILE__)), '..')
+$:.unshift File.join(COMBAT_ROOT, 'lib')
 require "rubygems"
 require "bundler/setup"
 
 # gems and libraries
 require 'ostruct'
 require 'erb'
+require 'yaml'
+require 'thor'
 
 # local classes
 require 'settings'
@@ -42,6 +46,8 @@ class Combat < Thor
       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"    
+      
+      say "Successfully deployed to #{@config.url}"
     else
       say "Config not valid, please check"
     end
@@ -61,9 +67,10 @@ class Combat < Thor
     end
     
     def generate_html_file
-      erb = ERB.new(File.read("template_#{@config.type}.erb"))
+      erb = ERB.new(File.read(@config.template_file))
       erb.result(@config.get_binding)
     end    
   end
+end
 
-end
+Combat.start

data/{settings.rb → lib/settings.rb}

@@ -1,5 +1,5 @@
 class Settings
-  attr_accessor :name, :url, :path, :filename, :plist_file, :provision_file_name, :remote_user, :host, :type
+  attr_accessor :name, :url, :path, :filename, :plist_file, :provision_file_name, :remote_user, :host, :type, :template_file
   
   def initialize(options)
     @name = options[:name]
@@ -13,6 +13,7 @@ class Settings
     @provision_file_name = "#{@filename}_AdHoc.mobileprovision"
     @plist_file = "#{@filename}.plist"
     @plist_file_url = "#{@url}#{@plist_file}"
+    @template_file = "#{COMBAT_ROOT}/templates/template_#{@type}.erb"
   end
   
   def user_and_host

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  version: "0.6"
+  - 7
+  version: "0.7"
 platform: ruby
 authors: 
 - Tomislav Car
@@ -30,12 +30,11 @@ extra_rdoc_files:
 files: 
 - Readme.md
 - LICENSE
-- combat.yml
 - Gemfile
 - Gemfile.lock
-- main.thor
-- settings.rb
-- template_iphone.erb
+- bin/combat
+- lib/settings.rb
+- templates/template_iphone.erb
 has_rdoc: true
 homepage: http://github.com/infinum/combat
 licenses: []

data/combat.yml

@@ -1,7 +0,0 @@
---- 
-: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