ucb_deployer 0.0.6 → 0.0.7

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require 'echoe'
 require 'spec/rake/spectask'
 
-Echoe.new('ucb_deployer', '0.0.6') do |p|
+Echoe.new('ucb_deployer', '0.0.7') do |p|
   p.description    = "Tool for deploying (Java/JRuby) war files to tomcat"
   p.url            = "http://ucbrb.rubyforge.org"
   p.author         = "Steven Hansen"

data/bin/deployer

@@ -1,10 +1,15 @@
 #!/usr/bin/env ruby
+
+require 'pp'
+require 'rubygems'
 require 'rake'
+# $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'ucb_deployer'
 
+
 Rake.application.init("ucb_deployer")
 
-USAGE = "Usage: deployer APP=<confluence|jira> VERSION=x.x.x"
+USAGE = "Usage: deployer <task> APP=<confluence|jira> VERSION=x.x.x"
 
 task :deploy => [:build] do
   @deployer.deploy()
@@ -24,8 +29,8 @@ end
 
 task :init => [:check_usage] do
   begin
+    UcbDeployer.debug_mode = true if ENV["DEBUG"]
     @deployer = UcbDeployer.factory(ENV["APP"].to_sym)
-    @deployer.debug_mode = true if ENV["DEBUG"]
   rescue UcbDeployer::ConfigError => e
     $stderr.puts(USAGE)
     $stderr.puts(e.message)    

data/lib/ucb_deployer/confluence_deployer.rb

@@ -3,7 +3,7 @@ module UcbDeployer
   class ConfluenceDeployer < Deployer
     
     def initialize(config_file = "#{ENV['HOME']}/config/confluence/deploy.yml")
-      FileUtils.touch(config_file) if !File.exists?(config_file)
+      debug("Using config file: #{config_file}")
       load_config(config_file)
     end
     

data/lib/ucb_deployer/deployer.rb

@@ -56,9 +56,9 @@ module UcbDeployer
     # +data_dir+  
     #
     def load_config(config_file)
-      debug("Using config file: #{config_file}")
-      debug("Setting options:")
       hash = YAML.load_file(config_file)
+      
+      debug("Setting options:")
       hash.each do |key, val|
         debug("#{key}: #{val}")      
         if CONFIG_OPTIONS.include?(key.to_sym)

data/lib/ucb_deployer.rb

@@ -21,13 +21,17 @@ module UcbDeployer
   # @return [UcbDeployer::Deployer]
   #
   def self.factory(app_name)
-    if app_name == :confluence
-      UcbDeployer::ConfluenceDeployer.new()
-    elsif app_name == :jira
-      UcbDeployer::JiraDeployer.new()
-    else
-      raise(ConfigError, "Unrecognized app_name: #{app_name}")
+    begin
+      if app_name == :confluence
+        return UcbDeployer::ConfluenceDeployer.new()
+      elsif app_name == :jira
+        return UcbDeployer::JiraDeployer.new()
+      end
+    rescue => e
+      raise(UcbDeployer::ConfigError, e)
     end
+    
+    raise(ConfigError, "Unrecognized app_name: #{app_name}")
   end
 
   def self.debug(str)

data/ucb_deployer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ucb_deployer}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hansen"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_deployer
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Steven Hansen